[gentoo-commits] repo/gentoo:master commit in: x11-libs/libva-intel-media-driver/, x11-libs/libva-intel-media-driver/files/

[Sam James]

commit:     17befa36302a513bcf3e80930815c5050b6c91e6
Author:     Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
AuthorDate: Sun Jun 27 11:59:42 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 29 17:37:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17befa36

x11-libs/libva-intel-media-driver: updated to version 21.2.2 pre

Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
Closes: https://github.com/gentoo/gentoo/pull/21423
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/libva-intel-media-driver/Manifest         |  1 +
 ...a-intel-media-driver-21.2.2_custom_cflags.patch | 52 ++++++++++++++++++++++
 ... => libva-intel-media-driver-21.2.2_pre.ebuild} |  6 +--
 .../libva-intel-media-driver-9999.ebuild           |  4 +-
 4 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 3bfeb9f0b70..bedf5dcb761 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -3,3 +3,4 @@ DIST intel-media-20.2.0.tar.gz 21860711 BLAKE2B df5ebb4ec603902dd34aca6915dab5be
 DIST intel-media-20.4.5.tar.gz 22437981 BLAKE2B 136be5280b463879e47ce8a1dae1befbe3907a2429b799b972dffbdcb8b21512e3161dc209abf7b4dfb0d3695512963c40cdd85fb6fb2f3158bee12e8e42ddcd SHA512 dfd70dc83eae181830844f9055ad728d91a51a55ea29ea5d272b154f16a92dfba86568d9b4e8f8c56d500582056b73602c999d2e877386fcf46df1633fc5e2ea
 DIST intel-media-21.1.2.tar.gz 22487027 BLAKE2B 819b7c4a4fc9295034af77f1e95d4b23ca974629f0ff70f14d84c881fa8ae2558708878e045b700fef30bb28a1af9ec61306854e91d0df4881e7d9dc229715b2 SHA512 046942ebedad2e40de3c592ed92bd7d266402f1f94d30ee7674adcb147774f6d90af18c56a19a8d16465144a7bded9cc7b6eeefdeb50f349c7d3ef6840c30ea4
 DIST intel-media-21.1.3.tar.gz 22507169 BLAKE2B 68962db57d6f4c11e50b5d44584adf0458d08a118234a091aa55734885ee9fab6449658a8736c4a23233be38b58311953492482c3d9b258dd2cf8008cf363f20 SHA512 a5a4c26d86191138245e0cc62304aeeccfb6627b04310e4b1d35cc2050b909d9b856b6176d868562336dd6342f93b1909b46fb481eb353ef02cc188eea5da121
+DIST intel-media-21.2.2.tar.gz 23021952 BLAKE2B 0173eb8fb81c3012af30bb755b87e5f4ad8e0ea1d7fd4c844dda8d08d72968e3080f320384dcc50caf0ad4f013eec69fe4e8d1444fac665623e6f72521fc3a95 SHA512 f88fd02af55538045e01982e7bda8a7e781ad7fa57a8e60e61681a705a87a402ceab433a5362fe0f6269366ea54b60f91ffd2689641370f20c66dc10d26d1c4a

diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch
new file mode 100644
index 00000000000..c0f598ce6cd
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch
@@ -0,0 +1,52 @@
+    Prevent overriding of user-defined CFLAGS.
+
+
+--- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
++++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
+@@ -51,16 +51,26 @@ set(MEDIA_COMPILER_FLAGS_COMMON
+     -fdata-sections
+     -ffunction-sections
+     -Wl,--gc-sections
++)
+ 
++if (OVERRIDE_COMPILER_FLAGS)
++    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
+     # -m32 or -m64
+     -m${ARCH}
++)
++endif(OVERRIDE_COMPILER_FLAGS)
+ 
++list (APPEND MEDIA_COMPILER_FLAGS_COMMON
+     # Global defines
+     -DLINUX=1
+     -DLINUX
+     -DNO_RTTI
+     -DNO_EXCEPTION_HANDLING
+     -DINTEL_NOT_PUBLIC
++)
++
++if (OVERRIDE_COMPILER_FLAGS)
++    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
+     -g
+ )
+ 
+@@ -73,6 +83,7 @@ if(${UFO_MARCH} STREQUAL "slm")
+         -mtune=atom
+     )
+ endif()
++endif(OVERRIDE_COMPILER_FLAGS)
+ 
+ if(${ARCH} STREQUAL "64")
+     set(MEDIA_COMPILER_FLAGS_COMMON
+@@ -189,9 +200,11 @@ 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}")
++if (OVERRIDE_COMPILER_FLAGS)
+     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}>")
++endif(OVERRIDE_COMPILER_FLAGS)
+ 
+     foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON})
+         SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")

diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild
similarity index 91%
copy from x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
copy to x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild
index 072d1d906b9..6eec248e7f0 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild
@@ -15,7 +15,7 @@ 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}"
-	KEYWORDS="~amd64"
+	KEYWORDS="" # no keywords for '_pre' releases
 fi
 
 DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
@@ -27,14 +27,14 @@ IUSE="+custom-cflags set-as-default test X"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=media-libs/gmmlib-21.1.1
+DEPEND=">=media-libs/gmmlib-21.1.3
 	>=x11-libs/libva-2.11.0[X?]
 "
 RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-21.1.2_custom_cflags.patch
+	"${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
 	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
 )
 

diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index 072d1d906b9..7e53505dd38 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -27,14 +27,14 @@ IUSE="+custom-cflags set-as-default test X"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=media-libs/gmmlib-21.1.1
+DEPEND=">=media-libs/gmmlib-21.1.3
 	>=x11-libs/libva-2.11.0[X?]
 "
 RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-21.1.2_custom_cflags.patch
+	"${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
 	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
 )