[SCM] x265/master: Completely disable assembly support on arm*

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 88e6ee0aa8df42f1708e3c220f56d632a7053cf5
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date:   Sat Aug 20 16:35:54 2016 +0200

    Completely disable assembly support on arm*

diff --git a/debian/control b/debian/control
index cb35c4c..8c7c912 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (>= 9.20151219),
  cmake,
  libnuma-dev [amd64 arm64 i386 mips mips64 mips64el mipsel powerpc ppc64el],
- yasm (>= 1.2) [amd64 kfreebsd-amd64 armel armhf]
+ yasm (>= 1.2) [amd64 kfreebsd-amd64]
 Build-Depends-Indep:
  python-sphinx
 Standards-Version: 3.9.8
diff --git a/debian/patches/compile-flags.patch b/debian/patches/compile-flags.patch
index 9d93404..57d7220 100644
--- a/debian/patches/compile-flags.patch
+++ b/debian/patches/compile-flags.patch
@@ -1,23 +1,21 @@
 Description: Remove platform specific compile flags
- We set HAVE_ARMV6 from d/rules and always want runtime detection of NEON.
+ Do not set ARM defines until we find a better way to build the asm files, also
+ always use runtime detection of NEON.
 Author: Sebastian Ramacher <sramacher at debian.org>
 Last-Update: 2014-11-30
 
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
-@@ -68,7 +68,10 @@
+@@ -68,7 +68,7 @@
      endif()
      message(STATUS "Detected ARM target processor")
      set(ARM 1)
 -    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1)
-+    add_definitions(-DX265_ARCH_ARM=1)
-+    if(HAVE_ARMV6)
-+      add_definitions(-DHAVE_ARMV6=1)
-+    endif()
++    # add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1)
  else()
      message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown")
      message(STATUS "Please add this value near ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}")
-@@ -189,12 +192,8 @@
+@@ -189,12 +189,8 @@
      if(ARM AND CROSS_COMPILE_ARM)
          set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
      elseif(ARM)
diff --git a/debian/rules b/debian/rules
index d1aeb94..958c6a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,27 +18,12 @@ FLAGS_OTHERBIT += -DENABLE_SHARED=OFF
 FLAGS_OTHERBIT += -DEXPORT_C_API=OFF
 FLAGS_OTHERBIT += -DHIGH_BIT_DEPTH=ON
 
-# enable assembly builds on amd64, kfreebsd-amd64 and armel, armhf
+# enable assembly builds on amd64, kfreebsd-amd64
 ifneq (,$(filter $(DEB_HOST_ARCH),amd64 kfreebsd-amd64))
 FLAGS += -DENABLE_ASSEMBLY=ON
 else
-ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf))
-# assembly versions are only available for 8bit
-FLAGS_8BIT += -DENABLE_ASSEMBLY=ON
-FLAGS_OTHERBIT += -DENABLE_ASSEMBLY=OFF
-else
 FLAGS += -DENABLE_ASSEMBLY=OFF
 endif
-endif
-
-# rely on NEON runtime detection on armhf
-ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf))
-FLAGS += -DCPU_HAS_NEON=0
-endif
-# enable support for armv6 and above on armhf
-ifneq (,$(filter $(DEB_HOST_ARCH),armhf))
-FLAGS += -DHAVE_ARMV6=1
-endif
 
 %:
 	dh $@ --parallel --buildsystem=cmake \

-- 
x265 packaging