[SCM] mixxx/master: Build with OpenGL ES on armel and armhf

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cdb74d5a284ffb897730e3b1d52c58b0e9f36a89
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Jan 26 12:02:33 2016 +0100

    Build with OpenGL ES on armel and armhf

diff --git a/debian/control b/debian/control
index b0b7e92..b812ad6 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends:
  libfftw3-dev,
  libflac-dev,
  libgl1-mesa-dev,
+ libgles2-mesa-dev [armel armhf],
  libglu1-mesa-dev,
  libhidapi-dev (>= 0.8.0~rc1),
  libid3tag0-dev,
diff --git a/debian/rules b/debian/rules
index 19d22ef..4deecb5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,6 @@ export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
 export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-export DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-export DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 export QT_SELECT=qt5
 
@@ -24,6 +22,10 @@ SCONS_OPTS += install_root=$(CURDIR)/debian/tmp/usr
 SCONS_OPTS += qtdir=/usr/share/qt5 prefix=/usr
 SCONS_OPTS += machine=$(DEB_HOST_ARCH)
 SCONS_OPTS += buildtime=0
+# build with OpenGL ES 2 on armel and armhf
+ifeq (,$(filter-out armel armhf,$(DEB_HOST_ARCH)))
+SCONS_OPTS += opengles=1
+endif
 
 %:
 	dh $@ --parallel --with=scour,autotools_dev

-- 
mixxx packaging