[SCM] x264/master: Add properly_detect_x32.patch

[ricotz-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d5f6f77adcc26379962e26292b5fd13c64f17d0e
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Wed Jan 14 23:29:35 2015 +0100

    Add properly_detect_x32.patch

diff --git a/debian/patches/properly_detect_x32.patch b/debian/patches/properly_detect_x32.patch
new file mode 100644
index 0000000..1c6fa37
--- /dev/null
+++ b/debian/patches/properly_detect_x32.patch
@@ -0,0 +1,40 @@
+Description: Properly detect x32.
+ As usually, x32 gets mistaken for amd64 (both are x86-64 ABIs after all).
+ This version doesn't use any assembly yet, a proper port is needed.
+Author: Adam Borowski <kilobyte at angband.pl>
+
+--- x264-0.142.2431+gita5831aa.orig/common/common.h
++++ x264-0.142.2431+gita5831aa/common/common.h
+@@ -1010,7 +1010,7 @@ static int ALWAYS_INLINE x264_predictor_
+     return cnt;
+ }
+ 
+-#if ARCH_X86 || ARCH_X86_64
++#if ARCH_X86 || ARCH_X86_64 || ARCH_X32
+ #include "x86/util.h"
+ #endif
+ 
+--- x264-0.142.2431+gita5831aa.orig/configure
++++ x264-0.142.2431+gita5831aa/configure
+@@ -556,6 +556,10 @@ esac
+ 
+ LDFLAGS="$LDFLAGS $libm"
+ 
++case `$CC -dumpmachine` in
++    *gnux32) host_cpu=x32
++esac
++
+ stack_alignment=16
+ case $host_cpu in
+     i*86)
+@@ -617,6 +621,10 @@ case $host_cpu in
+             ASFLAGS="$ASFLAGS -f elf -m amd64"
+         fi
+         ;;
++    x32)
++        ARCH="X32"
++        CFLAGS="$CFLAGS -fPIC"
++        ;;
+     powerpc|powerpc64)
+         ARCH="PPC"
+         if [ $asm = auto ] ; then
diff --git a/debian/patches/series b/debian/patches/series
index 19096e8..f55710a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 link_gpac_dynamically.patch
+properly_detect_x32.patch

-- 
x264 packaging