gentoo auto-resync : 09:10:2023 - 18:06:43

11 files changed, 273 insertions, 2 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index ed5699d76daa..40c90f3d23b4 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 5994cf9ea443..52904b91048f 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -4,11 +4,13 @@ AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a
 AUX gmmlib-22.3.7_ambiguating.patch 1350 BLAKE2B 2976bdb8610aefe4be84103e8b801d4cd920fa3184fb781bd16d56b34a0cf477f26756d5ba90aeb37b3bdf506ce8335075fabb61f76e5a6013ad1317456e1772 SHA512 472dca32c360c012af28778f1512a6c5b60c154cf31d717501a933965a7f790a5a5dd3d51eb0692ae412827f13932f2e2373bf38caf3ec2d971e6d65890227e4
 DIST intel-gmmlib-22.3.10.tar.gz 845575 BLAKE2B 2a8a58627ac6a626fe173537d8a97611a1298df1072da039ed1b96aba5b5d318229ad1a4a9838db610c539d40266d7d8b9f39154b80f81fe83bf5a13a7d5d0a1 SHA512 0522b04c4a7039cada42bf06370d3f0e6c712cf8c7d8be932ad55cfc4ed603c50b0a4672d589793a8f4d7930d20bc9635bdf66d2238daa920087363cf25b7967
 DIST intel-gmmlib-22.3.11.tar.gz 845664 BLAKE2B 1ca439ba59a230aad5d9f9b6da69c1069f370a6a1fd2f5d587f83f1472240bc734bea02c65aaa970e9a1a3463669bfd8f696812dd8262957b997cf72e107e09e SHA512 adbeb65a8377d49d139d788f1b013b39bed543b558c0307e766fb01a307685b0dda94c344992bd9d83f7900d1b93de8e06e76aa73749c40b11dff9520791e6b9
+DIST intel-gmmlib-22.3.12.tar.gz 845783 BLAKE2B 343e99e316b9dd18bc20f911b61ca3e555cef303916be6a64aab27abbd39d6d8527f5bb958a16a91490d0aad890f53aa0254ea68a1675ccc2bce384fd9641a57 SHA512 afe64aaaddac9b72ff12aa41faeb668141999e1b9c644fa21ced8fd851cf698ec57bac1080c87c0fae5c464b47ea5b94e6290c0e4c0c24ec010071f535c60e42
 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
 DIST intel-gmmlib-22.3.9.tar.gz 845228 BLAKE2B e7f25e84f124e72b0479bd0dc10bdc70c174c282ab86ab6ce1557b45a3953e68460cb1974d90135d41562a64f6ddaaa077f66c12889b7b194dcee769a8cccc31 SHA512 5dae51b028ff604ecdee4b939c31ff029a289a75485a820547976ef15de7ce7793f45fa9b9594022435c30237548fff212dc7cbbbefbdaadee3a5be6e4a75401
 EBUILD gmmlib-22.3.10.ebuild 814 BLAKE2B ce6b3be2c671e8ae86bb64c7d9cf337003bc38fcb9c89a43a692f2885bf4cfffdd6c748daef4f39ab72a1b8c96af3ec149571e3e1cefb93fdfee563fd97e386f SHA512 c4c6b82b137f753de446287aa2ae69a6da36fa8e518d6c185cbec27d7e3a9301f9a59b515fc4a70a51669649404d1588f7bc75fc0f3a2801ff8f73a52d9dc876
 EBUILD gmmlib-22.3.11.ebuild 814 BLAKE2B ce6b3be2c671e8ae86bb64c7d9cf337003bc38fcb9c89a43a692f2885bf4cfffdd6c748daef4f39ab72a1b8c96af3ec149571e3e1cefb93fdfee563fd97e386f SHA512 c4c6b82b137f753de446287aa2ae69a6da36fa8e518d6c185cbec27d7e3a9301f9a59b515fc4a70a51669649404d1588f7bc75fc0f3a2801ff8f73a52d9dc876
