[SCM] x264/master: Refresh patches and drop aarch64 build-fix

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

The following commit has been merged in the master branch:
commit c017488d4a771fe4b11629f28d1ecae91c3c7509
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Wed Oct 14 20:24:36 2015 +0200

    Refresh patches and drop aarch64 build-fix

diff --git a/debian/patches/aarch64.diff b/debian/patches/aarch64.diff
deleted file mode 100644
index 786e3db..0000000
--- a/debian/patches/aarch64.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-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/properly_detect_x32.patch b/debian/patches/properly_detect_x32.patch
index 1c6fa37..ac3024e 100644
--- a/debian/patches/properly_detect_x32.patch
+++ b/debian/patches/properly_detect_x32.patch
@@ -28,13 +28,13 @@ Author: Adam Borowski <kilobyte at angband.pl>
  case $host_cpu in
      i*86)
 @@ -617,6 +621,10 @@ case $host_cpu in
-             ASFLAGS="$ASFLAGS -f elf -m amd64"
+             ASFLAGS="$ASFLAGS -f elf64"
          fi
          ;;
 +    x32)
 +        ARCH="X32"
 +        CFLAGS="$CFLAGS -fPIC"
 +        ;;
-     powerpc|powerpc64)
+     powerpc*)
          ARCH="PPC"
          if [ $asm = auto ] ; then
diff --git a/debian/patches/series b/debian/patches/series
index 9b13f43..f55710a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 link_gpac_dynamically.patch
 properly_detect_x32.patch
-aarch64.diff

-- 
x264 packaging