commit: 40a69c1d47df038c274a35df29ce59af4e307db1
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 08:57:49 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 20:55:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40a69c1d
media-libs/intel-mediasdk: add 23.1.3, add multilib support
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
media-libs/intel-mediasdk/Manifest | 1 +
...dk-9999.ebuild => intel-mediasdk-23.1.3.ebuild} | 23 ++++++++++------------
.../intel-mediasdk/intel-mediasdk-9999.ebuild | 23 ++++++++++------------
3 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/media-libs/intel-mediasdk/Manifest
b/media-libs/intel-mediasdk/Manifest
index fc4891fc145d..2f88530fc829 100644
--- a/media-libs/intel-mediasdk/Manifest
+++ b/media-libs/intel-mediasdk/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
b/media-libs/intel-mediasdk/intel-mediasdk-23.1.3.ebuild
similarity index 79%
copy from media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
copy to media-libs/intel-mediasdk/intel-mediasdk-23.1.3.ebuild
index 90efdf1fc399..61173b80745c 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-23.1.3.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/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
