Removed .xvpics directory and added a new revision with patches to work with the new split openal/freealut packages.

Package-Manager: portage-2.1_rc1-r2

8 files changed, 411 insertions, 12 deletions

diff --git a/games-action/chromium/ChangeLog b/games-action/chromium/ChangeLog
index b120794344c8..f8272c781c9a 100644
--- a/games-action/chromium/ChangeLog
+++ b/games-action/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-action/chromium
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/ChangeLog,v 1.16 2006/04/18 12:14:57 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/ChangeLog,v 1.17 2006/05/20 00:16:01 wolf31o2 Exp $
+
+*chromium-0.9.12-r6 (20 May 2006)
+
+  20 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/0.9.12-configure.patch, +files/0.9.12-freealut.patch,
+  chromium-0.9.12-r5.ebuild, +chromium-0.9.12-r6.ebuild:
+  Removed .xvpics directory and added a new revision with patches to work with
+  the new split openal/freealut packages.
 
   18 Apr 2006; Jason Wever <weeve@gentoo.org> chromium-0.9.12-r5.ebuild:
   Stable on SPARC.
diff --git a/games-action/chromium/Manifest b/games-action/chromium/Manifest
index df7b9023067a..10ea935eb1cc 100644
--- a/games-action/chromium/Manifest
+++ b/games-action/chromium/Manifest
@@ -1,21 +1,44 @@
-MD5 37312d99cb88750835e9ee62db3ea498 ChangeLog 3653
-RMD160 ce0cc8f48f438669262f65834a75e194c7c2d7c8 ChangeLog 3653
-SHA256 b48802ba6c3e8874960fe4675d4f01d8be6cb1af8ee53fca27a27bb6cbffd3cd ChangeLog 3653
-MD5 d83efb8d0bac8db1675e061d3b5dfa19 chromium-0.9.12-r5.ebuild 2230
-RMD160 7642641fb3fad42b88023f36267482eb61debdb6 chromium-0.9.12-r5.ebuild 2230
-SHA256 9b80cfb412c005a8a83781d635418fef0d42d84a4e533ce0840677a0e7391c94 chromium-0.9.12-r5.ebuild 2230
+AUX 0.9.12-configure.patch 323 RMD160 19cee25d368692c5aa6214f55eea7a640cbdd6c9 SHA1 c92698b0791e744f9e005657a560e8c095e650c0 SHA256 51dd41f1aaf7dccb5f25dd88f931f5142339c629836cc5256a2b0ddc65f658a3 size 323
+MD5 78d6e86e35c196199788c0550b6cfc51 files/0.9.12-configure.patch 323
+RMD160 19cee25d368692c5aa6214f55eea7a640cbdd6c9 files/0.9.12-configure.patch 323
+SHA256 51dd41f1aaf7dccb5f25dd88f931f5142339c629836cc5256a2b0ddc65f658a3 files/0.9.12-configure.patch 323
+AUX 0.9.12-freealut.patch 7006 RMD160 e14eed7b6006dbf4b08d8766fa2279db7483b850 SHA1 fc6041b069bd10d55969cb92d37e25ee71cb154c SHA256 50b221196a057eb2d0800cdc987d3156be15747f093dbd752d3ac06343e21696 size 7006
+MD5 0e251478e227304cdd2bc2da88835727 files/0.9.12-freealut.patch 7006
+RMD160 e14eed7b6006dbf4b08d8766fa2279db7483b850 files/0.9.12-freealut.patch 7006
+SHA256 50b221196a057eb2d0800cdc987d3156be15747f093dbd752d3ac06343e21696 files/0.9.12-freealut.patch 7006
+AUX 0.9.12-gcc3-gentoo.patch 530 RMD160 2599f72b8a4cdb81cbad7802085321dbb2aa096d SHA1 49c2dca0dc05a29872d743bed457c984fae179ce SHA256 e10024adff892effc7ad2230234260c00106020c920180c69539f6f4e43b5d50 size 530
 MD5 704ffc456916b1e4953b5292b78f64c2 files/0.9.12-gcc3-gentoo.patch 530
 RMD160 2599f72b8a4cdb81cbad7802085321dbb2aa096d files/0.9.12-gcc3-gentoo.patch 530
 SHA256 e10024adff892effc7ad2230234260c00106020c920180c69539f6f4e43b5d50 files/0.9.12-gcc3-gentoo.patch 530
