1 |
commit: 26988f73e441ea872bd0f10ec88ff56c1278a5fe |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 17 12:23:12 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 17 13:37:21 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26988f73 |
7 |
|
8 |
media-video/vlc: Switch USE=gnutls to USE=ssl |
9 |
|
10 |
It is the only implementation available. |
11 |
|
12 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
13 |
|
14 |
media-video/vlc/vlc-3.0.9999.ebuild | 18 +++++++++--------- |
15 |
media-video/vlc/vlc-9999.ebuild | 18 +++++++++--------- |
16 |
2 files changed, 18 insertions(+), 18 deletions(-) |
17 |
|
18 |
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild |
19 |
index 122517e5a18..cee7fb8129a 100644 |
20 |
--- a/media-video/vlc/vlc-3.0.9999.ebuild |
21 |
+++ b/media-video/vlc/vlc-3.0.9999.ebuild |
22 |
@@ -31,13 +31,13 @@ SLOT="0/5-9" # vlc - vlccore |
23 |
|
24 |
IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394 |
25 |
debug directx dts dvb +dvbpsi dvd elibc_glibc +encode faad fdk +ffmpeg flac fluidsynth |
26 |
- fontconfig +gcrypt gme gnome-keyring gnutls gstreamer ieee1394 jack jpeg kate libass libav |
27 |
+ fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav |
28 |
libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications |
29 |
- macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl |
30 |
- optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba |
31 |
- schroedinger sdl-image sftp shout sid skins speex svg taglib theora tremor truetype twolame |
32 |
- udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wayland wma-fixed +X x264 x265 +xcb xml xv |
33 |
- zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse |
34 |
+ macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv |
35 |
+ opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root |
36 |
+ samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib theora tremor |
37 |
+ truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wayland wma-fixed +X |
38 |
+ x264 x265 +xcb xml xv zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse |
39 |
" |
40 |
REQUIRED_USE=" |
41 |
aalib? ( X ) |
42 |
@@ -45,11 +45,11 @@ REQUIRED_USE=" |
43 |
directx? ( ffmpeg ) |
44 |
dvb? ( dvbpsi ) |
45 |
fontconfig? ( truetype ) |
46 |
- gnutls? ( gcrypt ) |
47 |
libcaca? ( X ) |
48 |
libtar? ( skins ) |
49 |
libtiger? ( kate ) |
50 |
skins? ( qt5 truetype X xml ) |
51 |
+ ssl? ( gcrypt ) |
52 |
vaapi? ( ffmpeg X ) |
53 |
vdpau? ( ffmpeg X ) |
54 |
vlm? ( encode ) |
55 |
@@ -97,7 +97,6 @@ RDEPEND=" |
56 |
gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) |
57 |
gme? ( media-libs/game-music-emu:0 ) |
58 |
gnome-keyring? ( app-crypt/libsecret ) |
59 |
- gnutls? ( net-libs/gnutls:0 ) |
60 |
gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) |
61 |
ieee1394? ( |
62 |
>=sys-libs/libavc1394-0.5.3:0 |
63 |
@@ -175,6 +174,7 @@ RDEPEND=" |
64 |
>=media-libs/speex-1.2.0:0 |
65 |
media-libs/speexdsp:0 |
66 |
) |
67 |
+ ssl? ( net-libs/gnutls:0 ) |
68 |
svg? ( |
69 |
>=gnome-base/librsvg-2.9:2 |
70 |
>=x11-libs/cairo-1.13.1:0 |
71 |
@@ -309,7 +309,6 @@ src_configure() { |
72 |
$(use_enable gcrypt libgcrypt) |
73 |
$(use_enable gme) |
74 |
$(use_enable gnome-keyring secret) |
75 |
- $(use_enable gnutls) |
76 |
$(use_enable gstreamer gst-decode) |
77 |
$(use_enable ieee1394 dv1394) |
78 |
$(use_enable jack) |
79 |
@@ -356,6 +355,7 @@ src_configure() { |
80 |
$(use_enable sid) |
81 |
$(use_enable skins skins2) |
82 |
$(use_enable speex) |
83 |
+ $(use_enable ssl gnutls) |
84 |
$(use_enable svg) |
85 |
$(use_enable svg svgdec) |
86 |
$(use_enable taglib) |
87 |
|
88 |
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild |
89 |
index 5b44231cd32..527e458f997 100644 |
90 |
--- a/media-video/vlc/vlc-9999.ebuild |
91 |
+++ b/media-video/vlc/vlc-9999.ebuild |
92 |
@@ -31,13 +31,13 @@ SLOT="0/5-9" # vlc - vlccore |
93 |
|
94 |
IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394 |
95 |
debug directx dts dvb +dvbpsi dvd elibc_glibc +encode faad fdk +ffmpeg flac fluidsynth |
96 |
- fontconfig +gcrypt gme gnome-keyring gnutls gstreamer ieee1394 jack jpeg kate libass libav |
97 |
+ fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav |
98 |
libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications |
99 |
- macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl |
100 |
- optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba |
101 |
- schroedinger sdl-image sftp shout sid skins speex svg taglib theora tremor truetype twolame |
102 |
- udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wayland wma-fixed +X x264 x265 +xcb xml xv |
103 |
- zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse |
104 |
+ macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv |
105 |
+ opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root |
106 |
+ samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib theora tremor |
107 |
+ truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wayland wma-fixed +X |
108 |
+ x264 x265 +xcb xml xv zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse |
109 |
" |
110 |
REQUIRED_USE=" |
111 |
aalib? ( X ) |
112 |
@@ -45,11 +45,11 @@ REQUIRED_USE=" |
113 |
directx? ( ffmpeg ) |
114 |
dvb? ( dvbpsi ) |
115 |
fontconfig? ( truetype ) |
116 |
- gnutls? ( gcrypt ) |
117 |
libcaca? ( X ) |
118 |
libtar? ( skins ) |
119 |
libtiger? ( kate ) |
120 |
skins? ( qt5 truetype X xml ) |
121 |
+ ssl? ( gcrypt ) |
122 |
vaapi? ( ffmpeg X ) |
123 |
vdpau? ( ffmpeg X ) |
124 |
vlm? ( encode ) |
125 |
@@ -97,7 +97,6 @@ RDEPEND=" |
126 |
gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) |
127 |
gme? ( media-libs/game-music-emu:0 ) |
128 |
gnome-keyring? ( app-crypt/libsecret ) |
129 |
- gnutls? ( net-libs/gnutls:0 ) |
130 |
gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) |
131 |
ieee1394? ( |
132 |
>=sys-libs/libavc1394-0.5.3:0 |
133 |
@@ -175,6 +174,7 @@ RDEPEND=" |
134 |
>=media-libs/speex-1.2.0:0 |
135 |
media-libs/speexdsp:0 |
136 |
) |
137 |
+ ssl? ( net-libs/gnutls:0 ) |
138 |
svg? ( |
139 |
>=gnome-base/librsvg-2.9:2 |
140 |
>=x11-libs/cairo-1.13.1:0 |
141 |
@@ -309,7 +309,6 @@ src_configure() { |
142 |
$(use_enable gcrypt libgcrypt) |
143 |
$(use_enable gme) |
144 |
$(use_enable gnome-keyring secret) |
145 |
- $(use_enable gnutls) |
146 |
$(use_enable gstreamer gst-decode) |
147 |
$(use_enable ieee1394 dv1394) |
148 |
$(use_enable jack) |
149 |
@@ -356,6 +355,7 @@ src_configure() { |
150 |
$(use_enable sid) |
151 |
$(use_enable skins skins2) |
152 |
$(use_enable speex) |
153 |
+ $(use_enable ssl gnutls) |
154 |
$(use_enable svg) |
155 |
$(use_enable svg svgdec) |
156 |
$(use_enable taglib) |