From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D8B3B138332 for ; Tue, 13 Feb 2018 23:39:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16313E0AE7; Tue, 13 Feb 2018 23:39:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9C2DE0AE7 for ; Tue, 13 Feb 2018 23:39:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BB9AB335C52 for ; Tue, 13 Feb 2018 23:39:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 49EDF213 for ; Tue, 13 Feb 2018 23:39:04 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1518565101.898003d871816586563f89ad1967853a506bfbc6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vlc/vlc-3.0.0-r1.ebuild media-video/vlc/vlc-3.0.9999.ebuild media-video/vlc/vlc-9999.ebuild X-VCS-Directories: media-video/vlc/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 898003d871816586563f89ad1967853a506bfbc6 X-VCS-Branch: master Date: Tue, 13 Feb 2018 23:39:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: da0a4cc5-b4bc-4825-b00c-f2468d3910b1 X-Archives-Hash: 4fd83efdec5fdda583577fe037e7424a commit: 898003d871816586563f89ad1967853a506bfbc6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 13 23:08:56 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 13 23:38:21 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=898003d8 media-video/vlc: Put build switches into array, one line per switch Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-video/vlc/vlc-3.0.0-r1.ebuild | 299 ++++++++++++++++++------------------ media-video/vlc/vlc-3.0.9999.ebuild | 299 ++++++++++++++++++------------------ media-video/vlc/vlc-9999.ebuild | 299 ++++++++++++++++++------------------ 3 files changed, 453 insertions(+), 444 deletions(-) diff --git a/media-video/vlc/vlc-3.0.0-r1.ebuild b/media-video/vlc/vlc-3.0.0-r1.ebuild index c319a5b450d..db7fcef6308 100644 --- a/media-video/vlc/vlc-3.0.0-r1.ebuild +++ b/media-video/vlc/vlc-3.0.0-r1.ebuild @@ -283,7 +283,149 @@ src_prepare() { } src_configure() { - local myconf + local myeconfargs=( + --enable-vlc + --docdir=/usr/share/doc/${PF} + --disable-dependency-tracking + --disable-optimizations + --disable-update-check + --enable-fast-install + --enable-screen + $(use_enable a52) + $(use_enable aalib aa) + $(use_enable alsa) + $(use_enable altivec) + $(use_enable aom) + $(use_enable archive) + $(use_enable avcodec) + $(use_enable avformat) + $(use_enable bidi fribidi) + $(use_enable bluray) + $(use_enable cddb libcddb) + $(use_enable chromaprint) + $(use_enable chromecast) + $(use_enable dbus) + $(use_enable dbus kwallet) + $(use_enable directx) + $(use_enable dc1394) + $(use_enable debug) + $(use_enable dts dca) + $(use_enable dvbpsi) + $(use_enable dvd dvdnav) + $(use_enable dvd dvdread) + $(use_enable dxva2) + $(use_enable encode sout) + $(use_enable faad) + $(use_enable fdk fdkaac) + $(use_enable flac) + $(use_enable fluidsynth) + $(use_enable fontconfig) + $(use_enable gcrypt libgcrypt) + $(use_enable gme) + $(use_enable gnome-keyring secret) + $(use_enable gnutls) + $(use_enable gstreamer gst-decode) + $(use_enable ieee1394 dv1394) + $(use_enable jack) + $(use_enable jpeg) + $(use_enable kate) + $(use_enable libass) + $(use_enable libcaca caca) + $(use_enable libnotify notify) + $(use_enable libsamplerate samplerate) + $(use_enable libtar) + $(use_enable libtiger tiger) + $(use_enable linsys) + $(use_enable lirc) + $(use_enable live live555) + $(use_enable lua) + $(use_enable macosx-notifications osx-notifications) + $(use_enable macosx-qtkit) + $(use_enable cpu_flags_x86_mmx mmx) + $(use_enable modplug mod) + $(use_enable mp3 mad) + $(use_enable mpeg libmpeg2) + $(use_enable mtp) + $(use_enable musepack mpc) + $(use_enable ncurses) + $(use_enable neon) + $(use_enable ogg) $(use_enable ogg) + $(use_enable omxil) + $(use_enable omxil omxil-vout) + $(use_enable opencv) + $(use_enable opus) + $(use_enable optimisememory optimize-memory) + $(use_enable png) + $(use_enable postproc) + $(use_enable projectm) + $(use_enable pulseaudio pulse) + $(use_enable qt5 qt) + $(use_enable rdp freerdp) + $(use_enable rtsp realrtsp) + $(use_enable run-as-root) + $(use_enable samba smbclient) + $(use_enable schroedinger) + $(use_enable sdl-image) + $(use_enable sid) + $(use_enable sftp) + $(use_enable shout) + $(use_enable skins skins2) + $(use_enable speex) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable svg) + $(use_enable svg svgdec) + $(use_enable swscale) + $(use_enable taglib) + $(use_enable theora) + $(use_enable tremor) + $(use_enable truetype freetype) + $(use_enable twolame) + $(use_enable udev) + $(use_enable upnp) + $(use_enable v4l v4l2) + $(use_enable vaapi libva) + $(use_enable vcd) + $(use_enable vdpau) + $(use_enable vlm) + $(use_enable vnc) + $(use_enable vorbis) + $(use_enable vpx) + $(use_enable wayland) + $(use_enable wma-fixed) + $(use_with X x) + $(use_enable x264) + $(use_enable xcb) + $(use_enable xml libxml2) + $(use_enable xv xvideo) + $(use_enable x265) + $(use_enable zeroconf avahi) + $(use_enable zvbi) + $(use_enable !zvbi telx) + --disable-asdcp + --disable-coverage + --disable-cprof + --disable-crystalhd + --disable-decklink + --disable-gles2 + --disable-goom + --disable-kai + --disable-kva + --disable-libplacebo + --disable-maintainer-mode + --disable-merge-ffmpeg + --disable-mfx + --disable-mmal + --disable-opensles + --disable-oss + --disable-rpi-omxil + --disable-shine + --disable-sndio + --disable-spatialaudio + --disable-srt + --disable-vsxu + --disable-wasapi + ) + # ^ We don't have these disabled libraries in the Portage tree yet. # Compatibility fix for Samba 4. use samba && append-cppflags "-I/usr/include/samba-4.0" @@ -305,159 +447,20 @@ src_configure() { if use truetype || use projectm ; then local dejavu="/usr/share/fonts/dejavu/" - myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \ - --with-default-font-family=Sans \ - --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf - --with-default-monospace-font-family=Monospace" + myeconfargs+=( + --with-default-font=${dejavu}/DejaVuSans.ttf + --with-default-font-family=Sans + --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf + --with-default-monospace-font-family=Monospace + ) fi - econf \ - ${myconf} \ - --enable-vlc \ - --docdir=/usr/share/doc/${PF} \ - --disable-dependency-tracking \ - --disable-optimizations \ - --disable-update-check \ - --enable-fast-install \ - --enable-screen \ - $(use_enable a52) \ - $(use_enable aalib aa) \ - $(use_enable alsa) \ - $(use_enable altivec) \ - $(use_enable aom) \ - $(use_enable archive) \ - $(use_enable avcodec) \ - $(use_enable avformat) \ - $(use_enable bidi fribidi) \ - $(use_enable bluray) \ - $(use_enable cddb libcddb) \ - $(use_enable chromaprint) \ - $(use_enable chromecast) \ - $(use_enable dbus) \ - $(use_enable dbus kwallet) \ - $(use_enable directx) \ - $(use_enable dc1394) \ - $(use_enable debug) \ - $(use_enable dts dca) \ - $(use_enable dvbpsi) \ - $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \ - $(use_enable dxva2) \ - $(use_enable encode sout) \ - $(use_enable faad) \ - $(use_enable fdk fdkaac) \ - $(use_enable flac) \ - $(use_enable fluidsynth) \ - $(use_enable fontconfig) \ - $(use_enable gcrypt libgcrypt) \ - $(use_enable gme) \ - $(use_enable gnome-keyring secret) \ - $(use_enable gnutls) \ - $(use_enable gstreamer gst-decode) \ - $(use_enable ieee1394 dv1394) \ - $(use_enable jack) \ - $(use_enable jpeg) \ - $(use_enable kate) \ - $(use_enable libass) \ - $(use_enable libcaca caca) \ - $(use_enable libnotify notify) \ - $(use_enable libsamplerate samplerate) \ - $(use_enable libtar) \ - $(use_enable libtiger tiger) \ - $(use_enable linsys) \ - $(use_enable lirc) \ - $(use_enable live live555) \ - $(use_enable lua) \ - $(use_enable macosx-notifications osx-notifications) \ - $(use_enable macosx-qtkit) \ - $(use_enable cpu_flags_x86_mmx mmx) \ - $(use_enable modplug mod) \ - $(use_enable mp3 mad) \ - $(use_enable mpeg libmpeg2) \ - $(use_enable mtp) \ - $(use_enable musepack mpc) \ - $(use_enable ncurses) \ - $(use_enable neon) \ - $(use_enable ogg) $(use_enable ogg) \ - $(use_enable omxil) \ - $(use_enable omxil omxil-vout) \ - $(use_enable opencv) \ - $(use_enable opus) \ - $(use_enable optimisememory optimize-memory) \ - $(use_enable png) \ - $(use_enable postproc) \ - $(use_enable projectm) \ - $(use_enable pulseaudio pulse) \ - $(use_enable qt5 qt) \ - $(use_enable rdp freerdp) \ - $(use_enable rtsp realrtsp) \ - $(use_enable run-as-root) \ - $(use_enable samba smbclient) \ - $(use_enable schroedinger) \ - $(use_enable sdl-image) \ - $(use_enable sid) \ - $(use_enable sftp) \ - $(use_enable shout) \ - $(use_enable skins skins2) \ - $(use_enable speex) \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable svg) \ - $(use_enable svg svgdec) \ - $(use_enable swscale) \ - $(use_enable taglib) \ - $(use_enable theora) \ - $(use_enable tremor) \ - $(use_enable truetype freetype) \ - $(use_enable twolame) \ - $(use_enable udev) \ - $(use_enable upnp) \ - $(use_enable v4l v4l2) \ - $(use_enable vaapi libva) \ - $(use_enable vcd) \ - $(use_enable vdpau) \ - $(use_enable vlm) \ - $(use_enable vnc) \ - $(use_enable vorbis) \ - $(use_enable vpx) \ - $(use_enable wayland) \ - $(use_enable wma-fixed) \ - $(use_with X x) \ - $(use_enable x264) \ - $(use_enable xcb) \ - $(use_enable xml libxml2) \ - $(use_enable xv xvideo) \ - $(use_enable x265) \ - $(use_enable zeroconf avahi) \ - $(use_enable zvbi) $(use_enable !zvbi telx) \ - --disable-asdcp \ - --disable-coverage \ - --disable-cprof \ - --disable-crystalhd \ - --disable-decklink \ - --disable-gles2 \ - --disable-goom \ - --disable-kai \ - --disable-kva \ - --disable-libplacebo \ - --disable-maintainer-mode \ - --disable-merge-ffmpeg \ - --disable-mfx \ - --disable-mmal \ - --disable-opensles \ - --disable-oss \ - --disable-rpi-omxil \ - --disable-shine \ - --disable-sndio \ - --disable-spatialaudio \ - --disable-srt \ - --disable-vsxu \ - --disable-wasapi - - # ^ We don't have these disabled libraries in the Portage tree yet. + econf ${myeconfargs[@]} # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h. # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file - sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die + sed -i '1i#undef _FORTIFY_SOURCE' config.h || die } src_test() { diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index c319a5b450d..db7fcef6308 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -283,7 +283,149 @@ src_prepare() { } src_configure() { - local myconf + local myeconfargs=( + --enable-vlc + --docdir=/usr/share/doc/${PF} + --disable-dependency-tracking + --disable-optimizations + --disable-update-check + --enable-fast-install + --enable-screen + $(use_enable a52) + $(use_enable aalib aa) + $(use_enable alsa) + $(use_enable altivec) + $(use_enable aom) + $(use_enable archive) + $(use_enable avcodec) + $(use_enable avformat) + $(use_enable bidi fribidi) + $(use_enable bluray) + $(use_enable cddb libcddb) + $(use_enable chromaprint) + $(use_enable chromecast) + $(use_enable dbus) + $(use_enable dbus kwallet) + $(use_enable directx) + $(use_enable dc1394) + $(use_enable debug) + $(use_enable dts dca) + $(use_enable dvbpsi) + $(use_enable dvd dvdnav) + $(use_enable dvd dvdread) + $(use_enable dxva2) + $(use_enable encode sout) + $(use_enable faad) + $(use_enable fdk fdkaac) + $(use_enable flac) + $(use_enable fluidsynth) + $(use_enable fontconfig) + $(use_enable gcrypt libgcrypt) + $(use_enable gme) + $(use_enable gnome-keyring secret) + $(use_enable gnutls) + $(use_enable gstreamer gst-decode) + $(use_enable ieee1394 dv1394) + $(use_enable jack) + $(use_enable jpeg) + $(use_enable kate) + $(use_enable libass) + $(use_enable libcaca caca) + $(use_enable libnotify notify) + $(use_enable libsamplerate samplerate) + $(use_enable libtar) + $(use_enable libtiger tiger) + $(use_enable linsys) + $(use_enable lirc) + $(use_enable live live555) + $(use_enable lua) + $(use_enable macosx-notifications osx-notifications) + $(use_enable macosx-qtkit) + $(use_enable cpu_flags_x86_mmx mmx) + $(use_enable modplug mod) + $(use_enable mp3 mad) + $(use_enable mpeg libmpeg2) + $(use_enable mtp) + $(use_enable musepack mpc) + $(use_enable ncurses) + $(use_enable neon) + $(use_enable ogg) $(use_enable ogg) + $(use_enable omxil) + $(use_enable omxil omxil-vout) + $(use_enable opencv) + $(use_enable opus) + $(use_enable optimisememory optimize-memory) + $(use_enable png) + $(use_enable postproc) + $(use_enable projectm) + $(use_enable pulseaudio pulse) + $(use_enable qt5 qt) + $(use_enable rdp freerdp) + $(use_enable rtsp realrtsp) + $(use_enable run-as-root) + $(use_enable samba smbclient) + $(use_enable schroedinger) + $(use_enable sdl-image) + $(use_enable sid) + $(use_enable sftp) + $(use_enable shout) + $(use_enable skins skins2) + $(use_enable speex) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable svg) + $(use_enable svg svgdec) + $(use_enable swscale) + $(use_enable taglib) + $(use_enable theora) + $(use_enable tremor) + $(use_enable truetype freetype) + $(use_enable twolame) + $(use_enable udev) + $(use_enable upnp) + $(use_enable v4l v4l2) + $(use_enable vaapi libva) + $(use_enable vcd) + $(use_enable vdpau) + $(use_enable vlm) + $(use_enable vnc) + $(use_enable vorbis) + $(use_enable vpx) + $(use_enable wayland) + $(use_enable wma-fixed) + $(use_with X x) + $(use_enable x264) + $(use_enable xcb) + $(use_enable xml libxml2) + $(use_enable xv xvideo) + $(use_enable x265) + $(use_enable zeroconf avahi) + $(use_enable zvbi) + $(use_enable !zvbi telx) + --disable-asdcp + --disable-coverage + --disable-cprof + --disable-crystalhd + --disable-decklink + --disable-gles2 + --disable-goom + --disable-kai + --disable-kva + --disable-libplacebo + --disable-maintainer-mode + --disable-merge-ffmpeg + --disable-mfx + --disable-mmal + --disable-opensles + --disable-oss + --disable-rpi-omxil + --disable-shine + --disable-sndio + --disable-spatialaudio + --disable-srt + --disable-vsxu + --disable-wasapi + ) + # ^ We don't have these disabled libraries in the Portage tree yet. # Compatibility fix for Samba 4. use samba && append-cppflags "-I/usr/include/samba-4.0" @@ -305,159 +447,20 @@ src_configure() { if use truetype || use projectm ; then local dejavu="/usr/share/fonts/dejavu/" - myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \ - --with-default-font-family=Sans \ - --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf - --with-default-monospace-font-family=Monospace" + myeconfargs+=( + --with-default-font=${dejavu}/DejaVuSans.ttf + --with-default-font-family=Sans + --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf + --with-default-monospace-font-family=Monospace + ) fi - econf \ - ${myconf} \ - --enable-vlc \ - --docdir=/usr/share/doc/${PF} \ - --disable-dependency-tracking \ - --disable-optimizations \ - --disable-update-check \ - --enable-fast-install \ - --enable-screen \ - $(use_enable a52) \ - $(use_enable aalib aa) \ - $(use_enable alsa) \ - $(use_enable altivec) \ - $(use_enable aom) \ - $(use_enable archive) \ - $(use_enable avcodec) \ - $(use_enable avformat) \ - $(use_enable bidi fribidi) \ - $(use_enable bluray) \ - $(use_enable cddb libcddb) \ - $(use_enable chromaprint) \ - $(use_enable chromecast) \ - $(use_enable dbus) \ - $(use_enable dbus kwallet) \ - $(use_enable directx) \ - $(use_enable dc1394) \ - $(use_enable debug) \ - $(use_enable dts dca) \ - $(use_enable dvbpsi) \ - $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \ - $(use_enable dxva2) \ - $(use_enable encode sout) \ - $(use_enable faad) \ - $(use_enable fdk fdkaac) \ - $(use_enable flac) \ - $(use_enable fluidsynth) \ - $(use_enable fontconfig) \ - $(use_enable gcrypt libgcrypt) \ - $(use_enable gme) \ - $(use_enable gnome-keyring secret) \ - $(use_enable gnutls) \ - $(use_enable gstreamer gst-decode) \ - $(use_enable ieee1394 dv1394) \ - $(use_enable jack) \ - $(use_enable jpeg) \ - $(use_enable kate) \ - $(use_enable libass) \ - $(use_enable libcaca caca) \ - $(use_enable libnotify notify) \ - $(use_enable libsamplerate samplerate) \ - $(use_enable libtar) \ - $(use_enable libtiger tiger) \ - $(use_enable linsys) \ - $(use_enable lirc) \ - $(use_enable live live555) \ - $(use_enable lua) \ - $(use_enable macosx-notifications osx-notifications) \ - $(use_enable macosx-qtkit) \ - $(use_enable cpu_flags_x86_mmx mmx) \ - $(use_enable modplug mod) \ - $(use_enable mp3 mad) \ - $(use_enable mpeg libmpeg2) \ - $(use_enable mtp) \ - $(use_enable musepack mpc) \ - $(use_enable ncurses) \ - $(use_enable neon) \ - $(use_enable ogg) $(use_enable ogg) \ - $(use_enable omxil) \ - $(use_enable omxil omxil-vout) \ - $(use_enable opencv) \ - $(use_enable opus) \ - $(use_enable optimisememory optimize-memory) \ - $(use_enable png) \ - $(use_enable postproc) \ - $(use_enable projectm) \ - $(use_enable pulseaudio pulse) \ - $(use_enable qt5 qt) \ - $(use_enable rdp freerdp) \ - $(use_enable rtsp realrtsp) \ - $(use_enable run-as-root) \ - $(use_enable samba smbclient) \ - $(use_enable schroedinger) \ - $(use_enable sdl-image) \ - $(use_enable sid) \ - $(use_enable sftp) \ - $(use_enable shout) \ - $(use_enable skins skins2) \ - $(use_enable speex) \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable svg) \ - $(use_enable svg svgdec) \ - $(use_enable swscale) \ - $(use_enable taglib) \ - $(use_enable theora) \ - $(use_enable tremor) \ - $(use_enable truetype freetype) \ - $(use_enable twolame) \ - $(use_enable udev) \ - $(use_enable upnp) \ - $(use_enable v4l v4l2) \ - $(use_enable vaapi libva) \ - $(use_enable vcd) \ - $(use_enable vdpau) \ - $(use_enable vlm) \ - $(use_enable vnc) \ - $(use_enable vorbis) \ - $(use_enable vpx) \ - $(use_enable wayland) \ - $(use_enable wma-fixed) \ - $(use_with X x) \ - $(use_enable x264) \ - $(use_enable xcb) \ - $(use_enable xml libxml2) \ - $(use_enable xv xvideo) \ - $(use_enable x265) \ - $(use_enable zeroconf avahi) \ - $(use_enable zvbi) $(use_enable !zvbi telx) \ - --disable-asdcp \ - --disable-coverage \ - --disable-cprof \ - --disable-crystalhd \ - --disable-decklink \ - --disable-gles2 \ - --disable-goom \ - --disable-kai \ - --disable-kva \ - --disable-libplacebo \ - --disable-maintainer-mode \ - --disable-merge-ffmpeg \ - --disable-mfx \ - --disable-mmal \ - --disable-opensles \ - --disable-oss \ - --disable-rpi-omxil \ - --disable-shine \ - --disable-sndio \ - --disable-spatialaudio \ - --disable-srt \ - --disable-vsxu \ - --disable-wasapi - - # ^ We don't have these disabled libraries in the Portage tree yet. + econf ${myeconfargs[@]} # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h. # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file - sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die + sed -i '1i#undef _FORTIFY_SOURCE' config.h || die } src_test() { diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 6adf838096d..000f28b2d09 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -283,7 +283,149 @@ src_prepare() { } src_configure() { - local myconf + local myeconfargs=( + --enable-vlc + --docdir=/usr/share/doc/${PF} + --disable-dependency-tracking + --disable-optimizations + --disable-update-check + --enable-fast-install + --enable-screen + $(use_enable a52) + $(use_enable aalib aa) + $(use_enable alsa) + $(use_enable altivec) + $(use_enable aom) + $(use_enable archive) + $(use_enable avcodec) + $(use_enable avformat) + $(use_enable bidi fribidi) + $(use_enable bluray) + $(use_enable cddb libcddb) + $(use_enable chromaprint) + $(use_enable chromecast) + $(use_enable dbus) + $(use_enable dbus kwallet) + $(use_enable directx) + $(use_enable dc1394) + $(use_enable debug) + $(use_enable dts dca) + $(use_enable dvbpsi) + $(use_enable dvd dvdnav) + $(use_enable dvd dvdread) + $(use_enable dxva2) + $(use_enable encode sout) + $(use_enable faad) + $(use_enable fdk fdkaac) + $(use_enable flac) + $(use_enable fluidsynth) + $(use_enable fontconfig) + $(use_enable gcrypt libgcrypt) + $(use_enable gme) + $(use_enable gnome-keyring secret) + $(use_enable gnutls) + $(use_enable gstreamer gst-decode) + $(use_enable ieee1394 dv1394) + $(use_enable jack) + $(use_enable jpeg) + $(use_enable kate) + $(use_enable libass) + $(use_enable libcaca caca) + $(use_enable libnotify notify) + $(use_enable libsamplerate samplerate) + $(use_enable libtar) + $(use_enable libtiger tiger) + $(use_enable linsys) + $(use_enable lirc) + $(use_enable live live555) + $(use_enable lua) + $(use_enable macosx-notifications osx-notifications) + $(use_enable macosx-qtkit) + $(use_enable cpu_flags_x86_mmx mmx) + $(use_enable modplug mod) + $(use_enable mp3 mad) + $(use_enable mpeg libmpeg2) + $(use_enable mtp) + $(use_enable musepack mpc) + $(use_enable ncurses) + $(use_enable neon) + $(use_enable ogg) $(use_enable ogg) + $(use_enable omxil) + $(use_enable omxil omxil-vout) + $(use_enable opencv) + $(use_enable opus) + $(use_enable optimisememory optimize-memory) + $(use_enable png) + $(use_enable postproc) + $(use_enable projectm) + $(use_enable pulseaudio pulse) + $(use_enable qt5 qt) + $(use_enable rdp freerdp) + $(use_enable rtsp realrtsp) + $(use_enable run-as-root) + $(use_enable samba smbclient) + $(use_enable schroedinger) + $(use_enable sdl-image) + $(use_enable sid) + $(use_enable sftp) + $(use_enable shout) + $(use_enable skins skins2) + $(use_enable speex) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable svg) + $(use_enable svg svgdec) + $(use_enable swscale) + $(use_enable taglib) + $(use_enable theora) + $(use_enable tremor) + $(use_enable truetype freetype) + $(use_enable twolame) + $(use_enable udev) + $(use_enable upnp) + $(use_enable v4l v4l2) + $(use_enable vaapi libva) + $(use_enable vcd) + $(use_enable vdpau) + $(use_enable vlm) + $(use_enable vnc) + $(use_enable vorbis) + $(use_enable vpx) + $(use_enable wayland) + $(use_enable wma-fixed) + $(use_with X x) + $(use_enable x264) + $(use_enable xcb) + $(use_enable xml libxml2) + $(use_enable xv xvideo) + $(use_enable x265) + $(use_enable zeroconf avahi) + $(use_enable zvbi) + $(use_enable !zvbi telx) + --disable-asdcp + --disable-coverage + --disable-cprof + --disable-crystalhd + --disable-decklink + --disable-gles2 + --disable-goom + --disable-kai + --disable-kva + --disable-libplacebo + --disable-maintainer-mode + --disable-merge-ffmpeg + --disable-mfx + --disable-mmal + --disable-opensles + --disable-oss + --disable-rpi-omxil + --disable-shine + --disable-sndio + --disable-spatialaudio + --disable-srt + --disable-vsxu + --disable-wasapi + ) + # ^ We don't have these disabled libraries in the Portage tree yet. # Compatibility fix for Samba 4. use samba && append-cppflags "-I/usr/include/samba-4.0" @@ -305,159 +447,20 @@ src_configure() { if use truetype || use projectm ; then local dejavu="/usr/share/fonts/dejavu/" - myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \ - --with-default-font-family=Sans \ - --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf - --with-default-monospace-font-family=Monospace" + myeconfargs+=( + --with-default-font=${dejavu}/DejaVuSans.ttf + --with-default-font-family=Sans + --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf + --with-default-monospace-font-family=Monospace + ) fi - econf \ - ${myconf} \ - --enable-vlc \ - --docdir=/usr/share/doc/${PF} \ - --disable-dependency-tracking \ - --disable-optimizations \ - --disable-update-check \ - --enable-fast-install \ - --enable-screen \ - $(use_enable a52) \ - $(use_enable aalib aa) \ - $(use_enable alsa) \ - $(use_enable altivec) \ - $(use_enable aom) \ - $(use_enable archive) \ - $(use_enable avcodec) \ - $(use_enable avformat) \ - $(use_enable bidi fribidi) \ - $(use_enable bluray) \ - $(use_enable cddb libcddb) \ - $(use_enable chromaprint) \ - $(use_enable chromecast) \ - $(use_enable dbus) \ - $(use_enable dbus kwallet) \ - $(use_enable directx) \ - $(use_enable dc1394) \ - $(use_enable debug) \ - $(use_enable dts dca) \ - $(use_enable dvbpsi) \ - $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \ - $(use_enable dxva2) \ - $(use_enable encode sout) \ - $(use_enable faad) \ - $(use_enable fdk fdkaac) \ - $(use_enable flac) \ - $(use_enable fluidsynth) \ - $(use_enable fontconfig) \ - $(use_enable gcrypt libgcrypt) \ - $(use_enable gme) \ - $(use_enable gnome-keyring secret) \ - $(use_enable gnutls) \ - $(use_enable gstreamer gst-decode) \ - $(use_enable ieee1394 dv1394) \ - $(use_enable jack) \ - $(use_enable jpeg) \ - $(use_enable kate) \ - $(use_enable libass) \ - $(use_enable libcaca caca) \ - $(use_enable libnotify notify) \ - $(use_enable libsamplerate samplerate) \ - $(use_enable libtar) \ - $(use_enable libtiger tiger) \ - $(use_enable linsys) \ - $(use_enable lirc) \ - $(use_enable live live555) \ - $(use_enable lua) \ - $(use_enable macosx-notifications osx-notifications) \ - $(use_enable macosx-qtkit) \ - $(use_enable cpu_flags_x86_mmx mmx) \ - $(use_enable modplug mod) \ - $(use_enable mp3 mad) \ - $(use_enable mpeg libmpeg2) \ - $(use_enable mtp) \ - $(use_enable musepack mpc) \ - $(use_enable ncurses) \ - $(use_enable neon) \ - $(use_enable ogg) $(use_enable ogg) \ - $(use_enable omxil) \ - $(use_enable omxil omxil-vout) \ - $(use_enable opencv) \ - $(use_enable opus) \ - $(use_enable optimisememory optimize-memory) \ - $(use_enable png) \ - $(use_enable postproc) \ - $(use_enable projectm) \ - $(use_enable pulseaudio pulse) \ - $(use_enable qt5 qt) \ - $(use_enable rdp freerdp) \ - $(use_enable rtsp realrtsp) \ - $(use_enable run-as-root) \ - $(use_enable samba smbclient) \ - $(use_enable schroedinger) \ - $(use_enable sdl-image) \ - $(use_enable sid) \ - $(use_enable sftp) \ - $(use_enable shout) \ - $(use_enable skins skins2) \ - $(use_enable speex) \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable svg) \ - $(use_enable svg svgdec) \ - $(use_enable swscale) \ - $(use_enable taglib) \ - $(use_enable theora) \ - $(use_enable tremor) \ - $(use_enable truetype freetype) \ - $(use_enable twolame) \ - $(use_enable udev) \ - $(use_enable upnp) \ - $(use_enable v4l v4l2) \ - $(use_enable vaapi libva) \ - $(use_enable vcd) \ - $(use_enable vdpau) \ - $(use_enable vlm) \ - $(use_enable vnc) \ - $(use_enable vorbis) \ - $(use_enable vpx) \ - $(use_enable wayland) \ - $(use_enable wma-fixed) \ - $(use_with X x) \ - $(use_enable x264) \ - $(use_enable xcb) \ - $(use_enable xml libxml2) \ - $(use_enable xv xvideo) \ - $(use_enable x265) \ - $(use_enable zeroconf avahi) \ - $(use_enable zvbi) $(use_enable !zvbi telx) \ - --disable-asdcp \ - --disable-coverage \ - --disable-cprof \ - --disable-crystalhd \ - --disable-decklink \ - --disable-gles2 \ - --disable-goom \ - --disable-kai \ - --disable-kva \ - --disable-libplacebo \ - --disable-maintainer-mode \ - --disable-merge-ffmpeg \ - --disable-mfx \ - --disable-mmal \ - --disable-opensles \ - --disable-oss \ - --disable-rpi-omxil \ - --disable-shine \ - --disable-sndio \ - --disable-spatialaudio \ - --disable-srt \ - --disable-vsxu \ - --disable-wasapi - - # ^ We don't have these disabled libraries in the Portage tree yet. + econf ${myeconfargs[@]} # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h. # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file - sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die + sed -i '1i#undef _FORTIFY_SOURCE' config.h || die } src_test() {