[mupen64plus-video-rice] 191/191: Add armhf build with GLES

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-video-rice.

commit 677ddc1c903bb60a66e8d22c03d1b70b96a4be3f
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun May 10 15:21:15 2015 +0200

    Add armhf build with GLES
---
 debian/changelog | 4 ++++
 debian/control   | 7 ++++---
 debian/rules     | 7 ++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4a4e89..c27607b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ mupen64plus-video-rice (2.5-2) UNRELEASED; urgency=medium
   * debian/patches:
     - Add Use-pkg-config-to-find-GLESv2-library.patch, Use pkg-config to
       find GLESv2 library
+  * debian/control:
+    - Add support for armhf
+  * debian/rules:
+    - Build armhf with GLES
 
  -- Sven Eckelmann <sven at narfation.org>  Sun, 10 May 2015 22:33:59 +0200
 
diff --git a/debian/control b/debian/control
index 5854705..1cf3473 100644
--- a/debian/control
+++ b/debian/control
@@ -10,14 +10,15 @@ Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/mupen64plus-video-rice
 Build-Depends:
  debhelper (>= 9.20130604),
  dpkg-dev (>= 1.16.1.1),
- libgl1-mesa-dev | libgl-dev,
+ libgl1-mesa-dev [any-i386 any-amd64] | libgl-dev [any-i386 any-amd64],
+ libgles2-mesa-dev [armhf],
  libmupen64plus-dev (>= 2.5),
  libpng-dev,
  libsdl2-dev,
  pkg-config,
 
 Package: mupen64plus-video-rice
-Architecture: any-i386 any-amd64
+Architecture: any-i386 any-amd64 armhf
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
@@ -39,7 +40,7 @@ Description: Rice's high-level graphics emulation for mupen64plus
 Package: mupen64plus-video-rice-dbg
 Section: debug
 Priority: extra
-Architecture: any-i386 any-amd64
+Architecture: any-i386 any-amd64 armhf
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
diff --git a/debian/rules b/debian/rules
index 1e970e7..5f1cb5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,10 +8,15 @@ export DEB_CPPFLAGS_MAINT_APPEND = -D_FILE_OFFSET_BITS=64
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-MAKEOPTIONS = V=1 UNAME='$(DEB_HOST_ARCH_OS)' HOST_CPU='$(DEB_HOST_GNU_CPU)' APIDIR=/usr/include/mupen64plus/ DEBUG=1 PREFIX=/usr/ LIBDIR="/usr/lib/$(DEB_HOST_MULTIARCH)" PIC=1 OPTFLAGS="-DNDEBUG" SHAREDIR="/usr/share/games/mupen64plus/" SDL_CONFIG=sdl2-config
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
+MAKEOPTIONS = V=1 UNAME='$(DEB_HOST_ARCH_OS)' HOST_CPU='$(DEB_HOST_GNU_CPU)' APIDIR=/usr/include/mupen64plus/ DEBUG=1 PREFIX=/usr/ LIBDIR="/usr/lib/$(DEB_HOST_MULTIARCH)" PIC=1 OPTFLAGS="-DNDEBUG" SHAREDIR="/usr/share/games/mupen64plus/" SDL_CONFIG=sdl2-config
 DBG_PACKAGE=$(shell dpkg-parsechangelog|grep '^Source: '|sed 's/^Source:\s*//')-dbg
 
+ifeq ($(DEB_HOST_ARCH),armhf)
+MAKEOPTIONS += USE_GLES=1
+endif
+
 binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep:
 	dh $@ --sourcedirectory="projects/unix" --parallel --list-missing
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-rice.git