+EBUILD gmmlib-22.3.12.ebuild 814 BLAKE2B ce6b3be2c671e8ae86bb64c7d9cf337003bc38fcb9c89a43a692f2885bf4cfffdd6c748daef4f39ab72a1b8c96af3ec149571e3e1cefb93fdfee563fd97e386f SHA512 c4c6b82b137f753de446287aa2ae69a6da36fa8e518d6c185cbec27d7e3a9301f9a59b515fc4a70a51669649404d1588f7bc75fc0f3a2801ff8f73a52d9dc876
 EBUILD gmmlib-22.3.5.ebuild 813 BLAKE2B 22a076971e6ad350428a30d4f235bd31fd63d546be2da6210af2a9a79dc12220096ef79e8be7b2913cb86da7ce3bf1a45e5ee1975a4c12a6f99effe9c18e0a5c SHA512 68e563aba1012af8f0474e34da6cfa40cd7e1f07bd4835e9f5bcfb0aaaa92b6e20c8b0fdbf8ab4c34b059c443203246af32e448975bcc8d5bb02217b4d0ffae8
 EBUILD gmmlib-22.3.7.ebuild 859 BLAKE2B 6b96a48a99963cd6cf74ccfe91967eef12502f1419d244fc87196b82b6b7b161415d35e86a740c1928680986d0374bed64a0b3107903e0aba6a196697bffc0a7 SHA512 79b2a6119b98fe632a4eec559b15c0b25f030ac87a79e4252d73c0526399b6d3a843f65ecbe47005d4b5d630af107f08887e115ffe158adaaf22f4524baa6086
 EBUILD gmmlib-22.3.9.ebuild 814 BLAKE2B ce6b3be2c671e8ae86bb64c7d9cf337003bc38fcb9c89a43a692f2885bf4cfffdd6c748daef4f39ab72a1b8c96af3ec149571e3e1cefb93fdfee563fd97e386f SHA512 c4c6b82b137f753de446287aa2ae69a6da36fa8e518d6c185cbec27d7e3a9301f9a59b515fc4a70a51669649404d1588f7bc75fc0f3a2801ff8f73a52d9dc876
diff --git a/media-libs/gmmlib/gmmlib-22.3.12.ebuild b/media-libs/gmmlib/gmmlib-22.3.12.ebuild
new file mode 100644
index 000000000000..21abbf34e428
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-22.3.12.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+
+inherit cmake-multilib
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+S="${WORKDIR}/${PN}-intel-${P}"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0/12.3"
+IUSE="+custom-cflags test"
+RESTRICT="!test? ( test )"
+
+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
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_TYPE="Release"
+		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest
index bc1c4bf7e022..53b39938cb1f 100644
--- a/media-libs/libva-intel-media-driver/Manifest
+++ b/media-libs/libva-intel-media-driver/Manifest
@@ -1,13 +1,17 @@
 AUX libva-intel-media-driver-20.2.0_x11_optional.patch 458 BLAKE2B 22670f925729ab9e02a4b3ef753911f4e12867da2a0bad90c835ba3291ae139c65327dfdf1e236dd47cd66f943380bb20428d587c9fea57265c1287f31015ca7 SHA512 a235a4c18e388e0564c2ffa1fb4bdd86a05ae8622efdc03bd556b51361478e735330182f4310fd44c275d55759a48fc1ebef8384335daf5160d39b46642c3070
 AUX libva-intel-media-driver-20.4.5_testing_in_src_test.patch 1724 BLAKE2B a4820733470396b42152b8d3863c45946307c3d6e62b16a90a199a29e1564fbb56c044f07c895b2e6d12ecd5ef235db054d87ee49fcf5c2ced2b9242fd11ebe9 SHA512 02edb8803be4dd4608e8ee970c5472c2c6e6c7dfd2ca5c33b2807900cba49f0ef6d65440c7ca7b978abc368b56bfb7a163c3671aead68512b879fbd446475319
 AUX libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch 1473 BLAKE2B d3303d8cf11e99fc08b01cb4a12b1500afba27920e52a47cdf2d3cacc0b2cbea72e417ca4c118793c1149659cf1e51b619c0a81ca5103505a25994d9a0fee00a SHA512 41cd3cefd7a6aa6482c4d06b912cf441879e6fd14cee93380b081021e344d6555791e80d0925f66f59178d1b2d5ee15ff1f2deb4835d72f7fb74673912fc6b9e
