diff options
Diffstat (limited to 'ffmpeg/build/ffmpeg.SlackBuild')
| -rwxr-xr-x | ffmpeg/build/ffmpeg.SlackBuild | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild index 9c6ea666..497c3c36 100755 --- a/ffmpeg/build/ffmpeg.SlackBuild +++ b/ffmpeg/build/ffmpeg.SlackBuild @@ -615,6 +615,10 @@ make_lame() { echo -e "**\n** lame ...\n**" cd $TMP/tmp-$PRGNAM/lame-${LAME} +# Fix compilation on x86 (xmmintrin.h error: inlining failed) +cat $SRCDIR/patches/lame_x86-xmmintrin.patch | patch -p1 --verbose \ + 2>&1 | tee $OUTPUT/patch-${PRGNAM}_lame.log + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="$SLKLDFLAGS" \ @@ -932,7 +936,7 @@ echo -e "**\n** faac ...\n**" cd $TMP/tmp-$PRGNAM/faac-${FAAC} # Newer gcc/glibc will bail out otherwise: -cat $SRCDIR/faac_gcc44.diff | patch -p1 --verbose \ +cat $SRCDIR/patches/faac_gcc44.diff | patch -p1 --verbose \ 2>&1 | tee $OUTPUT/patch-${PRGNAM}_faac.log #sh bootstrap @@ -1135,7 +1139,7 @@ fi cd $TMP/tmp-$PRGNAM/schroedinger-$SCHROEDINGER # Do not try to build the testsuite, it gives errors about multiple definitions: -cat $SRCDIR/schroedinger_notests.patch | patch -p1 --verbose \ +cat $SRCDIR/patches/schroedinger_notests.patch | patch -p1 --verbose \ 2>&1 | tee $OUTPUT/patch-${PRGNAM}_schroedinger.log # Because of the patch, run autoreconf: @@ -1252,7 +1256,7 @@ case "$ARCH" in ;; armv7hl) ARCHOPTS="--target=armv7-linux-gcc --enable-pic" - cat $SRCDIR/libvpx_fix-armhf-link.patch | patch -p1 --verbose + cat $SRCDIR/patches/libvpx_fix-armhf-link.patch | patch -p1 --verbose export AS=as export AR=ar export CROSS="${TARGET}-" @@ -1365,7 +1369,7 @@ else fi # Allow for internal use of the library: -cat $SRCDIR/fribidi.patch | patch -p1 --verbose \ +cat $SRCDIR/patches/fribidi.patch | patch -p1 --verbose \ 2>&1 | tee $OUTPUT/patch-${PRGNAM}_fribidi.log # And since we patched the Makefile.am we have to bootstrap: |