summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-03-22 00:41:01 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-03-22 00:41:01 +0000
commit23b767af73549eeb4dd3069e09d0f2fcb88669a8 (patch)
tree7ad731ac748d72a48ae7079bc8fb0718c554d65d /media-libs
parent3003897133b1bcfe9a241c2708e938903879aee3 (diff)
gentoo auto-resync : 22:03:2023 - 00:41:01
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/Manifest.gzbin67737 -> 67741 bytes
-rw-r--r--media-libs/gmmlib/Manifest4
-rw-r--r--media-libs/gmmlib/gmmlib-22.3.4-r1.ebuild (renamed from media-libs/gmmlib/gmmlib-22.3.4.ebuild)4
-rw-r--r--media-libs/gmmlib/gmmlib-9999.ebuild6
-rw-r--r--media-libs/gst-plugins-bad/Manifest2
-rw-r--r--media-libs/gst-plugins-bad/gst-plugins-bad-1.20.5-r1.ebuild (renamed from media-libs/gst-plugins-bad/gst-plugins-bad-1.20.5.ebuild)5
-rw-r--r--media-libs/intel-mediasdk/Manifest4
-rw-r--r--media-libs/intel-mediasdk/intel-mediasdk-23.1.3.ebuild86
-rw-r--r--media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild23
-rw-r--r--media-libs/libva-intel-media-driver/Manifest4
-rw-r--r--media-libs/libva-intel-media-driver/libva-intel-media-driver-23.1.3.ebuild57
-rw-r--r--media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild13
-rw-r--r--media-libs/libva/Manifest4
-rw-r--r--media-libs/libva/libva-2.18.0.ebuild68
-rw-r--r--media-libs/libva/libva-9999.ebuild2
-rw-r--r--media-libs/oneVPL-intel-gpu/Manifest2
-rw-r--r--media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-23.1.3.ebuild46
-rw-r--r--media-libs/oneVPL/Manifest2
-rw-r--r--media-libs/oneVPL/oneVPL-2023.1.3-r1.ebuild (renamed from media-libs/oneVPL/oneVPL-2023.1.3.ebuild)41
19 files changed, 320 insertions, 53 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 5029cfca6896..2d677d847f03 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 75290c97106b..c66c518906e1 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -6,6 +6,6 @@ DIST intel-gmmlib-22.3.3.tar.gz 843483 BLAKE2B bbc447823fc7a7301cfb5579ff28ead8c
DIST intel-gmmlib-22.3.4.tar.gz 843421 BLAKE2B 8880b66e01015a01aa1464efb84c6cb2b31f1490133c0703601475dc873e2201b02e0b1e1121dc4bdb7c67f3f70701fde459f20625adc3edbfc7720e5743a4fa SHA512 64b1884361746c2ec97c42608af29e1c2d1487a7253f5cd3c1a73b1bf45ba4b0f49766ecbd93fa767863dcfa3dcc58cbf5a613e803eeb5b12e6a42ec622d223b
EBUILD gmmlib-22.3.0.ebuild 795 BLAKE2B aa072d7de2722997cb9b3b25e8fa6b3463c9550b77fffd4920af453083067105a53c85c8be3fedee817c345d971f26c3e710b9e0899b176231f3fb41dfcabd90 SHA512 033a1447890b49f48f44bb66a21b3a2be616bda44be8dc861421cc9cb9f77268273f871bce537159ae8b74751fb47bf6e1ff95e8382bef87685eb762f5a4c54d
EBUILD gmmlib-22.3.3.ebuild 795 BLAKE2B 9cfd9cd4326908a5e4d9bb8774d238f9c6094fe81c3c5819d800d440fdc54f816ca04e15016f77f4b378f6f777b71aab12f6b89d4346240015d2879552a24854 SHA512 24a15c24ad0772192939f194aab5839ae0fa0e6c0a1324c7fa6b63512134a4a5a89a7dfa08583e7c9acc5ee37e477975428017406c5ac2e002165b7e7702ca74
-EBUILD gmmlib-22.3.4.ebuild 796 BLAKE2B 3775ef25e7f1c37c3447d357b24ccbccc7b5579edb45c9c6cc150ba92eb53f32c2b195861007639c3c3829b9efb82278188ef3e218ca1ba6fdd8ebf65dbd0078 SHA512 07a10409cdbf332c4518751a600cc4348ba60d6af6be79caae08cb6a0d8bcd20725ba77195385da188ad1fca5e000286ed97b908ae1b405902d7a51e385aec56
-EBUILD gmmlib-9999.ebuild 875 BLAKE2B 7023f9e4f92483e48cd0f7ca9395739df74d4ccc104fb45a76cdcb5ca74ccf75445e14a87355d302cc290108a0bf4c0bdae4a7831f1bba30c40b3e7872767c4e SHA512 815c3eb892de44f887c66f33ea54e19634871b9e147e5c6ab75d73e46b3500935656c04a3c46305ae921afc3fb6bdfeabfecc87e27c5b573a906be693985c609
+EBUILD gmmlib-22.3.4-r1.ebuild 814 BLAKE2B ce6b3be2c671e8ae86bb64c7d9cf337003bc38fcb9c89a43a692f2885bf4cfffdd6c748daef4f39ab72a1b8c96af3ec149571e3e1cefb93fdfee563fd97e386f SHA512 c4c6b82b137f753de446287aa2ae69a6da36fa8e518d6c185cbec27d7e3a9301f9a59b515fc4a70a51669649404d1588f7bc75fc0f3a2801ff8f73a52d9dc876
+EBUILD gmmlib-9999.ebuild 893 BLAKE2B efb2985d5a9a68f687ef642de812d57558c81ce194fbb9583e738c57e3ac8768ee0fb85f031bb01d6c26fc0fa2c03a820d49404c9cb14e5531f7bc0b393cfa47 SHA512 8972b9dc98de7def5ffaebfa82965e82bec35ea6c1c4642b0143b339752e466825b7898bdd13759dfd8e77cb2b15d6161d15b3f7e7448fd17f63fdac201933d2
MISC metadata.xml 478 BLAKE2B 22fa7744f1f6ae793034225645314ed7f0a5499cc33b570a00aa2c076cb3fdc9c2663654df4998a30fc76f7d833ed4f2022fd8b2869539e25c47f64e6b0f438a SHA512 0c46a6af2f254ee9c314f08654739003f58283e3ec00a8a3e628225e14065d359d0816a05aba1754379dea826d1bf2d501fb35ba58c5020f036917771ea035d9
diff --git a/media-libs/gmmlib/gmmlib-22.3.4.ebuild b/media-libs/gmmlib/gmmlib-22.3.4-r1.ebuild
index 97335b7ca360..21abbf34e428 100644
--- a/media-libs/gmmlib/gmmlib-22.3.4.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.3.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
CMAKE_BUILD_TYPE="Release"
-inherit cmake
+inherit cmake-multilib
DESCRIPTION="Intel Graphics Memory Management Library"
HOMEPAGE="https://github.com/intel/gmmlib"
@@ -24,7 +24,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
)
-src_configure() {
+multilib_src_configure() {
local mycmakeargs=(
-DBUILD_TESTING="$(usex test)"
-DBUILD_TYPE="Release"
diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild
index 7042078bafaa..88b7feadef4d 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
CMAKE_BUILD_TYPE="Release"
-inherit cmake
+inherit cmake-multilib
if [[ ${PV} == *9999 ]] ; then
: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
@@ -30,7 +30,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
)
-src_configure() {
+multilib_src_configure() {
local mycmakeargs=(
-DBUILD_TESTING="$(usex test)"
-DBUILD_TYPE="Release"
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index a80d11450bf8..e437983a5ffe 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.20.4.tar.xz 6229992 BLAKE2B 2cd276cec9991e2ca7367a43024d7
DIST gst-plugins-bad-1.20.5.tar.xz 6237720 BLAKE2B bf379da420d1f7f148cf51373f6f2d0800685487c8bdb7a768e79e0a2e4f1721053922be9321958b4ce318de12ea390de4cd89c345329ac41dd0425815e0e7f6 SHA512 4b4603d755d17a0fa072d771521bdcbf554fc9abdc8105b9d9189062e5725ae2989f430e1de77363a69d8c969ecbf15e73e9c478fabe8efac83b2d9b1b0a4a0a
EBUILD gst-plugins-bad-1.20.3.ebuild 2430 BLAKE2B 006eae0daba269614a14ec162d322ce46022ad2cc79ade6af833a629bde087f50aa6ecc0018eeb271fef749300c9c153c0e4201fb3533b9ed6db0e3ef4ca3a8f SHA512 55add597ac8545422522440794162394355fb79b67d0d4a0e63680f0fed8d4aeb57e996aa770fdbc7ede5a55cb0384791efb361f886d888cde90a46835adb1f9
EBUILD gst-plugins-bad-1.20.4-r1.ebuild 2672 BLAKE2B d3011a7758be33f43a3d91570f2448a9e0c2b71cf1b6ed45eecbbd98dbd9f784b7d89d1d97426290bf09704fcfc7403be365c14ebead6f2f0a53ff3f9e23537c SHA512 96eb63a43caaa8d58f747959568db9d54c67e08885ac6cd73693e4367d29ca873472f924daba0405e8d84aae1029eb65c59d23fdcfdce2f784fd36d29b84733f
-EBUILD gst-plugins-bad-1.20.5.ebuild 2680 BLAKE2B 8772eea4e2131d4ddc0ed2af7af879e452adafddc816bbc115e16bb60be9adf0e698f1c3dd9a9dfec1bb4ac39d1a7cbf7f9a18a1cac3e556a6130d6cf9f9c0aa SHA512 da2b335683323f641c18638c245365508efe326b78e04c14aec3a9bac53f9ed1e4d6d0dd3dbb54c18965ffbe4d168315c6ceef3df797e8f848b535185aa9f80b
+EBUILD gst-plugins-bad-1.20.5-r1.ebuild 2632 BLAKE2B 062319f500bbe90a592c31994d0eb0b8f88a51bf9c7c2c9dcecce9f105ce9930768a59b4954a5326936fc7ccf380d243975c80b7fc038aef6a136a45bb5d653e SHA512 bd36f2e05e26c9f110f45846e30f8a2ebba5655358ecfba232adf48d8edb771cf2be0ec8357760e25d7e497b0ab16b1947c75ff37c0c4266d496a08e645f26b4
MISC metadata.xml 546 BLAKE2B 423dd10a0ced2de218d8d97cf63adec1cfbabc238c10fdbab763e21255884e869104abf8c4e8e6500fad9190c0ca2b855af69525558a0e51ff57df45bf4da393 SHA512 42e02ef93d4d168d37250df7e5d8b07b6b2b2db7127b371082ce4910ef1b3b8c96ed979f06d83e90f7030a9d1ce0aef4c82591d862a90b1ffc2aa78d6a7fd5e3
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.5.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.5-r1.ebuild
index 0ec9ff0784c8..9e09fc6de58e 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.5.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.5-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
- qsv? ( media-libs/oneVPL[wayland?,X?] )
+ qsv? ( media-libs/oneVPL[wayland?,X?,${MULTILIB_USEDEP}] )
"
DEPEND="${RDEPEND}"
@@ -70,8 +70,7 @@ multilib_src_configure() {
$(meson_feature wayland)
)
- # Quick Sync Video is amd64 native only
- if use qsv && multilib_is_native_abi; then
+ if use qsv; then
emesonargs+=(
-Dmsdk=enabled
-Dmfx_api=oneVPL
diff --git a/media-libs/intel-mediasdk/Manifest b/media-libs/intel-mediasdk/Manifest
index fac47a4e24c8..fb35d7f5b2f9 100644
--- a/media-libs/intel-mediasdk/Manifest
+++ b/media-libs/intel-mediasdk/Manifest
@@ -1,6 +1,8 @@
DIST intel-mediasdk-22.6.5.tar.gz 11657890 BLAKE2B 53b38f7b3757895f65badb7e43e5d1f1112f744dd4a43ea9313f7bfbdf889088310b2093ccd45794426f0ac5e38ca8d901790d4963945648a3b99922476d02e0 SHA512 af9a59a9a7e9477672a875f454988cc49d8b782b32701ba681efa6dda445239e133b00f9366fc58ddadf79beef0ee74f1165990f0b8194124a841b36d5dca6bc
DIST intel-mediasdk-23.1.2.tar.gz 11658547 BLAKE2B fb4314bb539630090594835b869c19c639097305cb3b72a14fca2c8b0e429c1c73a9736460db5852d4e2899efbca9aac076f8ff37da0851ac078ece913dab6ad SHA512 1f6a31197fc1f2670f36e1602cc7a194a02cd809470c7f4de630d68f0cbf9b643207491ce2f3c5b2d94af8843bfb9383d202e0f2ea8552e48307b7ad15a0cbb6
+DIST intel-mediasdk-23.1.3.tar.gz 11657956 BLAKE2B 69aeed5c706381571c03f5e62471ee6494182b181c682f959cfde88294d132872674aa04e59f91ac02718a87b2c9155122d72719dcffa23f441c21c3de9cea76 SHA512 560ac33ce6afaf078ae004d9d73ac4614b68596f961a1068bded738b4c4564c133b94a0f2b32b8c54a76ea70f0db2fcf21a68f74f59a3a3efe063d7c73ec6f29
EBUILD intel-mediasdk-22.6.5.ebuild 1960 BLAKE2B 759c7ebb495ff50f21f4b2675b3234f20883629b15db9704064ccdf36b18bbe35d7e5afe23dbd6a33e56577826baf672ab8e158e9232230ee7b2a6b4aafbf5d2 SHA512 a6373b9030a0b37504e075c1c20d8919f9881e9b4e006b18dbe3db31aa15f995c2c8a55ac48cf808d1c2d995ffbc43c99cf2a8a7a9a73e47a82d4424efef7c2f
EBUILD intel-mediasdk-23.1.2.ebuild 1914 BLAKE2B 130c75db7637c111ebc9fa229436a7d6e52ecef7417690fb06fcbfd59b4f86c899ae2410f653ce69054e9190dd550edec9a6eb56cd62bc6b3433fcaf00678e10 SHA512 2413e454af5f17327e857b7af3f77d0fc79a23cec9673c47041d04590b0ff36baab12c5e58bc9bc0402d6350eca9b4c694ac25f95ef37c4596b9cef966eb4777
-EBUILD intel-mediasdk-9999.ebuild 1960 BLAKE2B 759c7ebb495ff50f21f4b2675b3234f20883629b15db9704064ccdf36b18bbe35d7e5afe23dbd6a33e56577826baf672ab8e158e9232230ee7b2a6b4aafbf5d2 SHA512 a6373b9030a0b37504e075c1c20d8919f9881e9b4e006b18dbe3db31aa15f995c2c8a55ac48cf808d1c2d995ffbc43c99cf2a8a7a9a73e47a82d4424efef7c2f
+EBUILD intel-mediasdk-23.1.3.ebuild 2024 BLAKE2B f935f5a5bd9cc42db08ca3430ed1fba806cab08cafc8be1bfbdc202f29f93daf565ffe929a9f4842085b47d27672336b153d738dd1e252a9fdc897b50575a950 SHA512 f311ed3e54a0ec6cee30826a68dc75588effe77a691e622cef335b4e63044e6678b8198e20899904871f8f2fa64ccddb22bf6823b5739737378f1c1304295965
+EBUILD intel-mediasdk-9999.ebuild 2024 BLAKE2B f935f5a5bd9cc42db08ca3430ed1fba806cab08cafc8be1bfbdc202f29f93daf565ffe929a9f4842085b47d27672336b153d738dd1e252a9fdc897b50575a950 SHA512 f311ed3e54a0ec6cee30826a68dc75588effe77a691e622cef335b4e63044e6678b8198e20899904871f8f2fa64ccddb22bf6823b5739737378f1c1304295965
MISC metadata.xml 507 BLAKE2B 1e08efd32142406ac7fc4390a10f51b117bbaf56fc2006ed508bf026d2720447a782f2e86ba323017dc6388ca18e4743688eaf1a8fb7165bc6377194b4139d0b SHA512 ef8d11178dcded14cb74c49e01bedde8986ff8aa02641c275d5a36ca3973782955f90d0c25ef728ca120fc1a46f1f3965f4b5a36376203c6f6cb9b1411af52e1
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-23.1.3.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-23.1.3.ebuild
new file mode 100644
index 000000000000..61173b80745c
--- /dev/null
+++ b/media-libs/intel-mediasdk/intel-mediasdk-23.1.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+ : ${EGIT_REPO_URI:="https://github.com/Intel-Media-SDK/MediaSDK"}
+ if [[ ${PV%9999} != "" ]] ; then
+ : ${EGIT_BRANCH:="release/${PV%.9999}"}
+ fi
+ inherit git-r3
+fi
+
+DESCRIPTION="Intel Media SDK"
+HOMEPAGE="https://github.com/Intel-Media-SDK/MediaSDK"
+if [[ ${PV} == *9999 ]] ; then
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${PV}.tar.gz"
+ S="${WORKDIR}/MediaSDK-intel-mediasdk-${PV}"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="dri test tools wayland X"
+# Test not working at the moment
+#RESTRICT="!test? ( test )"
+RESTRICT="test"
+REQUIRED_USE="
+ dri? ( X )
+"
+
+# x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
+# bug #805224
+RDEPEND="
+ x11-libs/libpciaccess[${MULTILIB_USEDEP}]
+ >=media-libs/libva-intel-media-driver-${PV}[${MULTILIB_USEDEP}]
+ media-libs/libva[X?,wayland?,${MULTILIB_USEDEP}]
+ x11-libs/libdrm[video_cards_intel,${MULTILIB_USEDEP}]
+ wayland? (
+ dev-libs/wayland[${MULTILIB_USEDEP}]
+ )
+ X? (
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libxcb[${MULTILIB_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}
+ wayland? (
+ dev-libs/wayland-protocols
+ )
+"
+BDEPEND="
+ wayland? (
+ dev-util/wayland-scanner
+ )
+"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ # OpenCL only has an effect if we build kernels
+ -DENABLE_OPENCL=OFF
+ -DBUILD_TUTORIALS=OFF
+ # Need to package the cm-compiler to build kernels, use pre-built instead
+ -DBUILD_KERNELS=OFF
+ -DBUILD_RUNTIME=ON
+ -DBUILD_DISPATCHER=ON
+ -DBUILD_TOOLS="$(usex tools)"
+ # Cannot build tools without samples
+ -DBUILD_SAMPLES="$(usex tools)"
+ -DBUILD_TESTS="$(usex test)"
+ -DENABLE_X11="$(usex X)"
+ -DENABLE_X11_DRI3="$(usex dri)"
+ -DENABLE_WAYLAND="$(usex wayland)"
+ )
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ optfeature "Intel GPUs newer then, and including, Intel Xe" media-libs/oneVPL-intel-gpu
+}
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
index 90efdf1fc399..61173b80745c 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake optfeature
+inherit cmake-multilib optfeature
if [[ ${PV} == *9999 ]] ; then
: ${EGIT_REPO_URI:="https://github.com/Intel-Media-SDK/MediaSDK"}
@@ -26,30 +26,27 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE="dri test +tools wayland X"
+IUSE="dri test tools wayland X"
# Test not working at the moment
#RESTRICT="!test? ( test )"
RESTRICT="test"
-# # Most of these flags only have an effect on the tools
REQUIRED_USE="
dri? ( X )
- wayland? ( tools )
- X? ( tools )
"
# x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
# bug #805224
RDEPEND="
- x11-libs/libpciaccess
- >=media-libs/libva-intel-media-driver-${PV}
- media-libs/libva[X?,wayland?]
- x11-libs/libdrm[video_cards_intel]
+ x11-libs/libpciaccess[${MULTILIB_USEDEP}]
+ >=media-libs/libva-intel-media-driver-${PV}[${MULTILIB_USEDEP}]
+ media-libs/libva[X?,wayland?,${MULTILIB_USEDEP}]
+ x11-libs/libdrm[video_cards_intel,${MULTILIB_USEDEP}]
wayland? (
- dev-libs/wayland
+ dev-libs/wayland[${MULTILIB_USEDEP}]
)
X? (
- x11-libs/libX11
- x11-libs/libxcb
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libxcb[${MULTILIB_USEDEP}]
)
"
DEPEND="${RDEPEND}
@@ -63,7 +60,7 @@ BDEPEND="
)
"
-src_configure() {
+multilib_src_configure() {
local mycmakeargs=(
# OpenCL only has an effect if we build kernels
-DENABLE_OPENCL=OFF
diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest
index 03e8c933afb4..3335d427f330 100644
--- a/media-libs/libva-intel-media-driver/Manifest
+++ b/media-libs/libva-intel-media-driver/Manifest
@@ -4,8 +4,10 @@ AUX libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch 1473 BLAKE2B d3
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
EBUILD libva-intel-media-driver-22.5.4.ebuild 1348 BLAKE2B 06e45d9018fdfd720c9e2251d179cfb28db544595ef2daede5bce4c37e35c5e22b7a335fb19f7d239c5ed017362b91601144aa00efc836470c42ff88c21aef22 SHA512 5525f59567a4cba6ae9ed1d0db84c01445e349a2c9bb8040a08b503d98533a45559d7c128b895fdd9e6479ceb0ead7e71d95f9f899257166df59931d0ceacbdf
EBUILD libva-intel-media-driver-22.6.6.ebuild 1348 BLAKE2B 42c27e60a9177174c731466ed0d8a7385d97d1f3dfe607dcb08f486b10891d45adaeae518caecba24d7b6bb3727cea1612216daa65398e3a8cfeea7f25bea90a SHA512 9f24af8b9b5e5ca765972d2afa4ba13d48d173450a5e229409ef16273c9d322a4acf47d42f9df151207cc4953be46a203f17426dceba8018c85af2b4e041350c
EBUILD libva-intel-media-driver-23.1.2.ebuild 1349 BLAKE2B 61245fc4574b5ee78b89db02c1fdde20c1834b3e4016530cd63b5295627379e832353675756f8e8bcff770f869d77aaedf1e606510281db9b86e22e5d1911eca SHA512 61c6c3010ff565ef9a257d3bca2e731f787ce7e9e725574603fd83d66c1775a88b6d6426436e9e724fc79f6a0f8dc2eb3d7fb48804c72cfe5ff3dd945e7ed87c
-EBUILD libva-intel-media-driver-9999.ebuild 1372 BLAKE2B a48874cc6d1cff79803390c8f1ff2651ddb6464f21365d74a2f0b7bc97e392ad0eefa0002f659feda8db7b3424d66938db48be1a238c8bbd76eed220fd241507 SHA512 d6414971a1487d155214b8cfdc053b4657364e547aeafdc3d18d8f16bea241a2b775616f614a4c5320c6c52f119e20ae3ea208f23af684ee712f90bc006ef487
+EBUILD libva-intel-media-driver-23.1.3.ebuild 1512 BLAKE2B 8eb90fd1290e2ac8bdbc22c23456372e17c11c1a076a4a9a0fa6216ef56e836768735e6743ec64cb629684db5a44efc5cc8c0d4b6c67d6a6e31f3e0807fb4580 SHA512 184bac022aba9b2cb2e6cfe28973a1bde7d066891cd17b3d20b417f472de85788ebb3f8e9207610fb3e977a5889655f68594f6bd8cb953c2767332ac7228d5cf
+EBUILD libva-intel-media-driver-9999.ebuild 1535 BLAKE2B 3e0c6af2ce30282f4e5358dbb91d82a23a02090afc2cf4b823e3c5c01f389276fb2bcbfa5731e9c471903a733606f6226ac9cee73a9f286826fb35127829eec8 SHA512 306aac23e618b1c2a43f816e3114f54136478a7c770f18784f0dc549706d911064dfdc5453be89c1065baeac20408f7bf777eb2e3ef9e14584e6e2f109811c82
MISC metadata.xml 565 BLAKE2B e630d474342839898d53aef1849b002ef651c9f4fe3bfcfe72e809012e6c65153b1a6c14db922a45440ffd5717b90dddd6973185f8a625906e9d5571e50728d9 SHA512 22227f8a9cc39fff74f0bf2cdc8953f110e94ce0ab107076269d604c3cf8ae46c8496c9bcf47598e351cb9714e427f213ade5e446a5e8c67acfc87db5530b370
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.1.3.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.1.3.ebuild
new file mode 100644
index 000000000000..4e88c88c1c0a
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.1.3.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.0:=[${MULTILIB_USEDEP}]
+ >=media-libs/libva-2.14.0[X?,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
+ "${FILESDIR}"/${PN}-20.4.5_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-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)
diff --git a/media-libs/libva/Manifest b/media-libs/libva/Manifest
index f63b8f72ad25..cba638f5c129 100644
--- a/media-libs/libva/Manifest
+++ b/media-libs/libva/Manifest
@@ -1,6 +1,8 @@
DIST libva-2.16.0.tar.gz 267735 BLAKE2B 59c5dc39e1c40c2f24455ec7b0588eb4898b3cab7c49ffbca997882c634ca7be6334fdb820afada8e2ebf39eb2166c95610df190d90c2a98c4fc25d25c733b32 SHA512 08a1481ac693ee9de639f2abd483e1fabfee87f9c04ead066dfce5c24cc7f1d1a29d8664707bb534ce4cc25e52086c5e4a0ecfe704ca59590ce41353fda31c2a
DIST libva-2.17.0.tar.gz 276993 BLAKE2B 4d003f6649e4356a06438f8a88a5a549e94b12f342b1b72649b17d0aeb259ec7f26c3d1b5d21ca6cfc2b31141e01449ccc94a6bfdf2716976cbc80f63091fcfe SHA512 c9f841b4f35e732bfaa0358fe031207f011be90f95cc46acfd8c83092510cf68fe0921f28ce82402e7cce65f263eeb4d06cc17fd3c525274530a53b212f33779
+DIST libva-2.18.0.tar.gz 278493 BLAKE2B 619a1dcb9aaa71b38ec7be500adf6b526f50ae20fa76d1c5ac750229e03a2d5b82dabe334cf07c0f539c1b079829f2ec000ce6570e05e6e18fbf7415c5d5b9b3 SHA512 12e8d837604d2f354d849a8adc84281ae1ecfd2433f1b7dc8e28b5d703ada42b4a84b2b3870e8d2397b77d0d9741afe3bc04d25b4426531805aeb72defaac7ad
EBUILD libva-2.16.0.ebuild 1673 BLAKE2B 70e3fc2d9fa99c691b6c1411b2d491ea586cf24fa13d0f2702ffaaa07cc4ab3c8555329244d65970e550233bfb5ecbeaa28533f87cc51261020f91c289785cce SHA512 0f11878765a5b5813282e7456c03d7072bb35591f512149917fe8203f74669419b24e34ac70260758e01e9c317c5239d5528b81bc9d091da57eb403f811b2852
EBUILD libva-2.17.0.ebuild 1719 BLAKE2B d8745a3f8b92c9f61310f61307ef9eb90adbbba4440c2b8a86894d810b22c59d1ff98da3bee803f8446d821fb4aebe06862d142f1563d65968dc76906b4ba853 SHA512 3045261c46456b48a598449cfb7a6b6ed2d5faee979fe87cd3d39fc9f2ab124c302fb8134d70a5a0a4a4994b07b9734ad398947b981437b968ccfb89b1580905
-EBUILD libva-9999.ebuild 1688 BLAKE2B 2ad1b5623dd652d3ee6b7ce8ee7036bf891529ee9624cf6506391e8e95ab06dc0b5a4548a232972fb8e2d80c1a1a4a31113e1c12f6bfd02485434e753644012e SHA512 17ed1d781db916bacd3561e1024609fcc7764c996910305d3adaade3ba6fca433b875737c38c1c8b35c6c689511052b03c7b7ea1970d9c0adad9b134c77172f5
+EBUILD libva-2.18.0.ebuild 1694 BLAKE2B 8b840e15759fdaf967f93ce93b3cb36dbaa230ec427bb2d06d33b7e47d42dc216b014d4fcd382b5c44930a6826736c43f1040aa933bad9e7cc64c9208876ccce SHA512 ef471970a85be2d065cdaf32ec560a637f0e2f93fb1a1ad3ddd58b0788836278f2ba9789e5b0c500a6e1b58bf55f0b973a72fe214a929d11ea1fb54c4fe16ad9
+EBUILD libva-9999.ebuild 1694 BLAKE2B 8b840e15759fdaf967f93ce93b3cb36dbaa230ec427bb2d06d33b7e47d42dc216b014d4fcd382b5c44930a6826736c43f1040aa933bad9e7cc64c9208876ccce SHA512 ef471970a85be2d065cdaf32ec560a637f0e2f93fb1a1ad3ddd58b0788836278f2ba9789e5b0c500a6e1b58bf55f0b973a72fe214a929d11ea1fb54c4fe16ad9
MISC metadata.xml 332 BLAKE2B ee8f4e2f059c3b81126ce55575cfb267c783c37e84bfd39b4564b5f0615da7d6d7efda0bd1fe3c547aa81ff3a6de056bf2555d5049d15bc33aab16c0e2a7271d SHA512 dfa43788c2b4701dde7eacecacdd4a372b192fb98ba8d471a5226eb15b20acb89e564358aa75a1673956005ed904b9e34135ff77d230b1bee95731d61198aef0
diff --git a/media-libs/libva/libva-2.18.0.ebuild b/media-libs/libva/libva-2.18.0.ebuild
new file mode 100644
index 000000000000..ef0203c92e12
--- /dev/null
+++ b/media-libs/libva/libva-2.18.0.ebuild
@@ -0,0 +1,68 @@
+# 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="opengl wayland X"
+REQUIRED_USE="opengl? ( X )"
+
+RDEPEND="
+ >=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
+ wayland? (
+ >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+ )
+ X? (
+ >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+ >=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_backend_glx.h
+ /usr/include/va/va_x11.h
+ /usr/include/va/va_dri2.h
+ /usr/include/va/va_dricommon.h
+ /usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+ -Ddisable_drm=false
+ -Dwith_x11=$(usex X)
+ -Dwith_glx=$(usex X)
+ -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/libva/libva-9999.ebuild b/media-libs/libva/libva-9999.ebuild
index bd21375cee90..ef0203c92e12 100644
--- a/media-libs/libva/libva-9999.ebuild
+++ b/media-libs/libva/libva-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999 ]] ; then
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 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~amd64 ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
fi
LICENSE="MIT"
diff --git a/media-libs/oneVPL-intel-gpu/Manifest b/media-libs/oneVPL-intel-gpu/Manifest
index fdca4433446e..fb85fcd73541 100644
--- a/media-libs/oneVPL-intel-gpu/Manifest
+++ b/media-libs/oneVPL-intel-gpu/Manifest
@@ -1,5 +1,7 @@
DIST oneVPL-intel-gpu-22.6.5.tar.gz 6836805 BLAKE2B 73c2f0a7ec0f0712db737cbaee7c62d9801ebca3b75185bc35156922d04da1076015fcf9491be4ebe4cd2d5c87c90903d818a012d4af5c5393f298bd06fad200 SHA512 505bfc0235748fc4a3ee9229e5ffdb815212427266238dbaf0463565ec415c9c767247b6a1c6c10e479da186b834e5df114798a8e84d7b97873d1d97748e9bb5
DIST oneVPL-intel-gpu-23.1.2.tar.gz 6974931 BLAKE2B 82c3b0cf92f57d7dd4c46f51d27450b53bd9816786f45999bca41ac628c7f293708772580c4a01467519b02f67181203a28eba03e4e85846f993886898b75af9 SHA512 2053e5ec0560a93ae0bcf3d5d0269807d7925eb5b76cc32fc34d157b900c227a74584cd6f84bdcd653f70e0d3f068f5cb6e891a892e71caef5bb9b146a5571cd
+DIST oneVPL-intel-gpu-23.1.3.tar.gz 6976927 BLAKE2B a338ca7a088c8171a8b0c8fd4de09fb07c5272f9c50c8389aa6442f5368e88f9e012bf9f4c6d49e6a094f615366c84dcddca760cc144ea99204627198e0d4a6f SHA512 c01a32a4aa3988d105cee463e40bb59f834d926f8e67a3fff83dfb4e6f0e2690e845ad179e6bbc31e12528c35d422403706064152a387d36af8939b7168ab7be
EBUILD oneVPL-intel-gpu-22.6.5.ebuild 1189 BLAKE2B 8a6ed3716eb86c59cafe38febd015d9d66ed96f7db2397f9b3cf97283ed367d8d3ff49a764f97a0f59b831611576792df1398bd29d1cc740be7e0e6ccad8f62a SHA512 92c6095b06adfb4d3e697c8a2958d2afa9b5a50d13c1c16b870540be3356006a81913db012afbc8f5f9e0db96c29b95da6c547e9b9613666bbcdf932b33574db
EBUILD oneVPL-intel-gpu-23.1.2.ebuild 1189 BLAKE2B 8a6ed3716eb86c59cafe38febd015d9d66ed96f7db2397f9b3cf97283ed367d8d3ff49a764f97a0f59b831611576792df1398bd29d1cc740be7e0e6ccad8f62a SHA512 92c6095b06adfb4d3e697c8a2958d2afa9b5a50d13c1c16b870540be3356006a81913db012afbc8f5f9e0db96c29b95da6c547e9b9613666bbcdf932b33574db
+EBUILD oneVPL-intel-gpu-23.1.3.ebuild 1189 BLAKE2B b18f9405ece1aaf46f2bfc3ed514eb5ccbc16489412414b8a6e612c1fd34418fd85d801d4c2a786d8d6764163cc5b2a6f82b18086022a547b6666fedaf7446b1 SHA512 0279e6caa0ef6e730314b3ed8a7a64188f883375e439fd287761fab69967038b093c21e5437c5775f8b2196fc01d75fe8c2a21e4ae9c4bd46584113ba82fd8e4
MISC metadata.xml 434 BLAKE2B f5f6ea2e0ebac9ba06ebdb2a8469e99171f25ad08d8e992695e7d189f5c3f8fb3e966d710fe02cbd1f590f2137e265d9bf5014f0d9e7a492574b526360d70133 SHA512 713bf6044fd4d5606568af248dc0adf1a93c5917fb7d6d79c7a033a5b52a0164769b02086caa0a4492979c586511b5a4d7b85fe603ffe80d4884786e05dc520e
diff --git a/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-23.1.3.ebuild b/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-23.1.3.ebuild
new file mode 100644
index 000000000000..6d87d22aff64
--- /dev/null
+++ b/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-23.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="oneAPI Video Processing Library Intel GPU implementation"
+HOMEPAGE="https://github.com/oneapi-src/oneVPL-intel-gpu"
+SRC_URI="https://github.com/oneapi-src/oneVPL-intel-gpu/archive/refs/tags/intel-onevpl-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-intel-onevpl-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ media-libs/libva
+ x11-libs/libdrm[video_cards_intel]
+"
+# At runtime we need a dispatcher, oneVPL is preferred but mediasdk also works
+RDEPEND="${DEPEND}
+ >=media-libs/libva-intel-media-driver-${PV}
+ || (
+ media-libs/oneVPL[drm,vaapi]
+ media-libs/intel-mediasdk
+ )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_RUNTIME=ON
+ # To build the kernels we need to package the cm-compiler, use pre-built instead
+ -DBUILD_KERNELS=OFF
+ -DBUILD_TESTS="$(usex test)"
+ # This only seems to do something if we BUILD_KERNELS=ON
+ #-DBUILD_TOOLS="$(usex tools)"
+ # OpenCL only has an effect if we build kernels
+ -DENABLE_OPENCL=OFF
+ )
+ cmake_src_configure
+}
diff --git a/media-libs/oneVPL/Manifest b/media-libs/oneVPL/Manifest
index 3cd5fbb8063f..bb3594adf413 100644
--- a/media-libs/oneVPL/Manifest
+++ b/media-libs/oneVPL/Manifest
@@ -3,5 +3,5 @@ DIST oneVPL-2023.1.2.tar.gz 6317287 BLAKE2B 3333d32eb5370ac32136337dae122238ddc9
DIST oneVPL-2023.1.3.tar.gz 6326127 BLAKE2B ad09f6bb3eca51c11d921ffe89472f255413e2930da6de43d2130dea9629a1dd87ede2260acec20b056f3320f4c0db1911ece01dcdd83b514f8820b8befcd787 SHA512 e5241873447545f8cbfe27fcab07426234054300d1d0839aff85aeb64cd8fb75fc52f2dfe946aa7ea98b60f05121593bac9f38b5d5ebfc9d3cdfaa50644daa1a
EBUILD oneVPL-2023.1.1.ebuild 2146 BLAKE2B c6e3e3ecae998581833b70616d81354e54d32869379632293d3c1a29e5e7ff8465ad98b14332ab9d2db6d92693ad4dc322858a71ef487e059f7c36187b9e9447 SHA512 e77ed4ba01e53f7055264f32c88455e6b87e931735dfbb94560e685fedb3ef913fec63fdc29d53346fce044f08247af300d46b58f8002e3603cbaa28e98f0c3c
EBUILD oneVPL-2023.1.2.ebuild 2146 BLAKE2B c6e3e3ecae998581833b70616d81354e54d32869379632293d3c1a29e5e7ff8465ad98b14332ab9d2db6d92693ad4dc322858a71ef487e059f7c36187b9e9447 SHA512 e77ed4ba01e53f7055264f32c88455e6b87e931735dfbb94560e685fedb3ef913fec63fdc29d53346fce044f08247af300d46b58f8002e3603cbaa28e98f0c3c
-EBUILD oneVPL-2023.1.3.ebuild 2146 BLAKE2B c6e3e3ecae998581833b70616d81354e54d32869379632293d3c1a29e5e7ff8465ad98b14332ab9d2db6d92693ad4dc322858a71ef487e059f7c36187b9e9447 SHA512 e77ed4ba01e53f7055264f32c88455e6b87e931735dfbb94560e685fedb3ef913fec63fdc29d53346fce044f08247af300d46b58f8002e3603cbaa28e98f0c3c
+EBUILD oneVPL-2023.1.3-r1.ebuild 2291 BLAKE2B 7626732399eaa222ca9b8067d5a9e3f00e3e108ee5ee68482090bd9bd17e57cfa8c2b494ad618fd565232a814bf00f231e1b743134cc482a8e3c525b320a6035 SHA512 41eb1ab0d5da32801d3cbc0251131eb928a3f843e4f6f870b23a51cd41db3e57e8dcdecaf04e31221cef40755ba2aa8fa3d3ddcb830bd2374592c5d489e75fa3
MISC metadata.xml 633 BLAKE2B b53305f7c1127190352b5ba25b43411455eba014b85a2305abe07571c2d95c6e1a60b1f1872895b94b7e6292178966c5b3733d7c8b5b9d1c16925f153d60e00d SHA512 a1dcf8c3fe13311bd81d48c3afd76de850b7fc395ae89e2f5973811525e56e69c12de2c83ce8e25971ab4330ed80ba4794051e5826c271f62b86116bc520d81a
diff --git a/media-libs/oneVPL/oneVPL-2023.1.3.ebuild b/media-libs/oneVPL/oneVPL-2023.1.3-r1.ebuild
index 223184c18698..0758b6389a95 100644
--- a/media-libs/oneVPL/oneVPL-2023.1.3.ebuild
+++ b/media-libs/oneVPL/oneVPL-2023.1.3-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake optfeature
+inherit cmake-multilib optfeature
DESCRIPTION="oneAPI Video Processing Library, dispatcher, tools, and examples"
HOMEPAGE="https://github.com/oneapi-src/oneVPL"
@@ -13,34 +13,37 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="dri drm examples experimental +tools test vaapi wayland X"
+IUSE="dri drm examples experimental tools test vaapi wayland X"
RESTRICT="!test? ( test )"
-# Most of these flags only have an effect on the tools
+# Tools fails to compile on 32-bit
REQUIRED_USE="
dri? ( X drm )
- drm? ( tools )
- X? ( tools vaapi )
- wayland? ( tools drm )
- vaapi? ( tools )
+ X? ( vaapi )
+ wayland? ( drm )
+ abi_x86_32? ( !tools )
+ abi_x86_x32? ( !tools )
"
-BDEPEND="virtual/pkgconfig"
-DEPEND="
- x11-libs/libpciaccess
- vaapi? ( media-libs/libva[X?,wayland?,drm(+)?] )
- drm? ( x11-libs/libdrm )
+RDEPEND="
+ x11-libs/libpciaccess[${MULTILIB_USEDEP}]
+ vaapi? ( media-libs/libva[X?,wayland?,drm(+)?,${MULTILIB_USEDEP}] )
+ drm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
wayland? (
- dev-libs/wayland
- dev-libs/wayland-protocols
+ dev-libs/wayland[${MULTILIB_USEDEP}]
)
X? (
- x11-libs/libX11
- x11-libs/libxcb
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libxcb[${MULTILIB_USEDEP}]
)
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ wayland? (
+ dev-libs/wayland-protocols
+ )
+"
+BDEPEND="virtual/pkgconfig"
-src_configure() {
+multilib_src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=ON
-DBUILD_DISPATCHER=ON
@@ -65,7 +68,7 @@ src_configure() {
cmake_src_configure
}
-src_install() {
+multilib_src_install() {
cmake_src_install
# Remove these license files
rm -r "${ED}/usr/share/vpl/licensing" || die