media-video/ffmpeg: Drop USE celt

Bug: https://bugs.gentoo.org/664158
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Craig Andrews <candrews@gentoo.org>

diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
index d133d024790d30777dcf050b2b61587fa1c4dbf2..7969d816201c2621b2fb1da2b879a3d5e302043b 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -73,7 +73,7 @@ FFMPEG_FLAG_MAP=(
                libv4l:libv4l2 pulseaudio:libpulse
                # decoders
                amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-               jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+               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
                zvbi:libzvbi
@@ -159,7 +159,6 @@ RDEPEND="
        bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
        bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
        cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-       celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
        chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
        ebur128? ( >=media-libs/libebur128-1.1.0[${MULTILIB_USEDEP}] )
        encode? (
@@ -380,6 +379,7 @@ multilib_src_configure() {
                --enable-avfilter
                --enable-avresample
                --disable-stripping
+               --disable-libcelt # bug #664158
                "${myconf[@]}"
        )
 

diff --git a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
index ce347f5d0d868bb17d56d979ea7f17e315db1908..63dea73127437c44a1bec4dcfefcac598ce68e95 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -73,7 +73,7 @@ FFMPEG_FLAG_MAP=(
                libv4l:libv4l2 pulseaudio:libpulse
                # decoders
                amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-               jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+               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
                zvbi:libzvbi
@@ -159,7 +159,6 @@ RDEPEND="
        bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
        bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
        cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-       celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
        chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
        ebur128? ( >=media-libs/libebur128-1.1.0[${MULTILIB_USEDEP}] )
        encode? (
@@ -380,6 +379,7 @@ multilib_src_configure() {
                --enable-avfilter
                --enable-avresample
                --disable-stripping
+               --disable-libcelt # bug #664158
                "${myconf[@]}"
        )
 

diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
index 106581975ec48df77045fc7a813f7186f1e53f95..9bfc5b0be2b06b023c879040112773bf181e711c 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -73,7 +73,7 @@ FFMPEG_FLAG_MAP=(
                libv4l:libv4l2 pulseaudio:libpulse
                # decoders
                amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-               jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+               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
                zvbi:libzvbi
@@ -176,7 +176,6 @@ RDEPEND="
        bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
        bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
        cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-       celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
        chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
        encode? (
                amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
@@ -400,6 +399,7 @@ multilib_src_configure() {
                --enable-avfilter
                --enable-avresample
                --disable-stripping
+               --disable-libcelt # bug #664158
                "${myconf[@]}"
        )
 

diff --git a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
index 56f21ea10ded64160848ed51c46f40ef122e013b..03289d69b79ed8e9d1369bd896e5cc1162f7c4df 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -73,7 +73,7 @@ FFMPEG_FLAG_MAP=(
                libv4l:libv4l2 pulseaudio:libpulse
                # decoders
                amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-               jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+               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
                zvbi:libzvbi
@@ -176,7 +176,6 @@ RDEPEND="
        bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
        bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
        cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-       celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
        chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
        encode? (
                amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
@@ -400,6 +399,7 @@ multilib_src_configure() {
                --enable-avfilter
                --enable-avresample
                --disable-stripping
+               --disable-libcelt # bug #664158
                "${myconf[@]}"
        )
 

diff --git a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
index 8c86da808b0e7ceb5d92460dbbc6186b7086e0b2..d9e3e521ff37d56f6f0700e48edf45ae820dd92d 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -73,7 +73,7 @@ FFMPEG_FLAG_MAP=(
                libv4l:libv4l2 pulseaudio:libpulse
                # decoders
                amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-               jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+               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
                zvbi:libzvbi
@@ -176,7 +176,6 @@ RDEPEND="
        bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
        bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
        cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-       celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
        chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
        encode? (
                amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
@@ -400,6 +399,7 @@ multilib_src_configure() {
                --enable-avfilter
                --enable-avresample
                --disable-stripping
+               --disable-libcelt # bug #664158
                "${myconf[@]}"
        )
 

diff --git a/media-video/ffmpeg/ffmpeg-3.4.5.ebuild b/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
index d8fda730cbb286375d8734c47a8e0159aceb2ec2..07123b94bbfb237e7d0222652396ef09fb2cecad 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
@@ -73,7 +73,7 @@ FFMPEG_FLAG_MAP=(
                libv4l:libv4l2 pulseaudio:libpulse libdrm
                # decoders
                amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-               jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+               jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
                mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
                speex:libspeex svg:librsvg vorbis:libvorbis
                vpx:libvpx zvbi:libzvbi
@@ -167,7 +167,6 @@ RDEPEND="
        bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
        bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
        cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-       celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
        chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
        encode? (
                amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
@@ -382,6 +381,7 @@ multilib_src_configure() {
                --enable-avfilter
                --enable-avresample
                --disable-stripping
+               --disable-libcelt # bug #664158
                "${myconf[@]}"
        )
 

diff --git a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
index af3844683b8f722d18395164b742a3130727b2ca..dc2945d48719d2f3d7131464ca78eec7efb65f09 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -74,7 +74,7 @@ FFMPEG_FLAG_MAP=(
                libv4l:libv4l2 pulseaudio:libpulse libdrm
                # decoders
                amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 fdk:libfdk-aac
-               jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+               jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
                mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
                speex:libspeex svg:librsvg video_cards_nvidia:ffnvcodec
                vorbis:libvorbis vpx:libvpx zvbi:libzvbi
@@ -168,7 +168,6 @@ RDEPEND="
        bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
        bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
        cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-       celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
        chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
        codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
        encode? (
@@ -404,6 +403,7 @@ multilib_src_configure() {
                --enable-avfilter
                --enable-avresample
                --disable-stripping
+               --disable-libcelt # bug #664158
                "${myconf[@]}"
        )
 

diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 8f681d0353b549848f21f452c9f371b1ca65e4fb..7ad4c88a08be86ae32e30a548f935a9cad9e1cbc 100644 (file)
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -15,7 +15,6 @@
        <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
        <flag name="bs2b">Enables <pkg>media-libs/libbs2b</pkg> based Bauer stereo-to-binaural filter.</flag>
        <flag name="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
-       <flag name="celt">Adds Xiph CELT audio decoding support</flag>
        <flag name="chromaprint">Enables audio fingerprinting support with <pkg>media-libs/chromaprint</pkg>.</flag>
        <flag name="chromium">Builds libffmpeg.so to enable media playback in Chromium-based browsers like Opera and Vivaldi.</flag>
        <flag name="codec2">Enables codec2 low bit rate speech codec support via <pkg>media-libs/codec2</pkg>.</flag>