Add a fix for amd64

svn path=/; revision=85

4 files changed, 80 insertions, 12 deletions

diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog
index fa4a611..20b17c9 100644
--- a/games-emulation/zsnes/ChangeLog
+++ b/games-emulation/zsnes/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Jan 2007; Timothy Redaelli <drizzt@gentoo.org> ChangeLog:
+  Add a fix for amd64
+
   10 Jan 2007; Timothy Redaelli <drizzt@gentoo.org> ChangeLog:
   Added zsnes 1.50
 
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index aa287df..fe58ad5 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -1,26 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX zsnes-1.50-gzdirect.patch 2125 RMD160 34d20566d0239cc755e5d83213e069f7cddb5947 SHA1 39b7189146bcbadca5456c060c80f3fd30e577ee SHA256 752d52a2fc019c329d76e4f8fd6c0a3002ab75f82781ebec400f9b7d45fb87fa
+MD5 b67ada558af9164141ae505adcbf84d3 files/zsnes-1.50-gzdirect.patch 2125
+RMD160 34d20566d0239cc755e5d83213e069f7cddb5947 files/zsnes-1.50-gzdirect.patch 2125
+SHA256 752d52a2fc019c329d76e4f8fd6c0a3002ab75f82781ebec400f9b7d45fb87fa files/zsnes-1.50-gzdirect.patch 2125
 AUX zsnes-1.50-noforcearch.patch 1192 RMD160 71bcf86f2ff0425ebbf733f9a606160cdd12ca3b SHA1 b070ad2e65cfab9f49eb223a3ea98e0037a2d4a5 SHA256 8258f21d82df8794bdc6d6899eb67429692bfebe36d14c22f57f7504f2f525ab
 MD5 5872b196c6ab88cca69dd239929a698b files/zsnes-1.50-noforcearch.patch 1192
 RMD160 71bcf86f2ff0425ebbf733f9a606160cdd12ca3b files/zsnes-1.50-noforcearch.patch 1192
 SHA256 8258f21d82df8794bdc6d6899eb67429692bfebe36d14c22f57f7504f2f525ab files/zsnes-1.50-noforcearch.patch 1192
 DIST zsnes150src.tar.bz2 1058671 RMD160 3f7d7afceaf5c0f6f4c6eb34b4f8f4102fc6af13 SHA1 0c8482599cee06c595c21260cd5fa0a7c7215631 SHA256 2ddaaff892d511c717d3e270cc035b208ba2eca04cdf3e749c5739df78ba9aba
-EBUILD zsnes-1.50.ebuild 1707 RMD160 e93a260078b84966718d0a18f5912280c017fa33 SHA1 6ac64a6bf25597934cb22038aae8da38454d3c6b SHA256 47d493551c9a4b1ba250ef359b26c9a9616c244c6843a882f7547a1dcbf04b28
-MD5 bac5f9bf5245b5a074b012b43e56af52 zsnes-1.50.ebuild 1707
-RMD160 e93a260078b84966718d0a18f5912280c017fa33 zsnes-1.50.ebuild 1707
-SHA256 47d493551c9a4b1ba250ef359b26c9a9616c244c6843a882f7547a1dcbf04b28 zsnes-1.50.ebuild 1707
-MISC ChangeLog 205 RMD160 b6f003af2efe430868c4c7d6bfaf6e40a68dd1fb SHA1 37d75c88d414b8752affd1e6dfcae9d317296acf SHA256 ebe3955105265f06e49ae37ef09e40cb9c5d89bedc7c1869ed5f368343220fb9
-MD5 2db797790eb26bd9da2518cc863a8030 ChangeLog 205
-RMD160 b6f003af2efe430868c4c7d6bfaf6e40a68dd1fb ChangeLog 205
-SHA256 ebe3955105265f06e49ae37ef09e40cb9c5d89bedc7c1869ed5f368343220fb9 ChangeLog 205
+EBUILD zsnes-1.50.ebuild 1749 RMD160 f2b3e9dfb5ee3be41ffe82d9f22f45be838299f9 SHA1 c4fe2b55c8b5b6078c224282ab0d0e0f374b46b0 SHA256 ea70ad0f03865577da44ab2117dc416a9b97d34e119afe135a8fb67f676f321e
+MD5 c6edbf5afafed03da3d1b0b95e8aebef zsnes-1.50.ebuild 1749
+RMD160 f2b3e9dfb5ee3be41ffe82d9f22f45be838299f9 zsnes-1.50.ebuild 1749
+SHA256 ea70ad0f03865577da44ab2117dc416a9b97d34e119afe135a8fb67f676f321e zsnes-1.50.ebuild 1749
+MISC ChangeLog 291 RMD160 7fe94b053ee90390116598afe76e65f07cfe1661 SHA1 c169cb79e635ca6c1efda14b9af19516c0f633b9 SHA256 fe884eda955786975c8d6275d3c431a7eff2578710b0383369234e20715c111c
+MD5 a645d17c88d3f34b4637ff0af759e533 ChangeLog 291
+RMD160 7fe94b053ee90390116598afe76e65f07cfe1661 ChangeLog 291
+SHA256 fe884eda955786975c8d6275d3c431a7eff2578710b0383369234e20715c111c ChangeLog 291
 MD5 725ea6ef30dd128752ffbe77116074db files/digest-zsnes-1.50 241
 RMD160 98e876fb66d15de54a8d582d9352bb43b6f0da67 files/digest-zsnes-1.50 241
 SHA256 9aa1fbe50be5657e0ccd6c5ffafc13f163c8f5adf28c3e2e71f2f38b0b038432 files/digest-zsnes-1.50 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFpDDwGDyatLGpTbYRArW2AJ9BLwQGvxmiP0xtY83CxuXGL5/RBwCgntxA
