summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authormarino <marino@pkgsrc.org>2012-07-18 21:55:40 +0000
committermarino <marino@pkgsrc.org>2012-07-18 21:55:40 +0000
commit249556cd0dd4140275cacc2afc40df30611c9520 (patch)
treed4a174a59fe17c8b4ebf66b0dbf3aa5c1ff2fc72 /emulators
parent7c0149282943af170fd0cd3c22043fbd0aac133d (diff)
downloadpkgsrc-249556cd0dd4140275cacc2afc40df30611c9520.tar.gz
emulators/vba: Fix for libz >= 1.2.6
The current package won't compile if using libz >= 1.2.6 due to a typedef change of GzFile. Fix inspired by r1091 at vbam.svn.sourceforge.net Package broke after DragonFly upgraded system libz from 1.2.5 to 1.2.7
Diffstat (limited to 'emulators')
-rw-r--r--emulators/vba/Makefile4
-rw-r--r--emulators/vba/distinfo4
-rw-r--r--emulators/vba/patches/patch-ag13
3 files changed, 16 insertions, 5 deletions
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index 619da943590..fabf2619319 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2011/01/13 13:37:37 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2012/07/18 21:55:40 marino Exp $
DISTNAME= VisualBoyAdvance-src-1.7.2
PKGNAME= vba-1.7.2
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vba/}
diff --git a/emulators/vba/distinfo b/emulators/vba/distinfo
index 93df155a74a..5f394663c51 100644
--- a/emulators/vba/distinfo
+++ b/emulators/vba/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2012/03/29 20:32:34 wiz Exp $
+$NetBSD: distinfo,v 1.7 2012/07/18 21:55:40 marino Exp $
SHA1 (VisualBoyAdvance-src-1.7.2.tar.gz) = 04d82406079563fd17cda07f72488185e9152f51
RMD160 (VisualBoyAdvance-src-1.7.2.tar.gz) = 44f94a4f270f2cda25879681c52892f6978caf99
@@ -9,4 +9,4 @@ SHA1 (patch-ac) = 33158335dc12f335471d10962b4552082b589d25
SHA1 (patch-ad) = b61c4053bbed582db5df2039c20b436e1d9e1ff1
SHA1 (patch-ae) = b7e08365abd77b5c0f3473b4ce091b747298dfc8
SHA1 (patch-af) = a3db22d606c34388f20ee29d9e8a1259346d105a
-SHA1 (patch-ag) = bd304939c7f104e6114a5078f4347b37761a1ede
+SHA1 (patch-ag) = 35913566125b1d1ed8ed3a514664cd7167ed2c22
diff --git a/emulators/vba/patches/patch-ag b/emulators/vba/patches/patch-ag
index 1ee8ba51d05..f118f6c9345 100644
--- a/emulators/vba/patches/patch-ag
+++ b/emulators/vba/patches/patch-ag
@@ -1,6 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2011/01/14 11:40:55 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2012/07/18 21:55:41 marino Exp $
Fix build with png-1.5.
+GzFile change from void * in libz 1.2.6
+This change required to compile with libz >= 1.2.6
--- src/Util.cpp.orig 2004-05-20 17:42:37.000000000 +0000
+++ src/Util.cpp
@@ -13,3 +15,12 @@ Fix build with png-1.5.
png_destroy_write_struct(&png_ptr,NULL);
fclose(fp);
return false;
+@@ -984,7 +984,7 @@ void utilWriteData(gzFile gzFile, variab
+
+ gzFile utilGzOpen(const char *file, const char *mode)
+ {
+- utilGzWriteFunc = (int (*)(void *,void * const, unsigned int))gzwrite;
++ utilGzWriteFunc = (int (*)(gzFile, void * const, unsigned int))gzwrite;
+ utilGzReadFunc = gzread;
+ utilGzCloseFunc = gzclose;
+