Crash fix by Charles Clément, bug #193343

Package-Manager: portage-2.1.3.9

5 files changed, 84 insertions, 8 deletions

diff --git a/games-action/glaxium/ChangeLog b/games-action/glaxium/ChangeLog
index 11d4ecd6e8c9..1765c1b334ba 100644
--- a/games-action/glaxium/ChangeLog
+++ b/games-action/glaxium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-action/glaxium
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/ChangeLog,v 1.15 2007/09/21 13:48:27 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/ChangeLog,v 1.16 2007/09/24 21:51:04 nyhm Exp $
+
+*glaxium-0.5-r1 (24 Sep 2007)
+
+  24 Sep 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/glaxium-0.5-freeglut.patch, +glaxium-0.5-r1.ebuild:
+  Crash fix by Charles Clément, bug #193343
 
   21 Sep 2007; Tristan Heaven <nyhm@gentoo.org> glaxium-0.5.ebuild:
   Remove check for x11-drivers/nvidia-legacy-drivers, bug #193304
diff --git a/games-action/glaxium/Manifest b/games-action/glaxium/Manifest
index 94b74ac4bc31..3d7bfed355d2 100644
--- a/games-action/glaxium/Manifest
+++ b/games-action/glaxium/Manifest
@@ -9,6 +9,10 @@ AUX glaxium-0.5-build.patch 1648 RMD160 6817d8bd50abf422f5ad02ec985db00018eb67c9
 MD5 7a7880d16227c8e1c5a2173e4832b112 files/glaxium-0.5-build.patch 1648
 RMD160 6817d8bd50abf422f5ad02ec985db00018eb67c9 files/glaxium-0.5-build.patch 1648
 SHA256 b6ed7ffc219b9833d8cf9b911eb19cfd9c6a9d93afd21b9aff173c8073578aea files/glaxium-0.5-build.patch 1648
+AUX glaxium-0.5-freeglut.patch 393 RMD160 00bc74e16665090b81b26c698464131e064d5595 SHA1 58d892c89e8949da07f8ce85ba461599b1b832ea SHA256 2a0b7209fb4b90fad3817607aa8ec6b186732c78bf3565661dce0a1e98c7c0ad
+MD5 12b10997fc3eaeb7a0dfebc288c1d816 files/glaxium-0.5-freeglut.patch 393
+RMD160 00bc74e16665090b81b26c698464131e064d5595 files/glaxium-0.5-freeglut.patch 393
+SHA256 2a0b7209fb4b90fad3817607aa8ec6b186732c78bf3565661dce0a1e98c7c0ad files/glaxium-0.5-freeglut.patch 393
 AUX glaxium-0.5-gcc41.patch 808 RMD160 1943be88713d73836b32704b27a25473d94dec63 SHA1 97f9fbcfc3f1ca648c3d2e8a45f55e0a8bfefc67 SHA256 9e1ab3e231d583db0a8187dd86c6457ba80eef2ac3c539143229d11d75a86625
 MD5 57c59919852db441f8cdd5a0c38a682f files/glaxium-0.5-gcc41.patch 808
 RMD160 1943be88713d73836b32704b27a25473d94dec63 files/glaxium-0.5-gcc41.patch 808
@@ -18,14 +22,18 @@ MD5 bc74f1b2de241e6004a792b1e18cc457 files/glaxium-0.5-glx.patch 2017
 RMD160 e2e282f57c23de04c30d1d551efc30a937679812 files/glaxium-0.5-glx.patch 2017
 SHA256 e9875901eae693bb62c3fe3871dce796b4a5325131d022e40779cb47bf3a3319 files/glaxium-0.5-glx.patch 2017
 DIST glaxium_0.5.tar.gz 1692219 RMD160 5c988c53d4205ac80e0011a893a80daecf096c1f SHA1 42526a009a377a6fede7b7d343a0cd57c2f8e23e SHA256 78f5a9e1785e9e39f6dcb32134a3bd224372f572f191e7ed77bf50b109afb5f7
+EBUILD glaxium-0.5-r1.ebuild 1035 RMD160 2dc9dc40ce60dd7a0c1e3f08312612a30cd70bbd SHA1 28b6792f742f301fdaeb1b21facfba9d0d78f4d8 SHA256 a570dce4fa1d85bb666956efa2fd57d4e3f7660ea8584a4d7cdaa8e16ae1b514
+MD5 c26fca53fb0bf0b03c323775000283cb glaxium-0.5-r1.ebuild 1035
+RMD160 2dc9dc40ce60dd7a0c1e3f08312612a30cd70bbd glaxium-0.5-r1.ebuild 1035
+SHA256 a570dce4fa1d85bb666956efa2fd57d4e3f7660ea8584a4d7cdaa8e16ae1b514 glaxium-0.5-r1.ebuild 1035
 EBUILD glaxium-0.5.ebuild 992 RMD160 e64cc0ab1e8cbd3402430bedf863198355859cb0 SHA1 ae8e99c8495eaf75522d93a629f9f541f3fb6145 SHA256 14d50afcd81dc5c35f2414247a399576029d5ddb4f7d5e24a9ff5e38195031d0
 MD5 08741fdd0c5c80db9a5db61655822a0e glaxium-0.5.ebuild 992
 RMD160 e64cc0ab1e8cbd3402430bedf863198355859cb0 glaxium-0.5.ebuild 992
 SHA256 14d50afcd81dc5c35f2414247a399576029d5ddb4f7d5e24a9ff5e38195031d0 glaxium-0.5.ebuild 992
