Revision bump for the split freealut/openal and closing bug #132839.

(Portage version: 2.1_pre10-r5)

5 files changed, 140 insertions, 1 deletions

diff --git a/games-sports/trigger/ChangeLog b/games-sports/trigger/ChangeLog
index 98eace4aa784..da6193370e4a 100644
--- a/games-sports/trigger/ChangeLog
+++ b/games-sports/trigger/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-sports/trigger
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/ChangeLog,v 1.9 2006/01/29 08:04:42 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/ChangeLog,v 1.10 2006/05/15 20:31:21 wolf31o2 Exp $
+
+*trigger-0.5.2-r1 (15 May 2006)
+
+  15 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/trigger-0.5.2-freealut.patch, +trigger-0.5.2-r1.ebuild:
+  Revision bump for the split freealut/openal and closing bug #132839.
 
   29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   trigger-0.5.1c.ebuild, trigger-0.5.2.ebuild:
diff --git a/games-sports/trigger/files/digest-trigger-0.5.2 b/games-sports/trigger/files/digest-trigger-0.5.2
index d062a1e5f675..da3611ec69e5 100644
--- a/games-sports/trigger/files/digest-trigger-0.5.2
+++ b/games-sports/trigger/files/digest-trigger-0.5.2
@@ -1,2 +1,6 @@
 MD5 3e2bbed3438eb0c44315947b7e042b2f trigger-0.5.2-data.tar.bz2 6189856
+RMD160 945a6c491c3f490d5acdfe3ac3633d3ec839466c trigger-0.5.2-data.tar.bz2 6189856
+SHA256 2e922aa8117722c8524e4c63c3df79c368bae0fd1aeada6005c27c81d27de7a6 trigger-0.5.2-data.tar.bz2 6189856
 MD5 182da5d71c4db8f2d0df72ab91c743ed trigger-0.5.2-src.tar.bz2 333942
