Fix possible segfault

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

4 files changed, 75 insertions, 6 deletions

diff --git a/games-arcade/moleinvasion/ChangeLog b/games-arcade/moleinvasion/ChangeLog
index f3cba01013bb..7bdda361fd12 100644
--- a/games-arcade/moleinvasion/ChangeLog
+++ b/games-arcade/moleinvasion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-arcade/moleinvasion
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/moleinvasion/ChangeLog,v 1.2 2009/09/19 12:51:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/moleinvasion/ChangeLog,v 1.3 2009/11/22 03:06:33 nyhm Exp $
+
+*moleinvasion-0.4-r1 (22 Nov 2009)
+
+  22 Nov 2009; Tristan Heaven <nyhm@gentoo.org> +moleinvasion-0.4-r1.ebuild,
+  +files/moleinvasion-0.4-opengl.patch:
+  Fix possible segfault
 
   19 Sep 2009; Markus Meier <maekke@gentoo.org> moleinvasion-0.4.ebuild:
   amd64/x86 stable, bug #285405
diff --git a/games-arcade/moleinvasion/Manifest b/games-arcade/moleinvasion/Manifest
index 558a320e097c..5ec2b8066e7a 100644
--- a/games-arcade/moleinvasion/Manifest
+++ b/games-arcade/moleinvasion/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX moleinvasion-0.4-opengl.patch 439 RMD160 ab683640dababc840c5b83fc48904296c0918de9 SHA1 548918bf48538e1b1211731ddab563c5e0879951 SHA256 f904fd80fcd7d2212b5d8e76c861d7f44b5b756fdd099a524f2b1f7c53691834
 DIST MoleInvasion-0.4.tar.bz2 11213919 RMD160 6075fc2947e0811b46b7f15024f2ec8684122bab SHA1 2a4c6c34e57fe9df51fed02fbd0f955d0490567b SHA256 a011361f07c06d79a5ba6d110d7b06b59da2c57970515d24fab063fe991d922c
 DIST moleinvasion-music-20090731.tar.gz 83772534 RMD160 10834261ad857ad19c42323250a08ae6fc88d9b2 SHA1 2feb2d353112a8d6d6a847fe7a2504e0c5667cad SHA256 ef973ca073026dbe944c7c61058b1437e19f5abe144e9451aed6feffe3d72c73
+EBUILD moleinvasion-0.4-r1.ebuild 1197 RMD160 e9c026ba0a4bf6ba7ea6aaa1d82193a1fdf67dd7 SHA1 c73a3b1fcf74b74710db5dd600d0de314579b513 SHA256 fab03039213952f9a8b847617fd238fcb92b12fb7bbe031e2d3bb4b8374c4c79
 EBUILD moleinvasion-0.4.ebuild 1154 RMD160 3556a392a819e99660eae7d0ab8ded829024a866 SHA1 e3ae1748a9eec807a4a5b6cba2e2f6130ade2428 SHA256 5917cdda43ab34b126f87ce37515349ee1c84ba94e5c739c0e676d016eacf9b8
-MISC ChangeLog 471 RMD160 6b83f315de0288f1ac7c5eb9f8d57117a5071288 SHA1 66b2b8b3448c6dbc320d064d6f70f58219c0d62e SHA256 3d94dc229e52acc8fe2cea477bbbc0a470341c46bdefe95dcc1b4f488512e1e5
+MISC ChangeLog 647 RMD160 81f0cce4ca7a050e959a68bca6d702edc86ea043 SHA1 3e0891937ff218d7c75308cb9f299bc0d72648a8 SHA256 a85b050ded1018b5d1ace77855de6f81713012e9cb5d7982f2d388bafcf84b41
 MISC metadata.xml 239 RMD160 7367376202273040de00f4efe10e4cf8630519f7 SHA1 36a16f3c9c564d5a065a4dc0e3bb9d4adea05b86 SHA256 6b895868af60d56f4562164f82d0752bbc1e1da17f083e477790bfb22b5a96a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkq00/oACgkQkKaRLQcq0GLJVACglOrwvHI2O6h91HcBHopADHOz
-WEsAnjeu4Ya9fpzqfW1d1BoeHrx1UO85
-=C6xh
+iEYEARECAAYFAksIqr8ACgkQdz7hIScOUREEIACgk2tUACRAm/2BquBk6721p3bD
+i+oAn3N3o7G9RvVRR3rDq39VpzXNQRRN
+=pPOS
 -----END PGP SIGNATURE-----
diff --git a/games-arcade/moleinvasion/files/moleinvasion-0.4-opengl.patch b/games-arcade/moleinvasion/files/moleinvasion-0.4-opengl.patch
new file mode 100644
index 000000000000..357f1bc2b466
--- /dev/null
+++ b/games-arcade/moleinvasion/files/moleinvasion-0.4-opengl.patch
@@ -0,0 +1,18 @@
+--- src/MoleInvasion.c
++++ src/MoleInvasion.c
+@@ -159,6 +159,7 @@
+ 	else
+ 		printf("Video mode set to %ux%u at %u bpp\n",800, 600, bpp);
+ 
++	if(g_opengl) {
+ 	/* pour opengl */
+ 	glEnable (GL_TEXTURE_2D);
+ 	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+@@ -169,6 +170,7 @@
+         glEnable( GL_BLEND );
+ 	glMatrixMode(GL_PROJECTION);
+ 	/* fin opengl */
++	}
+ 
+ 	/* titre */
+ 	SDL_WM_SetCaption ("Mole Invasion", NULL);
diff --git a/games-arcade/moleinvasion/moleinvasion-0.4-r1.ebuild b/games-arcade/moleinvasion/moleinvasion-0.4-r1.ebuild
new file mode 100644
index 000000000000..8bf76fc5fe48
--- /dev/null
+++ b/games-arcade/moleinvasion/moleinvasion-0.4-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/moleinvasion/moleinvasion-0.4-r1.ebuild,v 1.1 2009/11/22 03:06:33 nyhm Exp $
+
+EAPI=2
+inherit eutils games
+
+DESCRIPTION="Mole infested 2D platform game"
+HOMEPAGE="http://moleinvasion.tuxfamily.org/"
+SRC_URI="ftp://download.tuxfamily.org/minvasion/packages/MoleInvasion-${PV}.tar.bz2
+	music? ( mirror://gentoo/${PN}-music-20090731.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="music"
+
+DEPEND="media-libs/libsdl
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-ttf"
+
+S=${WORKDIR}/${P}/src
+
+src_prepare() {
+	use music && mv -f "${WORKDIR}"/music ../
+	sed -i \
+		-e '/^CFLAGS/s:= -g:+=:' \
+		-e '/^LDFLAGS/d' \
+		-e "/^FINALEXEDIR/s:/usr.*:${GAMES_BINDIR}:" \
+		-e "/^FINALDATADIR/s:/usr.*:${GAMES_DATADIR}/${PN}:" \
+		Makefile \
+		|| die "sed failed"
+	epatch "${FILESDIR}"/${P}-opengl.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-data || die "emake install failed"
+	newicon ../gfx/icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Mole Invasion"
+	doman ../debian/*.6
+	prepgamesdirs
+}