Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/
Date: Tue, 13 Feb 2018 23:39:07
Message-Id: 1518565101.898003d871816586563f89ad1967853a506bfbc6.asturm@gentoo
1 commit: 898003d871816586563f89ad1967853a506bfbc6
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 13 23:08:56 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 13 23:38:21 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=898003d8
7
8 media-video/vlc: Put build switches into array, one line per switch
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 media-video/vlc/vlc-3.0.0-r1.ebuild | 299 ++++++++++++++++++------------------
13 media-video/vlc/vlc-3.0.9999.ebuild | 299 ++++++++++++++++++------------------
14 media-video/vlc/vlc-9999.ebuild | 299 ++++++++++++++++++------------------
15 3 files changed, 453 insertions(+), 444 deletions(-)
16
17 diff --git a/media-video/vlc/vlc-3.0.0-r1.ebuild b/media-video/vlc/vlc-3.0.0-r1.ebuild
18 index c319a5b450d..db7fcef6308 100644
19 --- a/media-video/vlc/vlc-3.0.0-r1.ebuild
20 +++ b/media-video/vlc/vlc-3.0.0-r1.ebuild
21 @@ -283,7 +283,149 @@ src_prepare() {
22 }
23
24 src_configure() {
25 - local myconf
26 + local myeconfargs=(
27 + --enable-vlc
28 + --docdir=/usr/share/doc/${PF}
29 + --disable-dependency-tracking
30 + --disable-optimizations
31 + --disable-update-check
32 + --enable-fast-install
33 + --enable-screen
34 + $(use_enable a52)
35 + $(use_enable aalib aa)
36 + $(use_enable alsa)
37 + $(use_enable altivec)
38 + $(use_enable aom)
39 + $(use_enable archive)
40 + $(use_enable avcodec)
41 + $(use_enable avformat)
42 + $(use_enable bidi fribidi)
43 + $(use_enable bluray)
44 + $(use_enable cddb libcddb)
45 + $(use_enable chromaprint)
46 + $(use_enable chromecast)
47 + $(use_enable dbus)
48 + $(use_enable dbus kwallet)
49 + $(use_enable directx)
50 + $(use_enable dc1394)
51 + $(use_enable debug)
52 + $(use_enable dts dca)
53 + $(use_enable dvbpsi)
54 + $(use_enable dvd dvdnav)
55 + $(use_enable dvd dvdread)
56 + $(use_enable dxva2)
57 + $(use_enable encode sout)
58 + $(use_enable faad)
59 + $(use_enable fdk fdkaac)
60 + $(use_enable flac)
61 + $(use_enable fluidsynth)
62 + $(use_enable fontconfig)
63 + $(use_enable gcrypt libgcrypt)
64 + $(use_enable gme)
65 + $(use_enable gnome-keyring secret)
66 + $(use_enable gnutls)
67 + $(use_enable gstreamer gst-decode)
68 + $(use_enable ieee1394 dv1394)
69 + $(use_enable jack)
70 + $(use_enable jpeg)
71 + $(use_enable kate)
72 + $(use_enable libass)
73 + $(use_enable libcaca caca)
74 + $(use_enable libnotify notify)
75 + $(use_enable libsamplerate samplerate)
76 + $(use_enable libtar)
77 + $(use_enable libtiger tiger)
78 + $(use_enable linsys)
79 + $(use_enable lirc)
80 + $(use_enable live live555)
81 + $(use_enable lua)
82 + $(use_enable macosx-notifications osx-notifications)
83 + $(use_enable macosx-qtkit)
84 + $(use_enable cpu_flags_x86_mmx mmx)
85 + $(use_enable modplug mod)
86 + $(use_enable mp3 mad)
87 + $(use_enable mpeg libmpeg2)
88 + $(use_enable mtp)
89 + $(use_enable musepack mpc)
90 + $(use_enable ncurses)
91 + $(use_enable neon)
92 + $(use_enable ogg) $(use_enable ogg)
93 + $(use_enable omxil)
94 + $(use_enable omxil omxil-vout)
95 + $(use_enable opencv)
96 + $(use_enable opus)
97 + $(use_enable optimisememory optimize-memory)
98 + $(use_enable png)
99 + $(use_enable postproc)
100 + $(use_enable projectm)
101 + $(use_enable pulseaudio pulse)
102 + $(use_enable qt5 qt)
103 + $(use_enable rdp freerdp)
104 + $(use_enable rtsp realrtsp)
105 + $(use_enable run-as-root)
106 + $(use_enable samba smbclient)
107 + $(use_enable schroedinger)
108 + $(use_enable sdl-image)
109 + $(use_enable sid)
110 + $(use_enable sftp)
111 + $(use_enable shout)
112 + $(use_enable skins skins2)
113 + $(use_enable speex)
114 + $(use_enable cpu_flags_x86_sse sse)
115 + $(use_enable svg)
116 + $(use_enable svg svgdec)
117 + $(use_enable swscale)
118 + $(use_enable taglib)
119 + $(use_enable theora)
120 + $(use_enable tremor)
121 + $(use_enable truetype freetype)
122 + $(use_enable twolame)
123 + $(use_enable udev)
124 + $(use_enable upnp)
125 + $(use_enable v4l v4l2)
126 + $(use_enable vaapi libva)
127 + $(use_enable vcd)
128 + $(use_enable vdpau)
129 + $(use_enable vlm)
130 + $(use_enable vnc)
131 + $(use_enable vorbis)
132 + $(use_enable vpx)
133 + $(use_enable wayland)
134 + $(use_enable wma-fixed)
135 + $(use_with X x)
136 + $(use_enable x264)
137 + $(use_enable xcb)
138 + $(use_enable xml libxml2)
139 + $(use_enable xv xvideo)
140 + $(use_enable x265)
141 + $(use_enable zeroconf avahi)
142 + $(use_enable zvbi)
143 + $(use_enable !zvbi telx)
144 + --disable-asdcp
145 + --disable-coverage
146 + --disable-cprof
147 + --disable-crystalhd
148 + --disable-decklink
149 + --disable-gles2
150 + --disable-goom
151 + --disable-kai
152 + --disable-kva
153 + --disable-libplacebo
154 + --disable-maintainer-mode
155 + --disable-merge-ffmpeg
156 + --disable-mfx
157 + --disable-mmal
158 + --disable-opensles
159 + --disable-oss
160 + --disable-rpi-omxil
161 + --disable-shine
162 + --disable-sndio
163 + --disable-spatialaudio
164 + --disable-srt
165 + --disable-vsxu
166 + --disable-wasapi
167 + )
168 + # ^ We don't have these disabled libraries in the Portage tree yet.
169
170 # Compatibility fix for Samba 4.
171 use samba && append-cppflags "-I/usr/include/samba-4.0"
172 @@ -305,159 +447,20 @@ src_configure() {
173
174 if use truetype || use projectm ; then
175 local dejavu="/usr/share/fonts/dejavu/"
176 - myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
177 - --with-default-font-family=Sans \
178 - --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
179 - --with-default-monospace-font-family=Monospace"
180 + myeconfargs+=(
181 + --with-default-font=${dejavu}/DejaVuSans.ttf
182 + --with-default-font-family=Sans
183 + --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
184 + --with-default-monospace-font-family=Monospace
185 + )
186 fi
187
188 - econf \
189 - ${myconf} \
190 - --enable-vlc \
191 - --docdir=/usr/share/doc/${PF} \
192 - --disable-dependency-tracking \
193 - --disable-optimizations \
194 - --disable-update-check \
195 - --enable-fast-install \
196 - --enable-screen \
197 - $(use_enable a52) \
198 - $(use_enable aalib aa) \
199 - $(use_enable alsa) \
200 - $(use_enable altivec) \
201 - $(use_enable aom) \
202 - $(use_enable archive) \
203 - $(use_enable avcodec) \
204 - $(use_enable avformat) \
205 - $(use_enable bidi fribidi) \
206 - $(use_enable bluray) \
207 - $(use_enable cddb libcddb) \
208 - $(use_enable chromaprint) \
209 - $(use_enable chromecast) \
210 - $(use_enable dbus) \
211 - $(use_enable dbus kwallet) \
212 - $(use_enable directx) \
213 - $(use_enable dc1394) \
214 - $(use_enable debug) \
215 - $(use_enable dts dca) \
216 - $(use_enable dvbpsi) \
217 - $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
218 - $(use_enable dxva2) \
219 - $(use_enable encode sout) \
220 - $(use_enable faad) \
221 - $(use_enable fdk fdkaac) \
222 - $(use_enable flac) \
223 - $(use_enable fluidsynth) \
224 - $(use_enable fontconfig) \
225 - $(use_enable gcrypt libgcrypt) \
226 - $(use_enable gme) \
227 - $(use_enable gnome-keyring secret) \
228 - $(use_enable gnutls) \
229 - $(use_enable gstreamer gst-decode) \
230 - $(use_enable ieee1394 dv1394) \
231 - $(use_enable jack) \
232 - $(use_enable jpeg) \
233 - $(use_enable kate) \
234 - $(use_enable libass) \
235 - $(use_enable libcaca caca) \
236 - $(use_enable libnotify notify) \
237 - $(use_enable libsamplerate samplerate) \
238 - $(use_enable libtar) \
239 - $(use_enable libtiger tiger) \
240 - $(use_enable linsys) \
241 - $(use_enable lirc) \
242 - $(use_enable live live555) \
243 - $(use_enable lua) \
244 - $(use_enable macosx-notifications osx-notifications) \
245 - $(use_enable macosx-qtkit) \
246 - $(use_enable cpu_flags_x86_mmx mmx) \
247 - $(use_enable modplug mod) \
248 - $(use_enable mp3 mad) \
249 - $(use_enable mpeg libmpeg2) \
250 - $(use_enable mtp) \
251 - $(use_enable musepack mpc) \
252 - $(use_enable ncurses) \
253 - $(use_enable neon) \
254 - $(use_enable ogg) $(use_enable ogg) \
255 - $(use_enable omxil) \
256 - $(use_enable omxil omxil-vout) \
257 - $(use_enable opencv) \
258 - $(use_enable opus) \
259 - $(use_enable optimisememory optimize-memory) \
260 - $(use_enable png) \
261 - $(use_enable postproc) \
262 - $(use_enable projectm) \
263 - $(use_enable pulseaudio pulse) \
264 - $(use_enable qt5 qt) \
265 - $(use_enable rdp freerdp) \
266 - $(use_enable rtsp realrtsp) \
267 - $(use_enable run-as-root) \
268 - $(use_enable samba smbclient) \
269 - $(use_enable schroedinger) \
270 - $(use_enable sdl-image) \
271 - $(use_enable sid) \
272 - $(use_enable sftp) \
273 - $(use_enable shout) \
274 - $(use_enable skins skins2) \
275 - $(use_enable speex) \
276 - $(use_enable cpu_flags_x86_sse sse) \
277 - $(use_enable svg) \
278 - $(use_enable svg svgdec) \
279 - $(use_enable swscale) \
280 - $(use_enable taglib) \
281 - $(use_enable theora) \
282 - $(use_enable tremor) \
283 - $(use_enable truetype freetype) \
284 - $(use_enable twolame) \
285 - $(use_enable udev) \
286 - $(use_enable upnp) \
287 - $(use_enable v4l v4l2) \
288 - $(use_enable vaapi libva) \
289 - $(use_enable vcd) \
290 - $(use_enable vdpau) \
291 - $(use_enable vlm) \
292 - $(use_enable vnc) \
293 - $(use_enable vorbis) \
294 - $(use_enable vpx) \
295 - $(use_enable wayland) \
296 - $(use_enable wma-fixed) \
297 - $(use_with X x) \
298 - $(use_enable x264) \
299 - $(use_enable xcb) \
300 - $(use_enable xml libxml2) \
301 - $(use_enable xv xvideo) \
302 - $(use_enable x265) \
303 - $(use_enable zeroconf avahi) \
304 - $(use_enable zvbi) $(use_enable !zvbi telx) \
305 - --disable-asdcp \
306 - --disable-coverage \
307 - --disable-cprof \
308 - --disable-crystalhd \
309 - --disable-decklink \
310 - --disable-gles2 \
311 - --disable-goom \
312 - --disable-kai \
313 - --disable-kva \
314 - --disable-libplacebo \
315 - --disable-maintainer-mode \
316 - --disable-merge-ffmpeg \
317 - --disable-mfx \
318 - --disable-mmal \
319 - --disable-opensles \
320 - --disable-oss \
321 - --disable-rpi-omxil \
322 - --disable-shine \
323 - --disable-sndio \
324 - --disable-spatialaudio \
325 - --disable-srt \
326 - --disable-vsxu \
327 - --disable-wasapi
328 -
329 - # ^ We don't have these disabled libraries in the Portage tree yet.
330 + econf ${myeconfargs[@]}
331
332 # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
333 # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
334 # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
335 - sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
336 + sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
337 }
338
339 src_test() {
340
341 diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
342 index c319a5b450d..db7fcef6308 100644
343 --- a/media-video/vlc/vlc-3.0.9999.ebuild
344 +++ b/media-video/vlc/vlc-3.0.9999.ebuild
345 @@ -283,7 +283,149 @@ src_prepare() {
346 }
347
348 src_configure() {
349 - local myconf
350 + local myeconfargs=(
351 + --enable-vlc
352 + --docdir=/usr/share/doc/${PF}
353 + --disable-dependency-tracking
354 + --disable-optimizations
355 + --disable-update-check
356 + --enable-fast-install
357 + --enable-screen
358 + $(use_enable a52)
359 + $(use_enable aalib aa)
360 + $(use_enable alsa)
361 + $(use_enable altivec)
362 + $(use_enable aom)
363 + $(use_enable archive)
364 + $(use_enable avcodec)
365 + $(use_enable avformat)
366 + $(use_enable bidi fribidi)
367 + $(use_enable bluray)
368 + $(use_enable cddb libcddb)
369 + $(use_enable chromaprint)
370 + $(use_enable chromecast)
371 + $(use_enable dbus)
372 + $(use_enable dbus kwallet)
373 + $(use_enable directx)
374 + $(use_enable dc1394)
375 + $(use_enable debug)
376 + $(use_enable dts dca)
377 + $(use_enable dvbpsi)
378 + $(use_enable dvd dvdnav)
379 + $(use_enable dvd dvdread)
380 + $(use_enable dxva2)
381 + $(use_enable encode sout)
382 + $(use_enable faad)
383 + $(use_enable fdk fdkaac)
384 + $(use_enable flac)
385 + $(use_enable fluidsynth)
386 + $(use_enable fontconfig)
387 + $(use_enable gcrypt libgcrypt)
388 + $(use_enable gme)
389 + $(use_enable gnome-keyring secret)
390 + $(use_enable gnutls)
391 + $(use_enable gstreamer gst-decode)
392 + $(use_enable ieee1394 dv1394)
393 + $(use_enable jack)
394 + $(use_enable jpeg)
395 + $(use_enable kate)
396 + $(use_enable libass)
397 + $(use_enable libcaca caca)
398 + $(use_enable libnotify notify)
399 + $(use_enable libsamplerate samplerate)
400 + $(use_enable libtar)
401 + $(use_enable libtiger tiger)
402 + $(use_enable linsys)
403 + $(use_enable lirc)
404 + $(use_enable live live555)
405 + $(use_enable lua)
406 + $(use_enable macosx-notifications osx-notifications)
407 + $(use_enable macosx-qtkit)
408 + $(use_enable cpu_flags_x86_mmx mmx)
409 + $(use_enable modplug mod)
410 + $(use_enable mp3 mad)
411 + $(use_enable mpeg libmpeg2)
412 + $(use_enable mtp)
413 + $(use_enable musepack mpc)
414 + $(use_enable ncurses)
415 + $(use_enable neon)
416 + $(use_enable ogg) $(use_enable ogg)
417 + $(use_enable omxil)
418 + $(use_enable omxil omxil-vout)
419 + $(use_enable opencv)
420 + $(use_enable opus)
421 + $(use_enable optimisememory optimize-memory)
422 + $(use_enable png)
423 + $(use_enable postproc)
424 + $(use_enable projectm)
425 + $(use_enable pulseaudio pulse)
426 + $(use_enable qt5 qt)
427 + $(use_enable rdp freerdp)
428 + $(use_enable rtsp realrtsp)
429 + $(use_enable run-as-root)
430 + $(use_enable samba smbclient)
431 + $(use_enable schroedinger)
432 + $(use_enable sdl-image)
433 + $(use_enable sid)
434 + $(use_enable sftp)
435 + $(use_enable shout)
436 + $(use_enable skins skins2)
437 + $(use_enable speex)
438 + $(use_enable cpu_flags_x86_sse sse)
439 + $(use_enable svg)
440 + $(use_enable svg svgdec)
441 + $(use_enable swscale)
442 + $(use_enable taglib)
443 + $(use_enable theora)
444 + $(use_enable tremor)
445 + $(use_enable truetype freetype)
446 + $(use_enable twolame)
447 + $(use_enable udev)
448 + $(use_enable upnp)
449 + $(use_enable v4l v4l2)
450 + $(use_enable vaapi libva)
451 + $(use_enable vcd)
452 + $(use_enable vdpau)
453 + $(use_enable vlm)
454 + $(use_enable vnc)
455 + $(use_enable vorbis)
456 + $(use_enable vpx)
457 + $(use_enable wayland)
458 + $(use_enable wma-fixed)
459 + $(use_with X x)
460 + $(use_enable x264)
461 + $(use_enable xcb)
462 + $(use_enable xml libxml2)
463 + $(use_enable xv xvideo)
464 + $(use_enable x265)
465 + $(use_enable zeroconf avahi)
466 + $(use_enable zvbi)
467 + $(use_enable !zvbi telx)
468 + --disable-asdcp
469 + --disable-coverage
470 + --disable-cprof
471 + --disable-crystalhd
472 + --disable-decklink
473 + --disable-gles2
474 + --disable-goom
475 + --disable-kai
476 + --disable-kva
477 + --disable-libplacebo
478 + --disable-maintainer-mode
479 + --disable-merge-ffmpeg
480 + --disable-mfx
481 + --disable-mmal
482 + --disable-opensles
483 + --disable-oss
484 + --disable-rpi-omxil
485 + --disable-shine
486 + --disable-sndio
487 + --disable-spatialaudio
488 + --disable-srt
489 + --disable-vsxu
490 + --disable-wasapi
491 + )
492 + # ^ We don't have these disabled libraries in the Portage tree yet.
493
494 # Compatibility fix for Samba 4.
495 use samba && append-cppflags "-I/usr/include/samba-4.0"
496 @@ -305,159 +447,20 @@ src_configure() {
497
498 if use truetype || use projectm ; then
499 local dejavu="/usr/share/fonts/dejavu/"
500 - myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
501 - --with-default-font-family=Sans \
502 - --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
503 - --with-default-monospace-font-family=Monospace"
504 + myeconfargs+=(
505 + --with-default-font=${dejavu}/DejaVuSans.ttf
506 + --with-default-font-family=Sans
507 + --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
508 + --with-default-monospace-font-family=Monospace
509 + )
510 fi
511
512 - econf \
513 - ${myconf} \
514 - --enable-vlc \
515 - --docdir=/usr/share/doc/${PF} \
516 - --disable-dependency-tracking \
517 - --disable-optimizations \
518 - --disable-update-check \
519 - --enable-fast-install \
520 - --enable-screen \
521 - $(use_enable a52) \
522 - $(use_enable aalib aa) \
523 - $(use_enable alsa) \
524 - $(use_enable altivec) \
525 - $(use_enable aom) \
526 - $(use_enable archive) \
527 - $(use_enable avcodec) \
528 - $(use_enable avformat) \
529 - $(use_enable bidi fribidi) \
530 - $(use_enable bluray) \
531 - $(use_enable cddb libcddb) \
532 - $(use_enable chromaprint) \
533 - $(use_enable chromecast) \
534 - $(use_enable dbus) \
535 - $(use_enable dbus kwallet) \
536 - $(use_enable directx) \
537 - $(use_enable dc1394) \
538 - $(use_enable debug) \
539 - $(use_enable dts dca) \
540 - $(use_enable dvbpsi) \
541 - $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
542 - $(use_enable dxva2) \
543 - $(use_enable encode sout) \
544 - $(use_enable faad) \
545 - $(use_enable fdk fdkaac) \
546 - $(use_enable flac) \
547 - $(use_enable fluidsynth) \
548 - $(use_enable fontconfig) \
549 - $(use_enable gcrypt libgcrypt) \
550 - $(use_enable gme) \
551 - $(use_enable gnome-keyring secret) \
552 - $(use_enable gnutls) \
553 - $(use_enable gstreamer gst-decode) \
554 - $(use_enable ieee1394 dv1394) \
555 - $(use_enable jack) \
556 - $(use_enable jpeg) \
557 - $(use_enable kate) \
558 - $(use_enable libass) \
559 - $(use_enable libcaca caca) \
560 - $(use_enable libnotify notify) \
561 - $(use_enable libsamplerate samplerate) \
562 - $(use_enable libtar) \
563 - $(use_enable libtiger tiger) \
564 - $(use_enable linsys) \
565 - $(use_enable lirc) \
566 - $(use_enable live live555) \
567 - $(use_enable lua) \
568 - $(use_enable macosx-notifications osx-notifications) \
569 - $(use_enable macosx-qtkit) \
570 - $(use_enable cpu_flags_x86_mmx mmx) \
571 - $(use_enable modplug mod) \
572 - $(use_enable mp3 mad) \
573 - $(use_enable mpeg libmpeg2) \
574 - $(use_enable mtp) \
575 - $(use_enable musepack mpc) \
576 - $(use_enable ncurses) \
577 - $(use_enable neon) \
578 - $(use_enable ogg) $(use_enable ogg) \
579 - $(use_enable omxil) \
580 - $(use_enable omxil omxil-vout) \
581 - $(use_enable opencv) \
582 - $(use_enable opus) \
583 - $(use_enable optimisememory optimize-memory) \
584 - $(use_enable png) \
585 - $(use_enable postproc) \
586 - $(use_enable projectm) \
587 - $(use_enable pulseaudio pulse) \
588 - $(use_enable qt5 qt) \
589 - $(use_enable rdp freerdp) \
590 - $(use_enable rtsp realrtsp) \
591 - $(use_enable run-as-root) \
592 - $(use_enable samba smbclient) \
593 - $(use_enable schroedinger) \
594 - $(use_enable sdl-image) \
595 - $(use_enable sid) \
596 - $(use_enable sftp) \
597 - $(use_enable shout) \
598 - $(use_enable skins skins2) \
599 - $(use_enable speex) \
600 - $(use_enable cpu_flags_x86_sse sse) \
601 - $(use_enable svg) \
602 - $(use_enable svg svgdec) \
603 - $(use_enable swscale) \
604 - $(use_enable taglib) \
605 - $(use_enable theora) \
606 - $(use_enable tremor) \
607 - $(use_enable truetype freetype) \
608 - $(use_enable twolame) \
609 - $(use_enable udev) \
610 - $(use_enable upnp) \
611 - $(use_enable v4l v4l2) \
612 - $(use_enable vaapi libva) \
613 - $(use_enable vcd) \
614 - $(use_enable vdpau) \
615 - $(use_enable vlm) \
616 - $(use_enable vnc) \
617 - $(use_enable vorbis) \
618 - $(use_enable vpx) \
619 - $(use_enable wayland) \
620 - $(use_enable wma-fixed) \
621 - $(use_with X x) \
622 - $(use_enable x264) \
623 - $(use_enable xcb) \
624 - $(use_enable xml libxml2) \
625 - $(use_enable xv xvideo) \
626 - $(use_enable x265) \
627 - $(use_enable zeroconf avahi) \
628 - $(use_enable zvbi) $(use_enable !zvbi telx) \
629 - --disable-asdcp \
630 - --disable-coverage \
631 - --disable-cprof \
632 - --disable-crystalhd \
633 - --disable-decklink \
634 - --disable-gles2 \
635 - --disable-goom \
636 - --disable-kai \
637 - --disable-kva \
638 - --disable-libplacebo \
639 - --disable-maintainer-mode \
640 - --disable-merge-ffmpeg \
641 - --disable-mfx \
642 - --disable-mmal \
643 - --disable-opensles \
644 - --disable-oss \
645 - --disable-rpi-omxil \
646 - --disable-shine \
647 - --disable-sndio \
648 - --disable-spatialaudio \
649 - --disable-srt \
650 - --disable-vsxu \
651 - --disable-wasapi
652 -
653 - # ^ We don't have these disabled libraries in the Portage tree yet.
654 + econf ${myeconfargs[@]}
655
656 # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
657 # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
658 # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
659 - sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
660 + sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
661 }
662
663 src_test() {
664
665 diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
666 index 6adf838096d..000f28b2d09 100644
667 --- a/media-video/vlc/vlc-9999.ebuild
668 +++ b/media-video/vlc/vlc-9999.ebuild
669 @@ -283,7 +283,149 @@ src_prepare() {
670 }
671
672 src_configure() {
673 - local myconf
674 + local myeconfargs=(
675 + --enable-vlc
676 + --docdir=/usr/share/doc/${PF}
677 + --disable-dependency-tracking
678 + --disable-optimizations
679 + --disable-update-check
680 + --enable-fast-install
681 + --enable-screen
682 + $(use_enable a52)
683 + $(use_enable aalib aa)
684 + $(use_enable alsa)
685 + $(use_enable altivec)
686 + $(use_enable aom)
687 + $(use_enable archive)
688 + $(use_enable avcodec)
689 + $(use_enable avformat)
690 + $(use_enable bidi fribidi)
691 + $(use_enable bluray)
692 + $(use_enable cddb libcddb)
693 + $(use_enable chromaprint)
694 + $(use_enable chromecast)
695 + $(use_enable dbus)
696 + $(use_enable dbus kwallet)
697 + $(use_enable directx)
698 + $(use_enable dc1394)
699 + $(use_enable debug)
700 + $(use_enable dts dca)
701 + $(use_enable dvbpsi)
702 + $(use_enable dvd dvdnav)
703 + $(use_enable dvd dvdread)
704 + $(use_enable dxva2)
705 + $(use_enable encode sout)
706 + $(use_enable faad)
707 + $(use_enable fdk fdkaac)
708 + $(use_enable flac)
709 + $(use_enable fluidsynth)
710 + $(use_enable fontconfig)
711 + $(use_enable gcrypt libgcrypt)
712 + $(use_enable gme)
713 + $(use_enable gnome-keyring secret)
714 + $(use_enable gnutls)
715 + $(use_enable gstreamer gst-decode)
716 + $(use_enable ieee1394 dv1394)
717 + $(use_enable jack)
718 + $(use_enable jpeg)
719 + $(use_enable kate)
720 + $(use_enable libass)
721 + $(use_enable libcaca caca)
722 + $(use_enable libnotify notify)
723 + $(use_enable libsamplerate samplerate)
724 + $(use_enable libtar)
725 + $(use_enable libtiger tiger)
726 + $(use_enable linsys)
727 + $(use_enable lirc)
728 + $(use_enable live live555)
729 + $(use_enable lua)
730 + $(use_enable macosx-notifications osx-notifications)
731 + $(use_enable macosx-qtkit)
732 + $(use_enable cpu_flags_x86_mmx mmx)
733 + $(use_enable modplug mod)
734 + $(use_enable mp3 mad)
735 + $(use_enable mpeg libmpeg2)
736 + $(use_enable mtp)
737 + $(use_enable musepack mpc)
738 + $(use_enable ncurses)
739 + $(use_enable neon)
740 + $(use_enable ogg) $(use_enable ogg)
741 + $(use_enable omxil)
742 + $(use_enable omxil omxil-vout)
743 + $(use_enable opencv)
744 + $(use_enable opus)
745 + $(use_enable optimisememory optimize-memory)
746 + $(use_enable png)
747 + $(use_enable postproc)
748 + $(use_enable projectm)
749 + $(use_enable pulseaudio pulse)
750 + $(use_enable qt5 qt)
751 + $(use_enable rdp freerdp)
752 + $(use_enable rtsp realrtsp)
753 + $(use_enable run-as-root)
754 + $(use_enable samba smbclient)
755 + $(use_enable schroedinger)
756 + $(use_enable sdl-image)
757 + $(use_enable sid)
758 + $(use_enable sftp)
759 + $(use_enable shout)
760 + $(use_enable skins skins2)
761 + $(use_enable speex)
762 + $(use_enable cpu_flags_x86_sse sse)
763 + $(use_enable svg)
764 + $(use_enable svg svgdec)
765 + $(use_enable swscale)
766 + $(use_enable taglib)
767 + $(use_enable theora)
768 + $(use_enable tremor)
769 + $(use_enable truetype freetype)
770 + $(use_enable twolame)
771 + $(use_enable udev)
772 + $(use_enable upnp)
773 + $(use_enable v4l v4l2)
774 + $(use_enable vaapi libva)
775 + $(use_enable vcd)
776 + $(use_enable vdpau)
777 + $(use_enable vlm)
778 + $(use_enable vnc)
779 + $(use_enable vorbis)
780 + $(use_enable vpx)
781 + $(use_enable wayland)
782 + $(use_enable wma-fixed)
783 + $(use_with X x)
784 + $(use_enable x264)
785 + $(use_enable xcb)
786 + $(use_enable xml libxml2)
787 + $(use_enable xv xvideo)
788 + $(use_enable x265)
789 + $(use_enable zeroconf avahi)
790 + $(use_enable zvbi)
791 + $(use_enable !zvbi telx)
792 + --disable-asdcp
793 + --disable-coverage
794 + --disable-cprof
795 + --disable-crystalhd
796 + --disable-decklink
797 + --disable-gles2
798 + --disable-goom
799 + --disable-kai
800 + --disable-kva
801 + --disable-libplacebo
802 + --disable-maintainer-mode
803 + --disable-merge-ffmpeg
804 + --disable-mfx
805 + --disable-mmal
806 + --disable-opensles
807 + --disable-oss
808 + --disable-rpi-omxil
809 + --disable-shine
810 + --disable-sndio
811 + --disable-spatialaudio
812 + --disable-srt
813 + --disable-vsxu
814 + --disable-wasapi
815 + )
816 + # ^ We don't have these disabled libraries in the Portage tree yet.
817
818 # Compatibility fix for Samba 4.
819 use samba && append-cppflags "-I/usr/include/samba-4.0"
820 @@ -305,159 +447,20 @@ src_configure() {
821
822 if use truetype || use projectm ; then
823 local dejavu="/usr/share/fonts/dejavu/"
824 - myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
825 - --with-default-font-family=Sans \
826 - --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
827 - --with-default-monospace-font-family=Monospace"
828 + myeconfargs+=(
829 + --with-default-font=${dejavu}/DejaVuSans.ttf
830 + --with-default-font-family=Sans
831 + --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
832 + --with-default-monospace-font-family=Monospace
833 + )
834 fi
835
836 - econf \
837 - ${myconf} \
838 - --enable-vlc \
839 - --docdir=/usr/share/doc/${PF} \
840 - --disable-dependency-tracking \
841 - --disable-optimizations \
842 - --disable-update-check \
843 - --enable-fast-install \
844 - --enable-screen \
845 - $(use_enable a52) \
846 - $(use_enable aalib aa) \
847 - $(use_enable alsa) \
848 - $(use_enable altivec) \
849 - $(use_enable aom) \
850 - $(use_enable archive) \
851 - $(use_enable avcodec) \
852 - $(use_enable avformat) \
853 - $(use_enable bidi fribidi) \
854 - $(use_enable bluray) \
855 - $(use_enable cddb libcddb) \
856 - $(use_enable chromaprint) \
857 - $(use_enable chromecast) \
858 - $(use_enable dbus) \
859 - $(use_enable dbus kwallet) \
860 - $(use_enable directx) \
861 - $(use_enable dc1394) \
862 - $(use_enable debug) \
863 - $(use_enable dts dca) \
864 - $(use_enable dvbpsi) \
865 - $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
866 - $(use_enable dxva2) \
867 - $(use_enable encode sout) \
868 - $(use_enable faad) \
869 - $(use_enable fdk fdkaac) \
870 - $(use_enable flac) \
871 - $(use_enable fluidsynth) \
872 - $(use_enable fontconfig) \
873 - $(use_enable gcrypt libgcrypt) \
874 - $(use_enable gme) \
875 - $(use_enable gnome-keyring secret) \
876 - $(use_enable gnutls) \
877 - $(use_enable gstreamer gst-decode) \
878 - $(use_enable ieee1394 dv1394) \
879 - $(use_enable jack) \
880 - $(use_enable jpeg) \
881 - $(use_enable kate) \
882 - $(use_enable libass) \
883 - $(use_enable libcaca caca) \
884 - $(use_enable libnotify notify) \
885 - $(use_enable libsamplerate samplerate) \
886 - $(use_enable libtar) \
887 - $(use_enable libtiger tiger) \
888 - $(use_enable linsys) \
889 - $(use_enable lirc) \
890 - $(use_enable live live555) \
891 - $(use_enable lua) \
892 - $(use_enable macosx-notifications osx-notifications) \
893 - $(use_enable macosx-qtkit) \
894 - $(use_enable cpu_flags_x86_mmx mmx) \
895 - $(use_enable modplug mod) \
896 - $(use_enable mp3 mad) \
897 - $(use_enable mpeg libmpeg2) \
898 - $(use_enable mtp) \
899 - $(use_enable musepack mpc) \
900 - $(use_enable ncurses) \
901 - $(use_enable neon) \
902 - $(use_enable ogg) $(use_enable ogg) \
903 - $(use_enable omxil) \
904 - $(use_enable omxil omxil-vout) \
905 - $(use_enable opencv) \
906 - $(use_enable opus) \
907 - $(use_enable optimisememory optimize-memory) \
908 - $(use_enable png) \
909 - $(use_enable postproc) \
910 - $(use_enable projectm) \
911 - $(use_enable pulseaudio pulse) \
912 - $(use_enable qt5 qt) \
913 - $(use_enable rdp freerdp) \
914 - $(use_enable rtsp realrtsp) \
915 - $(use_enable run-as-root) \
916 - $(use_enable samba smbclient) \
917 - $(use_enable schroedinger) \
918 - $(use_enable sdl-image) \
919 - $(use_enable sid) \
920 - $(use_enable sftp) \
921 - $(use_enable shout) \
922 - $(use_enable skins skins2) \
923 - $(use_enable speex) \
924 - $(use_enable cpu_flags_x86_sse sse) \
925 - $(use_enable svg) \
926 - $(use_enable svg svgdec) \
927 - $(use_enable swscale) \
928 - $(use_enable taglib) \
929 - $(use_enable theora) \
930 - $(use_enable tremor) \
931 - $(use_enable truetype freetype) \
932 - $(use_enable twolame) \
933 - $(use_enable udev) \
934 - $(use_enable upnp) \
935 - $(use_enable v4l v4l2) \
936 - $(use_enable vaapi libva) \
937 - $(use_enable vcd) \
938 - $(use_enable vdpau) \
939 - $(use_enable vlm) \
940 - $(use_enable vnc) \
941 - $(use_enable vorbis) \
942 - $(use_enable vpx) \
943 - $(use_enable wayland) \
944 - $(use_enable wma-fixed) \
945 - $(use_with X x) \
946 - $(use_enable x264) \
947 - $(use_enable xcb) \
948 - $(use_enable xml libxml2) \
949 - $(use_enable xv xvideo) \
950 - $(use_enable x265) \
951 - $(use_enable zeroconf avahi) \
952 - $(use_enable zvbi) $(use_enable !zvbi telx) \
953 - --disable-asdcp \
954 - --disable-coverage \
955 - --disable-cprof \
956 - --disable-crystalhd \
957 - --disable-decklink \
958 - --disable-gles2 \
959 - --disable-goom \
960 - --disable-kai \
961 - --disable-kva \
962 - --disable-libplacebo \
963 - --disable-maintainer-mode \
964 - --disable-merge-ffmpeg \
965 - --disable-mfx \
966 - --disable-mmal \
967 - --disable-opensles \
968 - --disable-oss \
969 - --disable-rpi-omxil \
970 - --disable-shine \
971 - --disable-sndio \
972 - --disable-spatialaudio \
973 - --disable-srt \
974 - --disable-vsxu \
975 - --disable-wasapi
976 -
977 - # ^ We don't have these disabled libraries in the Portage tree yet.
978 + econf ${myeconfargs[@]}
979
980 # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
981 # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
982 # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
983 - sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
984 + sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
985 }
986
987 src_test() {