[SCM] x265/master: Build only the 8bit build on armhf with yasm enabled

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9146f721869b81ea71a0ec22a5f6dc092fd77c8e
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Aug 18 22:22:41 2016 +0200

    Build only the 8bit build on armhf with yasm enabled

diff --git a/debian/control b/debian/control
index f080085..98037bd 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 armhf arm64]
+ yasm (>= 1.2) [amd64 kfreebsd-amd64 armhf]
 Build-Depends-Indep:
  python-sphinx
 Standards-Version: 3.9.8
diff --git a/debian/rules b/debian/rules
index 8b2245b..9108f30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,20 +13,30 @@ export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions
 export DEB_CPPFLAGS_MAINT_APPEND=$(shell getconf LFS_CFLAGS)
 
 FLAGS = -DENABLE_PIC=ON
+FLAGS_OTHERBIT  = -DENABLE_CLI=OFF
+FLAGS_OTHERBIT += -DENABLE_SHARED=OFF
+FLAGS_OTHERBIT += -DEXPORT_C_API=OFF
+FLAGS_OTHERBIT += -DHIGH_BIT_DEPTH=ON
 
-# enable assembly builds on amd64, kfreebsd-amd64, armhf and arm64
-ifneq (,$(filter $(DEB_HOST_ARCH),amd64 kfreebsd-amd64 armhf arm64))
+# enable assembly builds on amd64, kfreebsd-amd64 and armhf
+ifneq (,$(filter $(DEB_HOST_ARCH),amd64 kfreebsd-amd64))
 FLAGS += -DENABLE_ASSEMBLY=ON
 else
+ifneq (,$(filter $(DEB_HOST_ARCH),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 and arm64
-ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf arm64))
+# 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 arhf and arm64
-ifneq (,$(filter $(DEB_HOST_ARCH),armhf arm64))
+# enable support for armv6 and above on armhf
+ifneq (,$(filter $(DEB_HOST_ARCH),armhf))
 FLAGS += -DHAVE_ARMV6=1
 endif
 
@@ -45,20 +55,12 @@ override_dh_auto_clean:
 
 override_dh_auto_configure-arch:
 	dh_auto_configure --builddirectory=x265-10bit -- \
-		$(FLAGS) \
-		-DENABLE_CLI=OFF \
-		-DENABLE_SHARED=OFF \
-		-DEXPORT_C_API=OFF \
-		-DHIGH_BIT_DEPTH=ON
+		$(FLAGS) $(FLAGS_OTHERBIT)
 	dh_auto_configure --builddirectory=x265-12bit -- \
-		$(FLAGS) \
-		-DENABLE_CLI=OFF \
-		-DENABLE_SHARED=OFF \
-		-DEXPORT_C_API=OFF \
-		-DHIGH_BIT_DEPTH=ON \
+		$(FLAGS) $(FLAGS_OTHERBIT) \
 		-DMAIN12=ON
 	dh_auto_configure -- \
-		$(FLAGS) \
+		$(FLAGS) $(FLAGS_8BIT) \
 		-DLIB_INSTALL_DIR=lib/$(DEB_HOST_MULTIARCH) \
 		-DEXTRA_LIB="x265_main10.a;x265_main12.a" \
 		-DLINKED_10BIT=ON \

-- 
x265 packaging