Fix building with amd64. Bug #146114

Package-Manager: portage-2.1.1

4 files changed, 61 insertions, 14 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index 1e70996129de..7872dc921fe7 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-games/clanlib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.34 2006/09/11 22:38:17 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.35 2006/09/12 22:33:43 tupone Exp $
+
+  12 Sep 2006; <tupone@gentoo.org> +files/clanlib-0.6.5-64bit.patch,
+  clanlib-0.6.5-r3.ebuild:
+  Fix building with amd64. Bug #146114 by Frank Weinberg
+  using patch given in Bug #146849 by Pacho Ramos
 
   11 Sep 2006; <tupone@gentoo.org> clanlib-0.6.5-r3.ebuild:
   Removed lua flag. Bug #136587 by Kai.
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index a010e0471fa5..b7a1b0ffea23 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -9,6 +9,10 @@ AUX 0.7.8-port.patch 305 RMD160 1cc87ddb0c022eb4083d11a63f130b7154526c28 SHA1 4a
 MD5 940618fa67a1354533249defe3a89739 files/0.7.8-port.patch 305
 RMD160 1cc87ddb0c022eb4083d11a63f130b7154526c28 files/0.7.8-port.patch 305
 SHA256 6545f6e5463ff83e42c521a49fac300524b5283667e5bdcf30120d3b6cf01a0c files/0.7.8-port.patch 305
+AUX clanlib-0.6.5-64bit.patch 1576 RMD160 15e333ec70a77d70c66812f2c8b51acf8e8a0107 SHA1 cfa9b40393b9bb9ed7bf0dd1b9c24317765226a7 SHA256 aaf213505148e41a73de5b37b7d8098651ef08f051220205d8bb9d03baaffa5c
+MD5 d69fc620e7642f1b2751886df4bf0c7c files/clanlib-0.6.5-64bit.patch 1576
+RMD160 15e333ec70a77d70c66812f2c8b51acf8e8a0107 files/clanlib-0.6.5-64bit.patch 1576
+SHA256 aaf213505148e41a73de5b37b7d8098651ef08f051220205d8bb9d03baaffa5c files/clanlib-0.6.5-64bit.patch 1576
 AUX clanlib-0.6.5-DirectFB-update.patch 2467 RMD160 52f3f123f895bacddfca3f218e9fe3b2e94ac79b SHA1 86b51f372330eb6cce90b21b5602091b630e5fa6 SHA256 107ae01c9c499c230f7d9fb8c1f2929cda81214de7d0832acbb873f6d75815fd
 MD5 73a7ad2b2241c3ec66720d2fa936ef4b files/clanlib-0.6.5-DirectFB-update.patch 2467
 RMD160 52f3f123f895bacddfca3f218e9fe3b2e94ac79b files/clanlib-0.6.5-DirectFB-update.patch 2467
@@ -39,18 +43,18 @@ RMD160 e4562f30dea51c6b1f01014611f3a7ebf0976ca5 files/clanlib-0.7.8-refreshfix.p
 SHA256 1cb0bab20ef41f364d5bb4395a78213f4ad8fa187bc49cc5f85e80544f557ffa files/clanlib-0.7.8-refreshfix.patch 435
 DIST ClanLib-0.6.5-1.tar.gz 2183097 RMD160 31f060f438925c9ec7dd2a9466ed6bb367549b3b SHA1 d3a8558c1f8b652742636e4712b5b9911f74e4d8 SHA256 62e16913423945475f3541fc97deaeb9b0f735b6c93c88725a6a771d5a882db5
 DIST ClanLib-0.7.8-1.tar.bz2 6567261 RMD160 b22dbb97010e7b514cbbe3da85a52a1aafe2c686 SHA1 1416b09d8aa3549b1adeef50ba00df59b20917e6 SHA256 742b027b75160d0f17b913f7b3089c901717081d12d3ed1d1c38c108939793b8
