From d20c7d7760b703e413abf109e8d69d0f75239e27 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 29 May 2015 16:41:46 +0200 Subject: [PATCH] vlc: workaround an internal compiler with musl. -O4 makes it crash, so that until somebody finds the real cause and reports it upstream (in case it's not fixed) just change it -O2 to make it build. --- srcpkgs/vlc/template | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 84b96cc6b2e..2b344e3bb32 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=2.2.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --disable-lua --disable-live555 --disable-fluidsynth @@ -40,20 +40,13 @@ build_options="notify opengl qt smb svg v4l2" build_options_default="v4l2" case "$XBPS_TARGET_MACHINE" in - i686-musl|x86_64-musl) - # XXX samba broken with musl - # Enable opengl by default on x86. - build_options_default+=" opengl" - configure_args+=" --enable-vdpau --enable-libva" - makedepends+=" libvdpau-devel libva-devel MesaLib-devel" - ;; - i686|x86_64) + i686*|x86_64*) # Enable opengl and samba by default on x86. build_options_default+=" opengl smb" configure_args+=" --enable-vdpau --enable-libva" makedepends+=" libvdpau-devel libva-devel MesaLib-devel" ;; - armv[67]l) + armv[67]l*) # XXX only for rpi build_options_default+=" smb" configure_args+=" --enable-omxil --enable-omxil-vout --enable-rpi-omxil" @@ -79,6 +72,12 @@ pre_configure() { -e 's,freetype/ftsynth.h,freetype2/ftsynth.h,' \ modules/text_renderer/freetype.c } +pre_build() { + # -O[34] causes an internal compiler error with musl/gcc-4.9.2: + # internal compiler error: in vect_analyze_data_ref_accesses, + # at tree-vect-data-refs.c:2567 + sed -i 's,-O4,-O2,g' -i modules/video_filter/Makefile +} post_install() { # Remove unused stuff rm -f ${DESTDIR}/usr/lib/vlc/plugins/plugins.dat