+AUX libva-intel-media-driver-23.3.4-Remove-unwanted-CFLAGS.patch 1530 BLAKE2B 732af31ff06fc92c7fa5375e767dfbcf52805baa52a71f26b9b2b9687eda9fe60cf9b618030040e5595aba24c9c781eb26243a257a2f025f2427a1a9d2cbafa4 SHA512 eeba11f6c4922c909aef909f145213418c32e28c19bab9b5c6051e51de9482562f1229f2236f1ed0e7365d59359827c889cabc7f81566205e47152bcea380313
+AUX libva-intel-media-driver-23.3.4_testing_in_src_test.patch 2497 BLAKE2B 5db90e062447461d7310dc039f8969abd9618142b85b18d7b98dace6ef144df386f3cec3e3a1540588781ef1b92c7b6b276d8bddf30199cb0ff36dc3d7d88b3d SHA512 5a7b10a740e62c8729449d5f1d255621e5dadf944c3c9e13f8c8598c8e11c9b44b59844106825cc22d1fc30846e84539254a4c5b1295c5291638943cd314ca88
 DIST intel-media-23.2.4.tar.gz 28664669 BLAKE2B 01092c5786a7c665a3f1b61fdf306ba9fcb8957900fba987c9bca4716f48d7b006cb71a456cf75ea59f3dc9076e628dc4261bae5c3afe7da3bdc928c300cf4d4 SHA512 b02a50d5820cf22999c39ab2ff559c444682576018f2cb9aa669014f5c1fd07b01737fab706ec100929d3493a8b9e25bba7bcbae2af304d51c93b667af2884db
 DIST intel-media-23.3.0.tar.gz 28669245 BLAKE2B 3554ba23eef4adc0b24196bed96669b68f3a6eb3fc74817c155f2d88d041226feaea384f6e1f1602dfb45630dd826f02835ead670b311384b18e3082855eb9e5 SHA512 9eddb4294c8718a133144736c536b30e3a7a1cb0e96467ffc9565cc14f94659c59559b3bf59540b9e605325ee186afe9e359fbe2e64ab167dcbbd965ace68e9e
 DIST intel-media-23.3.1.tar.gz 28670977 BLAKE2B 7c546db40ecb65a1d6fc02779106c9cf7575f00d35614e9eb8b992a01b7fb5421b6fe7abd2192408caacb4b135d8c4677922c1710558c3835de0e482233628ad SHA512 b7944c94d89f456e017223c937d3e7dcd5d831fd6eb8b47c17e38a68227699953301d740119a8cf648e8d404cd8a02e4d4308472892b062858668d34272bed7d
 DIST intel-media-23.3.2.tar.gz 28672587 BLAKE2B 15ae0b33c34e7ea6e9b4fa7424c54ad7404a1d7561107ded3d9c8d6ab1703e59aad71734a8d0b1be73a638a6d241e7ae690602d8d19f7354856f99ff7a08897e SHA512 f88791175ee82996a8e4bb7bdac5fa46bad2e76eb7ae1812d4036e2ebc9a4a0b7f58776fc05bc862e9af78d1cb12efef3464a554c32f6b4e13b5a5d206e87432
+DIST intel-media-23.3.4.tar.gz 28685223 BLAKE2B b1d1d0283ea0b30ba3ee8348cfe8cacc9b242ec8e2f1f18f147aa6d444c69ddd04d2902cf36fd8e81e924a34ffb6aa6a6fd83ef0fa6dbe93e36ed2f34c716a8e SHA512 305ba7d94a7b2b8ac1000776c48e5654b8e42da414785851e5872db55d2125c6ef5acfe349746d7fd332b11a34ffe9a7be2a2c46bb1e91d5aedb445eb764ecfa
 EBUILD libva-intel-media-driver-23.2.4.ebuild 1511 BLAKE2B 08fb338238101411450d4b2ada8e8e7e2a4598394db29ceead660aa2a7356544d06b4ce28bd932e1c4a7de8ba479709624b0c9501ab74244f9f18ed66870d405 SHA512 2c625e14d5bf6678f0631072345bd97939178a15e657659ced38c488dfe62ad30e97eafc72ccc8bfeeeb55ad452e8b2387c9dbe2dad5003d9925b00ab56595f5
 EBUILD libva-intel-media-driver-23.3.0.ebuild 1512 BLAKE2B 6e4273c87c9ce89e139084e54585cf275e848dcdf23d87e7dbdaca39e479af4a38ac19ef68899200029d10ce29ee6b8e62c8bd07009f46af3bd9a6c539f8c7df SHA512 6715ad975388fe9c51de8d695549b41df8ac83cbf7612f12321523ae68fe5bb20beb6732ab9412297fc4a52244f38a09872390e167281e0857a32c762bada1a0
 EBUILD libva-intel-media-driver-23.3.1.ebuild 1512 BLAKE2B 6e4273c87c9ce89e139084e54585cf275e848dcdf23d87e7dbdaca39e479af4a38ac19ef68899200029d10ce29ee6b8e62c8bd07009f46af3bd9a6c539f8c7df SHA512 6715ad975388fe9c51de8d695549b41df8ac83cbf7612f12321523ae68fe5bb20beb6732ab9412297fc4a52244f38a09872390e167281e0857a32c762bada1a0
 EBUILD libva-intel-media-driver-23.3.2.ebuild 1513 BLAKE2B c74317814cbd6955924f3de6df55c60dedb5cc6321882e188641812c3cffca6e0a3e9ef24794226e6911e6309d61b99ac244e7464b739abed8edda04d81e9a5b SHA512 5ce4963cc828ac3fabd9b18227186df0f3ca9989a0c7498cfb8f65dbcd5bc49b2dcc7bbe115f527ad2489ef5aa83819241a8b4f2a7b31805364d3c970966d936
