commit: 5be8c6f8c6137132dfdcf571aa1f24dbeee3c81a Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Mon Apr 27 16:50:33 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sat May 9 18:07:07 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5be8c6f8
media-video/vlc: Merge "postproc" USE flag into "ffmpeg" USE flag. Bug: https://bugs.gentoo.org/719818 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> media-video/vlc/metadata.xml | 1 - media-video/vlc/vlc-3.0.10.ebuild | 5 ++--- media-video/vlc/vlc-3.0.8.ebuild | 7 +++---- media-video/vlc/vlc-3.0.9999.ebuild | 7 +++---- media-video/vlc/vlc-9999.ebuild | 7 +++---- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml index fdc2df2324f..8442a26823a 100644 --- a/media-video/vlc/metadata.xml +++ b/media-video/vlc/metadata.xml @@ -37,7 +37,6 @@ <flag name="nfs">Enable support for nfs protocol via <pkg>net-fs/libnfs</pkg></flag> <flag name="omxil">Enable OpenMAX Integration Layer codec module</flag> <flag name="optimisememory">Enable optimisation for memory rather than performance</flag> - <flag name="postproc">Enable image post-processing via libpostproc (part of FFmpeg)</flag> <flag name="projectm">Enable the projectM visualization plugin</flag> <flag name="run-as-root">Allows vlc to start for root. Don't enable this unless you have a very specific (e.g. embedded) need for it!</flag> <flag name="sdl-image">Enable sdl image video decoder (depends on sdl)</flag> diff --git a/media-video/vlc/vlc-3.0.10.ebuild b/media-video/vlc/vlc-3.0.10.ebuild index df602aabb05..5ef94fb86be 100644 --- a/media-video/vlc/vlc-3.0.10.ebuild +++ b/media-video/vlc/vlc-3.0.10.ebuild @@ -34,7 +34,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate 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 + nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_x86_mmx cpu_flags_x86_sse @@ -46,7 +46,6 @@ REQUIRED_USE=" libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) - postproc? ( ffmpeg ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) @@ -309,6 +308,7 @@ src_configure() { $(use_enable fdk fdkaac) $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) + $(use_enable ffmpeg postproc) $(use_enable ffmpeg swscale) $(use_enable flac) $(use_enable fluidsynth) @@ -347,7 +347,6 @@ src_configure() { $(use_enable optimisememory optimize-memory) $(use_enable opus) $(use_enable png) - $(use_enable postproc) $(use_enable projectm) $(use_enable pulseaudio pulse) $(use_enable qt5 qt) diff --git a/media-video/vlc/vlc-3.0.8.ebuild b/media-video/vlc/vlc-3.0.8.ebuild index 1b6c3bbb4d1..e85da62a511 100644 --- a/media-video/vlc/vlc-3.0.8.ebuild +++ b/media-video/vlc/vlc-3.0.8.ebuild @@ -34,7 +34,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate 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 + nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_x86_mmx cpu_flags_x86_sse @@ -46,7 +46,6 @@ REQUIRED_USE=" libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) - postproc? ( ffmpeg ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) @@ -95,7 +94,7 @@ RDEPEND=" ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) - ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc?,vaapi?,vdpau?] ) + ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg @@ -310,6 +309,7 @@ src_configure() { $(use_enable fdk fdkaac) $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) + $(use_enable ffmpeg postproc) $(use_enable ffmpeg swscale) $(use_enable flac) $(use_enable fluidsynth) @@ -348,7 +348,6 @@ src_configure() { $(use_enable optimisememory optimize-memory) $(use_enable opus) $(use_enable png) - $(use_enable postproc) $(use_enable projectm) $(use_enable pulseaudio pulse) $(use_enable qt5 qt) diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index ee56dc0ca25..eb1a4cfe9d4 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -34,7 +34,7 @@ IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate 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 + nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx @@ -47,7 +47,6 @@ REQUIRED_USE=" libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) - postproc? ( ffmpeg ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) @@ -96,7 +95,7 @@ RDEPEND=" ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) - ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc?,vaapi?,vdpau?] ) + ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg @@ -311,6 +310,7 @@ src_configure() { $(use_enable fdk fdkaac) $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) + $(use_enable ffmpeg postproc) $(use_enable ffmpeg swscale) $(use_enable flac) $(use_enable fluidsynth) @@ -349,7 +349,6 @@ src_configure() { $(use_enable optimisememory optimize-memory) $(use_enable opus) $(use_enable png) - $(use_enable postproc) $(use_enable projectm) $(use_enable pulseaudio pulse) $(use_enable qt5 qt) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 206465d11d3..fa184a95dce 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -34,7 +34,7 @@ IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms 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 + nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx @@ -47,7 +47,6 @@ REQUIRED_USE=" libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) - postproc? ( ffmpeg ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) @@ -96,7 +95,7 @@ RDEPEND=" ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) - ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc?,vaapi?,vdpau?] ) + ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg @@ -312,6 +311,7 @@ src_configure() { $(use_enable fdk fdkaac) $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) + $(use_enable ffmpeg postproc) $(use_enable ffmpeg swscale) $(use_enable flac) $(use_enable fluidsynth) @@ -351,7 +351,6 @@ src_configure() { $(use_enable optimisememory optimize-memory) $(use_enable opus) $(use_enable png) - $(use_enable postproc) $(use_enable projectm) $(use_enable pulseaudio pulse) $(use_enable qt5 qt)
