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

["Andrew Ammerlaan" <andrewammerlaan@gentoo.org>]

commit:     3391b2d6a9a849b7150dc754af37027658ff5bd5
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 08:31:28 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 20:54:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3391b2d6

media-libs/libva-intel-media-driver: add 23.1.3, add multilib support

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 media-libs/libva-intel-media-driver/Manifest             |  1 +
 ...999.ebuild => libva-intel-media-driver-23.1.3.ebuild} | 16 +++++++++-------
 .../libva-intel-media-driver-9999.ebuild                 | 13 ++++++++-----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest
index 1b05942c4583..b1f311bdaff5 100644
--- a/media-libs/libva-intel-media-driver/Manifest
+++ b/media-libs/libva-intel-media-driver/Manifest
@@ -1,3 +1,4 @@
 DIST intel-media-22.5.4.tar.gz 27493483 BLAKE2B ac6a93e06eec33edd823b1fd4310cd635f20229ce1ba1d52eb36a11b8fcaf484c836261cb5e8437889208e9b268f29f78a241867629eb517fbada28a314bb4dc SHA512 9e7e4d7f33d0248f3d2288239ca121cd8c748a98587384e69c92aeedf4b9ce7ff585cac06b260713f9cd95936d270c36e6981bc500c2a6bee7276d0e238f4b74
 DIST intel-media-22.6.6.tar.gz 28599397 BLAKE2B 3a3449f0af37c431ff1224bb919de3382767044a728603b9fb3343f6a2ed92ec8f9c30796623a17fe64de617816d0961507171c06e41739c9c650145b93439e2 SHA512 8013ecadfc827a89eea6c72e262c220fe05fc11348ab23d46fb703f170d927739b46b21bad5e79fdebde86b646609339d2333eafb7f0798d77f9c64f20203f90
 DIST intel-media-23.1.2.tar.gz 28625961 BLAKE2B bbeb070f22e9642d3a7510edbf34f438d2c817484ebce75ec3debf86498916a9b1c9ee37c721825a2e8041bd52b7a6501a089fc9d71bd3ecfa5ff6b69b5971b0 SHA512 b5f402c209552caaaa4b6f27094230e6dbed15e24e3bb035a543b72277d19d80d02697b9900ede4137a20e4a02c6ecaf498fe4a58ef247a1f880b9ebc9ca3dbb
+DIST intel-media-23.1.3.tar.gz 28638585 BLAKE2B 70bd4a16524887719fd4d0d506ec4325bb80eb78c18c820f26de1a9eb4fb221aef55dfe688b83d5ab2c1a7eb8ec189c17bbc2f634d890e6b5dfa8f80c58666ce SHA512 33a21638b7b274bda6f33c0d070bf60831d9d1464df8b7f0f4dc234525b199f9f8ff89f1d70c51aa9cf1a6329d9c691c8a6a675f48c606bc6db989351138d69c

diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.1.3.ebuild
similarity index 77%
copy from media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
copy to media-libs/libva-intel-media-driver/libva-intel-media-driver-23.1.3.ebuild
index aa9624b21204..4e88c88c1c0a 100644
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake
+inherit cmake-multilib flag-o-matic
 
 if [[ ${PV} == *9999 ]] ; then
 	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
@@ -29,24 +29,26 @@ IUSE="+redistributable test X"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=media-libs/gmmlib-22.1.8:=
-	>=media-libs/libva-2.14.0[X?]
+DEPEND=">=media-libs/gmmlib-22.3.0:=[${MULTILIB_USEDEP}]
+	>=media-libs/libva-2.14.0[X?,${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
 	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
 	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
 )
 
-src_configure() {
+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
-		-DUSE_X11=$(usex X)
+		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
 		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
 		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
 	)

diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index aa9624b21204..939ba7b8b003 100644
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake
+inherit cmake-multilib flag-o-matic
 
 if [[ ${PV} == *9999 ]] ; then
 	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
@@ -29,8 +29,8 @@ IUSE="+redistributable test X"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=media-libs/gmmlib-22.1.8:=
-	>=media-libs/libva-2.14.0[X?]
+DEPEND=">=media-libs/gmmlib-22.1.8:=[${MULTILIB_USEDEP}]
+	>=media-libs/libva-2.14.0[X?,${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 
@@ -40,7 +40,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
 )
 
-src_configure() {
+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)