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

Package-Manager: portage-2.1_pre10-r5

6 files changed, 172 insertions, 13 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/Manifest b/games-sports/trigger/Manifest
index 75218920d23a..01f5df0296ba 100644
--- a/games-sports/trigger/Manifest
+++ b/games-sports/trigger/Manifest
@@ -1,21 +1,41 @@
-MD5 96a21aa5ea4f87f07d8483638225bc72 ChangeLog 1518
-RMD160 6c811acb2d6199a47bf59bf370a97949ea0a5f3b ChangeLog 1518
-SHA256 daaa1f5b2e8e605b7c89b192794cf1972a4a9f775440e444b03011154a4a9ec2 ChangeLog 1518
-MD5 e39a2359502dafc730380be78246173f files/digest-trigger-0.5.1c 144
-RMD160 7a2fc2e068024256bf1a117494a3dcd0ae19548d files/digest-trigger-0.5.1c 144
-SHA256 27caa81463c486cd81f29dda0d503566ecc492ddf23b7c249ec280714fb749da files/digest-trigger-0.5.1c 144
-MD5 ac43101e9cf3b3740d2bbd70a03902c6 files/digest-trigger-0.5.2 142
-RMD160 d98b4701479e65316d79603961675465664134fb files/digest-trigger-0.5.2 142
-SHA256 b0c102e1c7e7aca4c68851c099264caa41155416d436ec305bfb46ed98b1e15f files/digest-trigger-0.5.2 142
+AUX trigger-0.5.1c-glx-check.patch 590 RMD160 50dc898d7e31dc94eb43076f4027f485fcd8f443 SHA1 bb19c963876c10890846b7d03187d6cf3f3fb647 SHA256 42845b9e322cea9406e250e4cba80aa1825c4722c84834ca362747d7bcea8030 size 590
 MD5 fab012ed7b17d5eeb472e71a6c9c7c06 files/trigger-0.5.1c-glx-check.patch 590
 RMD160 50dc898d7e31dc94eb43076f4027f485fcd8f443 files/trigger-0.5.1c-glx-check.patch 590
 SHA256 42845b9e322cea9406e250e4cba80aa1825c4722c84834ca362747d7bcea8030 files/trigger-0.5.1c-glx-check.patch 590
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
-SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+AUX trigger-0.5.2-freealut.patch 1164 RMD160 1da8767e11136b02ace9a536bb4ef26e6be47631 SHA1 40aa9774930c6a0ded7984d3418ed737091f9b10 SHA256 38c23c1f0a599454f7b5a373a7d233d588839584812e8a35327b230bbf1ef58b size 1164
+MD5 11b5b5c4e7e466719f3a0e5f5b870c59 files/trigger-0.5.2-freealut.patch 1164
+RMD160 1da8767e11136b02ace9a536bb4ef26e6be47631 files/trigger-0.5.2-freealut.patch 1164
+SHA256 38c23c1f0a599454f7b5a373a7d233d588839584812e8a35327b230bbf1ef58b files/trigger-0.5.2-freealut.patch 1164
+DIST trigger-0.5.1c-data.tar.bz2 6165837 size 6165837
+DIST trigger-0.5.1c-src.tar.bz2 259508 size 259508
+DIST trigger-0.5.2-data.tar.bz2 6189856 RMD160 945a6c491c3f490d5acdfe3ac3633d3ec839466c SHA256 2e922aa8117722c8524e4c63c3df79c368bae0fd1aeada6005c27c81d27de7a6 size 6189856
+DIST trigger-0.5.2-src.tar.bz2 333942 RMD160 af71c1e343d3eac20abe0c00257080fb592819b0 SHA256 0fbb4f62e8c6b09e268a523cc9dbdd211fbbe94e2a316961c3ea5c79fb327aca size 333942
+EBUILD trigger-0.5.1c.ebuild 1491 RMD160 2885a6c874aa8a669b7168c6b9c12ec3f33ff2af SHA1 042a31351840d4776bd73754d93075e1ccbc4f26 SHA256 40a6b06cccd52baa7ef2fedf3a9b1572a2fa2f09a1775310ffe1bf3c02fc71ea size 1491
 MD5 13baff2456a9cfcbf63a60e031ff6356 trigger-0.5.1c.ebuild 1491
 RMD160 2885a6c874aa8a669b7168c6b9c12ec3f33ff2af trigger-0.5.1c.ebuild 1491
 SHA256 40a6b06cccd52baa7ef2fedf3a9b1572a2fa2f09a1775310ffe1bf3c02fc71ea trigger-0.5.1c.ebuild 1491
