The following commit has been merged in the master branch:
commit e316b36ce788e291357b16abcb5ef7194ec83672
Author: Stephen Kitt <st...@sk2.org>
Date: Wed Feb 29 23:26:21 2012 +0100
Build with zlib 1.2.6 and later (patch by Michał Ziąbkowski, adapted by
Steven Chamberlain; closes: #661657).
diff --git a/debian/changelog b/debian/changelog
index db7566f..c298869 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mednafen (0.8.D.3-3) unstable; urgency=low
+
+ * Build with zlib 1.2.6 and later (patch by Michał Ziąbkowski, adapted
+ by Steven Chamberlain; closes: #661657).
+
+ -- Stephen Kitt <st...@sk2.org> Wed, 29 Feb 2012 22:45:10 +0100
+
mednafen (0.8.D.3-2) unstable; urgency=low
[ Stephen Kitt ]
diff --git a/debian/patches/series b/debian/patches/series
index 3d1d63b..142fdf6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
hardening-fixes.patch
+zlib-1.2.6-fix.patch
diff --git a/debian/patches/zlib-1.2.6-fix.patch
b/debian/patches/zlib-1.2.6-fix.patch
new file mode 100644
index 0000000..8ef7073
--- /dev/null
+++ b/debian/patches/zlib-1.2.6-fix.patch
@@ -0,0 +1,35 @@
+Description: fixes needed to build with zlib 1.2.6 or newer
+Author: Steven Chamberlain <ste...@pyro.eu.org>
+Bug-Debian: http://bugs.debian.org/661657
+
+Index: mednafen-0.8.D.3/src/file.cpp
+===================================================================
+--- mednafen-0.8.D.3.orig/src/file.cpp 2009-05-15 03:12:55.000000000 +0100
++++ mednafen-0.8.D.3/src/file.cpp 2012-02-29 19:48:21.000000000 +0000
+@@ -229,7 +229,7 @@
+ goto doret;
+ }
+
+- while((howmany = gzread(tz, tmp->data + cur_size, cur_alloced - cur_size))
> 0)
++ while((howmany = gzread((gzFile)tz, tmp->data + cur_size, cur_alloced -
cur_size)) > 0)
+ {
+ cur_size += howmany;
+ cur_alloced <<= 1;
+@@ -282,7 +282,7 @@
+ }
+ else if(type == MDFN_FILETYPE_GZIP)
+ {
+- gzclose(tz);
++ gzclose((gzFile)tz);
+ }
+ else if(type == MDFN_FILETYPE_ZIP)
+ {
+@@ -444,7 +444,7 @@
+
+ if(!(fceufp = MakeMemWrap(t, 1)))
+ {
+- gzclose(t);
++ gzclose((gzFile)t);
+ return(0);
+ }
+
--
multi-platform emulator, including NES, GB/A, Lynx, PC Engine
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
