gentoo auto-resync : 19:11:2024 - 03:03:00

4 files changed, 30 insertions, 1 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 9ec2fd9b07e2..dde3ae0e523e 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/xpadneo/Manifest b/games-util/xpadneo/Manifest
index 8786322a6f63..0b0e71245095 100644
--- a/games-util/xpadneo/Manifest
+++ b/games-util/xpadneo/Manifest
@@ -1,4 +1,5 @@
+AUX xpadneo-0.9.6-kernel-6.12.patch 754 BLAKE2B 061ae8fd13b11aee70138ce46848cf3c58c5167e115d81fd1b58af37c8f9448678b3a9853893c7f4b957635204438419da45ba88a473d097163c6689b5bc6f49 SHA512 605f1f60ddb250079c5411ffc8c7269ee88ba347ff6e3ad2e31d13ab2ae89c0e96a1a5c408a64e9e9d640fc4692cbc6ccc8b2880f368e13a503239e00c205e2c
 DIST xpadneo-0.9.6.tar.gz 1344171 BLAKE2B 22a85732de2894d310e0994c101ed62b7358f1b6b8ba5b389fc273bfd48a1ce619ebc04f3699818290f61833234d4c444fff25ea852d9dcf420b99ab28687a03 SHA512 f423fb89cf911c727917591d79909acaecc9fdb68ca10c5cc2a128bd66174799f3efb2b9a87e43bb315ab92ddb7513f79300f06d347fabc9de11e63fc1d25689
-EBUILD xpadneo-0.9.6.ebuild 1221 BLAKE2B 7a73667a194a051bea76487e06408a94db7a25324e4f972d7ec6e7cc70683a1b2412767998ec5f9cc853366bf50d0435c4a9e7ba1350ae15ac5fae4edf43aa7b SHA512 7048bffe098c066dee036777edf51e29d2c639b55b487dd2fe59403f735d546e63a8f59fd8640e9abbcb518581e8cfe63f15d5bcc4d39a1982c8979aef82be9a
+EBUILD xpadneo-0.9.6.ebuild 1272 BLAKE2B 16b2cbf209b8f8b481ec6a1698aea9bb4ab63f5bd5467d55314ede0637021ace0527fb5406363404a0b31dae74ce3ca8b6f1fb13afbb9efb970ff61a35fe72be SHA512 ec7093cac6f1de8e23e2770d85e32c72e43aa381ee8d91a8de7acf7016e3063cea4a09d182f9d929232bf7c795dda9472d5d235295b90921fc494c57cc3e285d
 EBUILD xpadneo-9999.ebuild 1222 BLAKE2B 6b2a1f8faaaeebc3f406f53bc9b5eb6ce6fd8a00c5d15c7ddc2bd4a44cd49dd44d26a7cb1bbacba54872ea61018680e211c00135dcf2e727e5e9b73b9a949631 SHA512 5a0fb0b032dbc825fdffec1298614de19027900d6c38ce7eb5c0f4ecb1716108462ca3ec5a0cf862cf1f824c066c72e73405d760e82c2b2985b55868afc84e77
 MISC metadata.xml 328 BLAKE2B 6511430d43b855d83d42dc94ea83bf20867568e9dbf642240ac279179d9f26d0a315f3fb90bebd4a564d4bc63beefcb8aa24af7acf25a60f9b25f732265de41b SHA512 defbfc601b6b61d10edf8947e2251f96416787a1141fccff1e017a6110eb4d8e8801fcd72cc678f816064eb5a5dc796c9c895ca9f74ad288f1338ccaaf3ee5c8
diff --git a/games-util/xpadneo/files/xpadneo-0.9.6-kernel-6.12.patch b/games-util/xpadneo/files/xpadneo-0.9.6-kernel-6.12.patch
new file mode 100644
index 000000000000..9e5115345111
--- /dev/null
+++ b/games-util/xpadneo/files/xpadneo-0.9.6-kernel-6.12.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/943776
+https://github.com/atar-axis/xpadneo/issues/498
+https://github.com/atar-axis/xpadneo/commit/4bfe0a1c35
+(+ include required linux/version.h from 242e9b46bb)
+--- a/hid-xpadneo/src/hid-xpadneo.c
++++ b/hid-xpadneo/src/hid-xpadneo.c
+@@ -713,5 +713,9 @@
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,12,0)
+ static u8 *xpadneo_report_fixup(struct hid_device *hdev, u8 *rdesc, unsigned int *rsize)
++#else
++static const u8 *xpadneo_report_fixup(struct hid_device *hdev, u8 *rdesc, unsigned int *rsize)
++#endif
+ {
+ 	struct xpadneo_devdata *xdata = hid_get_drvdata(hdev);
+--- a/hid-xpadneo/src/xpadneo.h
++++ b/hid-xpadneo/src/xpadneo.h
+@@ -13,4 +13,5 @@
+ 
+ #include <linux/hid.h>
++#include <linux/version.h>
+ 
+ #include "hid-ids.h"
diff --git a/games-util/xpadneo/xpadneo-0.9.6.ebuild b/games-util/xpadneo/xpadneo-0.9.6.ebuild
index 54ecc4aad8c5..02e62e777f88 100644
--- a/games-util/xpadneo/xpadneo-0.9.6.ebuild
+++ b/games-util/xpadneo/xpadneo-0.9.6.ebuild
@@ -22,6 +22,10 @@ SLOT="0"
 
 CONFIG_CHECK="INPUT_FF_MEMLESS"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-kernel-6.12.patch
+)
+
 src_compile() {
 	local modlist=( hid-${PN}=kernel/drivers/hid:hid-${PN}:hid-${PN}/src )
 	local modargs=( KERNEL_SOURCE_DIR="${KV_OUT_DIR}" )