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-glide64mk2.
commit 90e1bc666e81f1a1191a0763cfe7934bf3ab7e51 Author: Sven Eckelmann <[email protected]> Date: Sun May 10 15:30:42 2015 +0200 Build armhf 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 68e1fda..bcdba5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ mupen64plus-video-glide64mk2 (2.5-2) UNRELEASED; urgency=medium - 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 find GLESv2 library + * debian/control: + - Add support for armhf + * debian/rules: + - Build armhf with GLES -- Sven Eckelmann <[email protected]> Thu, 28 May 2015 22:02:45 +0200 diff --git a/debian/control b/debian/control index 80c6393..e51ea2d 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,8 @@ Build-Depends: dpkg-dev (>= 1.16.1.1), libboost-filesystem-dev, libboost-system-dev, - 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.0), libpng-dev, libsdl2-dev, @@ -20,7 +21,7 @@ Build-Depends: zlib1g-dev | libz-dev, Package: mupen64plus-video-glide64mk2 -Architecture: any-i386 any-amd64 +Architecture: any-i386 any-amd64 armhf Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, @@ -46,7 +47,7 @@ Description: Glide64Mk2 high-level graphics emulation for mupen64plus Package: mupen64plus-video-glide64mk2-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 5ba405e..4232704 100755 --- a/debian/rules +++ b/debian/rules @@ -9,10 +9,15 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed 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 TXCDXTN=1 +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 TXCDXTN=1 DBG_PACKAGE=$(shell dpkg-parsechangelog|grep '^Source: '|sed 's/^Source:\s*//')-dbg +ifeq ($(DEB_HOST_ARCH),armhf) +MAKEOPTIONS += USE_GLES=1 NO_SSE=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-glide64mk2.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
