diff --git a/U_xorg-xserver-e89edec497ba.patch b/U_xorg-xserver-e89edec497ba.patch new file mode 100644 index 0000000..dfe0ff5 --- /dev/null +++ b/U_xorg-xserver-e89edec497ba.patch @@ -0,0 +1,54 @@ +From e89edec497bac581ca9b614fb00c25365580f045 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= +Date: Fri, 19 Jan 2024 13:05:51 +0100 +Subject: [PATCH] ephyr: Fix incompatible pointer type build error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix a compilation error on 32 bits architectures with gcc 14: + + ephyr_glamor_xv.c: In function ‘ephyr_glamor_xv_init’: + ephyr_glamor_xv.c:154:31: error: assignment to ‘SetPortAttributeFuncPtr’ {aka ‘int (*)(struct _KdScreenInfo *, long unsigned int, int, void *)’} from incompatible pointer type ‘int (*)(KdScreenInfo *, Atom, INT32, void *)’ {aka ‘int (*)(struct _KdScreenInfo *, long unsigned int, long int, void *)’} [-Wincompatible-pointer-types] + 154 | adaptor->SetPortAttribute = ephyr_glamor_xv_set_port_attribute; + | ^ + ephyr_glamor_xv.c:155:31: error: assignment to ‘GetPortAttributeFuncPtr’ {aka ‘int (*)(struct _KdScreenInfo *, long unsigned int, int *, void *)’} from incompatible pointer type ‘int (*)(KdScreenInfo *, Atom, INT32 *, void *)’ {aka ‘int (*)(struct _KdScreenInfo *, long unsigned int, long int *, void *)’} [-Wincompatible-pointer-types] + 155 | adaptor->GetPortAttribute = ephyr_glamor_xv_get_port_attribute; + | ^ + +Build error logs: +https://koji.fedoraproject.org/koji/taskinfo?taskID=111964273 + +Signed-off-by: José Expósito +--- + hw/kdrive/ephyr/ephyr_glamor_xv.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/hw/kdrive/ephyr/ephyr_glamor_xv.c b/hw/kdrive/ephyr/ephyr_glamor_xv.c +index 4dd15cf417..b5eae48c85 100644 +--- a/hw/kdrive/ephyr/ephyr_glamor_xv.c ++++ b/hw/kdrive/ephyr/ephyr_glamor_xv.c +@@ -50,16 +50,16 @@ ephyr_glamor_xv_stop_video(KdScreenInfo *screen, void *data, Bool cleanup) + + static int + ephyr_glamor_xv_set_port_attribute(KdScreenInfo *screen, +- Atom attribute, INT32 value, void *data) ++ Atom attribute, int value, void *data) + { +- return glamor_xv_set_port_attribute(data, attribute, value); ++ return glamor_xv_set_port_attribute(data, attribute, (INT32)value); + } + + static int + ephyr_glamor_xv_get_port_attribute(KdScreenInfo *screen, +- Atom attribute, INT32 *value, void *data) ++ Atom attribute, int *value, void *data) + { +- return glamor_xv_get_port_attribute(data, attribute, value); ++ return glamor_xv_get_port_attribute(data, attribute, (INT32 *)value); + } + + static void +-- +GitLab + diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index ce507d2..5e82dd0 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 25 16:04:30 UTC 2024 - Martin Jambor + +- Added U_xorg-xserver-e89edec497ba.patch to fix incompatible pointer + type error with GCC 14. + ------------------------------------------------------------------- Thu Jul 18 10:44:59 UTC 2024 - Stefan Dirsch diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 0138f8f..6c521d5 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -244,6 +244,7 @@ Patch2000: u_fbdevhw_kernel6.9_break_fbdev_open.patch Patch1218176: u_miCloseScreen_check_for_null_pScreen_dev_private.patch Patch1222442: U_render-Avoid-possible-double-free-in-ProcRenderAddGl.patch +Patch1222443: U_xorg-xserver-e89edec497ba.patch %description This package contains the X.Org Server. @@ -404,6 +405,7 @@ sh %{SOURCE92} --verify . %{SOURCE91} %patch -P 1218176 -p1 %patch -P 1222442 -p1 +%patch -P 1222443 -p1 %build # We have some -z now related errors during X default startup (boo#1197994):