Patches for amd64 & fix blas usage. Bug #127554

Package-Manager: portage-2.1.1

6 files changed, 259 insertions, 9 deletions

diff --git a/games-board/gnubg/ChangeLog b/games-board/gnubg/ChangeLog
index f59633b0ef06..6c2008ec1522 100644
--- a/games-board/gnubg/ChangeLog
+++ b/games-board/gnubg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-board/gnubg
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.25 2006/07/08 08:11:02 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.26 2006/10/22 10:57:13 tupone Exp $
+
+*gnubg-0.14.3-r1 (22 Oct 2006)
+
+  22 Oct 2006; <tupone@gentoo.org> +files/gnubg-0.14.3-64bits.patch,
+  +files/gnubg-0.14.3-blas.patch, +gnubg-0.14.3-r1.ebuild:
+  Patches for amd64 & fix blas usage. Bug #127554 by playmiac
 
   08 Jul 2006; Markus Rothe <corsair@gentoo.org> gnubg-0.14.3.ebuild:
   Stable on ppc64
diff --git a/games-board/gnubg/Manifest b/games-board/gnubg/Manifest
index 538c923d388c..28ad01043b42 100644
--- a/games-board/gnubg/Manifest
+++ b/games-board/gnubg/Manifest
@@ -1,26 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gnubg-0.14.3-64bits.patch 2171 RMD160 b07cea2d81ce8508b38cbefa7ca13a152862fd2e SHA1 12a1e3fcb5d48401b6df4e9fc42ec1ffb70c0b4a SHA256 631572f633f7f86f071bb7497149dbeaf25666ae901f95d566d671286e5c0732
+MD5 0331fc35ec354c80d6412d978de148c1 files/gnubg-0.14.3-64bits.patch 2171
+RMD160 b07cea2d81ce8508b38cbefa7ca13a152862fd2e files/gnubg-0.14.3-64bits.patch 2171
+SHA256 631572f633f7f86f071bb7497149dbeaf25666ae901f95d566d671286e5c0732 files/gnubg-0.14.3-64bits.patch 2171
 AUX gnubg-0.14.3-as-needed.patch 663 RMD160 5fee6fd59dbaf749331ce1a1bdb41a8c2abc984e SHA1 5ea968a2ea20a7b144267a22c3432f1fe3edcaf5 SHA256 beca15462bb051736f1e56875dc64ddb9a5613698747fe831d2e420004a23335
 MD5 4e0bc2653e88cbde01cc8e478c34dafc files/gnubg-0.14.3-as-needed.patch 663
 RMD160 5fee6fd59dbaf749331ce1a1bdb41a8c2abc984e files/gnubg-0.14.3-as-needed.patch 663
 SHA256 beca15462bb051736f1e56875dc64ddb9a5613698747fe831d2e420004a23335 files/gnubg-0.14.3-as-needed.patch 663
+AUX gnubg-0.14.3-blas.patch 284 RMD160 4a517b4f7984099c2deda3d9e7a45bc1b9324dc4 SHA1 d9fa2178f19fb80e470654e8be1570c709ac6a50 SHA256 1c86e885acecd617d67cd6b44ae99de1cdc23e91dcc955a5c475fa91261ed570
+MD5 33b27a4561dcdc383656b7bcbdcc5f80 files/gnubg-0.14.3-blas.patch 284
+RMD160 4a517b4f7984099c2deda3d9e7a45bc1b9324dc4 files/gnubg-0.14.3-blas.patch 284
+SHA256 1c86e885acecd617d67cd6b44ae99de1cdc23e91dcc955a5c475fa91261ed570 files/gnubg-0.14.3-blas.patch 284
 AUX gnubg-0.14.3-gcc4.patch 3589 RMD160 28d8b654f837936db37f66e9df8e85e8369a82a3 SHA1 eed82ec0b1a4cb5f51468dbcb5c4f2ac80036e3d SHA256 0f3f7e08207f3d0ccbf4931127dde6c9ca95ec1cb4d12914d3dbc7932407c096
 MD5 138e70fe96c2f36dc2f3187f2b1e5a29 files/gnubg-0.14.3-gcc4.patch 3589
 RMD160 28d8b654f837936db37f66e9df8e85e8369a82a3 files/gnubg-0.14.3-gcc4.patch 3589
 SHA256 0f3f7e08207f3d0ccbf4931127dde6c9ca95ec1cb4d12914d3dbc7932407c096 files/gnubg-0.14.3-gcc4.patch 3589