+EBUILD trigger-0.5.2-r1.ebuild 1628 RMD160 ccfe759382a9c5c02d515d7d9d93d9607f486930 SHA1 37abfb4e8628dbb9319e8c3ec3717926a65e811f SHA256 4fbec03b8cc45e9969b48a3901797b39039c60f275bd46edf667591bb5052ccd size 1628
+MD5 9b2775a9bc937b5b0d2d36051ecd3b2b trigger-0.5.2-r1.ebuild 1628
+RMD160 ccfe759382a9c5c02d515d7d9d93d9607f486930 trigger-0.5.2-r1.ebuild 1628
+SHA256 4fbec03b8cc45e9969b48a3901797b39039c60f275bd46edf667591bb5052ccd trigger-0.5.2-r1.ebuild 1628
+EBUILD trigger-0.5.2.ebuild 1551 RMD160 2ca3a1b7a5169cf939c38ef1190d52657139a2a8 SHA1 86c2be22fc487625ec84206b643dd67a9a52e0a0 SHA256 29c17096ae3c360f0fa76f1aab3712b4892d141946afcf11677bfc553d15a5be size 1551
 MD5 051fb4f2147e73ed011027fbe678bb75 trigger-0.5.2.ebuild 1551
 RMD160 2ca3a1b7a5169cf939c38ef1190d52657139a2a8 trigger-0.5.2.ebuild 1551
 SHA256 29c17096ae3c360f0fa76f1aab3712b4892d141946afcf11677bfc553d15a5be trigger-0.5.2.ebuild 1551
+MISC ChangeLog 1738 RMD160 21e78b6c5774c359c0c247c4e3560124ca48902b SHA1 4f2f1cdeb3b456d08fac99127ed473a17e54153f SHA256 317a902d1177242261140a1090b195182164cc0085827730d11bda2e52551fa1 size 1738
+MD5 e07f038682b8c26f4271f85dcb857c75 ChangeLog 1738
+RMD160 21e78b6c5774c359c0c247c4e3560124ca48902b ChangeLog 1738
+SHA256 317a902d1177242261140a1090b195182164cc0085827730d11bda2e52551fa1 ChangeLog 1738
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 e39a2359502dafc730380be78246173f files/digest-trigger-0.5.1c 144
+RMD160 7a2fc2e068024256bf1a117494a3dcd0ae19548d files/digest-trigger-0.5.1c 144
+SHA256 27caa81463c486cd81f29dda0d503566ecc492ddf23b7c249ec280714fb749da files/digest-trigger-0.5.1c 144
+MD5 87f9ae9139f4c188b7c4f85b6ceb8231 files/digest-trigger-0.5.2 518
+RMD160 1f7c5ce70c6fda01a424a92d50cd4f8e9fb141b9 files/digest-trigger-0.5.2 518
+SHA256 a0ed004bff630f656c2e090b892f1d625f648b3458d778f259cce22c808baf2f files/digest-trigger-0.5.2 518
+MD5 87f9ae9139f4c188b7c4f85b6ceb8231 files/digest-trigger-0.5.2-r1 518
+RMD160 1f7c5ce70c6fda01a424a92d50cd4f8e9fb141b9 files/digest-trigger-0.5.2-r1 518
+SHA256 a0ed004bff630f656c2e090b892f1d625f648b3458d778f259cce22c808baf2f files/digest-trigger-0.5.2-r1 518
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
+}