[SCM] simplescreenrecorder/master: Use DEB_HOST_ARCH_CPU and any-amd64/any-i386 for adding non-x86 options

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 45ffb9afa939e4a35320d9ff751d73a49df9905f
Author: James Cowgill <jcowgill at debian.org>
Date:   Sat Nov 25 15:47:29 2017 +0000

    Use DEB_HOST_ARCH_CPU and any-amd64/any-i386 for adding non-x86 options

diff --git a/debian/control b/debian/control
index 6e10eaf..93ae25d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Build-Depends:
  libavcodec-dev,
  libavformat-dev,
  libavutil-dev,
- libgl1-mesa-dev [amd64 i386 hurd-i386 kfreebsd-amd64 kfreebsd-i386 x32],
- libglu1-mesa-dev [amd64 i386 hurd-i386 kfreebsd-amd64 kfreebsd-i386 x32],
+ libgl1-mesa-dev [any-amd64 any-i386],
+ libglu1-mesa-dev [any-amd64 any-i386],
  libjack-dev | libjack-jackd2-dev,
  liboss4-salsa-dev [!linux-any],
  libpulse-dev,
diff --git a/debian/rules b/debian/rules
index 3fa00ec..690e00f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-ARCH = $(shell dpkg --print-architecture)
+include /usr/share/dpkg/architecture.mk
 
 %:
 	dh $@
@@ -12,11 +12,11 @@ ARCH = $(shell dpkg --print-architecture)
 #    requires the x86-only elfhacks code (see README.source)
 
 override_dh_auto_configure:
-ifeq ($(ARCH),$(filter $(ARCH),amd64 i386 hurd-i386 kfreebsd-amd64 kfreebsd-i386 x32))
-		dh_auto_configure -- \
+ifneq ($(filter $(DEB_HOST_ARCH_CPU), amd64 i386),)
+	dh_auto_configure -- \
 		--disable-assert
 else
-		dh_auto_configure -- \
+	dh_auto_configure -- \
 		--disable-x86-asm \
 		--disable-assert \
 		--disable-glinjectlib

-- 
simplescreenrecorder packaging