+EBUILD libva-intel-media-driver-23.3.4.ebuild 1513 BLAKE2B 68ab29884f88387547bf97886052efc7992308f423ec90a98fee0de498660cd8a26bcf677bbcaeec19043e05ac63ca11b8a803d89988496b0913aaa7771d0de2 SHA512 baa9efc64d5ea94a00fc2d7db3541e90ac31ac7893a861dc1b937dff7d2815216cf3a39ef13b044d22c4f1ec2a3b2d2115fc7adfe8fc7aeae454e6d58e6aafc3
 EBUILD libva-intel-media-driver-9999.ebuild 1536 BLAKE2B e94703e45e48555f48821a87a56f0063c387655352dfe97e3cd8c84243509920d789cc1103819c586868076f85482c11df3ddc9f4f692ba29e17b0962a9d6de1 SHA512 2a8b3a577ab65e94ecbd93794bb57aef1bacb1f4bd346073b3892db0961251e51d9892c3011a8d2bbe51da497dfbbea403d6884126f7731d966635d9195deaef
 MISC metadata.xml 565 BLAKE2B e630d474342839898d53aef1849b002ef651c9f4fe3bfcfe72e809012e6c65153b1a6c14db922a45440ffd5717b90dddd6973185f8a625906e9d5571e50728d9 SHA512 22227f8a9cc39fff74f0bf2cdc8953f110e94ce0ab107076269d604c3cf8ae46c8496c9bcf47598e351cb9714e427f213ade5e446a5e8c67acfc87db5530b370
