[SCM] x264/master: Add build-fix for aarch64

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

The following commit has been merged in the master branch:
commit 6b5c71d2998bcd78891a7e8de74ec449963d9130
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Mon May 11 12:31:03 2015 +0200

    Add build-fix for aarch64

diff --git a/debian/patches/aarch64.diff b/debian/patches/aarch64.diff
new file mode 100644
index 0000000..786e3db
--- /dev/null
+++ b/debian/patches/aarch64.diff
@@ -0,0 +1,19 @@
+x264 (2:0.142.2495+git6a301b6-1ubuntu1) vivid; urgency=medium
+
+  * Fix the build on AArch64.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 04 Mar 2015 14:49:14 +0100
+
+Index: b/configure
+===================================================================
+--- a/configure
++++ b/configure
+@@ -797,7 +797,7 @@ fi
+ 
+ if [ $asm = auto -a $ARCH = AARCH64 ] ; then
+     # set flags so neon is built by default
+-    echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu|-arch)' || CFLAGS="$CFLAGS -arch arm64 -mfpu=neon"
++    echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu|-arch)' || CFLAGS="$CFLAGS"
+ 
+     if  cc_check '' '' '__asm__("cmeq v0.8h, v0.8h, #0");' ; then define HAVE_NEON
+         ASFLAGS="$ASFLAGS -c"
diff --git a/debian/patches/series b/debian/patches/series
index f55710a..9b13f43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 link_gpac_dynamically.patch
 properly_detect_x32.patch
+aarch64.diff

-- 
x264 packaging