[mupen64plus-core] 216/310: Ignore upper 8 bit of countrycode when checking for PAL/NTSC system

[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 0ade154f85b8f1193ac8b5bfb00a3755e600b030
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue Jun 11 10:24:02 2013 +0200

    Ignore upper 8 bit of countrycode when checking for PAL/NTSC system
---
 debian/changelog                       |  2 ++
 debian/patches/country_code_bits.patch | 22 ++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 13922e3..860045c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ mupen64plus-core (2.0~rc3+3+5d46baa3dd76-2) UNRELEASED; urgency=low
     - Depend on libsdl2-dev instead of libsdl1.2-dev
   * debian/patches:
     - Add sdl2_resize.patch, Fix compiling against SDL2
+    - Add country_code_bits.patch, Ignore upper 8 bit of countrycode when
+      checking for PAL/NTSC system
 
  -- Sven Eckelmann <sven at narfation.org>  Sun, 09 Jun 2013 22:51:15 +0200
 
diff --git a/debian/patches/country_code_bits.patch b/debian/patches/country_code_bits.patch
new file mode 100644
index 0000000..7bc649e
--- /dev/null
+++ b/debian/patches/country_code_bits.patch
@@ -0,0 +1,22 @@
+Description: Ignore upper 8 bit of countrycode when checking for PAL/NTSC system
+ Only the lower 8 bits are checked by the country code to system type check to
+ decide whether a PAL or NTSC system should be emulated. 8707bea8b73c
+ ("1. Update msvc11 project file to visual studio 2012 (msvc11)") changed the
+ type to be checked to 16 bit and forgot to mask the upper 8 bits out when doing
+ the system check.
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/src/main/rom.c b/src/main/rom.c
+index be26b0cd684740ad626ce2b6a30801c59c4fc54f..5cd1b3e7cfd5bc13de6279b261c7929f63db2fc8 100644
+--- a/src/main/rom.c
++++ b/src/main/rom.c
+@@ -238,7 +238,7 @@ m64p_error close_rom(void)
+ // Get the system type associated to a ROM country code.
+ static m64p_system_type rom_country_code_to_system_type(unsigned short country_code)
+ {
+-    switch (country_code)
++    switch (country_code & 0xFF)
+     {
+         // PAL codes
+         case 0x44:
diff --git a/debian/patches/series b/debian/patches/series
index c775659..1ede4f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ dejavu-font.patch
 printf_fixup.patch
 disable_recompiler_disassembler.patch
 sdl2_resize.patch
+country_code_bits.patch

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