CVS commit: pkgsrc/emulators/fceu

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Tue Feb 14 21:29:39 UTC 2017

Modified Files:
        pkgsrc/emulators/fceu: distinfo
Added Files:
        pkgsrc/emulators/fceu/patches: patch-src_file.c

Log Message:
Deal with zlib fallout.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/emulators/fceu/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/fceu/patches/patch-src_file.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/fceu/distinfo
diff -u pkgsrc/emulators/fceu/distinfo:1.9 pkgsrc/emulators/fceu/distinfo:1.10
--- pkgsrc/emulators/fceu/distinfo:1.9  Tue Nov  3 20:30:57 2015
+++ pkgsrc/emulators/fceu/distinfo      Tue Feb 14 21:29:39 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 20:30:57 agc Exp $
+$NetBSD: distinfo,v 1.10 2017/02/14 21:29:39 joerg Exp $
 
 SHA1 (fceu-0.98.13.src.tar.bz2) = fed37a9858aa8b149472f964b2ca652168e9f29a
 RMD160 (fceu-0.98.13.src.tar.bz2) = fc736006ed1e9aa564de817622ed575f246bad48
@@ -8,3 +8,4 @@ SHA1 (patch-aa) = 31ce24167b8f76df2961ce
 SHA1 (patch-ac) = 8a5297b11484c6eaf5d70a391bb486ff58475f35
 SHA1 (patch-af) = a2b55359d65c60ecb7e7d79390ef872873c0eba1
 SHA1 (patch-ah) = cc48e36406b6d9e4cf88179510824135507aa6f9
+SHA1 (patch-src_file.c) = 6a801513eae47f30eb5f9b7857c7b40b30063129

Added files:

Index: pkgsrc/emulators/fceu/patches/patch-src_file.c
diff -u /dev/null pkgsrc/emulators/fceu/patches/patch-src_file.c:1.1
--- /dev/null   Tue Feb 14 21:29:39 2017
+++ pkgsrc/emulators/fceu/patches/patch-src_file.c      Tue Feb 14 21:29:39 2017
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_file.c,v 1.1 2017/02/14 21:29:39 joerg Exp $
+
+Newer zlib expects gzgetc argument to be correctly typed.
+
+--- src/file.c.orig    2017-02-09 16:51:34.243801811 +0000
++++ src/file.c
+@@ -154,7 +154,7 @@ static MEMWRAP *MakeMemWrap(void *tz, in
+  {
+   /* Bleck.  The gzip file format has the size of the uncompressed data,
+      but I can't get to the info with the zlib interface(?). */
+-  for(tmp->size=0; gzgetc(tz) != EOF; tmp->size++);
++  for(tmp->size=0; gzgetc((gzFile)tz) != EOF; tmp->size++);
+   gzseek(tz,0,SEEK_SET);
+   if(!(tmp->data=(uint8 *)FCEU_malloc(tmp->size)))
+   {
+@@ -529,7 +529,7 @@ int FCEU_read32le(uint32 *Bufo, FCEUFILE
+ int FCEU_fgetc(FCEUFILE *fp)
+ {
+  if(fp->type==1)
+-  return gzgetc(fp->fp); 
++  return gzgetc((gzFile)fp->fp); 
+  else if(fp->type>=2)
+  {
+   MEMWRAP *wz;
+@@ -549,7 +549,7 @@ uint64 FCEU_fgetsize(FCEUFILE *fp)
+   int x,t;
+   t=gztell(fp->fp);
+   gzrewind(fp->fp);
+-  for(x=0; gzgetc(fp->fp) != EOF; x++);
++  for(x=0; gzgetc((gzFile)fp->fp) != EOF; x++);
+   gzseek(fp->fp,t,SEEK_SET);
+   return(x);
+  }