Add a patch for 64bit issues #103450 by Ian Kumlien.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 52 insertions, 11 deletions

diff --git a/games-engines/scummvm/ChangeLog b/games-engines/scummvm/ChangeLog
index 4ad053a47896..b9df0dee5c81 100644
--- a/games-engines/scummvm/ChangeLog
+++ b/games-engines/scummvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/scummvm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.24 2005/05/12 01:57:45 mr_bones_ Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.25 2005/09/01 03:18:31 vapier Exp $
+
+  01 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/scummvm-0.7.1-64bit.patch, scummvm-0.7.1.ebuild:
+  Add a patch for 64bit issues #103450 by Ian Kumlien.
 
   12 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
   -files/0.7.0-configure.patch, -scummvm-0.7.0.ebuild:
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 86ae7dded7ea..18c5110332e9 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d6ec4567eed4073d044cba64b3d7b076 scummvm-0.7.1.ebuild 1776
-MD5 1460d38d860a489484e2c2c299106d1f ChangeLog 5398
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 6b7e3eea92e3d3345457d83a2d851099 files/0.7.1-configure.patch 699
+MD5 aa1b37e7c166efb943f22779b115bad5 scummvm-0.7.1.ebuild 1813
+MD5 8902ad62b2521836015afb5a05bb81ee ChangeLog 5559
+MD5 8fb0ec95fec1bb32eac712cf85a116c4 files/scummvm-0.7.1-64bit.patch 1083
 MD5 fb4256256ccf802b62a4a9e798e259d3 files/digest-scummvm-0.7.1 67
+MD5 6b7e3eea92e3d3345457d83a2d851099 files/0.7.1-configure.patch 699
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFCughXBXaUFmZvwyMRAmXgAKCo752xRj+m30ZTOwCwpGVHeG80VwCdFK0Z
-Ls9Cxux8nTT2sOyDoN0ASzc=
-=P1Ix
+iD8DBQFDFnMjgIKl8Uu19MoRAnG0AJ9bKPzmC+zUYiuYukC1hQjn78wTKwCfVXuw
+fFqphcWQwaiQ228TzNTvEkU=
+=0vsY
 -----END PGP SIGNATURE-----
diff --git a/games-engines/scummvm/files/scummvm-0.7.1-64bit.patch b/games-engines/scummvm/files/scummvm-0.7.1-64bit.patch
new file mode 100644
index 000000000000..224b7106718d
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-0.7.1-64bit.patch
@@ -0,0 +1,35 @@
+Fixes for 64bit issues from upstream.
+
+http://bugs.gentoo.org/103450
+
+--- scummvm/scummvm/common/scaler.cpp
++++ scummvm/scummvm/common/scaler.cpp
+@@ -123,7 +123,7 @@
+ 							int width, int height) {
+ 	uint8 *r;
+ 
+-	assert(((int)dstPtr & 3) == 0);
++	assert(((long)dstPtr & 3) == 0);
+ 	while (height--) {
+ 		r = dstPtr;
+ 		for (int i = 0; i < width; ++i, r += 4) {
+@@ -148,7 +148,7 @@
+ 	const uint32 dstPitch2 = dstPitch * 2;
+ 	const uint32 dstPitch3 = dstPitch * 3;
+ 
+-	assert(((int)dstPtr & 1) == 0);
++	assert(((long)dstPtr & 1) == 0);
+ 	while (height--) {
+ 		r = dstPtr;
+ 		for (int i = 0; i < width; ++i, r += 6) {
+--- scummvm/scummvm/scumm/instrument.h
++++ scummvm/scummvm/scumm/instrument.h
+@@ -60,7 +60,7 @@
+ 
+ 	void clear();
+ 	void copy_to (Instrument *dest) { if (_instrument) _instrument->copy_to (dest); else dest->clear(); }
+-	operator int() { return (_instrument ? (int) _instrument : 255); }
++	operator int() { return (_instrument ? (long) _instrument : 255); }
+ 	void program (byte program, bool mt32);
+ 	void adlib (byte *instrument);
+ 	void roland (byte *instrument);
diff --git a/games-engines/scummvm/scummvm-0.7.1.ebuild b/games-engines/scummvm/scummvm-0.7.1.ebuild
index 3d40b6994ed1..bd49fda07aff 100644
--- a/games-engines/scummvm/scummvm-0.7.1.ebuild
+++ b/games-engines/scummvm/scummvm-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-0.7.1.ebuild,v 1.4 2005/06/23 00:54:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-0.7.1.ebuild,v 1.5 2005/09/01 03:18:31 vapier Exp $
 
 inherit eutils games
 
@@ -28,7 +28,8 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PV}-configure.patch"
+	epatch "${FILESDIR}"/${PV}-configure.patch
+	epatch "${FILESDIR}"/${P}-64bit.patch
 }
 
 src_compile() {