1 |
commit: 01971664316881492a2982086b564112dc282ab2 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 14 10:27:49 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 27 22:50:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01971664 |
7 |
|
8 |
media-video/vlc: Cleanup vulnerable 2.2.6 |
9 |
|
10 |
arm security stabilisation timeout. |
11 |
|
12 |
Bug: https://bugs.gentoo.org/620176 |
13 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
14 |
|
15 |
media-video/vlc/Manifest | 1 - |
16 |
...2.1.0-TomWij-bisected-PA-broken-underflow.patch | 23 - |
17 |
.../vlc/files/vlc-2.2.4-decoder-lock-scope.patch | 47 -- |
18 |
.../vlc/files/vlc-9999-libva-1.2.1-compat.patch | 12 - |
19 |
media-video/vlc/vlc-2.2.6.ebuild | 511 --------------------- |
20 |
5 files changed, 594 deletions(-) |
21 |
|
22 |
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest |
23 |
index 7de7a154668..b1a6a36d2b0 100644 |
24 |
--- a/media-video/vlc/Manifest |
25 |
+++ b/media-video/vlc/Manifest |
26 |
@@ -1,3 +1,2 @@ |
27 |
-DIST vlc-2.2.6.tar.xz 22198720 BLAKE2B a3d5d75551908a92c894ca18b36fd165ea0d6a99d1729c311f2051dfe1dd5eb7bf5045b08652e7a1d335212416a3e2d077f37157c7ae4773a5ecc2c49e39f5a6 SHA512 9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d |
28 |
DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a |
29 |
DIST vlc-3.0.0.tar.xz 25191148 BLAKE2B 8f0826f5586a304df4cc53acae768377a53bbd9a1c6578b4dcd39a4e1fb627d2e6f6f2f6ce3abacfb9ebc2a9fb1bae179938bbf88644aa9070f49675cc10fcf1 SHA512 9bdc64e16ddd2e8d2693179f2fcac8462d7defff186262a049ba325ef00882fbd75a9d323b506ba06876a8168fd5e90319837c8dcd136b206161e67748c2a9f7 |
30 |
|
31 |
diff --git a/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch b/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch |
32 |
deleted file mode 100644 |
33 |
index 3163410353a..00000000000 |
34 |
--- a/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch |
35 |
+++ /dev/null |
36 |
@@ -1,23 +0,0 @@ |
37 |
-index 2debbcd..72e7fcf 100644 |
38 |
---- a/modules/audio_output/pulse.c |
39 |
-+++ b/modules/audio_output/pulse.c |
40 |
-@@ -472,8 +472,17 @@ static void stream_underflow_cb(pa_stream *s, void *userdata) |
41 |
- { |
42 |
-+ uint32_t rate = pa_stream_get_sample_spec(s)->rate; |
43 |
- audio_output_t *aout = userdata; |
44 |
- |
45 |
-- msg_Dbg(aout, "underflow"); |
46 |
-- (void) s; |
47 |
-+ msg_Warn(aout, "underflow"); |
48 |
-+ stream_stop(s, aout); |
49 |
-+ |
50 |
-+ aout_sys_t *sys = aout->sys; |
51 |
-+ sys->first_pts = VLC_TS_INVALID; |
52 |
-+ |
53 |
-+ pa_operation *op = pa_stream_update_sample_rate(s, rate, NULL, NULL); |
54 |
-+ if (unlikely(op == NULL)) |
55 |
-+ return; |
56 |
-+ pa_operation_unref(op); |
57 |
- } |
58 |
- |
59 |
- static int stream_wait(pa_stream *stream, pa_threaded_mainloop *mainloop) |
60 |
|
61 |
diff --git a/media-video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch b/media-video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch |
62 |
deleted file mode 100644 |
63 |
index 51a2cdcb16d..00000000000 |
64 |
--- a/media-video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch |
65 |
+++ /dev/null |
66 |
@@ -1,47 +0,0 @@ |
67 |
-X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=src%2Finput%2Fdecoder.c;h=fe3cd428c65c18bfbdadb55baf11521afdc2bfc7;hp=83aa5bf54e2c29ad93fae803117558e4fcd0f658;hb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a;hpb=5b2de76965ee8b1ab5e3257f8b6d71bbb4e9e3f9 |
68 |
- |
69 |
---- a/src/input/decoder.c |
70 |
-+++ b/src/input/decoder.c |
71 |
-@@ -1162,7 +1162,10 @@ |
72 |
- b_paused = p_owner->b_paused; |
73 |
- |
74 |
- if (!p_audio) |
75 |
-+ { |
76 |
-+ vlc_mutex_unlock( &p_owner->lock ); |
77 |
- break; |
78 |
-+ } |
79 |
- |
80 |
- /* */ |
81 |
- int i_rate = INPUT_RATE_DEFAULT; |
82 |
-@@ -1180,6 +1183,9 @@ |
83 |
- |
84 |
- if( unlikely(p_owner->b_paused != b_paused) ) |
85 |
- continue; /* race with input thread? retry... */ |
86 |
-+ |
87 |
-+ vlc_mutex_unlock( &p_owner->lock ); |
88 |
-+ |
89 |
- if( p_aout == NULL ) |
90 |
- b_reject = true; |
91 |
- |
92 |
-@@ -1199,7 +1205,6 @@ |
93 |
- |
94 |
- break; |
95 |
- } |
96 |
-- vlc_mutex_unlock( &p_owner->lock ); |
97 |
- } |
98 |
- |
99 |
- static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block ) |
100 |
-@@ -1961,11 +1966,10 @@ |
101 |
- |
102 |
- /* Parameters changed, restart the aout */ |
103 |
- vlc_mutex_lock( &p_owner->lock ); |
104 |
-- |
105 |
-- aout_DecDelete( p_owner->p_aout ); |
106 |
- p_owner->p_aout = NULL; |
107 |
-- |
108 |
- vlc_mutex_unlock( &p_owner->lock ); |
109 |
-+ aout_DecDelete( p_owner->p_aout ); |
110 |
-+ |
111 |
- input_resource_PutAout( p_owner->p_resource, p_aout ); |
112 |
- } |
113 |
- |
114 |
|
115 |
diff --git a/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch b/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch |
116 |
deleted file mode 100644 |
117 |
index adfdefec56a..00000000000 |
118 |
--- a/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch |
119 |
+++ /dev/null |
120 |
@@ -1,12 +0,0 @@ |
121 |
---- a/modules/codec/avcodec/vaapi.c |
122 |
-+++ b/modules/codec/avcodec/vaapi.c |
123 |
-@@ -34,6 +34,9 @@ |
124 |
- #ifdef VLC_VA_BACKEND_XLIB |
125 |
- # include <vlc_xlib.h> |
126 |
- # include <va/va_x11.h> |
127 |
-+#if VA_MINOR_VERSION >= 34 |
128 |
-+# include <va/va_compat.h> |
129 |
-+#endif |
130 |
- #endif |
131 |
- #ifdef VLC_VA_BACKEND_DRM |
132 |
- # include <sys/types.h> |
133 |
|
134 |
diff --git a/media-video/vlc/vlc-2.2.6.ebuild b/media-video/vlc/vlc-2.2.6.ebuild |
135 |
deleted file mode 100644 |
136 |
index 8f50aca222d..00000000000 |
137 |
--- a/media-video/vlc/vlc-2.2.6.ebuild |
138 |
+++ /dev/null |
139 |
@@ -1,511 +0,0 @@ |
140 |
-# Copyright 1999-2017 Gentoo Foundation |
141 |
-# Distributed under the terms of the GNU General Public License v2 |
142 |
- |
143 |
-EAPI=6 |
144 |
- |
145 |
-SCM="" |
146 |
-if [[ ${PV} = *9999 ]] ; then |
147 |
- SCM="git-r3" |
148 |
- |
149 |
- if [ "${PV%.9999}" != "${PV}" ] ; then |
150 |
- EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git" |
151 |
- else |
152 |
- EGIT_REPO_URI="git://git.videolan.org/vlc.git" |
153 |
- fi |
154 |
-fi |
155 |
- |
156 |
-inherit autotools flag-o-matic toolchain-funcs versionator virtualx ${SCM} |
157 |
- |
158 |
-MY_PV="${PV/_/-}" |
159 |
-MY_PV="${MY_PV/-beta/-test}" |
160 |
-MY_P="${PN}-${MY_PV}" |
161 |
- |
162 |
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming" |
163 |
-HOMEPAGE="https://www.videolan.org/vlc/" |
164 |
-if [[ ${PV} = *9999 ]] ; then # Live ebuild |
165 |
- SRC_URI="" |
166 |
-elif [[ "${MY_P}" == "${P}" ]]; then |
167 |
- SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz" |
168 |
-else |
169 |
- SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" |
170 |
-fi |
171 |
- |
172 |
-LICENSE="LGPL-2.1 GPL-2" |
173 |
-SLOT="0/5-8" # vlc - vlccore |
174 |
- |
175 |
-if [[ ${PV} != *9999 ]] ; then |
176 |
- KEYWORDS="amd64 arm ppc ppc64 -sparc x86 ~x86-fbsd" |
177 |
-fi |
178 |
- |
179 |
-IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec |
180 |
- +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug |
181 |
- directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk |
182 |
- fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls |
183 |
- growl gstreamer httpd ieee1394 jack jpeg kate libass libav libcaca libnotify |
184 |
- +libsamplerate libtiger linsys libtar lirc live lua |
185 |
- macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit |
186 |
- matroska cpu_flags_x86_mmx modplug mp3 mpeg |
187 |
- mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus |
188 |
- png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba |
189 |
- schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale |
190 |
- taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau |
191 |
- vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi" |
192 |
- |
193 |
-RDEPEND=" |
194 |
- dev-libs/libgpg-error:0 |
195 |
- net-dns/libidn:0 |
196 |
- sys-libs/zlib:0[minizip] |
197 |
- virtual/libintl:0 |
198 |
- a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) |
199 |
- aalib? ( media-libs/aalib:0 ) |
200 |
- alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) |
201 |
- avcodec? ( |
202 |
- !libav? ( media-video/ffmpeg:0= ) |
203 |
- libav? ( media-video/libav:0= ) |
204 |
- ) |
205 |
- avformat? ( |
206 |
- !libav? ( media-video/ffmpeg:0= ) |
207 |
- libav? ( media-video/libav:0= ) |
208 |
- ) |
209 |
- bidi? ( dev-libs/fribidi:0 ) |
210 |
- bluray? ( >=media-libs/libbluray-0.3:0= ) |
211 |
- cddb? ( >=media-libs/libcddb-1.2:0 ) |
212 |
- chromaprint? ( >=media-libs/chromaprint-0.6:0 ) |
213 |
- dbus? ( >=sys-apps/dbus-1.6:0 ) |
214 |
- dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) |
215 |
- directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 ) |
216 |
- dts? ( >=media-libs/libdca-0.0.5:0 ) |
217 |
- dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) |
218 |
- dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) |
219 |
- elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) |
220 |
- faad? ( >=media-libs/faad2-2.6.1:0 ) |
221 |
- fdk? ( media-libs/fdk-aac:0 ) |
222 |
- flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) |
223 |
- fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) |
224 |
- fontconfig? ( media-libs/fontconfig:1.0 ) |
225 |
- gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) |
226 |
- gme? ( media-libs/game-music-emu:0 ) |
227 |
- gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) |
228 |
- gnutls? ( >=net-libs/gnutls-3.0.20:0 ) |
229 |
- gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) |
230 |
- ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) |
231 |
- jack? ( virtual/jack ) |
232 |
- jpeg? ( virtual/jpeg:0 ) |
233 |
- kate? ( >=media-libs/libkate-0.3:0 ) |
234 |
- libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) |
235 |
- libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) |
236 |
- libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) |
237 |
- libsamplerate? ( media-libs/libsamplerate:0 ) |
238 |
- libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) |
239 |
- libtiger? ( >=media-libs/libtiger-0.3.1:0 ) |
240 |
- linsys? ( >=media-libs/zvbi-0.2.28:0 ) |
241 |
- lirc? ( app-misc/lirc:0 ) |
242 |
- live? ( >=media-plugins/live-2011.12.23:0 ) |
243 |
- lua? ( >=dev-lang/lua-5.1:0 ) |
244 |
- matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) |
245 |
- modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) |
246 |
- mp3? ( media-libs/libmad:0 ) |
247 |
- mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) |
248 |
- mtp? ( >=media-libs/libmtp-1:0 ) |
249 |
- musepack? ( >=media-sound/musepack-tools-444:0 ) |
250 |
- ncurses? ( sys-libs/ncurses:0=[unicode] ) |
251 |
- ogg? ( >=media-libs/libogg-1:0 ) |
252 |
- opencv? ( >media-libs/opencv-2:0= ) |
253 |
- opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) |
254 |
- opus? ( >=media-libs/opus-1.0.3:0 ) |
255 |
- png? ( media-libs/libpng:0= sys-libs/zlib:0 ) |
256 |
- postproc? ( |
257 |
- !libav? ( >=media-video/ffmpeg-2.2:0= ) |
258 |
- libav? ( media-libs/libpostproc:0= ) |
259 |
- ) |
260 |
- projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) |
261 |
- pulseaudio? ( >=media-sound/pulseaudio-1:0 ) |
262 |
- !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ) |
263 |
- qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) |
264 |
- rdp? ( =net-misc/freerdp-1*:0=[client] ) |
265 |
- samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] ) |
266 |
- schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) |
267 |
- sdl? ( >=media-libs/libsdl-1.2.10:0 |
268 |
- sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) ) |
269 |
- sftp? ( net-libs/libssh2:0 ) |
270 |
- shout? ( >=media-libs/libshout-2.1:0 ) |
271 |
- sid? ( media-libs/libsidplay:2 ) |
272 |
- skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) |
273 |
- speex? ( media-libs/speex:0 ) |
274 |
- svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) |
275 |
- swscale? ( |
276 |
- !libav? ( media-video/ffmpeg:0= ) |
277 |
- libav? ( media-video/libav:0= ) |
278 |
- ) |
279 |
- taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 ) |
280 |
- theora? ( >=media-libs/libtheora-1.0_beta3:0 ) |
281 |
- tremor? ( media-libs/tremor:0 ) |
282 |
- truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 |
283 |
- !fontconfig? ( media-fonts/dejavu:0 ) ) |
284 |
- twolame? ( media-sound/twolame:0 ) |
285 |
- udev? ( >=virtual/udev-142:0 ) |
286 |
- upnp? ( net-libs/libupnp:0 ) |
287 |
- v4l? ( media-libs/libv4l:0 ) |
288 |
- vaapi? ( |
289 |
- x11-libs/libva:0[X,drm] |
290 |
- !libav? ( media-video/ffmpeg:0=[vaapi] ) |
291 |
- libav? ( media-video/libav:0=[vaapi] ) |
292 |
- ) |
293 |
- vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) |
294 |
- zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) |
295 |
-" |
296 |
- |
297 |
-# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works; |
298 |
-# thus we'll have to wait for a new release there. |
299 |
-RDEPEND="${RDEPEND} |
300 |
- vdpau? ( |
301 |
- x11-libs/libvdpau:0 |
302 |
- !libav? ( media-video/ffmpeg:0= ) |
303 |
- libav? ( >=media-video/libav-10:0= ) |
304 |
- ) |
305 |
- vnc? ( >=net-libs/libvncserver-0.9.9:0 ) |
306 |
- vorbis? ( media-libs/libvorbis:0 ) |
307 |
- vpx? ( media-libs/libvpx:0= ) |
308 |
- X? ( x11-libs/libX11:0 ) |
309 |
- x264? ( media-libs/x264:0= ) |
310 |
- x265? ( media-libs/x265:0= ) |
311 |
- xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) |
312 |
- xml? ( dev-libs/libxml2:2 ) |
313 |
- zvbi? ( media-libs/zvbi:0 ) |
314 |
-" |
315 |
- |
316 |
-DEPEND="${RDEPEND} |
317 |
- amd64? ( dev-lang/yasm:* ) |
318 |
- x86? ( dev-lang/yasm:* ) |
319 |
- xcb? ( x11-proto/xproto:0 ) |
320 |
- app-arch/xz-utils:0 |
321 |
- >=sys-devel/gettext-0.18.3:* |
322 |
- virtual/pkgconfig:* |
323 |
-" |
324 |
- |
325 |
-REQUIRED_USE=" |
326 |
- aalib? ( X ) |
327 |
- bidi? ( truetype ) |
328 |
- cddb? ( cdda ) |
329 |
- dvb? ( dvbpsi ) |
330 |
- dxva2? ( avcodec ) |
331 |
- ffmpeg? ( avcodec avformat swscale ) |
332 |
- fontconfig? ( truetype ) |
333 |
- gnutls? ( gcrypt ) |
334 |
- httpd? ( lua ) |
335 |
- libcaca? ( X ) |
336 |
- libtar? ( skins ) |
337 |
- libtiger? ( kate ) |
338 |
- qt4? ( X ) |
339 |
- qt5? ( X ) |
340 |
- sdl? ( X ) |
341 |
- skins? ( truetype X xml || ( qt4 qt5 ) ) |
342 |
- vaapi? ( avcodec X ) |
343 |
- vdpau? ( X ) |
344 |
- vlm? ( encode ) |
345 |
- xv? ( xcb ) |
346 |
-" |
347 |
- |
348 |
-PATCHES=( |
349 |
- # Fix build system mistake. |
350 |
- "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch |
351 |
- |
352 |
- # Patch up incompatibilities and reconfigure autotools. |
353 |
- "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch |
354 |
- |
355 |
- # Fix up broken audio when skipping using a fixed reversed bisected commit. |
356 |
- "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch |
357 |
- |
358 |
- # Bug #541678 |
359 |
- "${FILESDIR}"/qt4-select.patch |
360 |
- |
361 |
- # Allow QT5.5 since Gentoo has a patched QTwidgets |
362 |
- "${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch |
363 |
- |
364 |
- # Bug #575072 |
365 |
- "${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch |
366 |
- "${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch |
367 |
- |
368 |
- # Bug #589396 |
369 |
- "${FILESDIR}"/${PN}-2.2.4-cxx0x.patch |
370 |
- |
371 |
- # Bug #594126 |
372 |
- "${FILESDIR}"/${PN}-2.2.4-decoder-lock-scope.patch |
373 |
- "${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch |
374 |
- |
375 |
- # Bug #593460 |
376 |
- "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch |
377 |
-) |
378 |
- |
379 |
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt ) |
380 |
- |
381 |
-S="${WORKDIR}/${MY_P}" |
382 |
- |
383 |
-pkg_setup() { |
384 |
- if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then |
385 |
- if ! version_is_at_least 4.5 $(gcc-version) ; then |
386 |
- die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754." |
387 |
- fi |
388 |
- fi |
389 |
-} |
390 |
- |
391 |
-src_unpack() { |
392 |
- if [[ ${PV} = *9999 ]] ; then |
393 |
- git-r3_src_unpack |
394 |
- else |
395 |
- unpack ${A} |
396 |
- fi |
397 |
-} |
398 |
- |
399 |
-src_prepare() { |
400 |
- # Remove unnecessary warnings about unimplemented pragmas on gcc for now. |
401 |
- # Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc. |
402 |
- # |
403 |
- # config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas] |
404 |
- # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas] |
405 |
- # |
406 |
- # https://gcc.gnu.org/c99status.html |
407 |
- if tc-is-gcc ; then |
408 |
- sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die |
409 |
- fi |
410 |
- |
411 |
- # Bootstrap when we are on a git checkout. |
412 |
- if [[ ${PV} = *9999 ]] ; then |
413 |
- ./bootstrap |
414 |
- fi |
415 |
- |
416 |
- # Make it build with libtool 1.5 |
417 |
- rm -f m4/lt* m4/libtool.m4 || die |
418 |
- |
419 |
- # We are not in a real git checkout due to the absence of a .git directory. |
420 |
- touch src/revision.txt || die |
421 |
- |
422 |
- default |
423 |
- |
424 |
- # Don't use --started-from-file when not using dbus. |
425 |
- if ! use dbus ; then |
426 |
- sed -i 's/ --started-from-file//' share/vlc.desktop.in || die |
427 |
- fi |
428 |
- |
429 |
- eautoreconf |
430 |
- |
431 |
- # Disable automatic running of tests. |
432 |
- find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die |
433 |
- |
434 |
- # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt |
435 |
- # version may be used. Setting QT_SELECT environment variable will enforce correct binaries. |
436 |
- if use qt5; then |
437 |
- export QT_SELECT=qt5 |
438 |
- elif use qt4; then |
439 |
- export QT_SELECT=qt4 |
440 |
- fi |
441 |
-} |
442 |
- |
443 |
-src_configure() { |
444 |
- local myconf |
445 |
- |
446 |
- # Compatibility fix for Samba 4. |
447 |
- use samba && append-cppflags "-I/usr/include/samba-4.0" |
448 |
- |
449 |
- # We need to disable -fstack-check if use >=gcc 4.8.0. |
450 |
- # See bug #499996 |
451 |
- use x86 && append-cflags $(test-flags-CC -fno-stack-check) |
452 |
- |
453 |
- # Needs libresid-builder from libsidplay:2 which is in another directory... |
454 |
- # FIXME! |
455 |
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" |
456 |
- |
457 |
- if use truetype || use projectm ; then |
458 |
- local dejavu="/usr/share/fonts/dejavu/" |
459 |
- myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \ |
460 |
- --with-default-font-family=Sans \ |
461 |
- --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf |
462 |
- --with-default-monospace-font-family=Monospace" |
463 |
- fi |
464 |
- |
465 |
- if use qt5 ; then |
466 |
- myconf+=" --enable-qt=5" |
467 |
- else |
468 |
- if use qt4 ; then |
469 |
- myconf+=" --enable-qt=4" |
470 |
- else |
471 |
- myconf+=" --disable-qt" |
472 |
- fi |
473 |
- fi |
474 |
- |
475 |
- econf \ |
476 |
- ${myconf} \ |
477 |
- --enable-vlc \ |
478 |
- --docdir=/usr/share/doc/${PF} \ |
479 |
- --disable-dependency-tracking \ |
480 |
- --disable-optimizations \ |
481 |
- --disable-update-check \ |
482 |
- --enable-fast-install \ |
483 |
- --enable-screen \ |
484 |
- $(use_enable a52) \ |
485 |
- $(use_enable aalib aa) \ |
486 |
- $(use_enable alsa) \ |
487 |
- $(use_enable altivec) \ |
488 |
- $(use_enable atmo) \ |
489 |
- $(use_enable audioqueue) \ |
490 |
- $(use_enable avcodec) \ |
491 |
- $(use_enable avformat) \ |
492 |
- $(use_enable bidi fribidi) \ |
493 |
- $(use_enable bluray) \ |
494 |
- $(use_enable cdda vcd) \ |
495 |
- $(use_enable cddb libcddb) \ |
496 |
- $(use_enable chromaprint) \ |
497 |
- $(use_enable dbus) \ |
498 |
- $(use_enable directfb) \ |
499 |
- $(use_enable directx) \ |
500 |
- $(use_enable dc1394) \ |
501 |
- $(use_enable debug) \ |
502 |
- $(use_enable dts dca) \ |
503 |
- $(use_enable dvbpsi) \ |
504 |
- $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \ |
505 |
- $(use_enable dxva2) \ |
506 |
- $(use_enable encode sout) \ |
507 |
- $(use_enable faad) \ |
508 |
- $(use_enable fdk fdkaac) \ |
509 |
- $(use_enable flac) \ |
510 |
- $(use_enable fluidsynth) \ |
511 |
- $(use_enable fontconfig) \ |
512 |
- $(use_enable gcrypt libgcrypt) \ |
513 |
- $(use_enable gme) \ |
514 |
- $(use_enable gnome gnomevfs) \ |
515 |
- $(use_enable gnutls) \ |
516 |
- $(use_enable growl) \ |
517 |
- $(use_enable gstreamer gst-decode) \ |
518 |
- $(use_enable httpd) \ |
519 |
- $(use_enable ieee1394 dv1394) \ |
520 |
- $(use_enable jack) \ |
521 |
- $(use_enable jpeg) \ |
522 |
- $(use_enable kate) \ |
523 |
- $(use_enable libass) \ |
524 |
- $(use_enable libcaca caca) \ |
525 |
- $(use_enable libnotify notify) \ |
526 |
- $(use_enable libsamplerate samplerate) \ |
527 |
- $(use_enable libtar) \ |
528 |
- $(use_enable libtiger tiger) \ |
529 |
- $(use_enable linsys) \ |
530 |
- $(use_enable lirc) \ |
531 |
- $(use_enable live live555) \ |
532 |
- $(use_enable lua) \ |
533 |
- $(use_enable macosx-dialog-provider) \ |
534 |
- $(use_enable macosx-eyetv) \ |
535 |
- $(use_enable macosx-qtkit) \ |
536 |
- $(use_enable macosx-quartztext) \ |
537 |
- $(use_enable matroska mkv) \ |
538 |
- $(use_enable cpu_flags_x86_mmx mmx) \ |
539 |
- $(use_enable modplug mod) \ |
540 |
- $(use_enable mp3 mad) \ |
541 |
- $(use_enable mpeg libmpeg2) \ |
542 |
- $(use_enable mtp) \ |
543 |
- $(use_enable musepack mpc) \ |
544 |
- $(use_enable ncurses) \ |
545 |
- $(use_enable neon) \ |
546 |
- $(use_enable ogg) $(use_enable ogg mux_ogg) \ |
547 |
- $(use_enable omxil) \ |
548 |
- $(use_enable omxil omxil-vout) \ |
549 |
- $(use_enable opencv) \ |
550 |
- $(use_enable opengl glspectrum) \ |
551 |
- $(use_enable opus) \ |
552 |
- $(use_enable optimisememory optimize-memory) \ |
553 |
- $(use_enable png) \ |
554 |
- $(use_enable postproc) \ |
555 |
- $(use_enable projectm) \ |
556 |
- $(use_enable pulseaudio pulse) \ |
557 |
- $(use_enable rdp freerdp) \ |
558 |
- $(use_enable rtsp realrtsp) \ |
559 |
- $(use_enable run-as-root) \ |
560 |
- $(use_enable samba smbclient) \ |
561 |
- $(use_enable schroedinger) \ |
562 |
- $(use_enable sdl) \ |
563 |
- $(use_enable sdl-image) \ |
564 |
- $(use_enable sid) \ |
565 |
- $(use_enable sftp) \ |
566 |
- $(use_enable shout) \ |
567 |
- $(use_enable skins skins2) \ |
568 |
- $(use_enable speex) \ |
569 |
- $(use_enable cpu_flags_x86_sse sse) \ |
570 |
- $(use_enable svg) \ |
571 |
- $(use_enable svg svgdec) \ |
572 |
- $(use_enable swscale) \ |
573 |
- $(use_enable taglib) \ |
574 |
- $(use_enable theora) \ |
575 |
- $(use_enable tremor) \ |
576 |
- $(use_enable truetype freetype) \ |
577 |
- $(use_enable twolame) \ |
578 |
- $(use_enable udev) \ |
579 |
- $(use_enable upnp) \ |
580 |
- $(use_enable v4l v4l2) \ |
581 |
- $(use_enable vaapi libva) \ |
582 |
- $(use_enable vcdx) \ |
583 |
- $(use_enable vdpau) \ |
584 |
- $(use_enable vlm) \ |
585 |
- $(use_enable vnc) \ |
586 |
- $(use_enable vorbis) \ |
587 |
- $(use_enable vpx) \ |
588 |
- $(use_enable wma-fixed) \ |
589 |
- $(use_with X x) \ |
590 |
- $(use_enable x264) \ |
591 |
- $(use_enable x265) \ |
592 |
- $(use_enable xcb) \ |
593 |
- $(use_enable xml libxml2) \ |
594 |
- $(use_enable xv xvideo) \ |
595 |
- $(use_enable zeroconf bonjour) \ |
596 |
- $(use_enable zvbi) $(use_enable !zvbi telx) \ |
597 |
- --disable-asdcp \ |
598 |
- --disable-coverage \ |
599 |
- --disable-cprof \ |
600 |
- --disable-crystalhd \ |
601 |
- --disable-decklink \ |
602 |
- --disable-gles1 \ |
603 |
- --disable-gles2 \ |
604 |
- --disable-goom \ |
605 |
- --disable-kai \ |
606 |
- --disable-kva \ |
607 |
- --disable-maintainer-mode \ |
608 |
- --disable-merge-ffmpeg \ |
609 |
- --disable-mfx \ |
610 |
- --disable-mmal-codec \ |
611 |
- --disable-mmal-vout \ |
612 |
- --disable-opensles \ |
613 |
- --disable-oss \ |
614 |
- --disable-quicktime \ |
615 |
- --disable-rpi-omxil \ |
616 |
- --disable-shine \ |
617 |
- --disable-sndio \ |
618 |
- --disable-vda \ |
619 |
- --disable-vsxu \ |
620 |
- --disable-wasapi |
621 |
- |
622 |
- # ^ We don't have these disabled libraries in the Portage tree yet. |
623 |
- |
624 |
- # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. |
625 |
- # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h. |
626 |
- # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file |
627 |
- sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die |
628 |
-} |
629 |
- |
630 |
-src_test() { |
631 |
- virtx emake check-TESTS |
632 |
-} |
633 |
- |
634 |
-src_install() { |
635 |
- default |
636 |
- |
637 |
- # Punt useless libtool's .la files |
638 |
- find "${D}" -name '*.la' -delete || die |
639 |
-} |
640 |
- |
641 |
-pkg_postinst() { |
642 |
- if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then |
643 |
- einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/" |
644 |
- "/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/" |
645 |
- else |
646 |
- ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" |
647 |
- ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" |
648 |
- ewarn "If you do not do it, vlc will take a long time to load." |
649 |
- fi |
650 |
-} |