-TGeGQ4L8MLrzqxsdnjz/0jI=
-=wkuF
+iD8DBQFFqCRtGDyatLGpTbYRAthoAJ9vxkydNK5QReH9JoBjbGqEv9CSggCfX7hv
+i7cUijBUm4DKU5atct6yuMo=
+=Iq3k
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/zsnes/files/zsnes-1.50-gzdirect.patch b/games-emulation/zsnes/files/zsnes-1.50-gzdirect.patch
new file mode 100644
index 0000000..f076ffd
--- /dev/null
+++ b/games-emulation/zsnes/files/zsnes-1.50-gzdirect.patch
@@ -0,0 +1,60 @@
+Only in zsnes_1_50/src: aclocal.m4
+Only in zsnes_1_50/src: autom4te.cache
+Only in zsnes_1_50/src: config.h
+Only in zsnes_1_50/src: config.log
+Only in zsnes_1_50/src: config.status
+Only in zsnes_1_50.orig/src: configure
+diff -ur zsnes_1_50.orig/src/configure.in zsnes_1_50/src/configure.in
+--- zsnes_1_50.orig/src/configure.in	2007-01-13 00:24:30.000000000 +0100
++++ zsnes_1_50/src/configure.in	2007-01-13 00:27:50.000000000 +0100
+@@ -76,6 +76,7 @@
+ AM_PATH_ZLIB(1.2.3,,[AC_MSG_ERROR(zlib >= 1.2.3 is required)])
+ CFLAGS="$CFLAGS $ZLIB_CFLAGS"
+ LDFLAGS="$LDFLAGS $ZLIB_LIBS"
++AC_CHECK_FUNCS(gzdirect)
+ 
+ dnl - libpng stuff
+ AM_PATH_LIBPNG(1.2.0,,)
+diff -ur zsnes_1_50.orig/src/initc.c zsnes_1_50/src/initc.c
+--- zsnes_1_50.orig/src/initc.c	2007-01-13 00:24:30.000000000 +0100
++++ zsnes_1_50/src/initc.c	2007-01-13 00:38:25.000000000 +0100
+@@ -831,6 +831,35 @@
+   }
+ }
+ 
++#ifndef HAVE_GZDIRECT
++typedef struct gz_stream {
++  z_stream stream;
++  int      z_err;   /* error code for last stream operation */
++  int      z_eof;   /* set if end of input file */
++  FILE     *file;   /* .gz file */
++  Byte     *inbuf;  /* input buffer */
++  Byte     *outbuf; /* output buffer */
++  uLong    crc;     /* crc32 of uncompressed data */
++  char     *msg;    /* error message */
++  char     *path;   /* path name for debugging only */
++  int      transparent; /* 1 if input file is not a .gz file */
++  char     mode;    /* 'w' or 'r' */
++  z_off_t  start;   /* start of compressed data in file (header skipped) */
++  z_off_t  in;      /* bytes into deflate or inflate */
++  z_off_t  out;     /* bytes out of deflate or inflate */
++  int      back;    /* one character push-back */
++  int      last;    /* true if push-back is last character */
++} gz_stream;
++
++int gzdirect (gzFile file)
++{
++  gz_stream *s = (gz_stream*)file;
++
++  if (s == NULL || s->mode != 'r') return 0;
++  return s->transparent;
++}
++#endif
++
+ void loadGZipFile(char *filename)
+ {
+   //Open file for size reading
+Only in zsnes_1_50/src: Makefile
+Only in zsnes_1_50/src: makefile.dep
+Only in zsnes_1_50/src/tools: fileutil.o
+Only in zsnes_1_50/src/tools: strutil.o
diff --git a/games-emulation/zsnes/zsnes-1.50.ebuild b/games-emulation/zsnes/zsnes-1.50.ebuild
index 2f121c8..4f39cb0 100644
--- a/games-emulation/zsnes/zsnes-1.50.ebuild
+++ b/games-emulation/zsnes/zsnes-1.50.ebuild
@@ -33,6 +33,7 @@ src_unpack() {
 	cp "icons/48x48x32.png" "${T}/${PN}.png"
 
 	epatch "${FILESDIR}"/${P}-noforcearch.patch
+	epatch "${FILESDIR}"/${P}-gzdirect.patch
 
 	# Remove hardcoded CFLAGS and LDFLAGS
 	sed -i \