summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-fps/quake2-icculus')
-rw-r--r--games-fps/quake2-icculus/ChangeLog9
-rw-r--r--games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild9
2 files changed, 14 insertions, 4 deletions
diff --git a/games-fps/quake2-icculus/ChangeLog b/games-fps/quake2-icculus/ChangeLog
index 6879ad5e97db..235a851df5b6 100644
--- a/games-fps/quake2-icculus/ChangeLog
+++ b/games-fps/quake2-icculus/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-fps/quake2-icculus
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.39 2009/12/07 21:20:56 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.40 2010/02/22 12:57:42 ssuominen Exp $
+
+ 22 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+ quake2-icculus-0.16.1-r1.ebuild:
+ Fix building with jpeg-8 (conflicting type of jpeg_mem_src) wrt #306345,
+ thanks to Alexander Tsoy for reporting.
07 Dec 2009; Michael Sterrett <mr_bones_@gentoo.org>
quake2-icculus-0.16.1-r1.ebuild:
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
index 9f69996afcdf..a7f8b978c28a 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.20 2010/01/25 22:36:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.21 2010/02/22 12:57:42 ssuominen Exp $
EAPI=2
inherit eutils toolchain-funcs games
@@ -56,6 +56,11 @@ pkg_setup() {
src_unpack() {
unpack ${MY_P}.tar.gz
cd "${S}"
+
+ sed -i \
+ -e 's:jpeg_mem_src:_&:' \
+ src/ref_candygl/gl_image.c || die
+
sed -i -e 's:BUILD_SOFTX:BUILD_X11:' Makefile || die
# -amd64.patch # make sure this is still needed in future versions
epatch \