commit: ee8808a12ccc4fbe0ee4e81ea910a9a29c66a85c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 14:59:21 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 15:33:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee8808a1
media-video/ffmpeg: [QA] Punt removed schreodinger dep
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-video/ffmpeg/ffmpeg-3.2.6.ebuild | 3 +--
media-video/ffmpeg/ffmpeg-3.2.7.ebuild | 3 +--
media-video/ffmpeg/ffmpeg-3.3.4.ebuild | 3 +--
media-video/ffmpeg/ffmpeg-3.3.6.ebuild | 3 +--
media-video/ffmpeg/ffmpeg-3.3.8.ebuild | 3 +--
media-video/ffmpeg/metadata.xml | 1 -
profiles/base/package.use.mask | 1 -
7 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
index 51bc4aba9a9..a6291d34e90 100644
--- a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
- schroedinger:libschroedinger speex:libspeex vorbis:libvorbis
vpx:libvpx
+ speex:libspeex vorbis:libvorbis vpx:libvpx
zvbi:libzvbi
# libavfilter options
bs2b:libbs2b chromaprint ebur128:libebur128 flite:libflite
frei0r
@@ -217,7 +217,6 @@ RDEPEND="
librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
- schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]
)
sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
index 326439232c9..ac8492a79df 100644
--- a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
- schroedinger:libschroedinger speex:libspeex vorbis:libvorbis
vpx:libvpx
+ speex:libspeex vorbis:libvorbis vpx:libvpx
zvbi:libzvbi
# libavfilter options
bs2b:libbs2b chromaprint ebur128:libebur128 flite:libflite
frei0r
@@ -217,7 +217,6 @@ RDEPEND="
librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
- schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]
)
sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
index f6b827597e8..d55a0875bac 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
- schroedinger:libschroedinger speex:libspeex vorbis:libvorbis
vpx:libvpx
+ speex:libspeex vorbis:libvorbis vpx:libvpx
zvbi:libzvbi
# libavfilter options
bs2b:libbs2b chromaprint flite:libflite frei0r
@@ -233,7 +233,6 @@ RDEPEND="
librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
- schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]
)
sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
sofalizer? (
>=sci-libs/netcdf-4.3.2-r1[hdf5]
diff --git a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
index 5e1f935e172..c86f3c9aece 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
- schroedinger:libschroedinger speex:libspeex vorbis:libvorbis
vpx:libvpx
+ speex:libspeex vorbis:libvorbis vpx:libvpx
zvbi:libzvbi
# libavfilter options
bs2b:libbs2b chromaprint flite:libflite frei0r
@@ -233,7 +233,6 @@ RDEPEND="
librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
- schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]
)
sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
sofalizer? (
>=sci-libs/netcdf-4.3.2-r1[hdf5]
diff --git a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
index 6a794f83105..fe80b8d1262 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
- schroedinger:libschroedinger speex:libspeex vorbis:libvorbis
vpx:libvpx
+ speex:libspeex vorbis:libvorbis vpx:libvpx
zvbi:libzvbi
# libavfilter options
bs2b:libbs2b chromaprint flite:libflite frei0r
@@ -233,7 +233,6 @@ RDEPEND="
librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
- schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]
)
sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
sofalizer? (
>=sci-libs/netcdf-4.3.2-r1[hdf5]
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index ac9e4e532cc..35024c9f8c5 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -49,7 +49,6 @@
<flag name="pic">Force shared libraries to be built as PIC (this is
slower)</flag>
<flag name="postproc">Build and install libpostproc.</flag>
<flag name="rubberband">Adds time-stretching and pitch-shifting audio
filter based on <pkg>media-libs/rubberband</pkg>.</flag>
- <flag name="schroedinger">Enable Dirac video support (an advanced
royalty-free video compression format) via libschroedinger (high-speed
implementation in C of the Dirac codec).</flag>
<flag name="snappy">Enable <pkg>app-arch/snappy</pkg> support. Required
for e.g. Vidvox Hap encoder.</flag>
<flag name="sofalizer">Enables Sofalizer filter</flag>
<flag name="srt">Enable support for Secure Reliable Transport (SRT) via
<pkg>net-libs/srt</pkg></flag>
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 961109f8df4..e3dd8800c06 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -50,7 +50,6 @@ mate-extra/mate-power-manager pm-utils
# Pacho Ramos <pa...@gento.org> (04 Nov 2018)
# media-libs/schroedinger will be removed (#602938)
-media-video/ffmpeg schroedinger
media-video/libav schroedinger
# Pacho Ramos <pa...@gento.org> (04 Nov 2018)
