This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-rsp-hle.
commit 42c0b81455e0ae5c0250b2b4803818fdfda560dd
Author: Sven Eckelmann <sven at narfation.org>
Date: Sun Jul 24 10:08:36 2011 +0200
Don't use _BIG_ENDIAN to check for endianness
---
debian/changelog | 2 ++
debian/patches/big_endian_conflict.patch | 58 ++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 61 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 13c9e64..e360a15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ mupen64plus-rsp-hle (1.99.4-3) UNRELEASED; urgency=low
* debian/patches:
- Remove obsolete default-optimisations.patch, hurd_os.patch
- Add rewrite_makefile.patch, Rewrite Makefile to fix flags and linking
+ - Add big_endian_conflict.patch, Don't use _BIG_ENDIAN to check for
+ endianness
-- Sven Eckelmann <sven at narfation.org> Sat, 23 Jul 2011 16:42:47 +0200
diff --git a/debian/patches/big_endian_conflict.patch b/debian/patches/big_endian_conflict.patch
new file mode 100644
index 0000000..3609b04
--- /dev/null
+++ b/debian/patches/big_endian_conflict.patch
@@ -0,0 +1,58 @@
+Description: Don't use _BIG_ENDIAN to check for endianness
+ _BIG_ENDIAN is always enabled on some systems and would create wrong results.
+Origin: upstream, https://bitbucket.org/richard42/mupen64plus-rsp-hle/changeset/8cbd4b98438d
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/src/hle.h b/src/hle.h
+index 82fb09058deddb83ec3ad8e7ea09853d19886a7c..eef4b461635da56cee3ed6e4ea44a44d7dacd922 100644
+--- a/src/hle.h
++++ b/src/hle.h
+@@ -26,7 +26,7 @@
+
+ #define RSP_HLE_VERSION 0x016304
+
+-#ifdef _BIG_ENDIAN
++#ifdef M64P_BIG_ENDIAN
+ #define S 0
+ #define S16 0
+ #define S8 0
+diff --git a/src/ucode1.cpp b/src/ucode1.cpp
+index 0c0ad75fcd1fe274e0ed43b532f1673ce175ec25..3843143e795a653a9fbf1bcf5dfb1b63df24ba7c 100644
+--- a/src/ucode1.cpp
++++ b/src/ucode1.cpp
+@@ -860,7 +860,7 @@ static void INTERLEAVE (void) { // Works... - 3-11-01
+ Left2=*(inSrcL++);
+ Right2=*(inSrcR++);
+
+-#ifdef _BIG_ENDIAN
++#ifdef M64P_BIG_ENDIAN
+ *(outbuff++)=Right;
+ *(outbuff++)=Left;
+ *(outbuff++)=Right2;
+diff --git a/src/ucode2.cpp b/src/ucode2.cpp
+index 0ab3591c1bd528a360a85000b3b72fcfdabc2edc..b1688477a6b70ef267b4fabbec5591d8f3078ce3 100644
+--- a/src/ucode2.cpp
++++ b/src/ucode2.cpp
+@@ -710,7 +710,7 @@ static void INTERLEAVE2 (void) { // Needs accuracy verification...
+ Left2=*(inSrcL++);
+ Right2=*(inSrcR++);
+
+-#ifdef _BIG_ENDIAN
++#ifdef M64P_BIG_ENDIAN
+ *(outbuff++)=Right;
+ *(outbuff++)=Left;
+ *(outbuff++)=Right2;
+diff --git a/src/ucode3.cpp b/src/ucode3.cpp
+index ad8db73c6375d698045bcf0c1d81e89779b115e1..c0a36a0bbb4153f417f77bbe45f170ca72d8d30c 100644
+--- a/src/ucode3.cpp
++++ b/src/ucode3.cpp
+@@ -939,7 +939,7 @@ static void INTERLEAVE3 (void) { // Needs accuracy verification...
+ Left2=*(inSrcL++);
+ Right2=*(inSrcR++);
+
+-#ifdef _BIG_ENDIAN
++#ifdef M64P_BIG_ENDIAN
+ *(outbuff++)=Right;
+ *(outbuff++)=Left;
+ *(outbuff++)=Right2;
diff --git a/debian/patches/series b/debian/patches/series
index c753e70..724b713 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
rewrite_makefile.patch
+big_endian_conflict.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-rsp-hle.git