# 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:
DIST quake2-r0.16.1.tar.gz 1525384 RMD160 dbbf9cad08ab381e0c2cd037e317104085455c23 SHA1 9226acadc896ddc9924c6b7f9b71857078af5dba SHA256 49f4d3d53772b6ffd7733506f5d121c7893bfd8884133bfc36a28039c0744642
DIST roguesrc320.shar.Z 626769 RMD160 767c5b1a7a1123370e9c924282656dfdcc6cebba SHA1 7c5cadde75f5353622552cd28501ce60ac83dca2 SHA256 ceefb2fd748961cb0bc3244220f3eb09d8f7b8ca2eb32cdf9b284727a2fdc919
DIST xatrixsrc320.shar.Z 455917 RMD160 357182dcd760a95b27942cdf807ba1242bcb1160 SHA1 ec67b6d2be623dd344c100869fc48bcbadea927a SHA256 94bf596cd85d38ea294b99ccb0ebb5e4b9776cca335001b3803e2d8407395589
-EBUILD quake2-icculus-0.16.1-r1.ebuild 5365 RMD160 200a3aa4a4720eb4382fbb219e4be324c5145779 SHA1 6ef6e7ec08a96e42483c2943b13971a6c97216cb SHA256 b89a806763b44c62a8be38a5b4b1f862412cbd157ccfc97ecd10e34e41dec54e
-MISC ChangeLog 7012 RMD160 5e333efb9d63c06f6c3a3d7768667874e5245d27 SHA1 fa71d6991f7faba710a3a8c31a7756978dfb16ed SHA256 e79fc321be489439559ce9a1f6e50ec7d5f01a5c50800d3ed4bb4eae6ed8f3e2
+EBUILD quake2-icculus-0.16.1-r1.ebuild 5441 RMD160 184ed7e5c19a17c7085170f278cd5d6b251dd309 SHA1 62c249cbfe622033a45de681e84935fa59f2304a SHA256 9bdc480717fe28d05177e072942f46a043dcf6427c998679dd3848b2bf67b890
+MISC ChangeLog 7219 RMD160 d672701a4098fbfa4aec24f314a053f27efd0f27 SHA1 ec2c075758e13341d22be39ec4d128d314f2c53a SHA256 1d74d14a64ee0a68447a445812a4855c49ad435888bb0e334b7eba60f7c76d57
MISC metadata.xml 513 RMD160 1dc52f937a6d3f1e62131171345cd429c4f080cf SHA1 01cfd49cdfd38befba81acae82c76c52edc38b31 SHA256 0608a118c068c5cb15473fc3ee2c6338b6a6330ee2063d1d2b6864c57a761e2c
-# 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
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 \