media-video/vlc: Merge USE=vlm into encode

Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index d3e880287a291d93f86d4fa9924e60949934cb89..36f275345fde031fcbcc06951a987c1395e8a59b 100644 (file)
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -19,6 +19,7 @@
                <flag name="directx">Enable Win32 DirectX support.</flag>
                <flag name="dvbpsi">Enables support for Mpeg-TS files (.ts, .m2ts, .mts) via <pkg>media-libs/libdvbpsi</pkg>.</flag>
                <flag name="dxva2">Enables Win32 DxVA2 support.</flag>
+               <flag name="encode">Enable streaming-output support and videolan manager to control multiple streams from within one instance</flag>
                <flag name="faad">Enable AAC audio decoding library support via media-libs/faad2.</flag>
                <flag name="fdk">Enables the Fraunhofer AAC codec library.</flag>
                <flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (with external sound fonts).</flag>

diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index ed51905a841e56f8872e879ac42e3b82eb736637..681a018df7a74abe015d5c69d01901442ef6f9d7 100644 (file)
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -36,7 +36,7 @@ IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast
        macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv
        opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root
        samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib theora tremor
-       truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wayland wma-fixed +X
+       truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx wayland wma-fixed +X
        x264 x265 +xcb xml xv zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
@@ -51,7 +51,6 @@ REQUIRED_USE="
        ssl? ( gcrypt )
        vaapi? ( ffmpeg X )
        vdpau? ( ffmpeg X )
-       vlm? ( encode )
        xv? ( xcb )
 "
 RDEPEND="
@@ -297,6 +296,7 @@ src_configure() {
                $(use_enable dvd dvdnav)
                $(use_enable dvd dvdread)
                $(use_enable encode sout)
+               $(use_enable encode vlm)
                $(use_enable faad)
                $(use_enable fdk fdkaac)
                $(use_enable ffmpeg avcodec)
@@ -367,7 +367,6 @@ src_configure() {
                $(use_enable vaapi libva)
                $(use_enable vcd)
                $(use_enable vdpau)
-               $(use_enable vlm)
                $(use_enable vnc)
                $(use_enable vorbis)
                $(use_enable vpx)

diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 7e218689a9788ef4d4cc75a87cda6803b8334b69..8617ea9e2a90720913597a4714dc89110e0773a7 100644 (file)
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -36,7 +36,7 @@ IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast
        macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv
        opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root
        samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib theora tremor
-       truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wayland wma-fixed +X
+       truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx wayland wma-fixed +X
        x264 x265 +xcb xml xv zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
@@ -51,7 +51,6 @@ REQUIRED_USE="
        ssl? ( gcrypt )
        vaapi? ( ffmpeg X )
        vdpau? ( ffmpeg X )
-       vlm? ( encode )
        xv? ( xcb )
 "
 RDEPEND="
@@ -297,6 +296,7 @@ src_configure() {
                $(use_enable dvd dvdnav)
                $(use_enable dvd dvdread)
                $(use_enable encode sout)
+               $(use_enable encode vlm)
                $(use_enable faad)
                $(use_enable fdk fdkaac)
                $(use_enable ffmpeg avcodec)
@@ -367,7 +367,6 @@ src_configure() {
                $(use_enable vaapi libva)
                $(use_enable vcd)
                $(use_enable vdpau)
-               $(use_enable vlm)
                $(use_enable vnc)
                $(use_enable vorbis)
                $(use_enable vpx)