Version bump

(Portage version: 2.1.2_pre2)

6 files changed, 177 insertions, 1 deletions

diff --git a/games-sports/ultimatestunts/ChangeLog b/games-sports/ultimatestunts/ChangeLog
index 28c85270c3ef..09d204392275 100644
--- a/games-sports/ultimatestunts/ChangeLog
+++ b/games-sports/ultimatestunts/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-sports/ultimatestunts
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/ultimatestunts/ChangeLog,v 1.6 2006/05/12 18:18:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/ultimatestunts/ChangeLog,v 1.7 2006/10/01 19:42:03 nyhm Exp $
+
+*ultimatestunts-0.6.2 (01 Oct 2006)
+
+  01 Oct 2006; Tristan Heaven <nyhm@gentoo.org>
+  +files/ultimatestunts-0.6.2-freealut.patch,
+  +files/ultimatestunts-0.6.2-gcc41.patch,
+  +files/ultimatestunts-0.6.2-paths.patch, +ultimatestunts-0.6.2.ebuild:
+  Version bump
 
 *ultimatestunts-0.6.1-r1 (12 May 2006)
 
diff --git a/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.2 b/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.2
new file mode 100644
index 000000000000..2aa1595ed91c
--- /dev/null
+++ b/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.2
@@ -0,0 +1,3 @@
+MD5 173c9e915d4bcaf7206d8b872b387ad9 ultimatestunts-srcdata-0621.tar.gz 25355968
+RMD160 5b65bf35dcefaa5036b382c9b3edb5974471a1f9 ultimatestunts-srcdata-0621.tar.gz 25355968
+SHA256 363e1bc582cc3417dfbc2b629da502ce9b3151c1a83a5d54841f4112bfde7be3 ultimatestunts-srcdata-0621.tar.gz 25355968
diff --git a/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-freealut.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-freealut.patch
new file mode 100644
index 000000000000..2ecc58f602b1
--- /dev/null
+++ b/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-freealut.patch
@@ -0,0 +1,56 @@
+--- configure.ac
++++ configure.ac
+@@ -129,7 +129,7 @@
+ dnl Check openAL audio library (currently default)
+ dnl ------------------------
+ AC_CHECK_HEADER(AL/al.h, AC_DEFINE([OPENAL_HEADER], [], [OpenAL headers]))
+-AC_CHECK_LIB(openal, alGetError, soundlibs="-lopenal $soundlibs";AC_DEFINE([HAVE_LIBOPENAL], [], [OpenAL Lib]))
++AC_CHECK_LIB(openal, alGetError, soundlibs="-lopenal -lalut $soundlibs";AC_DEFINE([HAVE_LIBOPENAL], [], [OpenAL Lib]))
+ 
+ if test "x$soundlibs" = "x" ; then
+ 
+--- ultimatestunts/sndsample.cpp
++++ ultimatestunts/sndsample.cpp
+@@ -96,10 +96,7 @@
+ 	//data (and default values)
+ 	void *wave = NULL;
+ 	ALsizei
+-		format = AL_FORMAT_MONO16,
+-		size = 0,
+-		bits = 0,
+-		freq = 44100;
++		size = 0;
+ 
+ 	CString extension = realfile.mid(realfile.length() - 4);
+ 	extension.toLower();
+@@ -108,7 +105,7 @@
+ 	{
+ 		//the loading proc
+ 		ALboolean (*alutLoadVorbis)(ALuint, ALvoid *, ALint) =
+-			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress((ALubyte *) VORBISFUNC);
++			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress(VORBISFUNC);
+ 
+ 		if(alutLoadVorbis == NULL)
+ 		{
+@@ -134,7 +131,7 @@
+ 	{
+ 		//the loading proc
+ 		ALboolean (*alutLoadMP3)(ALuint, ALvoid *, ALint) =
+-			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress((ALubyte *) MP3FUNC);
++			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress(MP3FUNC);
+ 
+ 		if(alutLoadMP3 == NULL)
+ 		{
+@@ -158,9 +155,9 @@
+ 	}
+ 	else //default: load as wave file
+ 	{
+-		alGenBuffers(1, &m_Buffer);
+-		alutLoadWAV(realfile.c_str(), &wave, &format, &size, &bits, &freq);
+-		alBufferData(m_Buffer, format, wave, size, freq);
++		m_Buffer = alutCreateBufferFromFile(realfile.c_str());
++		if(m_Buffer == AL_NONE)
++			printf("%s\n", alutGetErrorString(alutGetError()));
+ 	}
+ 
+ 	free(wave);
diff --git a/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-gcc41.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-gcc41.patch
new file mode 100644
index 000000000000..36f20c2580e1
--- /dev/null
+++ b/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-gcc41.patch
@@ -0,0 +1,11 @@
+--- shared/lconfig.h
++++ shared/lconfig.h
+@@ -38,7 +38,7 @@
+ 
+ public:
+ 
+-	CStringArray CLCData::findAllFields(CString) const;
++	CStringArray findAllFields(CString) const;
+ 	CLCData();
+ 	virtual ~CLCData();
+ 	bool push(CString, CString, CString, CString);
diff --git a/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-paths.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-paths.patch
new file mode 100644
index 000000000000..36a677db5f3c
--- /dev/null
+++ b/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-paths.patch
@@ -0,0 +1,35 @@
+--- configure.ac
++++ configure.ac
+@@ -210,9 +210,9 @@
+ dnl ------------------
+ dnl The directory locations
+ dnl ------------------
+-usdatadir="${prefix}/share/ultimatestunts/"
++usdatadir="${datadir}/ultimatestunts/"
+ 
+-AC_DEFINE_UNQUOTED([PREFIXDIR], ["$prefix"], [Prefix dir])
++AC_DEFINE_UNQUOTED([PREFIXDIR], ["$sysconfdir"], [Prefix dir])
+ 
+ AC_SUBST(netlibs)
+ AC_SUBST(soundlibs)
+
+--- data/Makefile.am
++++ data/Makefile.am
+@@ -1,4 +1,4 @@
+-usdatadir=@usdatadir@
++usdatadir=$(DESTDIR)/@usdatadir@
+ 
+ install:
+ 	$(mkinstalldirs) ${usdatadir}
+
+--- shared/usmisc.cpp
++++ shared/usmisc.cpp
+@@ -42,7 +42,7 @@
+ 	printf("prefix = %s\n", prefixdir.c_str());
+ 
+ 	std::vector<CString> locations;
+-	locations.push_back(prefixdir + "/etc/ultimatestunts.conf");
++	locations.push_back(prefixdir + "/ultimatestunts.conf");
+ 	locations.push_back("/etc/ultimatestunts.conf");
+ 	locations.push_back("/usr/local/etc/ultimatestunts.conf");
+ 	locations.push_back("./ultimatestunts.conf");
diff --git a/games-sports/ultimatestunts/ultimatestunts-0.6.2.ebuild b/games-sports/ultimatestunts/ultimatestunts-0.6.2.ebuild
new file mode 100644
index 000000000000..25165e049840
--- /dev/null
+++ b/games-sports/ultimatestunts/ultimatestunts-0.6.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/ultimatestunts/ultimatestunts-0.6.2.ebuild,v 1.1 2006/10/01 19:42:03 nyhm Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+inherit autotools eutils versionator games
+
+MY_P=${PN}-srcdata-$(replace_all_version_separators)1
+DESCRIPTION="Remake of the famous Stunts game"
+HOMEPAGE="http://www.ultimatestunts.nl/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="media-libs/libsdl
+	media-libs/openal
+	media-libs/freealut
+	virtual/opengl
+	virtual/glu
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-freealut.patch \
+		"${FILESDIR}"/${P}-paths.patch
+
+	autopoint -f || die "autopoint failed"
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_compile() {
+	egamesconf $(use_enable nls) || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	make_desktop_entry ustunts "Ultimate Stunts"
+	dodoc AUTHORS README
+
+	rm -rf $(find "${D}" -name CVS)
+	prepgamesdirs
+}