| 1 |
commit: e61257df8c74213cdb9cb10594d605cae71c4899 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 19 00:51:10 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 19 06:43:52 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61257df |
| 7 |
|
| 8 |
media-video/vlc: Revert drop USE=linsys, merge with USE=zvbi |
| 9 |
|
| 10 |
Let's keep the hardware support independent, as it can be used without |
| 11 |
USE=zvbi which selects between two different vlc modules. |
| 12 |
|
| 13 |
media-video/vlc/vlc-3.0.9999.ebuild | 11 ++++++----- |
| 14 |
media-video/vlc/vlc-9999.ebuild | 13 +++++++------ |
| 15 |
2 files changed, 13 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild |
| 18 |
index b2011356705..74239039af5 100644 |
| 19 |
--- a/media-video/vlc/vlc-3.0.9999.ebuild |
| 20 |
+++ b/media-video/vlc/vlc-3.0.9999.ebuild |
| 21 |
@@ -30,9 +30,9 @@ LICENSE="LGPL-2.1 GPL-2" |
| 22 |
SLOT="0/5-9" # vlc - vlccore |
| 23 |
|
| 24 |
IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus |
| 25 |
- dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth |
| 26 |
- fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav |
| 27 |
- libcaca libnotify +libsamplerate libtar libtiger lirc live lua macosx-notifications |
| 28 |
+ dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig |
| 29 |
+ +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca |
| 30 |
+ libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications |
| 31 |
macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv |
| 32 |
optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root |
| 33 |
samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib theora tremor |
| 34 |
@@ -119,6 +119,7 @@ RDEPEND=" |
| 35 |
libsamplerate? ( media-libs/libsamplerate:0 ) |
| 36 |
libtar? ( dev-libs/libtar:0 ) |
| 37 |
libtiger? ( media-libs/libtiger:0 ) |
| 38 |
+ linsys? ( media-libs/zvbi ) |
| 39 |
lirc? ( app-misc/lirc:0 ) |
| 40 |
live? ( media-plugins/live:0 ) |
| 41 |
lua? ( >=dev-lang/lua-5.1:0 ) |
| 42 |
@@ -206,7 +207,7 @@ RDEPEND=" |
| 43 |
x265? ( media-libs/x265:0= ) |
| 44 |
xml? ( dev-libs/libxml2:2 ) |
| 45 |
zeroconf? ( net-dns/avahi:0[dbus] ) |
| 46 |
- zvbi? ( media-libs/zvbi:0 ) |
| 47 |
+ zvbi? ( media-libs/zvbi ) |
| 48 |
" |
| 49 |
DEPEND="${RDEPEND} |
| 50 |
>=sys-devel/gettext-0.19.8:* |
| 51 |
@@ -315,6 +316,7 @@ src_configure() { |
| 52 |
$(use_enable libsamplerate samplerate) |
| 53 |
$(use_enable libtar) |
| 54 |
$(use_enable libtiger tiger) |
| 55 |
+ $(use_enable linsys) |
| 56 |
$(use_enable lirc) |
| 57 |
$(use_enable live live555) |
| 58 |
$(use_enable lua) |
| 59 |
@@ -376,7 +378,6 @@ src_configure() { |
| 60 |
$(use_enable xml libxml2) |
| 61 |
$(use_enable zeroconf avahi) |
| 62 |
$(use_enable zvbi) |
| 63 |
- $(use_enable zvbi linsys) |
| 64 |
$(use_enable !zvbi telx) |
| 65 |
--disable-asdcp |
| 66 |
--disable-coverage |
| 67 |
|
| 68 |
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild |
| 69 |
index bfe872bbf4b..5ba1166a4d5 100644 |
| 70 |
--- a/media-video/vlc/vlc-9999.ebuild |
| 71 |
+++ b/media-video/vlc/vlc-9999.ebuild |
| 72 |
@@ -30,14 +30,14 @@ LICENSE="LGPL-2.1 GPL-2" |
| 73 |
SLOT="0/5-9" # vlc - vlccore |
| 74 |
|
| 75 |
IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus |
| 76 |
- dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth |
| 77 |
- fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav |
| 78 |
- libcaca libnotify +libsamplerate libtar libtiger lirc live lua macosx-notifications |
| 79 |
+ dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig |
| 80 |
+ +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca |
| 81 |
+ libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications |
| 82 |
macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv |
| 83 |
optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root |
| 84 |
samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib theora tremor |
| 85 |
truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx wayland wma-fixed +X |
| 86 |
- x264 x265 +xcb xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse |
| 87 |
+ x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse |
| 88 |
" |
| 89 |
REQUIRED_USE=" |
| 90 |
aalib? ( X ) |
| 91 |
@@ -119,6 +119,7 @@ RDEPEND=" |
| 92 |
libsamplerate? ( media-libs/libsamplerate:0 ) |
| 93 |
libtar? ( dev-libs/libtar:0 ) |
| 94 |
libtiger? ( media-libs/libtiger:0 ) |
| 95 |
+ linsys? ( media-libs/zvbi ) |
| 96 |
lirc? ( app-misc/lirc:0 ) |
| 97 |
live? ( media-plugins/live:0 ) |
| 98 |
lua? ( >=dev-lang/lua-5.1:0 ) |
| 99 |
@@ -206,7 +207,7 @@ RDEPEND=" |
| 100 |
x265? ( media-libs/x265:0= ) |
| 101 |
xml? ( dev-libs/libxml2:2 ) |
| 102 |
zeroconf? ( net-dns/avahi:0[dbus] ) |
| 103 |
- zvbi? ( media-libs/zvbi:0 ) |
| 104 |
+ zvbi? ( media-libs/zvbi ) |
| 105 |
" |
| 106 |
DEPEND="${RDEPEND} |
| 107 |
>=sys-devel/gettext-0.19.8:* |
| 108 |
@@ -315,6 +316,7 @@ src_configure() { |
| 109 |
$(use_enable libsamplerate samplerate) |
| 110 |
$(use_enable libtar) |
| 111 |
$(use_enable libtiger tiger) |
| 112 |
+ $(use_enable linsys) |
| 113 |
$(use_enable lirc) |
| 114 |
$(use_enable live live555) |
| 115 |
$(use_enable lua) |
| 116 |
@@ -376,7 +378,6 @@ src_configure() { |
| 117 |
$(use_enable xml libxml2) |
| 118 |
$(use_enable zeroconf avahi) |
| 119 |
$(use_enable zvbi) |
| 120 |
- $(use_enable zvbi linsys) |
| 121 |
$(use_enable !zvbi telx) |
| 122 |
--disable-asdcp |
| 123 |
--disable-coverage |
Archives