summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-02-22 12:57:42 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-02-22 12:57:42 +0000
commit8922f57b638c7028ceafab19317bb8bfa6a01e2e (patch)
tree08e0bbe45e5ad3eb2a2f1d18e2140b8b8b0d52e3 /games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
parentRemove USE="static-libs" because it doesn't compile on x86_64. (diff)
downloadgentoo-2-8922f57b638c7028ceafab19317bb8bfa6a01e2e.tar.gz
gentoo-2-8922f57b638c7028ceafab19317bb8bfa6a01e2e.tar.bz2
gentoo-2-8922f57b638c7028ceafab19317bb8bfa6a01e2e.zip
Fix building with jpeg-8 (conflicting type of jpeg_mem_src) wrt #306345, thanks to Alexander Tsoy for reporting.
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Diffstat (limited to 'games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild')
-rw-r--r--games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild9
1 files changed, 7 insertions, 2 deletions
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 \