| 1 |
commit: 63138dbd5b44df097d6a3ebbb217e2887a9652c3 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 18 18:12:58 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 18 20:25:36 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63138dbd |
| 7 |
|
| 8 |
media-video/vlc: Merge USE=vlm into encode |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
media-video/vlc/metadata.xml | 1 + |
| 13 |
media-video/vlc/vlc-3.0.9999.ebuild | 5 ++--- |
| 14 |
media-video/vlc/vlc-9999.ebuild | 5 ++--- |
| 15 |
3 files changed, 5 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml |
| 18 |
index d3e880287a2..36f275345fd 100644 |
| 19 |
--- a/media-video/vlc/metadata.xml |
| 20 |
+++ b/media-video/vlc/metadata.xml |
| 21 |
@@ -19,6 +19,7 @@ |
| 22 |
<flag name="directx">Enable Win32 DirectX support.</flag> |
| 23 |
<flag name="dvbpsi">Enables support for Mpeg-TS files (.ts, .m2ts, .mts) via <pkg>media-libs/libdvbpsi</pkg>.</flag> |
| 24 |
<flag name="dxva2">Enables Win32 DxVA2 support.</flag> |
| 25 |
+ <flag name="encode">Enable streaming-output support and videolan manager to control multiple streams from within one instance</flag> |
| 26 |
<flag name="faad">Enable AAC audio decoding library support via media-libs/faad2.</flag> |
| 27 |
<flag name="fdk">Enables the Fraunhofer AAC codec library.</flag> |
| 28 |
<flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (with external sound fonts).</flag> |
| 29 |
|
| 30 |
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild |
| 31 |
index ed51905a841..681a018df7a 100644 |
| 32 |
--- a/media-video/vlc/vlc-3.0.9999.ebuild |
| 33 |
+++ b/media-video/vlc/vlc-3.0.9999.ebuild |
| 34 |
@@ -36,7 +36,7 @@ IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast |
| 35 |
macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv |
| 36 |
opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root |
| 37 |
samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib theora tremor |
| 38 |
- truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wayland wma-fixed +X |
| 39 |
+ truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx wayland wma-fixed +X |
| 40 |
x264 x265 +xcb xml xv zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse |
| 41 |
" |
| 42 |
REQUIRED_USE=" |
| 43 |
@@ -51,7 +51,6 @@ REQUIRED_USE=" |
| 44 |
ssl? ( gcrypt ) |
| 45 |
vaapi? ( ffmpeg X ) |
| 46 |
vdpau? ( ffmpeg X ) |
| 47 |
- vlm? ( encode ) |
| 48 |
xv? ( xcb ) |
| 49 |
" |
| 50 |
RDEPEND=" |
| 51 |
@@ -297,6 +296,7 @@ src_configure() { |
| 52 |
$(use_enable dvd dvdnav) |
| 53 |
$(use_enable dvd dvdread) |
| 54 |
$(use_enable encode sout) |
| 55 |
+ $(use_enable encode vlm) |
| 56 |
$(use_enable faad) |
| 57 |
$(use_enable fdk fdkaac) |
| 58 |
$(use_enable ffmpeg avcodec) |
| 59 |
@@ -367,7 +367,6 @@ src_configure() { |
| 60 |
$(use_enable vaapi libva) |
| 61 |
$(use_enable vcd) |
| 62 |
$(use_enable vdpau) |
| 63 |
- $(use_enable vlm) |
| 64 |
$(use_enable vnc) |
| 65 |
$(use_enable vorbis) |
| 66 |
$(use_enable vpx) |
| 67 |
|
| 68 |
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild |
| 69 |
index 7e218689a97..8617ea9e2a9 100644 |
| 70 |
--- a/media-video/vlc/vlc-9999.ebuild |
| 71 |
+++ b/media-video/vlc/vlc-9999.ebuild |
| 72 |
@@ -36,7 +36,7 @@ IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast |
| 73 |
macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv |
| 74 |
opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root |
| 75 |
samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib theora tremor |
| 76 |
- truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wayland wma-fixed +X |
| 77 |
+ truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx wayland wma-fixed +X |
| 78 |
x264 x265 +xcb xml xv zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse |
| 79 |
" |
| 80 |
REQUIRED_USE=" |
| 81 |
@@ -51,7 +51,6 @@ REQUIRED_USE=" |
| 82 |
ssl? ( gcrypt ) |
| 83 |
vaapi? ( ffmpeg X ) |
| 84 |
vdpau? ( ffmpeg X ) |
| 85 |
- vlm? ( encode ) |
| 86 |
xv? ( xcb ) |
| 87 |
" |
| 88 |
RDEPEND=" |
| 89 |
@@ -297,6 +296,7 @@ src_configure() { |
| 90 |
$(use_enable dvd dvdnav) |
| 91 |
$(use_enable dvd dvdread) |
| 92 |
$(use_enable encode sout) |
| 93 |
+ $(use_enable encode vlm) |
| 94 |
$(use_enable faad) |
| 95 |
$(use_enable fdk fdkaac) |
| 96 |
$(use_enable ffmpeg avcodec) |
| 97 |
@@ -367,7 +367,6 @@ src_configure() { |
| 98 |
$(use_enable vaapi libva) |
| 99 |
$(use_enable vcd) |
| 100 |
$(use_enable vdpau) |
| 101 |
- $(use_enable vlm) |
| 102 |
$(use_enable vnc) |
| 103 |
$(use_enable vorbis) |
| 104 |
$(use_enable vpx) |
Archives