diff options
| author | joerg <joerg@pkgsrc.org> | 2017-02-14 21:29:39 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2017-02-14 21:29:39 +0000 |
| commit | 3c09f3ff9128c0905a1e3613bad7eaf9e0af7aa3 (patch) | |
| tree | 648acf042eda75b82fb84f0b10e318ce6a52d39f /emulators | |
| parent | b824bfab2098d4123542556e5a365be9252b95a6 (diff) | |
| download | pkgsrc-3c09f3ff9128c0905a1e3613bad7eaf9e0af7aa3.tar.gz | |
Deal with zlib fallout.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/fceu/distinfo | 3 | ||||
| -rw-r--r-- | emulators/fceu/patches/patch-src_file.c | 33 |
2 files changed, 35 insertions, 1 deletions
diff --git a/emulators/fceu/distinfo b/emulators/fceu/distinfo index 57176a5e72f..7a2d1c52d98 100644 --- a/emulators/fceu/distinfo +++ b/emulators/fceu/distinfo @@ -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) = 31ce24167b8f76df2961ce902d42f45b5278e451 SHA1 (patch-ac) = 8a5297b11484c6eaf5d70a391bb486ff58475f35 SHA1 (patch-af) = a2b55359d65c60ecb7e7d79390ef872873c0eba1 SHA1 (patch-ah) = cc48e36406b6d9e4cf88179510824135507aa6f9 +SHA1 (patch-src_file.c) = 6a801513eae47f30eb5f9b7857c7b40b30063129 diff --git a/emulators/fceu/patches/patch-src_file.c b/emulators/fceu/patches/patch-src_file.c new file mode 100644 index 00000000000..19df3dad01c --- /dev/null +++ b/emulators/fceu/patches/patch-src_file.c @@ -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); + } |