gentoo auto-resync : 17:06:2023 - 07:43:56

3 files changed, 30 insertions, 1 deletions

diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index d25d7651a800..038848348344 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,9 +1,10 @@
 AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6e4fc37e3603f98875e7d618f4a0bbad49d6d46745c2fdcc2405b3383443af767ab231cddeb1914ccbf0710190fe6c47a94033e638 SHA512 8f6a676104108161e5ca727d231789559bbf1c24b289b25b9809b5b70882e355af976051d31bd4a238df24b13fbe4a3324ce40c3ee3c592e650b34dde8d8a62b
 AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f85c23028e632c44f1cfe41a5fa47c7e94416ac1e5c58a4018a5da024d65e662c301e8d935994f6b53b52414a5f8081208c SHA512 feafa316267e903a25e7889fcbcfb31bd77402715d84d82464ae25f2cf013866c812b1c37bc1d64a8c5e1a0dd3f00e9333658532ad6d7abebf4f67bd6fc46d64
 AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292
+AUX gmmlib-22.3.7_ambiguating.patch 1350 BLAKE2B 2976bdb8610aefe4be84103e8b801d4cd920fa3184fb781bd16d56b34a0cf477f26756d5ba90aeb37b3bdf506ce8335075fabb61f76e5a6013ad1317456e1772 SHA512 472dca32c360c012af28778f1512a6c5b60c154cf31d717501a933965a7f790a5a5dd3d51eb0692ae412827f13932f2e2373bf38caf3ec2d971e6d65890227e4
 DIST intel-gmmlib-22.3.5.tar.gz 843587 BLAKE2B 671f09a2be66962762dc47c8ab51dbc3454f197b2f8a8da73e09d1f1cef2284d69ca97ff78a6b9fd1c7c93baf0b5773a89e0e7fa22f7bf106e7205f0f681e5f4 SHA512 1440fd9afdf9bdb6b9ab45529ec48cd434d7a9410cbf026c3dc7dc60b09a8fa067993540b953c354805a766ff001ef56c756a4c37d465a2ca801f6cc179ca532
 DIST intel-gmmlib-22.3.7.tar.gz 845054 BLAKE2B 0a5c284bc5aa32a6b79d0e36689665b8fb6157765e26f33b7aef800e515c6dc26527c011512d633d5d6160463f9f16a720a4e23fcbc9bb35c853a25a41a339ec SHA512 145e54da5c80c6f750847c496146c5853f92b90d1fa66695140052e0264d884069a459cf27bea7b742f1ac10817c00a369067512b9f2666c8b3c6cadf0233a2e
 EBUILD gmmlib-22.3.5.ebuild 813 BLAKE2B 22a076971e6ad350428a30d4f235bd31fd63d546be2da6210af2a9a79dc12220096ef79e8be7b2913cb86da7ce3bf1a45e5ee1975a4c12a6f99effe9c18e0a5c SHA512 68e563aba1012af8f0474e34da6cfa40cd7e1f07bd4835e9f5bcfb0aaaa92b6e20c8b0fdbf8ab4c34b059c443203246af32e448975bcc8d5bb02217b4d0ffae8
-EBUILD gmmlib-22.3.7.ebuild 814 BLAKE2B ce6b3be2c671e8ae86bb64c7d9cf337003bc38fcb9c89a43a692f2885bf4cfffdd6c748daef4f39ab72a1b8c96af3ec149571e3e1cefb93fdfee563fd97e386f SHA512 c4c6b82b137f753de446287aa2ae69a6da36fa8e518d6c185cbec27d7e3a9301f9a59b515fc4a70a51669649404d1588f7bc75fc0f3a2801ff8f73a52d9dc876
+EBUILD gmmlib-22.3.7.ebuild 860 BLAKE2B 8f899c93e19ca9230efacc8b2a67f82b94c71806108e0ac736e51aa4b6d3acb35b702f77bb4379140dac631aca01ed60f96bf7b2f0a6eb70dd96ba1a59b62e33 SHA512 113c4c4a6934a67c24156f6d23cf6aefa9ef8bcd74a96581fa0a72b4b5ef8e59c6797877631889691202962a1ac015fde6b569f87691bb2b03ca393697a355ac
 EBUILD gmmlib-9999.ebuild 893 BLAKE2B efb2985d5a9a68f687ef642de812d57558c81ce194fbb9583e738c57e3ac8768ee0fb85f031bb01d6c26fc0fa2c03a820d49404c9cb14e5531f7bc0b393cfa47 SHA512 8972b9dc98de7def5ffaebfa82965e82bec35ea6c1c4642b0143b339752e466825b7898bdd13759dfd8e77cb2b15d6161d15b3f7e7448fd17f63fdac201933d2
 MISC metadata.xml 478 BLAKE2B 22fa7744f1f6ae793034225645314ed7f0a5499cc33b570a00aa2c076cb3fdc9c2663654df4998a30fc76f7d833ed4f2022fd8b2869539e25c47f64e6b0f438a SHA512 0c46a6af2f254ee9c314f08654739003f58283e3ec00a8a3e628225e14065d359d0816a05aba1754379dea826d1bf2d501fb35ba58c5020f036917771ea035d9
diff --git a/media-libs/gmmlib/files/gmmlib-22.3.7_ambiguating.patch b/media-libs/gmmlib/files/gmmlib-22.3.7_ambiguating.patch
new file mode 100644
index 000000000000..889573ed94a5
--- /dev/null
+++ b/media-libs/gmmlib/files/gmmlib-22.3.7_ambiguating.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/908592
+https://github.com/intel/gmmlib/issues/103
+https://github.com/intel/gmmlib/pull/104
+
+From 2526286f29d8ad3d3a5833bdc29e23e5f3300b34 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart@gmail.com>
+Date: Mon, 12 Jun 2023 11:49:51 +0200
+Subject: [PATCH] Fix ambiguating new declaration LockMAContextSyncMutex()
+
+This fixes https://github.com/intel/gmmlib/issues/103 introduced by
+commit 5e12695c2c "Multi-threaded fixes for GMM Context info"
+
+Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
+--- a/Source/GmmLib/inc/External/Common/GmmInfo.h
++++ b/Source/GmmLib/inc/External/Common/GmmInfo.h
+@@ -627,8 +627,8 @@ typedef struct _GMM_ADAPTER_INFO_
+         GMM_ADAPTER_INFO *              GetAdapterNode(ADAPTER_BDF sBdf);   // Replacement for GetAdapterIndex, now get adapter node from the linked list
+ 
+         // Mutexes which protect the below thread unsafe functions
+-        GMM_STATUS                      LockMAContextSyncMutex();
+-        GMM_STATUS                      UnLockMAContextSyncMutex();
++        GMM_STATUS GMM_STDCALL          LockMAContextSyncMutex();
++        GMM_STATUS GMM_STDCALL          UnLockMAContextSyncMutex();
+ 
+         // thread unsafe functions; these must be protected with LockMAContextSyncMutex
+         GMM_ADAPTER_INFO *              GetAdapterNodeUnlocked(ADAPTER_BDF sBdf);
+
diff --git a/media-libs/gmmlib/gmmlib-22.3.7.ebuild b/media-libs/gmmlib/gmmlib-22.3.7.ebuild
index 21abbf34e428..9cd65afb169d 100644
--- a/media-libs/gmmlib/gmmlib-22.3.7.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.3.7.ebuild
@@ -22,6 +22,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
 	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
 	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
+	"${FILESDIR}"/${PN}-22.3.7_ambiguating.patch
 )
 
 multilib_src_configure() {