+AUX 0.9.12-proper-options.patch 1708 RMD160 6e3bb9f6f500904a986dfb04ae47123bd4cf28b3 SHA1 3c6c6b65f34c34b3dca9e2b06a5c53ea99bdfe3c SHA256 7ea0a8e6861d710b01bbe683585fdebd26a3d530f5b579aea10c563d4803a869 size 1708
 MD5 e363d085caa6b62c91264e68a15b0459 files/0.9.12-proper-options.patch 1708
 RMD160 6e3bb9f6f500904a986dfb04ae47123bd4cf28b3 files/0.9.12-proper-options.patch 1708
 SHA256 7ea0a8e6861d710b01bbe683585fdebd26a3d530f5b579aea10c563d4803a869 files/0.9.12-proper-options.patch 1708
+AUX 0.9.12-qt3.patch 979 RMD160 efe12c75b8d83b85292d974b0b4fe17f554a463b SHA1 0ce024be66d6ab60b72bb0d7c29764de18f1fee2 SHA256 3671171967c89b6ab675e49fd228cef0398bb01b9b60f77d26f749e4ea4f9861 size 979
 MD5 031dc9787ccdcb049081dccf31a4a401 files/0.9.12-qt3.patch 979
 RMD160 efe12c75b8d83b85292d974b0b4fe17f554a463b files/0.9.12-qt3.patch 979
 SHA256 3671171967c89b6ab675e49fd228cef0398bb01b9b60f77d26f749e4ea4f9861 files/0.9.12-qt3.patch 979
