[SCM] Emulator of the Super Nintendo Entertainment System (TM) branch, master, updated. upstream/1.510+bz2-61-g288d2b0

[Etienne Millon]

The following commit has been merged in the master branch:
commit 7915c82b400f67135bac61e4a6e29fa09abebdc4
Author: Etienne Millon <etienne.millon at gmail.com>
Date:   Mon Apr 4 10:40:41 2011 +0200

    Fix patches wrt new upstream tarball

diff --git a/debian/patches/0002-replace_crc32.patch b/debian/patches/0002-replace_crc32.patch
index fbf1da7..c5ff5d8 100644
--- a/debian/patches/0002-replace_crc32.patch
+++ b/debian/patches/0002-replace_crc32.patch
@@ -3,37 +3,23 @@ Date: Tue, 2 Nov 2010 17:04:53 +0100
 Subject: replace_crc32
 
 ---
- src/init.asm |    2 +-
  src/initc.c  |    6 +++---
  src/zmovie.c |    6 +++---
- 3 files changed, 7 insertions(+), 7 deletions(-)
+ 2 files changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/src/init.asm b/src/init.asm
-index d1ef900..e4b6811 100644
---- a/src/init.asm
-+++ b/src/init.asm
-@@ -892,7 +892,7 @@ SECTION .data
- SECTION .bss
- NEWSYM IPSPatched, resb 1
- NEWSYM Checksumvalue, resw 1
--NEWSYM CRC32, resd 1
-+NEWSYM RomCRC32, resd 1
- NEWSYM SramExists,    resb 1
- NEWSYM NumofBanks,    resd 1
- NEWSYM NumofBytes,    resd 1
 diff --git a/src/initc.c b/src/initc.c
-index f414bb5..405f07c 100644
+index 40348ec..40fba94 100644
 --- a/src/initc.c
 +++ b/src/initc.c
-@@ -1649,7 +1649,7 @@ static void SPC7PathSetup(char *PathVar, const char *Default)
-   }
- }
+@@ -1651,7 +1651,7 @@ static void SPC7PathSetup(char *PathVar, const char *Default)
  
--extern unsigned int MsgCount, MessageOn, CRC32;
-+extern unsigned int MsgCount, MessageOn, RomCRC32;
+ extern unsigned int MsgCount, MessageOn;
  extern char *Msgptr;
- unsigned int SPC7110Entries;
+-unsigned int SPC7110Entries, CRC32;
++unsigned int SPC7110Entries, RomCRC32;
  
+ void SPC7PackIndexLoad()
+ {
 @@ -1798,9 +1798,9 @@ unsigned int showinfogui()
    // 42 is the answer, and the uCONSRT standard
  
diff --git a/debian/patches/0003-gcc-4.3-ftbfs.patch b/debian/patches/0003-gcc-4.3-ftbfs.patch
index 4a43c0f..8e78c0d 100644
--- a/debian/patches/0003-gcc-4.3-ftbfs.patch
+++ b/debian/patches/0003-gcc-4.3-ftbfs.patch
@@ -9,7 +9,7 @@ Subject: gcc-4.3-ftbfs
  3 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/parsegen.cpp b/src/parsegen.cpp
-index 98e9acd..d36513a 100644
+index e664dc5..9f78fb4 100644
 --- a/src/parsegen.cpp
 +++ b/src/parsegen.cpp
 @@ -26,6 +26,7 @@ Config file handler creator by Nach (C) 2005-2007
@@ -20,12 +20,12 @@ index 98e9acd..d36513a 100644
  #include <vector>
  #include <algorithm>
  #include <sstream>
-@@ -1828,7 +1829,7 @@ void parser_generate(istream& psr_stream, ostream& c_stream, ostream& cheader_st
+@@ -1822,7 +1823,7 @@ void parser_generate(istream& psr_stream, ostream& c_stream, ostream& cheader_st
    }
  }
  
--int main(size_t argc, const char **argv)
-+int main(int argc, const char **argv)
+-int main(size_t argc, const char *const *const argv)
++int main(int argc, const char *const *const argv)
  {
    const char *cheader_file = 0;
    bool compile = false;

-- 
Emulator of the Super Nintendo Entertainment System (TM)