+RMD160 af71c1e343d3eac20abe0c00257080fb592819b0 trigger-0.5.2-src.tar.bz2 333942
+SHA256 0fbb4f62e8c6b09e268a523cc9dbdd211fbbe94e2a316961c3ea5c79fb327aca trigger-0.5.2-src.tar.bz2 333942
diff --git a/games-sports/trigger/files/digest-trigger-0.5.2-r1 b/games-sports/trigger/files/digest-trigger-0.5.2-r1
new file mode 100644
index 000000000000..da3611ec69e5
--- /dev/null
+++ b/games-sports/trigger/files/digest-trigger-0.5.2-r1
@@ -0,0 +1,6 @@
+MD5 3e2bbed3438eb0c44315947b7e042b2f trigger-0.5.2-data.tar.bz2 6189856
+RMD160 945a6c491c3f490d5acdfe3ac3633d3ec839466c trigger-0.5.2-data.tar.bz2 6189856
+SHA256 2e922aa8117722c8524e4c63c3df79c368bae0fd1aeada6005c27c81d27de7a6 trigger-0.5.2-data.tar.bz2 6189856
+MD5 182da5d71c4db8f2d0df72ab91c743ed trigger-0.5.2-src.tar.bz2 333942
+RMD160 af71c1e343d3eac20abe0c00257080fb592819b0 trigger-0.5.2-src.tar.bz2 333942
+SHA256 0fbb4f62e8c6b09e268a523cc9dbdd211fbbe94e2a316961c3ea5c79fb327aca trigger-0.5.2-src.tar.bz2 333942
diff --git a/games-sports/trigger/files/trigger-0.5.2-freealut.patch b/games-sports/trigger/files/trigger-0.5.2-freealut.patch
new file mode 100644
index 000000000000..f8b3b00cca1d
--- /dev/null
+++ b/games-sports/trigger/files/trigger-0.5.2-freealut.patch
@@ -0,0 +1,52 @@
+--- configure.ac
++++ configure.ac
+@@ -98,11 +98,17 @@
+ 	*)
+ 	
+ 	AX_FINDLIB([AUDIOLIB], [OpenAL], [OpenAL],
+-		AX_LANG_PROGRAM([#include <AL/alut.h>], [alutInit(0,0);]),
++		AX_LANG_PROGRAM([#include <AL/alc.h>], [alcOpenDevice(0);]),
+ 		[], [-lopenal],
+ 		[],
+ 		[AC_MSG_ERROR([Please install OpenAL])])
+ 	
++	AX_FINDLIB([AUDIOLIB], [ALUT], [ALUT],
++		AX_LANG_PROGRAM([#include <AL/alut.h>], [alutInit(0,0);]),
++		[], [-lalut],
++		[],
++		[AC_MSG_ERROR([Please install ALUT])])
++	
+ 	;;
+ 	
+ esac
+
+--- src/pengine/audio.cpp
++++ src/pengine/audio.cpp
+@@ -196,25 +196,18 @@
+ 	PHYSFS_read(pfile, wavbuffer, filesize, 1);
+ 	PHYSFS_close(pfile);
+ 	
+-	ALenum format;
+-	ALvoid *data = null;
+-	ALsizei size, freq;
+-	ALboolean loop;
+ 	
+-	alutLoadWAVMemory((ALbyte *)wavbuffer, &format, &data, &size, &freq, &loop);
++	buffer = alutCreateBufferFromFileImage(wavbuffer, filesize);
+ 	
+ 	delete [] wavbuffer;
+ 	
+-	if (!data) {
++	if (buffer == AL_NONE) {
+ 		unload();
+ 		throw MakePException ("Sample load failed");
+ 	}
+ 	
+-	alGenBuffers(1, &buffer);
+ 	
+-	alBufferData(buffer, format, data, size, freq);
+ 	
+-	alutUnloadWAV(format, data, size, freq);
+ }
+ 
+ void PAudioSample::unload()
diff --git a/games-sports/trigger/trigger-0.5.2-r1.ebuild b/games-sports/trigger/trigger-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..a96a96679e23
--- /dev/null
+++ b/games-sports/trigger/trigger-0.5.2-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.2-r1.ebuild,v 1.1 2006/05/15 20:31:21 wolf31o2 Exp $
+
+inherit eutils games
+
+DESCRIPTION="Free OpenGL rally car racing game"
+HOMEPAGE="http://www.positro.net/trigger/"
+SRC_URI="http://files.scapecaster.com/posit/${P}-src.tar.bz2
+	http://files.scapecaster.com/posit/${P}-data.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="virtual/opengl
+	|| (
+		( x11-libs/libX11 )
+		virtual/x11 )
+	>=media-libs/libsdl-1.2.5
+	>=media-libs/sdl-image-1.2
+	media-libs/sdl-mixer
+	~media-libs/openal
+	media-libs/freealut
+	dev-games/physfs"
+DEPEND="${RDEPEND}
+	|| (
+		( x11-libs/libXt
+			x11-proto/xproto )
+		virtual/x11
+	)
+	dev-util/jam"
+
+S=${WORKDIR}/${P}-src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e 's:#include <GL/glew.h>:#include "glew.h":' \
+		-e 's:include <GL/glxew.h>:include "glxew.h":' \
+		src/glew/glew.cpp \
+		src/glew/GL/glxew.h \
+		|| die "sed failed"
+	epatch "${FILESDIR}"/${P}-freealut.patch
+}
+
+src_compile() {
+	./autogen.sh
+	egamesconf --datadir="${GAMES_DATADIR}/${PN}" || die
+	jam || die "jam failed"
+}
+
+src_install() {
+	dogamesbin trigger || die "dogamesbin failed"
+
+	cd ../${P}-data
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r events maps plugins sounds textures vehicles trigger.config.defs
+
+	dodoc README.txt README-stereo.txt
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	einfo "After running ${PN} for the first time, a config file is"
+	einfo "available in ~/.trigger/trigger.config"
+	echo
+}