summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Vlad <marius.vlad@collabora.com>2023-09-26 15:27:40 +0300
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2024-04-26 16:15:24 +0200
commitdd0920346046339ac9f293b6925db0a6444a0591 (patch)
treed3a0b3aa6770d8e0e4a2361e734eab768a6a2c9a
parent62dc0e81f446b75a4746d49cd893dac6697f0c58 (diff)
weston: Fix toytoolkit rotation missing from libweston12
Turns out we missed a fix for libweston12, which we should've included it. Carry the fix until a new libweston12 point release will released. Bug-AGL: SPEC-4915 Change-Id: I77cda5ff5b19b5cd15cd2b82548a4af6a06ac32a Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29257 Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
-rw-r--r--meta-agl-core/recipes-graphics/wayland/weston/0001-toy-toolkit-Fix-rotations.patch32
-rw-r--r--meta-agl-core/recipes-graphics/wayland/weston_12.0_aglcore.inc5
2 files changed, 36 insertions, 1 deletions
diff --git a/meta-agl-core/recipes-graphics/wayland/weston/0001-toy-toolkit-Fix-rotations.patch b/meta-agl-core/recipes-graphics/wayland/weston/0001-toy-toolkit-Fix-rotations.patch
new file mode 100644
index 000000000..8c506409c
--- /dev/null
+++ b/meta-agl-core/recipes-graphics/wayland/weston/0001-toy-toolkit-Fix-rotations.patch
@@ -0,0 +1,32 @@
+From dbdbc6b5bce99f370e9627aeff9cfeaa7fe018c2 Mon Sep 17 00:00:00 2001
+From: Derek Foreman <derek.foreman@collabora.com>
+Date: Mon, 26 Jun 2023 11:19:23 -0500
+Subject: [PATCH] toy-toolkit: Fix rotations
+
+Ever since commit 3012934 some rotations have been broken. This is because
+I transposed xy and yx in the cairo_matrix_init() call.
+
+Upstream-Status: Pending
+
+Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
+(cherry picked from commit f0196739ae42195f178ce889e12460228a7a25cb)
+---
+ clients/window.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clients/window.c b/clients/window.c
+index f8bcd4d77..30f64109e 100644
+--- a/clients/window.c
++++ b/clients/window.c
+@@ -1661,7 +1661,7 @@ widget_cairo_update_transform(struct widget *widget, cairo_t *cr)
+ surface->allocation.width,
+ surface->allocation.height,
+ surface->buffer_scale);
+- cairo_matrix_init(&m, matrix.d[0], matrix.d[4], matrix.d[1],
++ cairo_matrix_init(&m, matrix.d[0], matrix.d[1], matrix.d[4],
+ matrix.d[5], matrix.d[12], matrix.d[13]);
+ cairo_transform(cr, &m);
+ }
+--
+2.40.1
+
diff --git a/meta-agl-core/recipes-graphics/wayland/weston_12.0_aglcore.inc b/meta-agl-core/recipes-graphics/wayland/weston_12.0_aglcore.inc
index caec5b90a..5333d7c72 100644
--- a/meta-agl-core/recipes-graphics/wayland/weston_12.0_aglcore.inc
+++ b/meta-agl-core/recipes-graphics/wayland/weston_12.0_aglcore.inc
@@ -2,7 +2,10 @@ FILESEXTRAPATHS:append := ":${THISDIR}/weston"
PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'weston-remoting', ' remoting', '', d)}"
-SRC_URI:append = "file://0001-libweston-weston-log-Add-a-iterator-helper-for-debug.patch "
+SRC_URI:append = "file://0001-libweston-weston-log-Add-a-iterator-helper-for-debug.patch \
+ file://0001-toy-toolkit-Fix-rotations.patch \
+"
+
# Split weston-terminal out of the main package to allow installing it
# separately for use with other compositors. The icons, etc. that end