summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-07-30 05:48:28 +0000
committerMike Frysinger <vapier@gentoo.org>2005-07-30 05:48:28 +0000
commit1b4cb8bb3f5685246144122c3a998656391f71a8 (patch)
tree67836df969ce2b6862b2fb390cabaebae94106bf
parenta digest came back, kill it (diff)
downloadgentoo-2-1b4cb8bb3f5685246144122c3a998656391f71a8.tar.gz
gentoo-2-1b4cb8bb3f5685246144122c3a998656391f71a8.tar.bz2
gentoo-2-1b4cb8bb3f5685246144122c3a998656391f71a8.zip
Refine the glx version check #100374 by David Grant.
(Portage version: 2.0.51.22-r2)
-rw-r--r--games-sports/trigger/ChangeLog6
-rw-r--r--games-sports/trigger/files/trigger-0.5.1c-glx-check.patch15
-rw-r--r--games-sports/trigger/trigger-0.5.1c.ebuild10
3 files changed, 28 insertions, 3 deletions
diff --git a/games-sports/trigger/ChangeLog b/games-sports/trigger/ChangeLog
index 6737c7bdc719..c0a905e1e289 100644
--- a/games-sports/trigger/ChangeLog
+++ b/games-sports/trigger/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-sports/trigger
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/ChangeLog,v 1.6 2005/07/26 22:26:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/ChangeLog,v 1.7 2005/07/30 05:48:28 vapier Exp $
+
+ 30 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+ +files/trigger-0.5.1c-glx-check.patch, trigger-0.5.1c.ebuild:
+ Refine the glx version check #100374 by David Grant.
26 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org>
trigger-0.5.1c.ebuild:
diff --git a/games-sports/trigger/files/trigger-0.5.1c-glx-check.patch b/games-sports/trigger/files/trigger-0.5.1c-glx-check.patch
new file mode 100644
index 000000000000..6eaef541beff
--- /dev/null
+++ b/games-sports/trigger/files/trigger-0.5.1c-glx-check.patch
@@ -0,0 +1,15 @@
+Make sure strings like 2.0 aren't misdetected as 0.0 or 1.0.
+
+http://bugs.gentoo.org/100374
+
+--- src/pengine/glew.c
++++ src/pengine/glew.c
+@@ -5737,7 +5737,7 @@
+ s = glGetString(GL_VERSION);
+ if (!s) return GLEW_ERROR_NO_GL_VERSION;
+ i = _glewStrCLen(s, '.')+1;
+- if (s+i-1 == NULL || s+i == NULL || s[i] < '1')
++ if (s+i-1 == NULL || s+i == NULL || (s[0] < '2' && s[i] < '1'))
+ {
+ return GLEW_ERROR_GL_VERSION_10_ONLY;
+ }
diff --git a/games-sports/trigger/trigger-0.5.1c.ebuild b/games-sports/trigger/trigger-0.5.1c.ebuild
index 1f9172c993fd..17905f84fc6f 100644
--- a/games-sports/trigger/trigger-0.5.1c.ebuild
+++ b/games-sports/trigger/trigger-0.5.1c.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.1c.ebuild,v 1.2 2005/07/26 22:26:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.1c.ebuild,v 1.3 2005/07/30 05:48:28 vapier Exp $
-inherit games
+inherit eutils games
PSOURCE="${P}-src"
PDATA="${P}-data"
@@ -27,6 +27,12 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${PSOURCE}
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-glx-check.patch
+}
+
src_compile() {
egamesconf --datadir="${GAMES_DATADIR}/${PN}" || die
jam || "jam failed"