multimedia/HandBrake: Fixed build on i686.

This commit is contained in:
David Spencer 2016-04-16 11:53:52 +01:00 committed by Willy Sudiarto Raharjo
parent f7c33cde3a
commit d8957c2de2
3 changed files with 52 additions and 0 deletions

View File

@ -0,0 +1,28 @@
diff -Naur lame.orig/configure lame/configure
--- lame.orig/configure 2015-02-08 17:37:18.000000000 -0500
+++ lame/configure 2015-02-08 17:38:32.000000000 -0500
@@ -21031,7 +21031,14 @@
-
+case $host_cpu in
+powerpc*|i686*)
+ check_xmmintrin=
+ ;;
+*)
+ check_xmmintrin="xmmintrin.h"
+ ;;
+esac
for ac_header in \
errno.h \
@@ -21042,7 +21049,7 @@
sys/soundcard.h \
sys/time.h \
unistd.h \
- xmmintrin.h \
+ $check_xmmintrin \
linux/soundcard.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

View File

@ -0,0 +1,19 @@
diff -Naur mpeg2dec.orig/configure mpeg2dec/configure
--- mpeg2dec.orig/configure 2015-02-08 17:37:18.000000000 -0500
+++ mpeg2dec/configure 2015-02-08 17:38:32.000000000 -0500
@@ -21031,7 +21031,14 @@
-
+case $host_cpu in
+powerpc*|i686*)
+ check_xmmintrin=
+ ;;
+*)
+ check_xmmintrin="xmmintrin.h"
+ ;;
+esac
for ac_header in \
errno.h \

View File

@ -62,6 +62,11 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# fix i686 build: "inlining failed in call to always_inline '_mm_loadu_ps': target specific option mismatch"
# https://github.com/HandBrake/HandBrake/blob/master/contrib/lame/A00-xmmintrin.patch
cp $CWD/A00-lame-xmmintrin.patch contrib/lame/
cp $CWD/A00-mpeg2dec-xmmintrin.patch contrib/mpeg2dec/
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \
./configure \ ./configure \