-MISC ChangeLog 1991 RMD160 f00977b7e0c7b53d07a582a7f0ace62e9173c227 SHA1 6fd94cc53903cd67632ef4844857527cf7d50b57 SHA256 1df4106b01b7c9ec335d907a4a5bef110fbbc55a2d98bec9bf83fddb5f31e84a
-MD5 09805c14e9704cc1b9b3ab541ba3d350 ChangeLog 1991
-RMD160 f00977b7e0c7b53d07a582a7f0ace62e9173c227 ChangeLog 1991
-SHA256 1df4106b01b7c9ec335d907a4a5bef110fbbc55a2d98bec9bf83fddb5f31e84a ChangeLog 1991
+MISC ChangeLog 2177 RMD160 fd5b8dfd7e892f9f4257cd0f06feb8c0de0be1af SHA1 a36088cd5c4592c4dec6ce1589618d1f41190a3c SHA256 8f478a1902e90a2660cbeb0611f93ddb40a64de39d88517d43544d9ab2ae8bd1
+MD5 562251a856be1907ce1122fe6b5ccab7 ChangeLog 2177
+RMD160 fd5b8dfd7e892f9f4257cd0f06feb8c0de0be1af ChangeLog 2177
+SHA256 8f478a1902e90a2660cbeb0611f93ddb40a64de39d88517d43544d9ab2ae8bd1 ChangeLog 2177
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -33,10 +41,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 bc92909e8ed1a74fc951d2ce7aedc9f3 files/digest-glaxium-0.5 238
 RMD160 0f80f6f684cb2603fb09e51864cc98e80a081757 files/digest-glaxium-0.5 238
 SHA256 4e59f1b6657fbd4ddec5ef58522bb6c5b37a33657975939d9242020f3313344a files/digest-glaxium-0.5 238
+MD5 bc92909e8ed1a74fc951d2ce7aedc9f3 files/digest-glaxium-0.5-r1 238
+RMD160 0f80f6f684cb2603fb09e51864cc98e80a081757 files/digest-glaxium-0.5-r1 238
+SHA256 4e59f1b6657fbd4ddec5ef58522bb6c5b37a33657975939d9242020f3313344a files/digest-glaxium-0.5-r1 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG88uxdz7hIScOURERAnULAKCQje9bh9mXaf3tTWNaOseu/nBblACglMTX
-/JPcXopq5/sTjGF8P35ffO0=
-=90Bo
+iD8DBQFG+DFOdz7hIScOURERAtmJAKDUR3gwyM4tMxGhp65JTUCdn8ivoACghVsc
+898sanrG5+tA7sdTPa5kHvI=
+=KrXx
 -----END PGP SIGNATURE-----
diff --git a/games-action/glaxium/files/digest-glaxium-0.5-r1 b/games-action/glaxium/files/digest-glaxium-0.5-r1
new file mode 100644
index 000000000000..0a4cbb8d38a6
--- /dev/null
+++ b/games-action/glaxium/files/digest-glaxium-0.5-r1
@@ -0,0 +1,3 @@
+MD5 ea6d6f8b4ebb7c73b74af64d83f45cb7 glaxium_0.5.tar.gz 1692219
+RMD160 5c988c53d4205ac80e0011a893a80daecf096c1f glaxium_0.5.tar.gz 1692219
+SHA256 78f5a9e1785e9e39f6dcb32134a3bd224372f572f191e7ed77bf50b109afb5f7 glaxium_0.5.tar.gz 1692219
diff --git a/games-action/glaxium/files/glaxium-0.5-freeglut.patch b/games-action/glaxium/files/glaxium-0.5-freeglut.patch
new file mode 100644
index 000000000000..4c2348d5f4ef
--- /dev/null
+++ b/games-action/glaxium/files/glaxium-0.5-freeglut.patch
@@ -0,0 +1,13 @@
+Index: glaxium_0.5/main.cpp
+===================================================================
+--- glaxium_0.5.orig/main.cpp
++++ glaxium_0.5/main.cpp
+@@ -143,7 +143,7 @@ int main( int argc, char *argv[] )

+     signal(SIGINT, exit);

+     signal(SIGTERM, exit);

+   */  

+-//    glutInit(&argc, argv);

++    glutInit(&argc, argv);

+     

+     SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE,8);

+ 

diff --git a/games-action/glaxium/glaxium-0.5-r1.ebuild b/games-action/glaxium/glaxium-0.5-r1.ebuild
new file mode 100644
index 000000000000..6394b0599072
--- /dev/null
+++ b/games-action/glaxium/glaxium-0.5-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/glaxium-0.5-r1.ebuild,v 1.1 2007/09/24 21:51:04 nyhm Exp $
+
+inherit autotools eutils games
+
+DESCRIPTION="OpenGL-based space-ship shoot-em-up style game"
+HOMEPAGE="http://xhosxe.free.fr/glaxium/"
+SRC_URI="http://xhosxe.free.fr/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl
+	media-libs/sdl-mixer
+	virtual/opengl
+	virtual/glu
+	virtual/glut
+	media-libs/libpng"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	if has_version x11-drivers/nvidia-drivers ; then
+		epatch "${FILESDIR}"/${P}-glx.patch
+	fi
+	epatch \
+		"${FILESDIR}"/${PV}-rc.patch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-freeglut.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README.txt CHANGES.txt
+	prepgamesdirs
+}