diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-05-22 00:06:25 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-05-22 00:06:25 +0100 |
commit | 236e75597883501f8700d9ba1a5c8276f578a17f (patch) | |
tree | 6b441a1dfa3a82840e3aa74678cc90c5294a4bca /x11-base/xorg-server | |
parent | bfd63d5b0e96ad32e0d0a8fe15512b6a9ac6fc9e (diff) |
gentoo auto-resync : 22:05:2024 - 00:06:25
Diffstat (limited to 'x11-base/xorg-server')
-rw-r--r-- | x11-base/xorg-server/Manifest | 3 | ||||
-rw-r--r-- | x11-base/xorg-server/files/xorg-server-21.1.10-fix-c99-32bit.patch | 54 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild (renamed from x11-base/xorg-server/xorg-server-21.1.13.ebuild) | 2 |
3 files changed, 58 insertions, 1 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 97e9bc405c64..6fce6a0fe4cf 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,8 +1,9 @@ AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1beaf8a8714a85f1cfe65032df3e9ea23378b4d2db0057ea7a75ab00e8d5d89ae0d63c766dce05350446f69ffe69bb668d06e2e68b SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5 AUX xorg-server-21.1.10-c99.patch 1508 BLAKE2B 7c4080924f5f5a8d4be2addae218bbc66e7532798bcd9bd5c43498afb09adfeb1d2238a0157add2e4f9ad49d5f00a80c1acb41001b08ccb509dd2da614276da6 SHA512 d5e5c33834966599df376d0ad3a425f4b56dc4dcc2ca549731dfcc1acfb3e20cf30644586daf590be90357e03d323f7d7d9e2efa8dff6a748a2ce0e1249b6bd3 +AUX xorg-server-21.1.10-fix-c99-32bit.patch 2821 BLAKE2B c0fb85a4b7aef3b025b054ce525ffd8e8eb3a4cef3b249a764d328fd3c83336ab50d278f13214691b71b4644bd5604094ca3d5d26341f69625b55fa1c424e12c SHA512 21880bd7f6a8008b1f44e815e6bfc83976153f8639de7d004b82adc647c9e9715d2ba9d4dcb8ad2e16f4b9b80441fe7acae1cc10091fc00b7ba7dc761d167958 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1 -EBUILD xorg-server-21.1.13.ebuild 4597 BLAKE2B 64f058ab6c0c2c37fdea3db9e1a7ec986294b4097ce6cfaffa34e55fe990c752885f5f361bc45699db649f6f533cb7784cef1e26a4730f7010220ebccaac52ee SHA512 32b6b238c87a75bbc77a7d7a7e3591189a903be9e9a27f8d2a20389ea3e02caeb253b5d00bfe7740268b4d656c662997b4f9c8016f63b526f7c8ffd63c236fb0 +EBUILD xorg-server-21.1.13-r1.ebuild 4690 BLAKE2B 95b4ed10aa4909d74f38f36b6701a73815da0d0152a742bb2ad05a56c6c0cd2b9a3087d5329b41f62e6813d7601b69054de5b7084621d734c922f839de85631b SHA512 40b388f1a08e6d2ac299af817dfd6e7485ff222ef3131769f0be05829da5bd9f564611bb44872f07ee2255a5386a9e115e632730c1a6ce2e48a0807855b957f6 EBUILD xorg-server-9999.ebuild 4493 BLAKE2B cad2953ec28afb82bb24cf3adf5d6e4249b88eb860637fc124f16f3a672937d5ae28501849ef38567d2dac22486a85d90f34f261b681f37395e569eab4eb1f24 SHA512 a46b38a7047d4c4a00d41090bffb586bab2dd5fdadd9693bcd27b420909f340da740d5d1d25e964142e0398ea2415934d098d9c7a341da7a6d838de0cc63b15c MISC metadata.xml 881 BLAKE2B e5b0384c9cc45cf1e12a3010abf31232e4a726c11aa46b7303cc22b582e31d6ece1dbed35aacee265ca5a54433a6821d964059709307e4d4e51bb5a22b74b31d SHA512 72d6c8a97e474464e222d8d0be1a5d16c123683bf1415a142204b26361fdefdfbf1b3493d7b33cb637c03a808d5068c10d18adeb7de2a4fd5ecfcd4fa40f2f90 diff --git a/x11-base/xorg-server/files/xorg-server-21.1.10-fix-c99-32bit.patch b/x11-base/xorg-server/files/xorg-server-21.1.10-fix-c99-32bit.patch new file mode 100644 index 000000000000..40afef18cead --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-21.1.10-fix-c99-32bit.patch @@ -0,0 +1,54 @@ +https://bugs.gentoo.org/925876 +https://gitlab.freedesktop.org/xorg/xserver/-/commit/e89edec497bac581ca9b614fb00c25365580f045 + +From e89edec497bac581ca9b614fb00c25365580f045 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= <jexposit@redhat.com> +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 <jexposit@redhat.com> +--- + 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 4dd15cf41..b5eae48c8 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 diff --git a/x11-base/xorg-server/xorg-server-21.1.13.ebuild b/x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild index aac526f8a150..e32da90e92a2 100644 --- a/x11-base/xorg-server/xorg-server-21.1.13.ebuild +++ b/x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild @@ -104,6 +104,8 @@ PATCHES=( "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch # pending upstream backport, bug #885763 "${FILESDIR}"/${PN}-21.1.10-c99.patch + # backport of upstream commit, bug #925876 + "${FILESDIR}"/${PN}-21.1.10-fix-c99-32bit.patch ) src_configure() { |