-EBUILD clanlib-0.6.5-r3.ebuild 2488 RMD160 f87789556f310cd3514c018eb9f82ca9c6c86ccc SHA1 5e1d06de2360d1b019586346771dd7e16262dad8 SHA256 96c6b22f3768d93b37b825a8e3d8c2373049fedc73c04139595b38562694fc9e
-MD5 ca9b449ba12c273b035c9c4aa80fbe61 clanlib-0.6.5-r3.ebuild 2488
-RMD160 f87789556f310cd3514c018eb9f82ca9c6c86ccc clanlib-0.6.5-r3.ebuild 2488
-SHA256 96c6b22f3768d93b37b825a8e3d8c2373049fedc73c04139595b38562694fc9e clanlib-0.6.5-r3.ebuild 2488
+EBUILD clanlib-0.6.5-r3.ebuild 2526 RMD160 cece23d45166649c7df56b07805c1b026b712074 SHA1 28b2d5a6cdfce3f37bb08f7dd26e5fb1b606633a SHA256 e59b5d43022c91dec77b6ac54d688ee31b27c83a892cba81bbe795d99ac233a6
+MD5 71d0b7829efa50d24456281917933452 clanlib-0.6.5-r3.ebuild 2526
+RMD160 cece23d45166649c7df56b07805c1b026b712074 clanlib-0.6.5-r3.ebuild 2526
+SHA256 e59b5d43022c91dec77b6ac54d688ee31b27c83a892cba81bbe795d99ac233a6 clanlib-0.6.5-r3.ebuild 2526
 EBUILD clanlib-0.7.8-r2.ebuild 2369 RMD160 367e0228f1d72ab25fa68dd9a51d5769d1390281 SHA1 ba8123215714795cd37c0107c95a48b9de6db971 SHA256 752a81a5fbffe92dc98c3d1f593e24f4a56819bc088d5fdf82f648f4ec190c9d
 MD5 ee9ea6af33bd9154656e1ee012234b5b clanlib-0.7.8-r2.ebuild 2369
 RMD160 367e0228f1d72ab25fa68dd9a51d5769d1390281 clanlib-0.7.8-r2.ebuild 2369
 SHA256 752a81a5fbffe92dc98c3d1f593e24f4a56819bc088d5fdf82f648f4ec190c9d clanlib-0.7.8-r2.ebuild 2369
-MISC ChangeLog 7413 RMD160 851e71458b63f8226a2dbf279322b4f350807066 SHA1 3b5291cc4fed29ebeb1c47ab47d9338930969009 SHA256 ef47d05b155d5786d3d6512ab86f35a436a2629879f12fc73fd08f8f5347932f
-MD5 70ab29fcd93ac1560c05a75c83f94edb ChangeLog 7413
-RMD160 851e71458b63f8226a2dbf279322b4f350807066 ChangeLog 7413
-SHA256 ef47d05b155d5786d3d6512ab86f35a436a2629879f12fc73fd08f8f5347932f ChangeLog 7413
+MISC ChangeLog 7617 RMD160 8feeb39d7592b0486ceac9cd24ffa4e11fe001ec SHA1 a05f5861fd079c9b121d8813b32f404092b74e7e SHA256 0f46eebf2a1296bcee63acff24505df95d38571f635423b1582ba74d3d258b38
+MD5 d4417092897f423972ce86e0f974b6de ChangeLog 7617
+RMD160 8feeb39d7592b0486ceac9cd24ffa4e11fe001ec ChangeLog 7617
+SHA256 0f46eebf2a1296bcee63acff24505df95d38571f635423b1582ba74d3d258b38 ChangeLog 7617
 MISC metadata.xml 3010 RMD160 e619d1e2cbf474c526bf1deb3dd15a0117643e66 SHA1 44ca5cd8acbcf860a068802ceca92f39693846aa SHA256 3b9b77c59757bc65889103949b95597432d5e00f69fdf4bdc909f50dcbff98ac
 MD5 33ee8adc6546aef9881086d98bfadb79 metadata.xml 3010
 RMD160 e619d1e2cbf474c526bf1deb3dd15a0117643e66 metadata.xml 3010
