[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.19-1-2-g781519a

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit 18873b93128e6ee58d56b30386d70b5b94b7c9db
Author: Stephen Kitt <steve at sk2.org>
Date:   Mon Feb 20 08:36:56 2012 +0100

    Build with zlib 1.2.6 and later (patch by Michał Ziąbkowski).

diff --git a/debian/changelog b/debian/changelog
index 1b4f3ed..d88b35f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mednafen (0.9.19-2) experimental; urgency=low
+
+  * Build with zlib 1.2.6 and later (patch by Michał Ziąbkowski).
+
+ -- Stephen Kitt <steve at sk2.org>  Mon, 20 Feb 2012 06:52:07 +0100
+
 mednafen (0.9.19-1) experimental; urgency=low
 
   * New upstream WIP version.
diff --git a/debian/patches/gzip-1.2.6-fix.patch b/debian/patches/gzip-1.2.6-fix.patch
new file mode 100644
index 0000000..fd4f7ac
--- /dev/null
+++ b/debian/patches/gzip-1.2.6-fix.patch
@@ -0,0 +1,32 @@
+Description: Use gzFile as appropriate for zlib 1.2.6 and later
+Origin: http://forum.fobby.net/index.php?t=rview&goto=2411#msg_2411
+
+--- mednafen.orig/src/file.cpp
++++ mednafen/src/file.cpp
+@@ -293,7 +293,7 @@
+    goto doret;
+   }
+ 
+-  while((howmany = gzread(tz, f_data + cur_size, cur_alloced - cur_size)) > 0)
++  while((howmany = gzread((gzFile)tz, f_data + cur_size, cur_alloced - cur_size)) > 0)
+   {
+    cur_size += howmany;
+    cur_alloced <<= 1;
+@@ -320,7 +320,7 @@
+   {
+    int gzerrnum = 0;
+    const char *gzerrstring;
+-   if((gzerrstring = gzerror(tz, &gzerrnum)) && gzerrnum != Z_OK && gzerrnum != Z_STREAM_END)
++   if((gzerrstring = gzerror((gzFile)tz, &gzerrnum)) && gzerrnum != Z_OK && gzerrnum != Z_STREAM_END)
+    {
+     if(gzerrnum != Z_ERRNO)
+     {
+@@ -365,7 +365,7 @@
+  }
+  else if(type == MDFN_FILETYPE_GZIP)
+  {
+-  gzclose(tz);
++  gzclose((gzFile)tz);
+  }
+  else if(type == MDFN_FILETYPE_ZIP)
+  {
diff --git a/debian/patches/series b/debian/patches/series
index 6c59cc0..4f3f041 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 use-system-tremor.patch
 hardening-fixes.patch
 spelling-fixes.patch
+gzip-1.2.6-fix.patch

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine