commit: e0938d33e01c0a5863d209c550dcbaa864b171be
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 12:04:36 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 12:04:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0938d33
media-video/vlc: Remove media-video/libav
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-video/vlc/vlc-3.0.8.ebuild | 6 ++----
media-video/vlc/vlc-3.0.9999.ebuild | 6 ++----
media-video/vlc/vlc-9999.ebuild | 6 ++----
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/media-video/vlc/vlc-3.0.8.ebuild b/media-video/vlc/vlc-3.0.8.ebuild
index 090c04ddbb2..7c59a75a78b 100644
--- a/media-video/vlc/vlc-3.0.8.ebuild
+++ b/media-video/vlc/vlc-3.0.8.ebuild
@@ -32,7 +32,7 @@ SLOT="0/5-9" # vlc - vlccore
IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint
chromecast
dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk
+ffmpeg flac
fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack
jpeg kate
- libass libav libcaca libnotify +libsamplerate libtar libtiger linsys
lirc
+ libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
live lua macosx-notifications mad matroska modplug mp3 mpeg mtp
musepack ncurses
nfs ogg omxil optimisememory opus png postproc projectm pulseaudio +qt5
rdp
run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg
taglib
@@ -96,8 +96,7 @@ RDEPEND="
faad? ( media-libs/faad2 )
fdk? ( media-libs/fdk-aac:= )
ffmpeg? (
- !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
- libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
+ >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?]
)
flac? (
media-libs/flac
@@ -152,7 +151,6 @@ RDEPEND="
ogg? ( media-libs/libogg )
opus? ( >=media-libs/opus-1.0.3 )
png? ( media-libs/libpng:0= )
- postproc? ( libav? ( media-libs/libpostproc ) )
projectm? (
media-fonts/dejavu
media-libs/libprojectm
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild
b/media-video/vlc/vlc-3.0.9999.ebuild
index 8af1fe6e259..45f4261e6c1 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -32,7 +32,7 @@ SLOT="0/5-9" # vlc - vlccore
IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk
+ffmpeg flac
fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack
jpeg kate
- libass libav libcaca libnotify +libsamplerate libtar libtiger linsys
lirc
+ libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
live lua macosx-notifications mad matroska modplug mp3 mpeg mtp
musepack ncurses
nfs ogg omxil optimisememory opus png postproc projectm pulseaudio +qt5
rdp
run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg
taglib
@@ -97,8 +97,7 @@ RDEPEND="
faad? ( media-libs/faad2 )
fdk? ( media-libs/fdk-aac:= )
ffmpeg? (
- !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
- libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
+ >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?]
)
flac? (
media-libs/flac
@@ -153,7 +152,6 @@ RDEPEND="
ogg? ( media-libs/libogg )
opus? ( >=media-libs/opus-1.0.3 )
png? ( media-libs/libpng:0= )
- postproc? ( libav? ( media-libs/libpostproc ) )
projectm? (
media-fonts/dejavu
media-libs/libprojectm
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 87341a4212c..859f05b91c6 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -32,7 +32,7 @@ SLOT="0/12-9" # vlc - vlccore
IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk
+ffmpeg flac
fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack
jpeg kate kms
- libass libav libcaca libnotify libplacebo +libsamplerate libtar
libtiger linsys lirc
+ libass libcaca libnotify libplacebo +libsamplerate libtar libtiger
linsys lirc
live lua macosx-notifications mad matroska modplug mp3 mpeg mtp
musepack ncurses
nfs ogg omxil optimisememory opus png postproc projectm pulseaudio +qt5
rdp
run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg
taglib
@@ -97,8 +97,7 @@ RDEPEND="
faad? ( media-libs/faad2 )
fdk? ( media-libs/fdk-aac:= )
ffmpeg? (
- !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
- libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
+ >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?]
)
flac? (
media-libs/flac
@@ -155,7 +154,6 @@ RDEPEND="
ogg? ( media-libs/libogg )
opus? ( >=media-libs/opus-1.0.3 )
png? ( media-libs/libpng:0= )
- postproc? ( libav? ( media-libs/libpostproc ) )
projectm? (
media-fonts/dejavu
media-libs/libprojectm
