[mupen64plus-core] 310/310: Add armhf build with GLES and NEON

[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-core.

commit 3651ec16e63b1d8c8f3279327d147df164558026
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun May 10 11:27:23 2015 +0200

    Add armhf build with GLES and NEON
---
 debian/changelog | 3 +++
 debian/control   | 8 ++++----
 debian/rules     | 6 ++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf77d19..5331566 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ mupen64plus-core (2.5-2) UNRELEASED; urgency=medium
     - move ConfigSetParameterHelp to the first official release version 2.5
   * debian/control:
     - Change Vcs-Browser to new alioth CGit URL
+    - Add support for armhf
+  * debian/rules:
+    - Build armhf with NEON and GLES
   * debian/patches:
     - Move patches to alternative DEP-3 format and manage them with gbp pq
     - Add Use-pkg-config-to-find-GLESv2-library.patch, Use pkg-config to
diff --git a/debian/control b/debian/control
index 753ab58..45721fe 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Build-Depends:
  debhelper (>= 9.20130604),
  dpkg-dev (>= 1.16.1.1),
  libfreetype6-dev,
- libgl1-mesa-dev | libgl-dev,
- libglu1-mesa-dev | libglu-dev,
+ libgl1-mesa-dev [any-i386 any-amd64] | libgl-dev [any-i386 any-amd64],
+ libglu1-mesa-dev [any-i386 any-amd64] | libglu-dev [any-i386 any-amd64],
  libminizip-dev,
  libpng-dev,
  libsdl2-dev,
@@ -21,7 +21,7 @@ Build-Depends:
 
 Package: libmupen64plus2
 Section: libs
-Architecture: any-i386 any-amd64
+Architecture: any-i386 any-amd64 armhf
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
@@ -65,7 +65,7 @@ Description: plugin-based Nintendo 64 emulator, core library
 Package: libmupen64plus2-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 cd49788..2ddbe61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +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)
+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 DEBUGGER=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 NEON=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-core.git