commit: 39b6480755c410eb30e6a1b02172223547454f9c
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 21:32:16 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 21:33:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39b64807
media-video/ffmpeg: make dep on oneVPL/intel-mediasdk multilib
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
media-video/ffmpeg/{ffmpeg-5.1.2-r1.ebuild => ffmpeg-5.1.2-r2.ebuild} | 4 ++--
media-video/ffmpeg/{ffmpeg-6.0.ebuild => ffmpeg-6.0-r1.ebuild} | 4 ++--
media-video/ffmpeg/ffmpeg-9999.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/media-video/ffmpeg/ffmpeg-5.1.2-r1.ebuild
b/media-video/ffmpeg/ffmpeg-5.1.2-r2.ebuild
similarity index 99%
rename from media-video/ffmpeg/ffmpeg-5.1.2-r1.ebuild
rename to media-video/ffmpeg/ffmpeg-5.1.2-r2.ebuild
index 3d21b79ce2d7..cc4189424afc 100644
--- a/media-video/ffmpeg/ffmpeg-5.1.2-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-5.1.2-r2.ebuild
@@ -248,7 +248,7 @@ RDEPEND="
opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- qsv? ( media-libs/intel-mediasdk )
+ qsv? ( media-libs/intel-mediasdk[${MULTILIB_USEDEP}] )
rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
@@ -432,7 +432,7 @@ multilib_src_configure() {
# (temporarily) disable non-multilib deps
if ! multilib_is_native_abi; then
- for i in librav1e libmfx libzmq ; do
+ for i in librav1e libzmq ; do
myconf+=( --disable-${i} )
done
fi
diff --git a/media-video/ffmpeg/ffmpeg-6.0.ebuild
b/media-video/ffmpeg/ffmpeg-6.0-r1.ebuild
similarity index 99%
rename from media-video/ffmpeg/ffmpeg-6.0.ebuild
rename to media-video/ffmpeg/ffmpeg-6.0-r1.ebuild
index eee97981c06f..e9e752819bc1 100644
--- a/media-video/ffmpeg/ffmpeg-6.0.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.0-r1.ebuild
@@ -248,7 +248,7 @@ RDEPEND="
opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- qsv? ( media-libs/oneVPL )
+ qsv? ( media-libs/oneVPL[${MULTILIB_USEDEP}] )
rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
@@ -432,7 +432,7 @@ multilib_src_configure() {
# (temporarily) disable non-multilib deps
if ! multilib_is_native_abi; then
- for i in librav1e libmfx libvpl libzmq ; do
+ for i in librav1e libzmq ; do
myconf+=( --disable-${i} )
done
fi
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild
b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 31684f96890d..7e4387880715 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -248,7 +248,7 @@ RDEPEND="
opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- qsv? ( media-libs/oneVPL )
+ qsv? ( media-libs/oneVPL[${MULTILIB_USEDEP}] )
rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
@@ -430,7 +430,7 @@ multilib_src_configure() {
# (temporarily) disable non-multilib deps
if ! multilib_is_native_abi; then
- for i in librav1e libmfx libvpl libzmq ; do
+ for i in librav1e libzmq ; do
myconf+=( --disable-${i} )
done
fi
