From ae0bd8f1a5eebb48a588bb8010436c4b13dd3ec8 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Tue, 6 Nov 2018 12:04:22 -0500 Subject: 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 --- media-video/ffmpeg/ffmpeg-3.2.6.ebuild | 6 +++--- media-video/ffmpeg/ffmpeg-3.2.7.ebuild | 6 +++--- media-video/ffmpeg/ffmpeg-3.3.4.ebuild | 6 +++--- media-video/ffmpeg/ffmpeg-3.3.6.ebuild | 6 +++--- media-video/ffmpeg/ffmpeg-3.3.8.ebuild | 6 +++--- media-video/ffmpeg/ffmpeg-3.4.5.ebuild | 4 ++-- media-video/ffmpeg/ffmpeg-4.0.2.ebuild | 6 +++--- media-video/ffmpeg/metadata.xml | 1 - 8 files changed, 20 insertions(+), 21 deletions(-) (limited to 'media-video') diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild index d133d024790d..7969d816201c 100644 --- 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 ce347f5d0d86..63dea7312743 100644 --- 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 106581975ec4..9bfc5b0be2b0 100644 --- 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 56f21ea10ded..03289d69b79e 100644 --- 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 8c86da808b0e..d9e3e521ff37 100644 --- 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 d8fda730cbb2..07123b94bbfb 100644 --- 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 af3844683b8f..dc2945d48719 100644 --- 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 8f681d0353b5..7ad4c88a08be 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -15,7 +15,6 @@ Enable playback of Blu-ray filesystems Enables media-libs/libbs2b based Bauer stereo-to-binaural filter. Enables audio CD grabbing with dev-libs/libcdio. - Adds Xiph CELT audio decoding support Enables audio fingerprinting support with media-libs/chromaprint. Builds libffmpeg.so to enable media playback in Chromium-based browsers like Opera and Vivaldi. Enables codec2 low bit rate speech codec support via media-libs/codec2. -- cgit v1.2.3-65-gdbad