-MD5 8efe8d996573ec81e5357e39c046cdd3 files/digest-chromium-0.9.12-r5 144
-RMD160 b2cf303d091225a917958b092b376f736bee4479 files/digest-chromium-0.9.12-r5 144
-SHA256 21c20f6472561b9e720b9c8f58459c383730a0e274ba429ba5490c4c571f121e files/digest-chromium-0.9.12-r5 144
+DIST chromium-data-0.9.12.tar.gz 1111134 RMD160 b05510d8b4a5a868b632108f688ec187a89ed805 SHA256 749d10bcedeff7a82701da97701f9d31b4a057dfa84f33e197085ac71975b195 size 1111134
+DIST chromium-src-0.9.12.tar.gz 640283 RMD160 f422098a67efedb53fafbbb08119596c6b87a1d8 SHA256 a4a2c929dfd462a9281d8c0dae485c70362140e038f532608550f6528b6ab745 size 640283
+EBUILD chromium-0.9.12-r5.ebuild 2258 RMD160 f3c53be798bf716ae046ec44bba61a9ee80d34f7 SHA1 694fb645c40cc63b0dbbb874f6e2747342e0331e SHA256 3c1eb6c1e12c3fa42e647792e9f9a643494d73e8b62da0c7744c14d9d006294c size 2258
+MD5 2e744113fb586283003e4c1d2a25630f chromium-0.9.12-r5.ebuild 2258
+RMD160 f3c53be798bf716ae046ec44bba61a9ee80d34f7 chromium-0.9.12-r5.ebuild 2258
+SHA256 3c1eb6c1e12c3fa42e647792e9f9a643494d73e8b62da0c7744c14d9d006294c chromium-0.9.12-r5.ebuild 2258
+EBUILD chromium-0.9.12-r6.ebuild 2323 RMD160 93a87c6c9e9c4a0fe346be78314fc96ff776645d SHA1 3ac89aa03147dce3bcb5d42909504a573027e3eb SHA256 53e370514fc9878ed03338c61f052b94888073f4b5167f334e2b007bc17b1335 size 2323
+MD5 6cac5f53bc8d0927eb0e3ae9128cf575 chromium-0.9.12-r6.ebuild 2323
+RMD160 93a87c6c9e9c4a0fe346be78314fc96ff776645d chromium-0.9.12-r6.ebuild 2323
+SHA256 53e370514fc9878ed03338c61f052b94888073f4b5167f334e2b007bc17b1335 chromium-0.9.12-r6.ebuild 2323
+MISC ChangeLog 3987 RMD160 88e92e51529aad24f437cd5a07f31bbb6180bed7 SHA1 425821cc1f1339be923cfd5139078e0abe6fe446 SHA256 287df9c30bd8ae84c9d37c510f6cd1fcc5dce5a4f6c1a7ce34fe1d47371d6fe5 size 3987
+MD5 8e8c4889cf031f41fa9e87b4c1e8f43b ChangeLog 3987
+RMD160 88e92e51529aad24f437cd5a07f31bbb6180bed7 ChangeLog 3987
+SHA256 287df9c30bd8ae84c9d37c510f6cd1fcc5dce5a4f6c1a7ce34fe1d47371d6fe5 ChangeLog 3987
+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 1091ea4475a76a7d4c9ece5a6d7d9ffa files/digest-chromium-0.9.12-r5 524
+RMD160 f81a71dfef00a132ebd52a1bc7b545483715672e files/digest-chromium-0.9.12-r5 524
+SHA256 e15835fb5548e4a00ad3f117321c25681586d4b65569d538f3d9454ea6edbbcc files/digest-chromium-0.9.12-r5 524
+MD5 1091ea4475a76a7d4c9ece5a6d7d9ffa files/digest-chromium-0.9.12-r6 524
+RMD160 f81a71dfef00a132ebd52a1bc7b545483715672e files/digest-chromium-0.9.12-r6 524
+SHA256 e15835fb5548e4a00ad3f117321c25681586d4b65569d538f3d9454ea6edbbcc files/digest-chromium-0.9.12-r6 524
diff --git a/games-action/chromium/chromium-0.9.12-r5.ebuild b/games-action/chromium/chromium-0.9.12-r5.ebuild
index 0740e35a34bd..a499fb939dc6 100644
--- a/games-action/chromium/chromium-0.9.12-r5.ebuild
+++ b/games-action/chromium/chromium-0.9.12-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/chromium-0.9.12-r5.ebuild,v 1.15 2006/04/18 12:14:57 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/chromium-0.9.12-r5.ebuild,v 1.16 2006/05/20 00:16:01 wolf31o2 Exp $
 
 inherit flag-o-matic eutils games
 
