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

(Portage version: 2.0.51.22-r2)

1 files changed, 35 insertions, 0 deletions

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);