Added new (masked) revision which depends on the split openal/freealut. Closing bug #132819.

(Portage version: 2.1_pre10-r5)

4 files changed, 144 insertions, 1 deletions

diff --git a/games-sports/ultimatestunts/ChangeLog b/games-sports/ultimatestunts/ChangeLog
index 7a050e686d13..28c85270c3ef 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.5 2006/05/02 02:58:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/ultimatestunts/ChangeLog,v 1.6 2006/05/12 18:18:19 wolf31o2 Exp $
+
+*ultimatestunts-0.6.1-r1 (12 May 2006)
+
+  12 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/ultimatestunts-0.6.1-freealut.patch,
+  +ultimatestunts-0.6.1-r1.ebuild:
+  Added new (masked) revision which depends on the split openal/freealut.
+  Closing bug #132819.
 
   02 May 2006; Michael Sterrett <mr_bones_@gentoo.org>
   -ultimatestunts-0.6.0.ebuild, ultimatestunts-0.6.1.ebuild:
diff --git a/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.1-r1 b/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.1-r1
new file mode 100644
index 000000000000..6072f2efe79b
--- /dev/null
+++ b/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.1-r1
@@ -0,0 +1,3 @@
+MD5 aa0524704fefe873b7dae77e88a86c9c ultimatestunts-srcdata-0611.tar.gz 23171268
+RMD160 4ca3d691fe05bfa714129ad7eaeb358e1c4b2f02 ultimatestunts-srcdata-0611.tar.gz 23171268
+SHA256 d1ac09ad03e7b81611b014bdef5956910be01e53cab7b0bafdfbfe7047547fe7 ultimatestunts-srcdata-0611.tar.gz 23171268
diff --git a/games-sports/ultimatestunts/files/ultimatestunts-0.6.1-freealut.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.6.1-freealut.patch
new file mode 100644
index 000000000000..6d20da0c6074
--- /dev/null
+++ b/games-sports/ultimatestunts/files/ultimatestunts-0.6.1-freealut.patch
@@ -0,0 +1,56 @@
+--- configure
++++ configure
+@@ -6908,7 +6908,7 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_openal_alGetError" >&5
+ echo "${ECHO_T}$ac_cv_lib_openal_alGetError" >&6
+ if test $ac_cv_lib_openal_alGetError = yes; then
+-  soundlibs="-lopenal $soundlibs";cat >>confdefs.h <<\_ACEOF
++  soundlibs="-lopenal -lalut $soundlibs";cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LIBOPENAL 1
+ _ACEOF
+ 
+--- 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("alutCreateBufferFromFile failed\n");
+ 	}
+ 
+ 	free(wave);
diff --git a/games-sports/ultimatestunts/ultimatestunts-0.6.1-r1.ebuild b/games-sports/ultimatestunts/ultimatestunts-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..0dab6086c5ba
--- /dev/null
+++ b/games-sports/ultimatestunts/ultimatestunts-0.6.1-r1.ebuild
@@ -0,0 +1,76 @@
+# 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.1-r1.ebuild,v 1.1 2006/05/12 18:18:19 wolf31o2 Exp $
+
+inherit eutils versionator games
+
+MY_PV=$(replace_all_version_separators '')1
+MY_P=${PN}-srcdata-${MY_PV}
+
+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=""
+
+DEPEND="media-libs/libsdl
+	~media-libs/openal-0.0.8
+	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 )
+		virtual/x11 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e "s:/etc/ultimatestunts.conf:${GAMES_SYSCONFDIR}/ultimatestunts.conf:" \
+		shared/usmisc.cpp \
+		|| die "sed failed"
+
+	sed -i \
+		-e '302,306s#${usdatadir}#$(DESTDIR)${usdatadir}#' \
+		data/Makefile.in \
+		|| die "sed failed"
+
+	#fix up install paths (bug #130513)
+	sed -i \
+		-e "s:\${prefix}/share/ultimatestunts/:${GAMES_DATADIR}/ultimatestunts/:" \
+		configure \
+		|| die "sed failed"
+
+	epatch \
+		"${FILESDIR}/${P}"-64bits.patch \
+		"${FILESDIR}/${P}"-gcc41.patch \
+		"${FILESDIR}/${P}"-freealut.patch
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+	make_desktop_entry ustunts "Ultimate Stunts"
+	dodoc AUTHORS README TODO
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	echo
+	einfo "Please update or remove ~/.ultimatestunts/ultimatestunts.conf"
+	einfo "if you have it to update the path for the data files."
+	echo
+}