diff --git a/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-23.3.4-Remove-unwanted-CFLAGS.patch b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-23.3.4-Remove-unwanted-CFLAGS.patch
new file mode 100644
index 000000000000..1048d0c6bbba
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-23.3.4-Remove-unwanted-CFLAGS.patch
@@ -0,0 +1,43 @@
+From f961b7d5141f8c795afe69b0b2868de6129ecdc8 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 9 Oct 2023 11:55:56 -0400
+Subject: [PATCH] Remove unwanted CFLAGS
+
+---
+ media_driver/cmake/linux/media_compile_flags_linux.cmake | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake
+index 0a211fdc7..17b0cb5a5 100755
+--- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
++++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
+@@ -53,8 +53,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON
+ 
+     # Enable c++14 features
+     -std=c++14
+-    # -m32 or -m64
+-    -m${ARCH}
+ 
+     # Global defines
+     -DLINUX=1
+@@ -62,7 +60,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON
+     -DNO_RTTI
+     -DNO_EXCEPTION_HANDLING
+     -DINTEL_NOT_PUBLIC
+-    -g
+ )
+ 
+ if(MEDIA_BUILD_HARDENING)
+@@ -204,9 +201,6 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA
+ if(${PLATFORM} STREQUAL "linux")
+     #set predefined compiler flags set
+     add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}")
+-    add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>")
+-    add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>")
+-    add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>")
+ 
+     foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON})
+         SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+-- 
+2.41.0
+
diff --git a/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-23.3.4_testing_in_src_test.patch b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-23.3.4_testing_in_src_test.patch
new file mode 100644
index 000000000000..834c64bcf601
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-23.3.4_testing_in_src_test.patch
@@ -0,0 +1,64 @@
+From d462b4a2c6a134ab19d8903655a75f879642c5e0 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 9 Oct 2023 12:01:26 -0400
+Subject: [PATCH] Run tests in src_test() instead of src_compile() and
+ src_install()
+
+---
+ CMakeLists.txt                                |  2 ++
+ media_driver/linux/ult/CMakeLists.txt         |  6 ------
+ media_driver/linux/ult/ult_app/CMakeLists.txt | 11 ++++-------
+ 3 files changed, 6 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aabce7341..5e58009a7 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,6 +42,8 @@ if("${os_name}" STREQUAL "clear-linux-os")
+     set(CMAKE_INSTALL_SYSCONFDIR "usr/share/defaults/etc")
+ endif()
+ 
++include(CTest)
++
+ include(CMakeDependentOption)
+ 
+ option (ENABLE_KERNELS "Build driver with shaders (kernels) support" ON)
+diff --git a/media_driver/linux/ult/CMakeLists.txt b/media_driver/linux/ult/CMakeLists.txt
+index 9fb5b39ee..94e53f4d9 100644
+--- a/media_driver/linux/ult/CMakeLists.txt
++++ b/media_driver/linux/ult/CMakeLists.txt
+@@ -52,9 +52,3 @@ endif ()
+ add_subdirectory(libdrm_mock)
+ add_subdirectory(ult_app)
+ 
+-enable_testing()
+-add_test(NAME test_devult COMMAND devult ${UMD_PATH})
+-set_tests_properties(test_devult
+-    PROPERTIES PASS_REGULAR_EXPRESSION "PASS")
+-set_tests_properties(test_devult
+-    PROPERTIES FAIL_REGULAR_EXPRESSION "FAIL")
+diff --git a/media_driver/linux/ult/ult_app/CMakeLists.txt b/media_driver/linux/ult/ult_app/CMakeLists.txt
+index a232ee38c..3132ce704 100644
+--- a/media_driver/linux/ult/ult_app/CMakeLists.txt
++++ b/media_driver/linux/ult/ult_app/CMakeLists.txt
+@@ -75,13 +75,10 @@ if (DEFINED BYPASS_MEDIA_ULT AND "${BYPASS_MEDIA_ULT}" STREQUAL "yes")
+     message("-- media -- BYPASS_MEDIA_ULT = ${BYPASS_MEDIA_ULT}")
+ else ()
+     if (ENABLE_NONFREE_KERNELS)
+-        add_custom_target(RunULT ALL DEPENDS ${LIB_NAME} devult)
+-
+-        add_custom_command(
+-            TARGET RunULT
+-            POST_BUILD
+-            COMMAND LD_PRELOAD=${MEDIA_MISC_LIB}:../libdrm_mock/libdrm_mock.so ./devult ../../../${LIB_NAME}.so
++        add_test(
++            NAME RunULT
++            COMMAND "${CMAKE_COMMAND}" -E env "LD_PRELOAD=${CMAKE_CURRENT_BINARY_DIR}/../libdrm_mock/libdrm_mock.so" "${CMAKE_CURRENT_BINARY_DIR}/devult" "${CMAKE_CURRENT_BINARY_DIR}/../../../${LIB_NAME}.so"
+             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-            COMMENT "Running devult...")
++            )
+         endif ()
+ endif ()
+-- 
+2.41.0
+
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.3.4.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.3.4.ebuild
new file mode 100644
index 000000000000..d75e117f636d
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.3.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VA-API (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.3.10:=[${MULTILIB_USEDEP}]
+	>=media-libs/libva-2.19.0[X?,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.3.4-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-23.3.4_testing_in_src_test.patch
+)
+
+multilib_src_configure() {
+	# https://github.com/intel/media-driver/issues/356
+	append-cxxflags -D_FILE_OFFSET_BITS=64
+
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
+		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
diff --git a/media-libs/libva/Manifest b/media-libs/libva/Manifest
index b75089164848..97ac23c33b44 100644
--- a/media-libs/libva/Manifest
+++ b/media-libs/libva/Manifest
@@ -1,6 +1,8 @@
 DIST libva-2.18.0.tar.gz 278493 BLAKE2B 619a1dcb9aaa71b38ec7be500adf6b526f50ae20fa76d1c5ac750229e03a2d5b82dabe334cf07c0f539c1b079829f2ec000ce6570e05e6e18fbf7415c5d5b9b3 SHA512 12e8d837604d2f354d849a8adc84281ae1ecfd2433f1b7dc8e28b5d703ada42b4a84b2b3870e8d2397b77d0d9741afe3bc04d25b4426531805aeb72defaac7ad
 DIST libva-2.19.0.tar.gz 279536 BLAKE2B 85b60819b2a02aeb895c0608aa56d3d31f2c1c9db960ec9688b2af177cafad3b37e4f23f9ab9c952b7dd107233be57406f71edbcc5d7a5bbc3f5a6afece80c39 SHA512 04976f84487abac1a194a7ace9f698bb01eed04369e027351f63e07ced8694dbbe45511965e7775a6d8a701d6ad61fe6d57a23ee8c9b0d99089d5108657d018c
+DIST libva-2.20.0.tar.gz 280079 BLAKE2B bb1b7f8757d068765fa69e57e8747e0bbd61ea0874bd42d27e0a99786cad2a4a81d7c20a28ff977cebcef54cd8cafa6c0493c18b563ad1ab47a9c3190d0cd1c6 SHA512 85f4aa6b6e9173d407ca3987745f985d0f898091f14c947a928b6db662a03b5cfe82483901690d81618697fe17a2c41ff6694a611f3654d5ab06840da987e40d
 EBUILD libva-2.18.0-r1.ebuild 1540 BLAKE2B 2474e8646794f2a9110e9a696e9eb87dbfe65a36e12f0fbf567781ce2d3125b96505cbe3a76e6408a0743244a098244b4a06283ced8923b480cd75e98defea99 SHA512 ed47e9788a734564415aa57ba860d22249f474faf053c47537f9346d824ec4b497d27082b1494745a4ee1ec849751c093ccbefea9dd397fbcd1794c487686f08
 EBUILD libva-2.19.0.ebuild 1545 BLAKE2B 6fdf54255522daed04b98f8197fab60de24d5135033a2bf06e4a1e51216475c44629297bce8dcbca8c5ef28ad59002f861a3f42ce581f2ebef80980ffff4f81c SHA512 e0184e6812ce5255b3260215c3d168d4a9e1978c3b8ec6e10cbbb9c15695996475f97825fead54c622e0cff98989f46bc4b1aba0d07d0f9f03f1c357444496ed
+EBUILD libva-2.20.0.ebuild 1545 BLAKE2B 6fdf54255522daed04b98f8197fab60de24d5135033a2bf06e4a1e51216475c44629297bce8dcbca8c5ef28ad59002f861a3f42ce581f2ebef80980ffff4f81c SHA512 e0184e6812ce5255b3260215c3d168d4a9e1978c3b8ec6e10cbbb9c15695996475f97825fead54c622e0cff98989f46bc4b1aba0d07d0f9f03f1c357444496ed
 EBUILD libva-9999.ebuild 1544 BLAKE2B 3b5b3112bafca3f8e6efdf15f214135cb7e8d4ebc0a64040bcd6ab39a4f40fbd4df03af84101f25280780768512706a25568361187c9c3684332211b36b54a8f SHA512 cbb0614ff00b592a4ca71561acab24d5c1053bab5ed7a8c75353a0b1e3182c589035019536254dd44bc2377b841bd77fb2fcd45d2e9dbe4e7951e8cc5c4740f7
 MISC metadata.xml 332 BLAKE2B ee8f4e2f059c3b81126ce55575cfb267c783c37e84bfd39b4564b5f0615da7d6d7efda0bd1fe3c547aa81ff3a6de056bf2555d5049d15bc33aab16c0e2a7271d SHA512 dfa43788c2b4701dde7eacecacdd4a372b192fb98ba8d471a5226eb15b20acb89e564358aa75a1673956005ed904b9e34135ff77d230b1bee95731d61198aef0
diff --git a/media-libs/libva/libva-2.20.0.ebuild b/media-libs/libva/libva-2.20.0.ebuild
new file mode 100644
index 000000000000..4f264beeabed
--- /dev/null
+++ b/media-libs/libva/libva-2.20.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib optfeature
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+
+if [[ ${PV} = *9999 ]] ; then
+	inherit git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/intel/libva"
+else
+	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+IUSE="wayland X"
+
+RDEPEND="
+	>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+		x11-libs/libxcb:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	wayland? ( dev-util/wayland-scanner )
+	virtual/pkgconfig
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/va/va_x11.h
+	/usr/include/va/va_dri2.h
+	/usr/include/va/va_dricommon.h
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		-Ddisable_drm=false
+		-Dwith_x11=$(usex X)
+		-Dwith_glx=no
+		-Dwith_wayland=$(usex wayland)
+		-Denable_docs=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature_header
+	optfeature "Older Intel GPU support up to Gen8" media-libs/libva-intel-driver
+	optfeature "Newer Intel GPU support from Gen9+" media-libs/libva-intel-media-driver
+}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 83626ac835bf..3b18a97a6969 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -21,6 +21,6 @@ DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f7
 EBUILD opencv-4.6.0-r4.ebuild 21277 BLAKE2B 458906fe516524a8d997e6645d16ca3621774795271cb06aa2bb414a5937139db84beffb1dfa39d96215f45aa56c93461463a62f5f771cfc16396b3d926e049b SHA512 2d2b557fe6b260cd4c3ffbd4159cac68dafb9fc22138ff2f119350723a44f3376ee39f20d8c8b2d61952d88d9a60b470d36477552f0a1eb9b12eccd690547e6e
 EBUILD opencv-4.7.0-r1.ebuild 21289 BLAKE2B 0e2c1ac23fcd0ec261329eeeb73f035bb92bdd0d114b6123a9934d85937034e65e22a5264553cf294c66023a23e7bab7bb77560bb422a0d36ed726bc010afdd8 SHA512 332206b352f57fd16375b104f84e3019a8358ed174159f0827f51ac522ccdb62c360fcea1a94c2333adae5468acb95e78ad6897c3e8f9daa33292161794b737e
 EBUILD opencv-4.7.0.ebuild 21242 BLAKE2B 930ce7cdb362134193217aced8fb53e6695cde0d2abf1582db923c5bad84c01189eea5d76dc6bfd81e1bbcd0e286f94c2d17b59bb3ace0dd2cdbf26e21be6d17 SHA512 43f45361d176e7f34dc0c1d98dc459b351215b9a2db8d76390b384e774a95db8792386fecd35007ffee90d2a275f3daea010da1cea5e9728221f71d6c6a44164
-EBUILD opencv-4.8.0-r1.ebuild 21500 BLAKE2B 0857dd0ebac0e6d9839031ec3c254d699923485d51cda623c38731ee356b57b6ce0f9401f0f1627db4ef9c769af0d86cc208145da89102c3b63179bf21c6002c SHA512 0b3a550504a762aa99b04ddd74adbd9069ca103bc6de47d03987ffced8e8a5188eeea62e78737a38339e98e03700fe0944cefee1cff3504967fcfadfd317336e
+EBUILD opencv-4.8.0-r1.ebuild 21499 BLAKE2B 6db3f87023c085a9c4a9c9dc589e0958161a9b4ac344de6187e48318ccbbfbacb20f05e27e85ae986022c4c2e5b06e1b2da43886d7625b7a4296311fba2f2693 SHA512 0a1406097097af0f8175f650ce1085293ce84b836b231948dc3c939c7a82853215b5b592781790288e54280286f4b279b1a0f1d49bd469f0ec1ebf1a5963ab6a
 EBUILD opencv-4.8.0.ebuild 21266 BLAKE2B f7eef7599c1dba1eeafc61ff2717d47229c64ce3c9592da01a2ac8d0e75e6c7158c1b66346db77d969e573d5f7e50880b42827b185184c5fa571b7cc7b4dc747 SHA512 a47347e0966585c4b5789ddb11373e5b9b7559e26a8ab401de25b2f427b85cdbf7a9d47ea53d654e79bd44fece38d45f437ad91bdbe872410b9cd881192d3055
 MISC metadata.xml 3147 BLAKE2B 37bb20a0fd752e1e3d4fae7f1b549be49648cb45cc3c6537a9bdb01b609cbab68a443bc17ded790bedd3afa800d1ce16c4220ebdd42a0d9dd73dacf415d29b5f SHA512 e9cf8dc6a63be3708ee595149122ffb2ef9722402716ac4a100c971a39c17e82e3d32253c03f56dd4814202a0727b29d8fb0879605a71c15e0a3f8e01e152069
diff --git a/media-libs/opencv/opencv-4.8.0-r1.ebuild b/media-libs/opencv/opencv-4.8.0-r1.ebuild
index 27cec3eb3fa4..9ffb620264e6 100644
--- a/media-libs/opencv/opencv-4.8.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 
 # The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications