Use the system libpng

Package-Manager: portage-2.1.3.2

5 files changed, 182 insertions, 10 deletions

diff --git a/games-action/chromium/ChangeLog b/games-action/chromium/ChangeLog
index 0469aa4f06df..895b738ef0e9 100644
--- a/games-action/chromium/ChangeLog
+++ b/games-action/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # 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.24 2006/10/06 22:06:36 nyhm Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/ChangeLog,v 1.25 2007/08/03 17:47:52 nyhm Exp $
+
+*chromium-0.9.12-r7 (03 Aug 2007)
+
+  03 Aug 2007; Tristan Heaven <nyhm@gentoo.org> +files/0.9.12-png.patch,
+  +chromium-0.9.12-r7.ebuild:
+  Use the system libpng
 
   06 Oct 2006; Tristan Heaven <nyhm@gentoo.org> chromium-0.9.12-r6.ebuild:
   Use qt3 eclass
diff --git a/games-action/chromium/Manifest b/games-action/chromium/Manifest
index 28fec250d9dc..069e186363eb 100644
--- a/games-action/chromium/Manifest
+++ b/games-action/chromium/Manifest
@@ -13,6 +13,10 @@ AUX 0.9.12-gcc3-gentoo.patch 530 RMD160 2599f72b8a4cdb81cbad7802085321dbb2aa096d
 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-png.patch 1782 RMD160 a29e92481b9680d4e825e74f3333d1dc8a37ef5f SHA1 e49efcb0e5ab59e21faf59d0f1a909a1af785411 SHA256 3b6f3a161e5b9122d67d2643dc70fd33e2d794fddd868ca018703072e58be43b
+MD5 8d24d822bb5d8b3c5f6bb399633fa652 files/0.9.12-png.patch 1782
+RMD160 a29e92481b9680d4e825e74f3333d1dc8a37ef5f files/0.9.12-png.patch 1782
+SHA256 3b6f3a161e5b9122d67d2643dc70fd33e2d794fddd868ca018703072e58be43b files/0.9.12-png.patch 1782
 AUX 0.9.12-qt3.patch 979 RMD160 efe12c75b8d83b85292d974b0b4fe17f554a463b SHA1 0ce024be66d6ab60b72bb0d7c29764de18f1fee2 SHA256 3671171967c89b6ab675e49fd228cef0398bb01b9b60f77d26f749e4ea4f9861
 MD5 031dc9787ccdcb049081dccf31a4a401 files/0.9.12-qt3.patch 979
 RMD160 efe12c75b8d83b85292d974b0b4fe17f554a463b files/0.9.12-qt3.patch 979
@@ -23,10 +27,14 @@ EBUILD chromium-0.9.12-r6.ebuild 2384 RMD160 a734989907e6be3366cff3f1086b1dfe1d8
 MD5 14317f5e934c3f94680930466ba64375 chromium-0.9.12-r6.ebuild 2384
 RMD160 a734989907e6be3366cff3f1086b1dfe1d8f4ce0 chromium-0.9.12-r6.ebuild 2384
 SHA256 eb7ddd4098adfc986f423be211b09821c6b9c64f582a8e415a668bd5b5cd4863 chromium-0.9.12-r6.ebuild 2384
-MISC ChangeLog 4779 RMD160 b257f45701a17fda0e3e14b480962c769e802b16 SHA1 48e6d0a7f13c560fc093b7b88075f431edca0df8 SHA256 999caef5241c86008854e1b45d0283a7fd6481c36891ecfb0cda79c17c4c3c41
-MD5 0f06b9ddf869a75eec59f39e3cfe74de ChangeLog 4779
-RMD160 b257f45701a17fda0e3e14b480962c769e802b16 ChangeLog 4779
-SHA256 999caef5241c86008854e1b45d0283a7fd6481c36891ecfb0cda79c17c4c3c41 ChangeLog 4779
+EBUILD chromium-0.9.12-r7.ebuild 2413 RMD160 d33d518b386bb05e5a43bf891bd99e2d166f51d2 SHA1 fc494d096de101b0488c8e92de29287bb512a6ff SHA256 5e6a98057f6b6a0a309f8dfd746c0e18221b30e43055196c79d26a9413e00dc4
+MD5 3b3d79007c9eba90ed3bd2b7d486b80c chromium-0.9.12-r7.ebuild 2413
+RMD160 d33d518b386bb05e5a43bf891bd99e2d166f51d2 chromium-0.9.12-r7.ebuild 2413
+SHA256 5e6a98057f6b6a0a309f8dfd746c0e18221b30e43055196c79d26a9413e00dc4 chromium-0.9.12-r7.ebuild 2413
+MISC ChangeLog 4942 RMD160 42d66cc43b2ddf2f133bc359a6a12b31ee747975 SHA1 0051730a117882d42ba987e5ccb18b8ba8fea5c6 SHA256 bcd3944c5d1c550e096cc4f80d48a1a6a17c7a25cd34ee24c1b6508c0d6ba0f8
+MD5 9c42518e30f1055f251881f6760438fb ChangeLog 4942
+RMD160 42d66cc43b2ddf2f133bc359a6a12b31ee747975 ChangeLog 4942
+SHA256 bcd3944c5d1c550e096cc4f80d48a1a6a17c7a25cd34ee24c1b6508c0d6ba0f8 ChangeLog 4942
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -34,10 +42,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 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
+MD5 1091ea4475a76a7d4c9ece5a6d7d9ffa files/digest-chromium-0.9.12-r7 524
+RMD160 f81a71dfef00a132ebd52a1bc7b545483715672e files/digest-chromium-0.9.12-r7 524
+SHA256 e15835fb5548e4a00ad3f117321c25681586d4b65569d538f3d9454ea6edbbcc files/digest-chromium-0.9.12-r7 524
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFFfhmfdz7hIScOURERAmSaAJ0fjXnRr63VECWDc6wj0S7idAZM/QCg417c
-DOio9EgC0iCdXWRK3oQ4lf8=
-=xaTa
+iD8DBQFGs2pOdz7hIScOURERAqknAKD04iao06ZLCBxS7GNCl2Cfb9UtFACgmCJh
+G+ONYqweLK3g9jCqpvS3LOw=
+=Kgi/
 -----END PGP SIGNATURE-----
