summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2004-06-12 00:49:40 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2004-06-12 00:49:40 +0000
commit1f2b777ccdbd29c603ae763773ddc44db4b2952b (patch)
tree6b984fce389554508724903c307b287585dd59cc
parentFixed bison problem #45121. Added hppa to KEYWORDS. (diff)
downloadhistorical-1f2b777ccdbd29c603ae763773ddc44db4b2952b.tar.gz
historical-1f2b777ccdbd29c603ae763773ddc44db4b2952b.tar.bz2
historical-1f2b777ccdbd29c603ae763773ddc44db4b2952b.zip
add patch from Guillaume Cottenceau via bug #53320
-rw-r--r--games-arcade/crack-attack/ChangeLog6
-rw-r--r--games-arcade/crack-attack/Manifest5
-rw-r--r--games-arcade/crack-attack/crack-attack-1.1.10.ebuild5
-rw-r--r--games-arcade/crack-attack/files/1.1.10-i865g.patch15
4 files changed, 26 insertions, 5 deletions
diff --git a/games-arcade/crack-attack/ChangeLog b/games-arcade/crack-attack/ChangeLog
index 3186b88ab050..194478d19999 100644
--- a/games-arcade/crack-attack/ChangeLog
+++ b/games-arcade/crack-attack/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-arcade/crack-attack
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/crack-attack/ChangeLog,v 1.6 2004/05/05 03:53:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/crack-attack/ChangeLog,v 1.7 2004/06/12 00:49:40 mr_bones_ Exp $
+
+ 11 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+ crack-attack-1.1.10.ebuild, files/1.1.10-i865g.patch:
+ add patch from Guillaume Cottenceau via bug #53320
04 May 2004; Michael Sterrett <mr_bones_@gentoo.org>
crack-attack-1.1.10.ebuild, files/1.1.10-gcc34.patch:
diff --git a/games-arcade/crack-attack/Manifest b/games-arcade/crack-attack/Manifest
index 1ed82f9c6e2e..1ea67b0491f2 100644
--- a/games-arcade/crack-attack/Manifest
+++ b/games-arcade/crack-attack/Manifest
@@ -1,5 +1,6 @@
-MD5 fe1be32789c0290dca94620e50ba5d44 ChangeLog 1576
-MD5 91ddb35d37b60ae7359b04e3f65d47ed crack-attack-1.1.10.ebuild 1084
+MD5 39c90232008bb6984fd13fd815949aee ChangeLog 1740
+MD5 485c403275f1fdf9ceec7cb4150876fe crack-attack-1.1.10.ebuild 1138
MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
MD5 63bc39c1a6f83860c8091e344e4613fa files/1.1.10-gcc34.patch 4824
+MD5 0f64d6304af0ffe9d461d703d901cee8 files/1.1.10-i865g.patch 543
MD5 131162585001d8d65c1b8750ca2aa4a7 files/digest-crack-attack-1.1.10 71
diff --git a/games-arcade/crack-attack/crack-attack-1.1.10.ebuild b/games-arcade/crack-attack/crack-attack-1.1.10.ebuild
index 1ae53cbe5171..6e13145fca5e 100644
--- a/games-arcade/crack-attack/crack-attack-1.1.10.ebuild
+++ b/games-arcade/crack-attack/crack-attack-1.1.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/crack-attack/crack-attack-1.1.10.ebuild,v 1.7 2004/05/05 03:53:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/crack-attack/crack-attack-1.1.10.ebuild,v 1.8 2004/06/12 00:49:40 mr_bones_ Exp $
inherit eutils flag-o-matic gcc games
@@ -24,11 +24,12 @@ src_unpack() {
-e 's:-O6:@CXXFLAGS@:' src/Makefile.in \
|| die "sed src/Makefile.in failed"
epatch "${FILESDIR}/${PV}-gcc34.patch"
+ epatch "${FILESDIR}/1.1.10-i865g.patch" # bug #53320
}
src_compile() {
append-flags -DGL_GLEXT_LEGACY
- [ "`gcc-fullversion`" == "3.2.3" ] && filter-flags -march=pentium3
+ [ "$(gcc-fullversion)" == "3.2.3" ] && filter-flags -march=pentium3
egamesconf || die
emake || die "emake failed"
}
diff --git a/games-arcade/crack-attack/files/1.1.10-i865g.patch b/games-arcade/crack-attack/files/1.1.10-i865g.patch
new file mode 100644
index 000000000000..8dbd99e67f08
--- /dev/null
+++ b/games-arcade/crack-attack/files/1.1.10-i865g.patch
@@ -0,0 +1,15 @@
+--- src/obj_block.cxx.orig 2004-06-11 16:53:45.000000000 -0700
++++ src/obj_block.cxx 2004-06-11 16:55:19.000000000 -0700
+@@ -1480,6 +1480,12 @@
+ "since it segfaults\n**********" << endl;
+ return;
+ }
++ if (strstr((char*) renderer, "865G 20021115")) {
++ cerr << "**********\nWARNING:"
++ "disabling call to 1d texturing on 865G 20021115 renderer "
++ "since it segfaults\n**********" << endl;
++ return;
++ }
+
+ glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE, 32, GL_FALSE, GL_LUMINANCE,
+ GL_UNSIGNED_BYTE, texture);