[SCM] x265/master: B-D on yasm on more architectures

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ef5af6a04d751ef501f3e1354a7792390e7c29f6
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Aug 18 21:11:00 2016 +0200

    B-D on yasm on more architectures

diff --git a/debian/control b/debian/control
index 8c7c912..f080085 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]
+ yasm (>= 1.2) [amd64 kfreebsd-amd64 armhf arm64]
 Build-Depends-Indep:
  python-sphinx
 Standards-Version: 3.9.8
diff --git a/debian/rules b/debian/rules
index b05f2f8..e701d06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #! /usr/bin/make -f
 
-DEB_HOST_MULTIARCH=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
 
@@ -12,6 +12,21 @@ export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions
 # LFS support
 export DEB_CPPFLAGS_MAINT_APPEND=$(shell getconf LFS_CFLAGS)
 
+FLAGS = -DENABLE_PIC=ON
+
+# enable assembly builds on amd64, kfreebsd-amd64, armhf and arm64
+ifneq (,$(filter $(DEB_HOST_ARCH),amd64 kfreebsd-amd64 armhf arm64))
+FLAGS += -DENABLE_ASSEMBLY=ON
+else
+FLAGS += -DENABLE_ASSEMBLY=OFF
+endif
+
+# build with NEON support on armhf and arm64
+# actual support by the CPU will be detected during runtime
+ifneq (,$(filter $(DEB_HOST_ARCH),armhf arm64))
+FLAGS += -DCPU_HAS_NEON
+endif
+
 %:
 	dh $@ --parallel --buildsystem=cmake \
 		--sourcedirectory=source \
@@ -27,20 +42,20 @@ override_dh_auto_clean:
 
 override_dh_auto_configure-arch:
 	dh_auto_configure --builddirectory=x265-10bit -- \
-		-DENABLE_PIC=ON \
+		$(FLAGS) \
 		-DENABLE_CLI=OFF \
 		-DENABLE_SHARED=OFF \
 		-DEXPORT_C_API=OFF \
 		-DHIGH_BIT_DEPTH=ON
 	dh_auto_configure --builddirectory=x265-12bit -- \
-		-DENABLE_PIC=ON \
+		$(FLAGS) \
 		-DENABLE_CLI=OFF \
 		-DENABLE_SHARED=OFF \
 		-DEXPORT_C_API=OFF \
 		-DHIGH_BIT_DEPTH=ON \
 		-DMAIN12=ON
 	dh_auto_configure -- \
-		-DENABLE_PIC=ON \
+		$(FLAGS) \
 		-DLIB_INSTALL_DIR=lib/$(DEB_HOST_MULTIARCH) \
 		-DEXTRA_LIB="x265_main10.a;x265_main12.a" \
 		-DLINKED_10BIT=ON \

-- 
x265 packaging