@@ -74,6 +74,7 @@ src_compile() {
 src_install() {
 	dogamesbin bin/chromium* || die "dogamesbin failed"
 	insinto "${GAMES_DATADIR}/${PN}"
+	rm -rf data/png/.xvpics
 	doins -r data || die "doins failed"
 	doicon "${T}"/chromium.png
 	make_desktop_entry chromium "Chromium B.S.U"
diff --git a/games-action/chromium/chromium-0.9.12-r6.ebuild b/games-action/chromium/chromium-0.9.12-r6.ebuild
new file mode 100644
index 000000000000..b7f13de09e6e
--- /dev/null
+++ b/games-action/chromium/chromium-0.9.12-r6.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/chromium-0.9.12-r6.ebuild,v 1.1 2006/05/20 00:16:01 wolf31o2 Exp $
+
+inherit flag-o-matic eutils games
+
+DESCRIPTION="Chromium B.S.U. - an arcade game"
+HOMEPAGE="http://www.reptilelabour.com/software/chromium/"
+SRC_URI="http://www.reptilelabour.com/software/files/chromium/chromium-src-${PV}.tar.gz
+	 http://www.reptilelabour.com/software/files/chromium/chromium-data-${PV}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="vorbis qt sdl"
+
+DEPEND="|| ( x11-libs/libXext virtual/x11 )
+	|| (
+		sdl? ( media-libs/libsdl
+			media-libs/smpeg )
+		virtual/glut
+	)
+	vorbis? ( media-libs/libvorbis )
+	qt? ( =x11-libs/qt-3* )
+	~media-libs/openal-0.0.8
+	media-libs/freealut"
+
+S=${WORKDIR}/Chromium-0.9
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	cp data/png/hero.png "${T}/chromium.png" || die "cp failed"
+	epatch \
+		"${FILESDIR}"/${PV}-gcc3-gentoo.patch \
+		"${FILESDIR}"/${PV}-freealut.patch \
+		"${FILESDIR}"/${PV}-configure.patch
+	if use qt ; then
+		epatch "${FILESDIR}/${PV}-qt3.patch"
+	fi
+	append-flags -DPKGDATADIR="'\"${GAMES_DATADIR}/${PN}\"'"
+	append-flags -DPKGBINDIR="'\"${GAMES_BINDIR}\"'"
+	sed -i \
+		-e "s:-O2 -DOLD_OPENAL:${CFLAGS}:" src/Makefile \
+			|| die "sed src/Makefile failed"
+	sed -i \
+		-e "s:-g:${CFLAGS}:" src-setup/Makefile \
+			|| die "sed src-setup/Makefile failed"
+	sed -i \
+		-e "s:-O2:${CFLAGS}:" support/glpng/src/Makefile \
+			|| die "sed support/glpng/src/Makefile failed"
+	find "${S}" -type d -name CVS -exec rm -rf '{}' \; >& /dev/null
+}
+
+src_compile() {
+	if use sdl ; then
+		export ENABLE_SDL="yes"
+		export ENABLE_SMPEG="yes"
+	else
+		export ENABLE_SDL="no"
+		export ENABLE_SMPEG="no"
+	fi
+	use vorbis \
+		&& export ENABLE_VORBIS="yes" \
+		|| export ENABLE_VORBIS="no"
+	if use qt ; then
+		export ENABLE_SETUP="yes"
+		export QTDIR=/usr/qt/3
+	else
+		export ENABLE_SETUP="no"
+	fi
+	./configure || die "configure failed"
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	dogamesbin bin/chromium* || die "dogamesbin failed"
+	insinto "${GAMES_DATADIR}/${PN}"
+	rm -rf data/png/.xvpics
+	doins -r data || die "doins failed"
+	doicon "${T}"/chromium.png
+	make_desktop_entry chromium "Chromium B.S.U"
+	prepgamesdirs
+}
diff --git a/games-action/chromium/files/0.9.12-configure.patch b/games-action/chromium/files/0.9.12-configure.patch
new file mode 100644
index 000000000000..10878c6732e7
--- /dev/null
+++ b/games-action/chromium/files/0.9.12-configure.patch
@@ -0,0 +1,13 @@
+--- configure.orig	2003-11-19 19:33:19.947616192 -0500
++++ configure	2003-11-19 19:35:31.510615576 -0500
+@@ -7,10 +7,6 @@
+ 
+ ## Defaults
+ ###################################
+-ENABLE_SDL="yes"
+-ENABLE_SMPEG="yes"
+-ENABLE_VORBIS="no"
+-ENABLE_SETUP="yes"
+ 
+ ## Where do we look for stuff?
+ ###################################
diff --git a/games-action/chromium/files/0.9.12-freealut.patch b/games-action/chromium/files/0.9.12-freealut.patch
new file mode 100644
index 000000000000..ad2accb830ef
--- /dev/null
+++ b/games-action/chromium/files/0.9.12-freealut.patch
@@ -0,0 +1,260 @@
+--- configure
++++ configure
+@@ -158,8 +158,8 @@
+ ## set up other config.mak variables
+ ######################################################################
+ GL_LIBS="-lglpng -lGL -lGLU -lm"
+-AL_LIBS="-L../support/openal/lib -lopenal -ldl" 
+-AL_CFLAGS="-I../support/openal/linux/include -I../support/openal/include"
++AL_LIBS="-lopenal -lalut" 
++AL_CFLAGS=""
+ 
+ ## write out config.mak
+ ######################################################################
+
+--- scripts/Makefile.all
++++ scripts/Makefile.all
+@@ -1,5 +1,4 @@
+ SUPPORT_DIRS	=	 \
+-			./support/openal/ \
+ 			./support/glpng/src
+ 
+ CHROMIUM_DIRS	=	\
+
+--- scripts/Makefile.no-setup
++++ scripts/Makefile.no-setup
+@@ -1,5 +1,4 @@
+ SUPPORT_DIRS	=	 \
+-			./support/openal/ \
+ 			./support/glpng/src
+ 
+ CHROMIUM_DIRS	=	\
+
+--- src/AudioOpenAL.cpp
++++ src/AudioOpenAL.cpp
+@@ -43,8 +43,7 @@
+ 	//try to use OpenAL alc[GS]etAudioChannel extensions in linux...
+ 	#ifdef __linux__ 
+ 		#define CD_VOLUME 1
+-//		#include <AL/alext.h>
+-		#include <AL/alkludgetypes.h>
++		#include <AL/alext.h>
+ 	#endif //__linux__
+ #endif //USE_SDL
+ #else
+@@ -52,8 +51,7 @@
+ 	//try to use OpenAL alc[GS]etAudioChannel extensions in linux...
+ 	#ifdef __linux__ 
+ 		#define CD_VOLUME 1
+-//		#include <AL/alext.h>
+-		#include <AL/alexttypes.h>
++		#include <AL/alext.h>
+ 	#endif //__linux__
+ #endif //USE_SDL
+ #endif
+@@ -124,6 +122,7 @@
+ 			audioScale[0] = 0.5;
+ 			audioScale[1] = 0.3;
+ 			audioScale[2] = 0.3;
++			alDistanceModel(AL_NONE);
+ 		}
+ 
+ 		if(config->swapStereo())
+@@ -235,6 +234,7 @@
+ 	printExtensions(stderr,  (const char*)alGetString( AL_EXTENSIONS ));
+ 	fprintf(stderr, "------------------------------------------------------------\n");
+ 
++	alutInitWithoutContext(NULL, NULL);
+ 	checkForExtensions();
+ 	
+ 	alListenerfv(AL_POSITION, pos);
+@@ -310,7 +310,7 @@
+ 				
+ 	//-- check AttenuationScale extension
+ 	alAttenuationScale = (void (*)(ALfloat param))
+-						alGetProcAddress((ALubyte *)"alAttenuationScale_LOKI");
++						alGetProcAddress("alAttenuationScale_LOKI");
+ 	if(alAttenuationScale == NULL) 
+ 		fprintf(stderr, "ATTENTION!! Could not load alAttenuationScale\n");
+ 	else
+@@ -318,9 +318,9 @@
+ 	
+ 	//-- check Audio Channel extension
+ 	alcGetAudioChannel = (float (*)(ALuint channel))
+-						alGetProcAddress((const ALubyte *)"alcGetAudioChannel_LOKI");
++						alGetProcAddress("alcGetAudioChannel_LOKI");
+ 	alcSetAudioChannel = (void (*)(ALuint channel, ALfloat volume))
+-						alGetProcAddress((const ALubyte *)"alcSetAudioChannel_LOKI");
++						alGetProcAddress("alcSetAudioChannel_LOKI");
+ #ifdef CD_VOLUME
+ 	if(alcGetAudioChannel)
+ 		origCDvolume = alcGetAudioChannel(ALC_CHAN_CD_LOKI);
+@@ -328,10 +328,10 @@
+ 	
+ 	//-- check MP3 extension
+ 	alutLoadMP3 = (ALboolean (*)(ALuint, ALvoid *, ALint))
+-		alGetProcAddress((const ALubyte *)"alutLoadMP3_LOKI");
++		alGetProcAddress("alutLoadMP3_LOKI");
+ 	//-- check Ogg/Vorbis extension
+ 	alutLoadVorbis = (ALboolean (*)(ALuint, ALvoid *, ALint))
+-		alGetProcAddress((const ALubyte *)"alutLoadVorbis_LOKI");
++		alGetProcAddress("alutLoadVorbis_LOKI");
+ 
+ #endif //_WIN32
+ }
+@@ -468,9 +468,6 @@
+ void AudioOpenAL::loadSounds()
+ {
+ 	int i;
+-	ALsizei size, freq, bits;
+-	ALenum format;
+-	ALvoid *data;
+ 
+ 	for(i = 0; i < NumSoundTypes; i++)
+ 	{
+@@ -481,9 +478,7 @@
+ 		else
+ 		{
+ #ifndef _WIN32
+-			alutLoadWAV(dataLoc(fileNames[i]), &data, &format, &size, &bits, &freq);
+-			alBufferData (buffer[i], format, data, size, freq);
+-			free(data);
++			buffer[i] = alutCreateBufferFromFile(dataLoc(fileNames[i]));
+ #else //_WIN32
+ 			char nameBuffer[256];
+ 			sprintf(nameBuffer, "%s", dataLoc(fileNames[i]));
+@@ -842,17 +837,8 @@
+ 	fprintf(stderr, "         PlayList support not compiled into Chromium (AudioOpenAL.cpp)\n");
+ 	return false;
+ #else //USE_PLAYLIST
+-	bool retVal;
+-	ALsizei size, freq, bits;
+-	ALenum format;
+-	ALvoid *data;
+-	retVal = alutLoadWAV(filename, &data, &format, &size, &bits, &freq);
+-	if(retVal)
+-	{
+-		alBufferData (buffer[MusicGame], format, data, size, freq);
+-		free(data);	
+-	}
+-	return retVal;
++	buffer[MusicGame] =	alutCreateBufferFromFile(filename);
++	return true;
+ #endif//USE_PLAYLIST
+ }
+ 
+--- src/AudioOpenAL.h
++++ src/AudioOpenAL.h
+@@ -16,6 +16,7 @@
+ #include <openal.h>
+ #else //macintosh
+ #include <AL/al.h>
++#include <AL/alc.h>
+ #endif //macintosh
+ 
+ /**
+@@ -89,7 +90,7 @@
+ 	
+ 	float	origCDvolume;
+ 	
+-	void	*context_id;
++	ALCcontext	*context_id;
+ 	bool	initialized;
+ 	float	audioScale[3];
+ 	
+--- src-setup/Audio.cpp
++++ src-setup/Audio.cpp
+@@ -56,7 +56,7 @@
+ {
+ 	fprintf(stderr, "stopping OpenAL...");
+ 	if(initialized)
+-		alcDestroyContext(context_id);
++		alutExit();
+ 	initialized = false;
+ 	fprintf(stderr, "done.\n");	
+ }
+@@ -71,8 +71,7 @@
+ 	if(!initialized)
+ 	{
+ 		fprintf(stderr, "starting OpenAL...");
+-		context_id = alcCreateContext(NULL);
+-		initialized = (bool)context_id;
++		initialized = alutInit(NULL, NULL);
+ 		fprintf(stderr, "done.\n");
+ 
+ 		if(initialized)
+@@ -81,21 +80,21 @@
+ 
+ #ifndef _WIN32
+ 			alAttenuationScale = (void (*)(ALfloat param))
+-				alGetProcAddress((const ALubyte *)"alAttenuationScale_LOKI");
++				alGetProcAddress("alAttenuationScale_LOKI");
+ 			if(alAttenuationScale == NULL) 
+ 				fprintf(stderr, "alAttenuationScale NOT present\n");
+ 			else
+ 				alAttenuationScale(1.0);
+ 
+ 			alutLoadMP3 = (ALboolean (*)(ALuint, ALvoid *, ALint))
+-				alGetProcAddress((const ALubyte *)"alutLoadMP3_LOKI");
++				alGetProcAddress("alutLoadMP3_LOKI");
+ 			if(alutLoadMP3)
+ 				fprintf(stderr, "alutLoadMP3_LOKI present\n");
+ 			else
+ 				fprintf(stderr, "alutLoadMP3_LOKI NOT present\n");
+ 
+ 			alutLoadVorbis = (ALboolean (*)(ALuint, ALvoid *, ALint))
+-				alGetProcAddress((const ALubyte *)"alutLoadVorbis_LOKI");
++				alGetProcAddress("alutLoadVorbis_LOKI");
+ 			if(alutLoadVorbis)
+ 				fprintf(stderr, "alutLoadVorbis_LOKI present\n");
+ 			else
+@@ -271,12 +270,8 @@
+ //----------------------------------------------------------
+ bool Audio::loadWAV(const char *filename)
+ {
+-	bool retVal = false;
+ 	if(initialized)
+ 	{
+-		ALsizei size, freq, bits;
+-		ALenum format;
+-		ALvoid *data;
+ 		struct	stat sbuf;
+ 		
+ 		if(stat(filename, &sbuf) == -1) 
+@@ -286,19 +281,16 @@
+ 			return false;
+ 		}
+ 		
+-		retVal = alutLoadWAV(filename, &data, &format, &size, &bits, &freq);
+-		if(retVal)
+-		{
+-			alBufferData (buffer[MusicGame], format, data, size, freq);
+-			free(data);	
+-		}
+-		else
++		alGetError();
++		buffer[MusicGame] = alutCreateBufferFromFile(filename);
++		if (buffer[MusicGame] == AL_NONE)
+ 		{
+-			sprintf(errorBuffer, "ERROR: alutLoadWAV failed for\n\"%s\"\nin Audio::loadWAV", filename);
++			sprintf(errorBuffer, "ERROR: failed to load\n\"%s\"\nin Audio::loadWAV", filename);
+ 			fprintf(stderr, "%s\n", errorBuffer);
++			return false;
+ 		}
+ 	}
+-	return retVal;
++	return true;
+ }
+ 
+ //----------------------------------------------------------
+
+--- src-setup/Audio.h
++++ src-setup/Audio.h
+@@ -46,7 +46,6 @@
+ 	ALuint	buffer[NumSoundTypes];
+ 	ALuint	source[NumSoundTypes];
+ 	
+-	void	*context_id;
+ 	bool	initialized;
+ 	
+ 	char errorBuffer[512];
diff --git a/games-action/chromium/files/digest-chromium-0.9.12-r5 b/games-action/chromium/files/digest-chromium-0.9.12-r5
index c31ca7413705..9e1dd867f920 100644
--- a/games-action/chromium/files/digest-chromium-0.9.12-r5
+++ b/games-action/chromium/files/digest-chromium-0.9.12-r5
@@ -1,2 +1,6 @@
-MD5 969883f2f20f10cd6cdb380582f130c4 chromium-src-0.9.12.tar.gz 640283
 MD5 173fdf76f1e4d7496142cd5662456a73 chromium-data-0.9.12.tar.gz 1111134
+RMD160 b05510d8b4a5a868b632108f688ec187a89ed805 chromium-data-0.9.12.tar.gz 1111134
+SHA256 749d10bcedeff7a82701da97701f9d31b4a057dfa84f33e197085ac71975b195 chromium-data-0.9.12.tar.gz 1111134
+MD5 969883f2f20f10cd6cdb380582f130c4 chromium-src-0.9.12.tar.gz 640283
+RMD160 f422098a67efedb53fafbbb08119596c6b87a1d8 chromium-src-0.9.12.tar.gz 640283
+SHA256 a4a2c929dfd462a9281d8c0dae485c70362140e038f532608550f6528b6ab745 chromium-src-0.9.12.tar.gz 640283
diff --git a/games-action/chromium/files/digest-chromium-0.9.12-r6 b/games-action/chromium/files/digest-chromium-0.9.12-r6
new file mode 100644
index 000000000000..9e1dd867f920
--- /dev/null
+++ b/games-action/chromium/files/digest-chromium-0.9.12-r6
@@ -0,0 +1,6 @@
+MD5 173fdf76f1e4d7496142cd5662456a73 chromium-data-0.9.12.tar.gz 1111134
+RMD160 b05510d8b4a5a868b632108f688ec187a89ed805 chromium-data-0.9.12.tar.gz 1111134
+SHA256 749d10bcedeff7a82701da97701f9d31b4a057dfa84f33e197085ac71975b195 chromium-data-0.9.12.tar.gz 1111134
+MD5 969883f2f20f10cd6cdb380582f130c4 chromium-src-0.9.12.tar.gz 640283
+RMD160 f422098a67efedb53fafbbb08119596c6b87a1d8 chromium-src-0.9.12.tar.gz 640283
+SHA256 a4a2c929dfd462a9281d8c0dae485c70362140e038f532608550f6528b6ab745 chromium-src-0.9.12.tar.gz 640283