-DIST gnubg-0.14.3.tar.gz 4241526 RMD160 da7b2a3b52194ca11d505a70fba805e99f15c3ed SHA256 76d18f1a7952a4ba2372e439b3c4ecf2fcd244d334c609bb22d3f501067d1d72
+DIST gnubg-0.14.3.tar.gz 4241526 RMD160 da7b2a3b52194ca11d505a70fba805e99f15c3ed SHA1 8a03c91d190e26fb4024cacd766464741b1dfc90 SHA256 76d18f1a7952a4ba2372e439b3c4ecf2fcd244d334c609bb22d3f501067d1d72
 DIST gnubg.weights-0.14.gz 460747 RMD160 5d588b1145f0d0489b5d70fa6cfccd9ce6738f04 SHA1 e828006193629063460b032f9a7da9761fdbc085 SHA256 6c134ded36d0875cb673a4f9fd84e2d30424935951baeffcd94852ccdb2daf70
 DIST gnubg_os0.bd.gz 906720 RMD160 83fefa3c39544ca9a51f1ba7ae5e8bd5215e631c SHA1 d038a338ee2998d8a61d90b89478eeac3ad464c8 SHA256 e84a36f133ee7ea9fa3686af6c111088b8b43906db1b6c6b3db0035c84cda809
 DIST gnubg_ts0.bd.gz 5899380 RMD160 9e0bea798a53374061014226aca9f5d2063133e8 SHA1 b7c4c18dfc2f3be6cd884444bdf523c8aef6ce41 SHA256 0934e4f2d84f5cd50c2ff4592c93c49d43f7cb89da342600736849c7362626d5
+EBUILD gnubg-0.14.3-r1.ebuild 2870 RMD160 16a3038a72050b6ff7f0d724f794f3f8c00e4724 SHA1 68efb66e79fd573e5c77bdc03c4421355f5f1751 SHA256 b2d6b105364c00ef53411928e53405c73a1203bafb077c2003aa972ba45bd016
+MD5 bcd211259bf92f03b5d37e8c8d57c7a8 gnubg-0.14.3-r1.ebuild 2870
+RMD160 16a3038a72050b6ff7f0d724f794f3f8c00e4724 gnubg-0.14.3-r1.ebuild 2870
+SHA256 b2d6b105364c00ef53411928e53405c73a1203bafb077c2003aa972ba45bd016 gnubg-0.14.3-r1.ebuild 2870
 EBUILD gnubg-0.14.3.ebuild 2815 RMD160 23c0b7f631eed5cac32cbf3ed93d2ecfb1e767d9 SHA1 3f38fb2482bf0dd6584cd793623cf29534ca49fb SHA256 8824196dc87233e5b2562e71b3ab4cdc7d2c20d0c0ea08df2f6f91d0211e8197
 MD5 d4e4456214acd86dfdfb65a2dcba81dc gnubg-0.14.3.ebuild 2815
 RMD160 23c0b7f631eed5cac32cbf3ed93d2ecfb1e767d9 gnubg-0.14.3.ebuild 2815
 SHA256 8824196dc87233e5b2562e71b3ab4cdc7d2c20d0c0ea08df2f6f91d0211e8197 gnubg-0.14.3.ebuild 2815
-MISC ChangeLog 3367 RMD160 366a6d88a4934d3990d9cd28621ea403133d3d9a SHA1 85d10c9359b6c94efb592fe4626dc5ae2e132d6a SHA256 967b31d84e8d6576e2a876bbb8c4e7fa2fe97e1602ef223c4676bb0f085a16f1
-MD5 8114f272cd73bde99a174769cdaf69df ChangeLog 3367
-RMD160 366a6d88a4934d3990d9cd28621ea403133d3d9a ChangeLog 3367
-SHA256 967b31d84e8d6576e2a876bbb8c4e7fa2fe97e1602ef223c4676bb0f085a16f1 ChangeLog 3367
+MISC ChangeLog 3589 RMD160 8ff1a79e6b683f29921ced59aa524a40ac31732f SHA1 cf2740c1d7631e7c903732792fb4855fee4abf6a SHA256 25c547913ae905a0e1fb99b9ca62d04d2c6c8482ac7d20e77e1ddc0c4f8cdffc
+MD5 bf93ad05ed5cf6f5b088b26f2ead381d ChangeLog 3589
+RMD160 8ff1a79e6b683f29921ced59aa524a40ac31732f ChangeLog 3589
+SHA256 25c547913ae905a0e1fb99b9ca62d04d2c6c8482ac7d20e77e1ddc0c4f8cdffc ChangeLog 3589
 MISC metadata.xml 251 RMD160 f77a8fea97ab2a02ef2d9bf1cc7b390c5c19e6cb SHA1 8134d1f2611a2e4387a89e84580a2cb5c25f5649 SHA256 34f41062e84f1e12c08550faffc97632a2432df3579520cec76dbe8b08fb9cfe
 MD5 3f11aaf297b2fe67404a96cda13e9bfe metadata.xml 251
 RMD160 f77a8fea97ab2a02ef2d9bf1cc7b390c5c19e6cb metadata.xml 251