diff --git a/games-action/chromium/chromium-0.9.12-r7.ebuild b/games-action/chromium/chromium-0.9.12-r7.ebuild
new file mode 100644
index 000000000000..05c91949bdb8
--- /dev/null
+++ b/games-action/chromium/chromium-0.9.12-r7.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2007 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-r7.ebuild,v 1.1 2007/08/03 17:47:52 nyhm Exp $
+
+inherit eutils flag-o-matic qt3 toolchain-funcs versionator games
+
+MY_PV=$(get_version_component_range -2)
+DESCRIPTION="Chromium B.S.U. - an arcade game"
+HOMEPAGE="http://www.reptilelabour.com/software/chromium/"
+SRC_URI="http://www.reptilelabour.com/software/files/${PN}/${PN}-src-${PV}.tar.gz
+	 http://www.reptilelabour.com/software/files/${PN}/${PN}-data-${PV}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="sdl qt3 vorbis"
+
+DEPEND="virtual/opengl
+	virtual/glu
+	x11-libs/libXmu
+	sdl? ( media-libs/libsdl
+		media-libs/smpeg )
+	!sdl? ( virtual/glut )
+	vorbis? ( media-libs/libvorbis )
+	qt3? ( $(qt_min_version 3.3) )
+	media-libs/libpng
+	media-libs/openal
+	media-libs/freealut"
+
+S=${WORKDIR}/Chromium-${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${FILESDIR}"/${PV}-gcc3-gentoo.patch \
+		"${FILESDIR}"/${PV}-freealut.patch \
+		"${FILESDIR}"/${PV}-configure.patch \
+		"${FILESDIR}"/${PV}-qt3.patch \
+		"${FILESDIR}"/${PV}-png.patch
+	append-flags -DPKGDATADIR="'\"${GAMES_DATADIR}/${PN}\"'"
+	append-flags -DPKGBINDIR="'\"${GAMES_BINDIR}\"'"
+	sed -i \
+		-e "s:-O2 -DOLD_OPENAL:${CXXFLAGS}:" src/Makefile \
+			|| die "sed src/Makefile failed"
+	sed -i \
+		-e "s:-g:${CXXFLAGS}:" 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 qt3 ; then
+		export ENABLE_SETUP="yes"
+	else
+		export ENABLE_SETUP="no"
+	fi
+	./configure || die "configure failed"
+	emake -j1 \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		LINK=$(tc-getCXX) \
+		|| die "emake failed"
+}
+
+src_install() {
+	dogamesbin bin/chromium* || die "dogamesbin failed"
+	insinto "${GAMES_DATADIR}/${PN}"
+	rm -rf data/png/.xvpics
+	doins -r data || die "doins failed"
+	newicon data/png/hero.png ${PN}.png
+	make_desktop_entry chromium "Chromium B.S.U"
+	prepgamesdirs
+}
diff --git a/games-action/chromium/files/0.9.12-png.patch b/games-action/chromium/files/0.9.12-png.patch
new file mode 100644
index 000000000000..0b72bd245b0f
--- /dev/null
+++ b/games-action/chromium/files/0.9.12-png.patch
@@ -0,0 +1,62 @@
+--- src/Makefile
++++ src/Makefile
+@@ -12,10 +12,10 @@
+ CXX	=	g++
+ CFLAGS	=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
+ CXXFLAGS=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
+-INCPATH	=	-I../support/include -I../support/glpng/include -I/usr/X11R6/include
++INCPATH	=	-I../support/glpng/include -I/usr/X11R6/include
+ LINK	=	g++
+ LFLAGS	=	
+-LIBS	=	$(SUBLIBS) -L../support/glpng/lib -L/usr/lib -L/usr/X11R6/lib -L/usr/local/lib $(GL_LIBS) $(AL_LIBS) $(SDL_LIBS) $(SMPEG_LIBS) $(VORBIS_LIBS)
++LIBS	=	$(SUBLIBS) -L../support/glpng/lib -L/usr/lib -L/usr/X11R6/lib -L/usr/local/lib $(GL_LIBS) $(AL_LIBS) $(SDL_LIBS) $(SMPEG_LIBS) $(VORBIS_LIBS) -lpng
+ MOC	=	$(QTDIR)/bin/moc
+ UIC	=	$(QTDIR)/bin/uic
+ 
+--- support/glpng/src/glpng.c
++++ support/glpng/src/glpng.c
+@@ -3,11 +3,12 @@
+ 	#include <windows.h>
+ #endif
+ 
++#define GL_GLEXT_PROTOTYPES 1
+ #include <GL/glpng.h>
+ #include <GL/gl.h>
+ #include <stdlib.h>
+ #include <math.h>
+-#include "png/png.h"
++#include <png.h>
+ 
+ /* Used to decide if GL/gl.h supports the paletted extension */
+ #ifdef GL_COLOR_INDEX1_EXT
+--- support/glpng/src/Makefile
++++ support/glpng/src/Makefile
+@@ -54,27 +54,7 @@
+ 		zlib/inftrees.c \
+ 		zlib/infutil.c \
+ 		zlib/zutil.c
+-OBJECTS =	glpng.o \
+-		png/png.o \
+-		png/pngerror.o \
+-		png/pngget.o \
+-		png/pngmem.o \
+-		png/pngpread.o \
+-		png/pngread.o \
+-		png/pngrio.o \
+-		png/pngrtran.o \
+-		png/pngrutil.o \
+-		png/pngset.o \
+-		png/pngtrans.o \
+-		zlib/adler32.o \
+-		zlib/crc32.o \
+-		zlib/infblock.o \
+-		zlib/infcodes.o \
+-		zlib/inffast.o \
+-		zlib/inflate.o \
+-		zlib/inftrees.o \
+-		zlib/infutil.o \
+-		zlib/zutil.o
++OBJECTS =	glpng.o
+ INTERFACES =	
+ UICDECLS =	
+ UICIMPLS =	
diff --git a/games-action/chromium/files/digest-chromium-0.9.12-r7 b/games-action/chromium/files/digest-chromium-0.9.12-r7
new file mode 100644
index 000000000000..9e1dd867f920
--- /dev/null
+++ b/games-action/chromium/files/digest-chromium-0.9.12-r7
@@ -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