| 1 |
ssuominen 10/02/22 12:57:43 |
| 2 |
|
| 3 |
Modified: ChangeLog quake2-icculus-0.16.1-r1.ebuild |
| 4 |
Log: |
| 5 |
Fix building with jpeg-8 (conflicting type of jpeg_mem_src) wrt #306345, thanks to Alexander Tsoy for reporting. |
| 6 |
(Portage version: 2.2_rc63/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.40 games-fps/quake2-icculus/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/quake2-icculus/ChangeLog?rev=1.40&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/quake2-icculus/ChangeLog?rev=1.40&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/quake2-icculus/ChangeLog?r1=1.39&r2=1.40 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v |
| 18 |
retrieving revision 1.39 |
| 19 |
retrieving revision 1.40 |
| 20 |
diff -u -r1.39 -r1.40 |
| 21 |
--- ChangeLog 7 Dec 2009 21:20:56 -0000 1.39 |
| 22 |
+++ ChangeLog 22 Feb 2010 12:57:42 -0000 1.40 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for games-fps/quake2-icculus |
| 25 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.39 2009/12/07 21:20:56 mr_bones_ Exp $ |
| 27 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.40 2010/02/22 12:57:42 ssuominen Exp $ |
| 29 |
+ |
| 30 |
+ 22 Feb 2010; Samuli Suominen <ssuominen@g.o> |
| 31 |
+ quake2-icculus-0.16.1-r1.ebuild: |
| 32 |
+ Fix building with jpeg-8 (conflicting type of jpeg_mem_src) wrt #306345, |
| 33 |
+ thanks to Alexander Tsoy for reporting. |
| 34 |
|
| 35 |
07 Dec 2009; Michael Sterrett <mr_bones_@g.o> |
| 36 |
quake2-icculus-0.16.1-r1.ebuild: |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.21 games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild?rev=1.21&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild?rev=1.21&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild?r1=1.20&r2=1.21 |
| 45 |
|
| 46 |
Index: quake2-icculus-0.16.1-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v |
| 49 |
retrieving revision 1.20 |
| 50 |
retrieving revision 1.21 |
| 51 |
diff -u -r1.20 -r1.21 |
| 52 |
--- quake2-icculus-0.16.1-r1.ebuild 25 Jan 2010 22:36:36 -0000 1.20 |
| 53 |
+++ quake2-icculus-0.16.1-r1.ebuild 22 Feb 2010 12:57:42 -0000 1.21 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
-# Copyright 1999-2009 Gentoo Foundation |
| 56 |
+# Copyright 1999-2010 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $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 $ |
| 59 |
+# $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 $ |
| 60 |
|
| 61 |
EAPI=2 |
| 62 |
inherit eutils toolchain-funcs games |
| 63 |
@@ -56,6 +56,11 @@ |
| 64 |
src_unpack() { |
| 65 |
unpack ${MY_P}.tar.gz |
| 66 |
cd "${S}" |
| 67 |
+ |
| 68 |
+ sed -i \ |
| 69 |
+ -e 's:jpeg_mem_src:_&:' \ |
| 70 |
+ src/ref_candygl/gl_image.c || die |
| 71 |
+ |
| 72 |
sed -i -e 's:BUILD_SOFTX:BUILD_X11:' Makefile || die |
| 73 |
# -amd64.patch # make sure this is still needed in future versions |
| 74 |
epatch \ |
Archives