added patch and ~amd64

4 files changed, 49 insertions, 6 deletions

diff --git a/games-puzzle/quadra/ChangeLog b/games-puzzle/quadra/ChangeLog
index aac13d06a790..df90c388d1cd 100644
--- a/games-puzzle/quadra/ChangeLog
+++ b/games-puzzle/quadra/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-puzzle/quadra
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/ChangeLog,v 1.7 2004/06/24 23:08:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/ChangeLog,v 1.8 2004/11/12 18:36:38 blubb Exp $
+
+  12 Nov 2004; Simon Stelling <blubb@gentoo.org> quadra-1.1.8.ebuild:
+  Added Daniel Karlsson's patch to get it working on amd64 and marked testing
 
   19 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> quadra-1.1.8.ebuild:
   use_with svga instead of use_with svgalib; tidy
diff --git a/games-puzzle/quadra/Manifest b/games-puzzle/quadra/Manifest
index c61b28a0577f..c4e947d9ccad 100644
--- a/games-puzzle/quadra/Manifest
+++ b/games-puzzle/quadra/Manifest
@@ -1,6 +1,7 @@
-MD5 a08b6e14c7a9585469fffc50b1e2b6a9 quadra-1.1.8.ebuild 1311
-MD5 abb3a3c98b073ac1aaf2b247e2f4a24c ChangeLog 1239
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 bba09cc9f175516cb6eeadcc7cb5f20b files/libpng-1.2.5.patch 319
+MD5 f7bafb9f75fa28cb24ffd7dfa9310e1e quadra-1.1.8.ebuild 1367
+MD5 5528507ee160086a691599baa9da8b03 ChangeLog 1385
 MD5 bdff1f4721aa26a2dc4ac7f4f38e7194 files/digest-quadra-1.1.8 65
+MD5 bba09cc9f175516cb6eeadcc7cb5f20b files/libpng-1.2.5.patch 319
 MD5 9e774090da8184c5773262c18467cd32 files/quadra-1.1.8-gcc3.patch 2830
+MD5 ffdb7b1e6830df6f4d6064c9fca1f6bb files/quadra-1.1.8-amd64.patch 1075
diff --git a/games-puzzle/quadra/files/quadra-1.1.8-amd64.patch b/games-puzzle/quadra/files/quadra-1.1.8-amd64.patch
new file mode 100644
index 000000000000..925f20a31305
--- /dev/null
+++ b/games-puzzle/quadra/files/quadra-1.1.8-amd64.patch
@@ -0,0 +1,38 @@
+--- quadra-1.1.8/skelton/common/net.cpp	2004-11-01 05:12:11.097347848 -0100
++++ quadra-1.1.8-fix/skelton/common/net.cpp	2004-11-01 05:15:13.875561336 -0100
+@@ -41,7 +41,7 @@
+ #include <netdb.h>
+ #include <string.h>
+ #include <fcntl.h>
+-typedef size_t addr_size_t;
++typedef socklen_t addr_size_t;
+ inline int closesocket(int fd) {
+ 	return close(fd);
+ }
+--- quadra-1.1.8/skelton/svgalib/video_x11_24.cpp	2001-10-11 19:35:14.000000000 -0100
++++ quadra-1.1.8-fix/skelton/svgalib/video_x11_24.cpp	2004-11-01 20:03:16.513369160 -0100
+@@ -63,7 +63,12 @@
+   };
+ #pragma pack()
+ 
++#ifdef _LP64
++  unsigned int* buf32;
++#else
+   unsigned long* buf32;
++#endif
++
+   Pixel3* buf24;
+   int x, y;
+ 
+@@ -82,7 +87,11 @@
+ 	    ((PixelValue*)(&colors[vfb[(y * width) +x]]))->pixel;
+     } else {
+       /* Conversion of the 8 bpp buffer to a 32 bpp buffer. */
++#ifdef _LP64
++      buf32 = (unsigned int*) image->data;
++#else
+       buf32 = (unsigned long*) image->data;
++#endif
+       for(y = 0; y < 480; y++)
+         for(x = min_x[y]; x <= max_x[y]; x++)
+           buf32[(y * width) + x] =
diff --git a/games-puzzle/quadra/quadra-1.1.8.ebuild b/games-puzzle/quadra/quadra-1.1.8.ebuild
index 6ab50e92bca4..d2cb4f8bce3c 100644
--- a/games-puzzle/quadra/quadra-1.1.8.ebuild
+++ b/games-puzzle/quadra/quadra-1.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/quadra-1.1.8.ebuild,v 1.7 2004/06/24 23:08:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/quadra-1.1.8.ebuild,v 1.8 2004/11/12 18:36:38 blubb Exp $
 
 inherit eutils gcc games
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/quadra/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 IUSE="svga"
 
 RDEPEND="virtual/x11
@@ -25,6 +25,7 @@ src_unpack() {
 	cd ${S}
 	[ $(gcc-major-version) == 3 ] && epatch "${FILESDIR}/${P}-gcc3.patch"
 	epatch "${FILESDIR}/libpng-1.2.5.patch"
+	use amd64 && epatch "${FILESDIR}/${P}-amd64.patch"
 	sed -i \
 		-e 's:-pedantic::' config/vars.mk \
 			|| die "sed config/vars.mk failed"