@@ -28,10 +40,13 @@ SHA256 34f41062e84f1e12c08550faffc97632a2432df3579520cec76dbe8b08fb9cfe metadata
 MD5 73279a730dd0234f743d5326bdf41b6b files/digest-gnubg-0.14.3 940
 RMD160 51f4904714d31dea82db728be317de6e1b90bcbe files/digest-gnubg-0.14.3 940
 SHA256 887bd90f455fffd6d5bfdb8ba3befc1667c22bb0ff9ed6ee91e1f54eff84963c files/digest-gnubg-0.14.3 940
+MD5 73279a730dd0234f743d5326bdf41b6b files/digest-gnubg-0.14.3-r1 940
+RMD160 51f4904714d31dea82db728be317de6e1b90bcbe files/digest-gnubg-0.14.3-r1 940
+SHA256 887bd90f455fffd6d5bfdb8ba3befc1667c22bb0ff9ed6ee91e1f54eff84963c files/digest-gnubg-0.14.3-r1 940
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFOHUbdz7hIScOURERAhLqAKDOkxQvPtJ6ymZnwuFuAfOw61UjOQCfd+iC
-W8YjFX5Lgzjy9hluXWKYPbc=
-=Q2V7
+iD8DBQFFO06VbfN2jvlVAhwRApbPAJ0QznmVLQfbQbQav/f9VZ5h+ilSlQCgss+0
+0gQ+yAnlVpYbv3mIw4TWl8g=
+=vozl
 -----END PGP SIGNATURE-----