@@ -64,7 +68,7 @@ SHA256 2d33b72d6157f3dc50ef950fdae218e425b0faf6e38220dd98a64d46774779ac files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFBeVl2CTtIKiFlQIRApzaAJ9/OxhAGgatsrtkvGUq+eu+U8P6BgCfYYDa
-ePb4x1dC1sTl+wIKq+jIf0g=
-=t8f6
+iD8DBQFFBzXU2CTtIKiFlQIRArfSAJoDY0MPP7pmBFC7dEnTbEfibXMT7QCdHto3
+f488HZKWVpCk5+sGMD1//G0=
+=0bmw
 -----END PGP SIGNATURE-----
diff --git a/dev-games/clanlib/clanlib-0.6.5-r3.ebuild b/dev-games/clanlib/clanlib-0.6.5-r3.ebuild
index ce07addf7e9f..4603e800465f 100644
--- a/dev-games/clanlib/clanlib-0.6.5-r3.ebuild
+++ b/dev-games/clanlib/clanlib-0.6.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.6.5-r3.ebuild,v 1.10 2006/09/11 22:38:17 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.6.5-r3.ebuild,v 1.11 2006/09/12 22:33:43 tupone Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.clanlib.org/download/legacy/ClanLib-${PV}-1.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
-KEYWORDS="-amd64 x86" #not big endian safe #82779
+KEYWORDS="amd64 x86" #not big endian safe #82779
 IUSE="arts oss esd alsa png opengl truetype X vorbis mikmod jpeg directfb joystick"
 
 DEPEND=">=media-libs/hermes-1.3.2
@@ -47,6 +47,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-freetype.patch
 	epatch "${FILESDIR}"/${P}-gcc41.patch
 	epatch "${FILESDIR}"/${P}-uclibc.patch
+	epatch "${FILESDIR}"/${P}-64bit.patch
 	sed -i 's:@comp_mode@::' Setup/Unix/clanlib-config.in
 }
 
diff --git a/dev-games/clanlib/files/clanlib-0.6.5-64bit.patch b/dev-games/clanlib/files/clanlib-0.6.5-64bit.patch
new file mode 100644
index 000000000000..5cacb50c4fc8
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.6.5-64bit.patch
@@ -0,0 +1,37 @@
+--- Sources/SmallJPEG/jpgd/jpegdecoder.cpp.old	2006-09-13 00:08:55.000000000 +0200
++++ Sources/SmallJPEG/jpgd/jpegdecoder.cpp	2006-09-13 00:10:41.000000000 +0200
+@@ -19,6 +19,7 @@
+ // License along with this library; if not, write to the Free Software
+ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ //------------------------------------------------------------------------------
++#include <stdint.h>
+ #include "jpegdecoder.h"
+ //------------------------------------------------------------------------------
+ // Coefficients are stored in this sequence in the data stream.
+@@ -102,7 +103,7 @@
+   blocks[i] = q;
+ 
+   // Round to qword boundry, to avoid misaligned accesses with MMX code
+-  return ((void *)(((uint)q + 7) & ~7));
++  return ((void *)(((uintptr_t)q + 7) & ~7));
+ }
+ //------------------------------------------------------------------------------
+ // Clear buffer to word values.
+@@ -1870,7 +1871,7 @@
+   q = (uchar *)alloc(max_blocks_per_row * 64 * sizeof(BLOCK_TYPE) + 8);
+ 
+   // Align to 8-byte boundry, for MMX code
+-  q = (uchar *)(((uint)q + 7) & ~7);
++  q = (uchar *)(((uintptr_t)q + 7) & ~7);
+ 
+   // The block_seg[] array's name dates back to the
+   // 16-bit assembler implementation. "seg" stood for "segment".
+@@ -1880,7 +1881,7 @@
+   for (i = 0; i < max_blocks_per_row; i++)
+     block_max_zag_set[i] = 64;
+ 
+-  Psample_buf = (uchar *)(((uint)alloc(max_blocks_per_row * 64 + 8) + 7) & ~7);
++  Psample_buf = (uchar *)(((uintptr_t)alloc(max_blocks_per_row * 64 + 8) + 7) & ~7);
+ 
+   total_lines_left = image_y_size;
+