DEPEND cleanup #33866 and build it nicer

5 files changed, 150 insertions, 3 deletions

diff --git a/games-action/chromium/ChangeLog b/games-action/chromium/ChangeLog
index 2ce5af89fd40..6ed82d18ad5e 100644
--- a/games-action/chromium/ChangeLog
+++ b/games-action/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-action/chromium
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/ChangeLog,v 1.4 2003/10/14 07:28:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/ChangeLog,v 1.5 2003/11/20 01:39:42 vapier Exp $
+
+*chromium-0.9.12-r5 (19 Nov 2003)
+
+  19 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Clean up DEPEND #33866 and build process in general.  Use system openal and 
+  user's CFLAGS.
+
+*chromium-0.9.12-r4 (07 Jul 2003)
 
   14 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org>
   chromium-0.9.12-r4.ebuild:
@@ -9,8 +17,6 @@
   04 Oct 2003; Aron Griffis <agriffis@gentoo.org> chromium-0.9.12-r4.ebuild:
   Stable on alpha
 
-*chromium-0.9.12-r4 (07 Jul 2003)
-
   07 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
   Version bumped to fix the environment #18570.  (yes i really fixed it this time)
 
diff --git a/games-action/chromium/chromium-0.9.12-r5.ebuild b/games-action/chromium/chromium-0.9.12-r5.ebuild
new file mode 100644
index 000000000000..02c15e9b9b46
--- /dev/null
+++ b/games-action/chromium/chromium-0.9.12-r5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.1 2003/11/20 01:40:24 vapier Exp $
+
+inherit games eutils
+
+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="x86 ppc alpha amd64"
+IUSE="arts esd qt sdl svga oggvorbis alsa"
+
+DEPEND="virtual/glibc
+	|| (
+		sdl? ( media-libs/libsdl
+			media-libs/smpeg )
+		virtual/glut
+	)
+	oggvorbis? ( media-libs/libvorbis )
+	qt? ( =x11-libs/qt-2* )
+	media-libs/openal
+	virtual/x11"
+
+S=${WORKDIR}/Chromium-0.9
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc3-gentoo.patch
+	epatch ${FILESDIR}/${PV}-proper-options.patch
+	append-flags -DPKGDATADIR="'\"${GAMES_DATADIR}/${PN}\"'"
+	append-flags -DPKGBINDIR="'\"${GAMES_BINDIR}\"'"
+	sed -i "s:-O2 -DOLD_OPENAL:${CFLAGS}:" src/Makefile
+	sed -i "s:-g:${CFLAGS}:" src-setup/Makefile
+	sed -i "s:-O2:${CFLAGS}:" support/glpng/src/Makefile
+}
+
+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 oggvorbis \
+		&& export ENABLE_VORBIS="yes" \
+		|| export ENABLE_VORBIS="no"
+	use qt \
+		&& export ENABLE_SETUP="yes" \
+		&& export QTDIR=/usr/qt/2 \
+		|| export ENABLE_SETUP="no"
+	./configure || die "configure failed"
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	exeinto ${GAMES_BINDIR}
+	doexe bin/chromium*
+
+	dodir ${GAMES_DATADIR}/${PN}
+	cp -r data ${D}/${GAMES_DATADIR}/${PN}/
+
+	find ${D} -name CVS -exec rm -rf '{}' \; >& /dev/null
+
+	prepgamesdirs
+}
diff --git a/games-action/chromium/files/0.9.12-gcc3-gentoo.patch b/games-action/chromium/files/0.9.12-gcc3-gentoo.patch
new file mode 100644
index 000000000000..3e3e41095983
--- /dev/null
+++ b/games-action/chromium/files/0.9.12-gcc3-gentoo.patch
@@ -0,0 +1,11 @@
+diff -ur Chromium-0.9/src/NCString.cpp Chromium-0.9.m/src/NCString.cpp
+--- Chromium-0.9/src/NCString.cpp	2001-05-20 12:04:58.000000000 -0500
++++ Chromium-0.9.m/src/NCString.cpp	2002-07-25 22:57:03.000000000 -0500
+@@ -5,6 +5,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <limits.h>
++#include <stdarg.h>
+ 
+ /**
+  * ctor
diff --git a/games-action/chromium/files/0.9.12-proper-options.patch b/games-action/chromium/files/0.9.12-proper-options.patch
new file mode 100644
index 000000000000..75643b930c41
--- /dev/null
+++ b/games-action/chromium/files/0.9.12-proper-options.patch
@@ -0,0 +1,57 @@
+--- 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?
+ ###################################
+@@ -158,8 +154,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 -ldl" 
++AL_CFLAGS=""
+ 
+ ## write out config.mak
+ ######################################################################
+--- scripts/Makefile.all.orig	2003-11-19 19:41:22.502256736 -0500
++++ scripts/Makefile.all	2003-11-19 19:41:25.414813960 -0500
+@@ -1,5 +1,4 @@
+ SUPPORT_DIRS	=	 \
+-			./support/openal/ \
+ 			./support/glpng/src
+ 
+ CHROMIUM_DIRS	=	\
+--- scripts/Makefile.no-setup.orig	2003-11-19 19:41:22.502256736 -0500
++++ scripts/Makefile.no-setup	2003-11-19 19:41:25.414813960 -0500
+@@ -1,5 +1,4 @@
+ SUPPORT_DIRS	=	 \
+-			./support/openal/ \
+ 			./support/glpng/src
+ 
+ CHROMIUM_DIRS	=	\
+--- src-setup/Audio.cpp.orig	2003-11-19 20:03:23.237474464 -0500
++++ src-setup/Audio.cpp	2003-11-19 20:03:49.838430504 -0500
+@@ -71,7 +71,14 @@
+ 	if(!initialized)
+ 	{
+ 		fprintf(stderr, "starting OpenAL...");
++#ifdef OLD_OPENAL
+ 		context_id = alcCreateContext(NULL);
++#else
++		ALCdevice *dev;
++		dev = alcOpenDevice( NULL );
++		context_id = alcCreateContext(dev, NULL);
++		alcMakeContextCurrent(context_id);
++#endif
+ 		initialized = (bool)context_id;
+ 		fprintf(stderr, "done.\n");
+ 
diff --git a/games-action/chromium/files/digest-chromium-0.9.12-r5 b/games-action/chromium/files/digest-chromium-0.9.12-r5
new file mode 100644
index 000000000000..c31ca7413705
--- /dev/null
+++ b/games-action/chromium/files/digest-chromium-0.9.12-r5
@@ -0,0 +1,2 @@
+MD5 969883f2f20f10cd6cdb380582f130c4 chromium-src-0.9.12.tar.gz 640283
+MD5 173fdf76f1e4d7496142cd5662456a73 chromium-data-0.9.12.tar.gz 1111134