[openjk] 04/08: add another portability patch, making JA work on PowerPC

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository openjk.

commit ff0aa7e6526e89b6857210c9865d6c4aa8b5682c
Author: Simon McVittie <smcv at debian.org>
Date:   Fri May 8 22:19:56 2015 +0100

    add another portability patch, making JA work on PowerPC
---
 .../mp3code-use-Q3-macros-for-endianness.patch     | 115 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 2 files changed, 116 insertions(+)

diff --git a/debian/patches/mp3code-use-Q3-macros-for-endianness.patch b/debian/patches/mp3code-use-Q3-macros-for-endianness.patch
new file mode 100644
index 0000000..c185111
--- /dev/null
+++ b/debian/patches/mp3code-use-Q3-macros-for-endianness.patch
@@ -0,0 +1,115 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Fri, 8 May 2015 22:04:20 +0100
+Subject: mp3code: use Q3 macros for endianness
+
+The mp3code came from Zinf (formerly FreeAmp) in which a similar
+endianness bug was fixed back in 2003 <https://bugs.debian.org/56472>.
+
+I'm surprised this wasn't fixed in JK2/JA already, since at least JK2
+ran on Mac back when that meant PowerPC, but perhaps changes from the
+Mac port didn't all make it into Raven's GPL release.
+
+Forwarded: no
+---
+ code/mp3code/l3.h   | 32 +++-----------------------------
+ codemp/mp3code/l3.h | 32 +++-----------------------------
+ 2 files changed, 6 insertions(+), 58 deletions(-)
+
+diff --git a/code/mp3code/l3.h b/code/mp3code/l3.h
+index eb558ab..992f216 100644
+--- a/code/mp3code/l3.h
++++ b/code/mp3code/l3.h
+@@ -37,41 +37,15 @@ ____________________________________________________________________________*/
+ 
+ #include "config.h"
+ 
++#include "qcommon/q_platform.h"
++
+ #define GLOBAL_GAIN_SCALE (4*15)
+ /* #define GLOBAL_GAIN_SCALE 0 */
+ 
+-#ifdef _WIN32
+-#if (defined _M_IX86 || defined __i386__)
+-#define LITTLE_ENDIAN 1
+-#endif
+-
+-#if (defined _M_X64 || defined _WIN64 || defined __WIN64__ || defined __x86_64__)
+-#define LITTLE_ENDIAN 1
+-#endif
+-
+-#ifdef _M_ALPHA
+-#define LITTLE_ENDIAN 1
+-#endif
+-
+-#ifdef sparc
+-#define LITTLE_ENDIAN 0
+-#endif
+-
+-#if defined(__POWERPC__)
+-#define LITTLE_ENDIAN 0
+-#elif defined(__INTEL__)
+-#define LITTLE_ENDIAN 1
+-#endif
+-#endif
+-
+-#ifndef LITTLE_ENDIAN
+-#error Layer III LITTLE_ENDIAN must be defined 0 or 1
+-#endif
+-
+ /*-----------------------------------------------------------*/
+ /*---- huffman lookup tables ---*/
+ /* endian dependent !!! */
+-#if LITTLE_ENDIAN
++#ifdef Q3_LITTLE_ENDIAN
+ typedef union
+ {
+    int ptr;
+diff --git a/codemp/mp3code/l3.h b/codemp/mp3code/l3.h
+index 0f650a7..f1f1e1d 100644
+--- a/codemp/mp3code/l3.h
++++ b/codemp/mp3code/l3.h
+@@ -37,41 +37,15 @@ ____________________________________________________________________________*/
+ 
+ #include "config.h"
+ 
++#include "qcommon/q_platform.h"
++
+ #define GLOBAL_GAIN_SCALE (4*15)
+ /* #define GLOBAL_GAIN_SCALE 0 */
+ 
+-#ifdef _WIN32
+-#if (defined _M_IX86 || defined __i386__)
+-#define LITTLE_ENDIAN 1
+-#endif
+-
+-#if (defined _M_X64 || defined _WIN64 || defined __WIN64__ || defined __x86_64__)
+-#define LITTLE_ENDIAN 1
+-#endif
+-
+-#ifdef _M_ALPHA
+-#define LITTLE_ENDIAN 1
+-#endif
+-
+-#ifdef sparc
+-#define LITTLE_ENDIAN 0
+-#endif
+-
+-#if defined(__POWERPC__)
+-#define LITTLE_ENDIAN 0
+-#elif defined(__INTEL__)
+-#define LITTLE_ENDIAN 1
+-#endif
+-#endif
+-
+-#ifndef LITTLE_ENDIAN
+-#error Layer III LITTLE_ENDIAN must be defined 0 or 1
+-#endif
+-
+ /*-----------------------------------------------------------*/
+ /*---- huffman lookup tables ---*/
+ /* endian dependent !!! */
+-#if LITTLE_ENDIAN
++#ifdef Q3_LITTLE_ENDIAN
+ typedef union
+ {
+    int ptr;
diff --git a/debian/patches/series b/debian/patches/series
index 1f9efa1..fa4f490 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,7 @@ build-pass-fsigned-char-to-gcc-on-all-architectures.patch
 build-use-CMAKE_SIZEOF_VOID_P-instead-of-ARCH_BITS.patch
 build-derive-Architecture-from-CMAKE_SYSTEM_PROCESSO.patch
 build-use-x86-specific-flags-on-x86-family-not-on-no.patch
+mp3code-use-Q3-macros-for-endianness.patch
 g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch
 Use-NET_Sleep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch
 Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch

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