diff --git a/games-board/gnubg/files/digest-gnubg-0.14.3-r1 b/games-board/gnubg/files/digest-gnubg-0.14.3-r1
new file mode 100644
index 000000000000..16a6cf327157
--- /dev/null
+++ b/games-board/gnubg/files/digest-gnubg-0.14.3-r1
@@ -0,0 +1,12 @@
+MD5 b3ab1ace76fa4bea69db8e617ab587da gnubg-0.14.3.tar.gz 4241526
+RMD160 da7b2a3b52194ca11d505a70fba805e99f15c3ed gnubg-0.14.3.tar.gz 4241526
+SHA256 76d18f1a7952a4ba2372e439b3c4ecf2fcd244d334c609bb22d3f501067d1d72 gnubg-0.14.3.tar.gz 4241526
+MD5 9f1154a9b327954a260726aa6aa6eea5 gnubg.weights-0.14.gz 460747
+RMD160 5d588b1145f0d0489b5d70fa6cfccd9ce6738f04 gnubg.weights-0.14.gz 460747
+SHA256 6c134ded36d0875cb673a4f9fd84e2d30424935951baeffcd94852ccdb2daf70 gnubg.weights-0.14.gz 460747
+MD5 4015327219322eacab5ddd58f6fa268d gnubg_os0.bd.gz 906720
+RMD160 83fefa3c39544ca9a51f1ba7ae5e8bd5215e631c gnubg_os0.bd.gz 906720
+SHA256 e84a36f133ee7ea9fa3686af6c111088b8b43906db1b6c6b3db0035c84cda809 gnubg_os0.bd.gz 906720
+MD5 01bd14c184bd701ae484618eb8acec6e gnubg_ts0.bd.gz 5899380
+RMD160 9e0bea798a53374061014226aca9f5d2063133e8 gnubg_ts0.bd.gz 5899380
+SHA256 0934e4f2d84f5cd50c2ff4592c93c49d43f7cb89da342600736849c7362626d5 gnubg_ts0.bd.gz 5899380
diff --git a/games-board/gnubg/files/gnubg-0.14.3-64bits.patch b/games-board/gnubg/files/gnubg-0.14.3-64bits.patch
new file mode 100644
index 000000000000..d4b400a80ced
--- /dev/null
+++ b/games-board/gnubg/files/gnubg-0.14.3-64bits.patch
@@ -0,0 +1,97 @@
+--- gnubg.c.old	2006-10-21 09:42:47.000000000 +0200
++++ gnubg.c	2006-10-21 09:45:19.000000000 +0200
+@@ -8971,7 +8971,8 @@
+ #if HAVE_ICONV
+ 
+   iconv_t id;
+-  int lIn, lOut, l, rc, nUsed;
++  size_t  lIn, lOut, l;
++  int rc, nUsed;
+ #if WIN32
+   const char *pchIn;
+ #else
+--- renderprefs.c.old	2006-10-21 09:51:22.000000000 +0200
++++ renderprefs.c	2006-10-21 10:13:00.000000000 +0200
+@@ -158,11 +158,13 @@
+ #endif /* USE_GTK */
+ 
+ #if USE_BOARD3D
+-static int SetMaterialCommon(Material* pMat, char *sz)
++static int SetMaterialCommon(Material* pMat, char **newsz)
+ {
++	char *sz;
+ 	float opac;
+ 	char* pch;
+ 
++	sz = *newsz;
+ 	if (SetColourF(pMat->ambientColour, sz) != 0)
+ 		return -1;
+ 	sz += strlen(sz) + 1;
+@@ -206,38 +208,43 @@
+ 	{
+ 		sz += strlen(sz) + 1;
+ 		if (sz && *sz)
+-			return (int)sz;
++		{
++			*newsz = sz;
++			return 1;
++		}
+ 	}
+ 	return 0;
+ }
+ 
+ static int SetMaterial(Material* pMat, char *sz)
+ {
++	int status = (sz != NULL);
+ 	if (fX)
+ 	{
+-		sz = (char*)SetMaterialCommon(pMat, sz);
++		status = SetMaterialCommon(pMat, &sz);
+ 		pMat->textureInfo = 0;
+ 		pMat->pTexture = 0;
+-		if (sz > 0)
++		if (status > 0)
+ 		{
+ 			FindTexture(&pMat->textureInfo, sz);
+-			sz = 0;
++			status = 0;
+ 		}
+ 	}
+-	return (int)sz;
++	return status;
+ }
+ 
+ static int SetMaterialDice(Material* pMat, char *sz, int* flag)
+ {
+-	sz = (char*)SetMaterialCommon(pMat, sz);
++	int status;
++	status = SetMaterialCommon(pMat, &sz);
+ 	/* die colour same as chequer colour */
+ 	*flag = TRUE;
+-	if (sz > 0)
++	if (status > 0)
+ 	{
+ 		*flag = (toupper(*sz) == 'Y');
+-		sz = 0;
++		status = 0;
+ 	}
+-	return (int)sz;
++	return status;
+ }
+ 
+ #endif
+--- board3d/misc3d.c.old	2006-10-21 10:16:16.000000000 +0200
++++ board3d/misc3d.c	2006-10-21 10:16:36.000000000 +0200
+@@ -787,10 +787,10 @@
+ float ***Alloc3d(int x, int y, int z)
+ {	/* Allocate 3d array */
+ 	int i, j;
+-	float ***array = (float ***)malloc(sizeof(float) * x);
++	float ***array = (float ***)malloc(sizeof(float **) * x);
+ 	for (i = 0; i < x; i++)
+ 	{
+-		array[i] = (float **)malloc(sizeof(float) * y);
++		array[i] = (float **)malloc(sizeof(float *) * y);
+ 		for (j = 0; j < y; j++)
+ 			array[i][j] = (float *)malloc(sizeof(float) * z);
+ 	}
diff --git a/games-board/gnubg/files/gnubg-0.14.3-blas.patch b/games-board/gnubg/files/gnubg-0.14.3-blas.patch
new file mode 100644
index 000000000000..aa9c5425648a
--- /dev/null
+++ b/games-board/gnubg/files/gnubg-0.14.3-blas.patch
@@ -0,0 +1,11 @@
+--- lib/neuralnet.c.old	2006-10-22 12:12:20.000000000 +0200
++++ lib/neuralnet.c	2006-10-22 12:13:05.000000000 +0200
+@@ -39,7 +39,7 @@
+ 
+ #if HAVE_LIBATLAS
+ #warning "LIBATLAS processing..."
+-#include <cblas.h>
++#include <atlas/cblas.h>
+ #endif /* HAVE_LIBATLAS */
+ 
+ #if SIGMOID_BAUR
diff --git a/games-board/gnubg/gnubg-0.14.3-r1.ebuild b/games-board/gnubg/gnubg-0.14.3-r1.ebuild
new file mode 100644
index 000000000000..cdaa257ce1d7
--- /dev/null
+++ b/games-board/gnubg/gnubg-0.14.3-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/gnubg-0.14.3-r1.ebuild,v 1.1 2006/10/22 10:57:13 tupone Exp $
+
+inherit flag-o-matic eutils games
+
+WPV="0.14"
+DESCRIPTION="GNU BackGammon"
+HOMEPAGE="http://www.gnu.org/software/gnubg/gnubg.html"
+SRC_URI="ftp://alpha.gnu.org/gnu/gnubg/${P}.tar.gz
+	ftp://alpha.gnu.org/gnu/gnubg/${PN}.weights-${WPV}.gz
+	ftp://alpha.gnu.org/gnu/gnubg/gnubg_os0.bd.gz
+	ftp://alpha.gnu.org/gnu/gnubg/gnubg_ts0.bd.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
+IUSE="arts esd gdbm gtk guile nas nls opengl python readline X"
+
+# test fail - bug #132002
+RESTRICT="test"
+
+# FIXME does this need to DEPEND on netpbm?
+DEPEND="dev-libs/glib
+	>=media-libs/freetype-2
+	media-libs/libpng
+	dev-libs/libxml2
+	sys-libs/zlib
+	arts? ( kde-base/arts )
+	esd? ( media-sound/esound )
+	gdbm? ( sys-libs/gdbm )
+	=dev-libs/glib-2*
+	gtk? (
+		=x11-libs/gtk+-2*
+		media-libs/libart_lgpl
+		opengl? ( x11-libs/gtkglext >=media-libs/ftgl-2.1.2-r1 )
+	)
+	guile? ( dev-util/guile )
+	nas? ( media-libs/nas )
+	python? ( dev-lang/python )
+	readline? ( sys-libs/readline )
+	X? ( x11-libs/libXmu )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mv ../${PN}.weights-${WPV} "${S}/${PN}.weights"
+	mv ../*bd .
+	epatch \
+		"${FILESDIR}/${P}"-gcc4.patch \
+		"${FILESDIR}/${P}"-64bits.patch \
+		"${FILESDIR}/${P}"-blas.patch \
+		"${FILESDIR}/${P}"-as-needed.patch
+}
+
+src_compile() {
+	local myconf=
+	if use gtk ; then
+		# doesn't make any sense to add this without gtk or gtk2
+		if has_version x11-libs/gtk+extra ; then
+			myconf="--with-gtkextra"
+		else
+			myconf="--without-gtkextra"
+		fi
+		myconf="${myconf} --with-gtk --with-gtk2"
+		if use opengl ; then
+			myconf="${myconf} --with-board3d"
+			append-flags $(pkg-config ftgl --cflags)
+			append-ldflags $(pkg-config ftgl --libs)
+		else
+			myconf="${myconf} --without-board3d"
+		fi
+	else
+		myconf="${myconf} --without-gtk --disable-gtktest --without-board3d"
+	fi
+	if use arts || use esd ; then
+		myconf="${myconf} --with-sound"
+	else
+		myconf="${myconf} --without-sound --disable-esdtest --disable-artsc-test"
+	fi
+	if ! use guile ; then
+		myconf="${myconf} --without-guile"
+	fi
+
+	filter-flags -ffast-math #bug #67929
+
+	LIBART_CONFIG="/usr/bin/libart2-config" egamesconf \
+		$(use_enable arts artsc) \
+		$(use_enable esd) \
+		$(use_with gdbm) \
+		$(use_enable nas) \
+		$(use_enable nls) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with X x) \
+		${myconf} \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins ${PN}.weights *bd || die "doins failed"
+	dodoc AUTHORS README NEWS
+	newicon xpm/gnubg-big.xpm gnubg.xpm
+	make_desktop_entry "gnubg -w" "GNU Backgammon" gnubg.xpm
+	prepgamesdirs
+}