gentoo auto-resync : 25:07:2023 - 22:29:01

4 files changed, 49 insertions, 1 deletions

diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 8283d31786d5..a7a0392ec766 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/tp_smapi/Manifest b/app-laptop/tp_smapi/Manifest
index e99476489185..5d501d787ea9 100644
--- a/app-laptop/tp_smapi/Manifest
+++ b/app-laptop/tp_smapi/Manifest
@@ -1,6 +1,7 @@
 AUX tp_smapi-0.40-confd 785 BLAKE2B da1e2a5ce6e441eebf1a3dffcce8a863688a525f6ee4c29537b1783e3283c5a0311e4317617cff4be8c35246accf69738778c6c34e4d2af77a18f23a1e84b363 SHA512 a08f0b15ea37f79e1a8b41b3a3a59421dcf26e482d2eaa269e7c3f728c142e68e8c130c8a53f4c14829436a20e1354318464de780d9fbe10777d7929d7944dca
 AUX tp_smapi-0.40-initd 1851 BLAKE2B 852fc13e2d74a570918c451966214ed8ca3daea9bdb66e856f48554261f4cafc8d8be7b76889a6a639f0dc1310d34036131a9982be0cdcf0e458707e7938b161 SHA512 ebf8ac628e00979f21e266fb6d187f02bfeeafc9482a0c5bed4fd4f092c7a27158747ccf629c802969ad2a8f13124276ef889927b3f1f01a7ce44fdcde103698
+AUX tp_smapi-0.43-linux-6.4.patch 1465 BLAKE2B 0489612a5cf4d39e34d90b170484f03a9219388ad6ef4a0be6fba6c8b68301c6022c1dc0314715e2f4210629db3c3804b1cf5b76588944611eada14631ab16ff SHA512 2d3c9d889c20009647a297f8c4a229adea6e1af26992ff0e7e4fb20b39d9947fc5e3fddfa74dda2a12018d44e70f1988edf17d02b738b48a016c310e1359372f
 DIST tp_smapi-0.43.tgz 40122 BLAKE2B e14caa05d741d14b03c56c57badc5900a47735bc58966b5195ca34269a6227ecc50518ee5ce8cf47a4aacb314a0ed0332b987098f3be024b6af9024df6efdf9b SHA512 ec2e40a248e7eb5bff2ad9e57087058a8b4706d564bd340daba5a4700ad8a5389d1f9ec29984516a1167827ae55c28240dafb558df29e1f758a4f7af80caa1e7
 EBUILD tp_smapi-0.43-r2.ebuild 1972 BLAKE2B 7233b4d28930f40417981c4f3b68924ffa505149970dd989e2487e529eda0b24fa4ef76902fdc01587d0837cf371430a68c7551724a1d9e6123bf6e451b4ed10 SHA512 7216a203f3330a6b1c6299ddc9ac9c3f6e511453e95fc11b12bb45dba9d9613ae56fed73e61ad469e46f70460770a05512804ddb24e6aa3a6572c5d279291b8e
-EBUILD tp_smapi-0.43-r3.ebuild 1067 BLAKE2B a51d7fd0cb31da0267b240404455406ab2776e77e2e74ee9065d62062af2c367a3f5ba5b2c8a83a09e9f5a14a7574909bad0c537f8127e63b02a2a5f09db560a SHA512 a05f14470ac995bcff009961334c0554fc8cea007154455823e35ec7f411d8d0d55f2ec74d001f48771ef4c90f01484bca4c8ea8e9390fd856c7a2612392bd9a
+EBUILD tp_smapi-0.43-r3.ebuild 1115 BLAKE2B d38c1a5f5eacfbbbbd3fe4a72b51005626d1d82cd53c0d5ec13068f3d5026d8807778006d0f16f7eebef98681373d04e174ffb53975f7e07b3c1b280569eb61f SHA512 10b9377cbb2eeda654888ad273a38630cb31cb6b4892e8bc2f64e6082aeb74499ba1e90f1d9513220ac02e1732721836e37b5f9947d86652a171c066c2e40020
 MISC metadata.xml 474 BLAKE2B dc28834282453dbb412e11a3677d2c4fe8bf2b9f90b4c700aa4de53b87ea0b1e80a9aeb8d24254a6e4d61e3e55c8fa3bf34db8eb55015ea788c5d49363618edf SHA512 94866e40b00e2ea573ac250e8e4f715c7cefc6118eba385ebbbfbe641d8ab6ccb691def271873bb50e6454f2bb7834fc7901c7dde8fa0ed5b132afee3af20970
diff --git a/app-laptop/tp_smapi/files/tp_smapi-0.43-linux-6.4.patch b/app-laptop/tp_smapi/files/tp_smapi-0.43-linux-6.4.patch
new file mode 100644
index 000000000000..4ff1facca07f
--- /dev/null
+++ b/app-laptop/tp_smapi/files/tp_smapi-0.43-linux-6.4.patch
@@ -0,0 +1,45 @@
+From 0c3398b1acf2a2cabd9cee91dc3fe3d35805fa8b Mon Sep 17 00:00:00 2001
+From: Evgeni Golov <evgeni@golov.de>
+Date: Fri, 16 Jun 2023 18:13:54 +0200
+Subject: [PATCH] update DEFINE_SEMAPHORE usage for linux 6.4+
+
+Linux changed the DEFINE_SEMAPHORE macro in
+48380368dec14859723b9e3fbd43e042638d9a76, making it take two parameters
+instead of one. Pass an explicit 1 as on 6.4+.
+---
+ thinkpad_ec.c | 4 +++-
+ tp_smapi.c    | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/thinkpad_ec.c b/thinkpad_ec.c
+index a8e812f..62ef5ca 100644
+--- a/thinkpad_ec.c
++++ b/thinkpad_ec.c
+@@ -90,8 +90,10 @@ static u64 prefetch_jiffies;                      /* time of prefetch, or: */
+ /* Locking: */
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+ static DECLARE_MUTEX(thinkpad_ec_mutex);
+-#else
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0)
+ static DEFINE_SEMAPHORE(thinkpad_ec_mutex);
++#else
++static DEFINE_SEMAPHORE(thinkpad_ec_mutex, 1);
+ #endif
+ 
+ /* Kludge in case the ACPI DSDT reserves the ports we need. */
+diff --git a/tp_smapi.c b/tp_smapi.c
+index 6346287..9feebab 100644
+--- a/tp_smapi.c
++++ b/tp_smapi.c
+@@ -111,8 +111,10 @@ static unsigned short smapi_port;  /* APM control port, normally 0xB2 */
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+ static DECLARE_MUTEX(smapi_mutex);
+-#else
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0)
+ static DEFINE_SEMAPHORE(smapi_mutex);
++#else
++static DEFINE_SEMAPHORE(smapi_mutex, 1);
+ #endif
+ 
+ /**
diff --git a/app-laptop/tp_smapi/tp_smapi-0.43-r3.ebuild b/app-laptop/tp_smapi/tp_smapi-0.43-r3.ebuild
index bf08d020ede7..b9105968ab60 100644
--- a/app-laptop/tp_smapi/tp_smapi-0.43-r3.ebuild
+++ b/app-laptop/tp_smapi/tp_smapi-0.43-r3.ebuild
@@ -15,6 +15,8 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="hdaps"
 
+PATCHES=( "${FILESDIR}/${P}-linux-6.4.patch" )
+
 pkg_setup() {
 	if use hdaps; then
 		local CONFIG_CHECK="~INPUT_UINPUT"