[openarena] 01/01: Add arm64 support by applying Martin Michlmayr's patch from ioquake3, which is also needed here (Closes: #790668)

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository openarena.

commit 9fcd208da579b66ffa246613112b050df2242538
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jul 13 08:52:09 2015 +0100

    Add arm64 support by applying Martin Michlmayr's patch from ioquake3, which is also needed here (Closes: #790668)
---
 debian/changelog                                   |  7 ++++
 debian/patches/Add-support-for-Aarch64-ARM64.patch | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 49 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6e03280..a68c002 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openarena (0.8.8-14) unstable; urgency=medium
+
+  * Add arm64 support by applying Martin Michlmayr's patch from ioquake3,
+    which is also needed here (Closes: #790668)
+
+ -- Simon McVittie <smcv at debian.org>  Mon, 13 Jul 2015 08:52:01 +0100
+
 openarena (0.8.8-13) unstable; urgency=medium
 
   * Another try at making the build reproducible: force TZ=UTC so the
diff --git a/debian/patches/Add-support-for-Aarch64-ARM64.patch b/debian/patches/Add-support-for-Aarch64-ARM64.patch
new file mode 100644
index 0000000..1707400
--- /dev/null
+++ b/debian/patches/Add-support-for-Aarch64-ARM64.patch
@@ -0,0 +1,41 @@
+From: Martin Michlmayr <tbm at cyrius.com>
+Date: Tue, 30 Jun 2015 14:22:49 -0400
+Subject: Add support for Aarch64 (ARM64)
+
+Add support for Aarch64, the 64-bit ARM architecture.
+
+Bug-Debian: https://bugs.debian.org/790668
+Applied-upstream: (in ioquake3) https://github.com/ioquake/ioq3/commit/ebb69f699cd1392cbe7a865f9f51dbbecdd99b59
+---
+ Makefile                  | 4 ++++
+ code/qcommon/q_platform.h | 2 ++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index a0f4193..8876959 100644
+--- a/Makefile
++++ b/Makefile
+@@ -227,6 +227,10 @@ ifeq ($(PLATFORM),linux)
+   else
+   ifeq ($(ARCH),s390x)
+     LIB=lib64
++  else
++  ifeq ($(ARCH),aarch64)
++    LIB=lib64
++  endif
+   endif
+   endif
+   endif
+diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
+index 0ce4c29..ed3bfbb 100644
+--- a/code/qcommon/q_platform.h
++++ b/code/qcommon/q_platform.h
+@@ -175,6 +175,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ #define ARCH_STRING "sparc"
+ #elif defined __arm__
+ #define ARCH_STRING "arm"
++#elif defined __aarch64__
++#define ARCH_STRING "aarch64"
+ #elif defined __cris__
+ #define ARCH_STRING "cris"
+ #elif defined __hppa__
diff --git a/debian/patches/series b/debian/patches/series
index 0241962..78de6a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
 Add-support-for-the-GNU-Hurd-architecture.patch
 Use-LDFLAGS-on-non-Linux-too.patch
 Allow-__DATE__-to-be-avoided-for-reproducible-builds.patch
+Add-support-for-Aarch64-ARM64.patch

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