Fix build with >=media-libs/jpeg-8 Bug #302093 by Xake

Package-Manager: portage-2.1.6.13/cvs/Linux i686

5 files changed, 32 insertions, 58 deletions

diff --git a/games-fps/alienarena/ChangeLog b/games-fps/alienarena/ChangeLog
index 3218dd3cb32d..80a460c33f39 100644
--- a/games-fps/alienarena/ChangeLog
+++ b/games-fps/alienarena/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/alienarena
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/ChangeLog,v 1.17 2009/12/29 05:09:13 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/ChangeLog,v 1.18 2010/01/29 11:57:39 tupone Exp $
+
+  29 Jan 2010; Tupone Alfredo <tupone@gentoo.org>
+  -files/alienarena-20090616-path-overflows.patch,
+  alienarena-20091227.ebuild, +files/alienarena-20091227-jpeg8.patch:
+  Fix build with >=media-libs/jpeg-8 Bug #302093 by Xake
 
 *alienarena-20091227 (29 Dec 2009)
 
diff --git a/games-fps/alienarena/Manifest b/games-fps/alienarena/Manifest
index 37b8d3443561..a6d4a89fb8a3 100644
--- a/games-fps/alienarena/Manifest
+++ b/games-fps/alienarena/Manifest
@@ -1,7 +1,7 @@
-AUX alienarena-20090616-path-overflows.patch 1169 RMD160 6fed6af2125c61ba2c89db391bee1a39e5fa5eb6 SHA1 da22480ae66f5a31acf041e518d5237aedf1d27d SHA256 dc2b94b866d368db9422686419eda1a5a9aed1c046eb68cffc14f7b60ae2f6fe
+AUX alienarena-20091227-jpeg8.patch 520 RMD160 78db549899420db6c7fce5ec329f408a8c15f5fc SHA1 5d2b21abaaac94356a9d5c7ac69b18b0561f983e SHA256 d7d67c026b17537658078dc45fe3c10f09e4a624787126d6ed6b22e7513553bc
 DIST alienarena-linux20091016.zip 286465717 RMD160 fcf20dcdb536b0f4821ea6f1248ee7f9ddd9ea34 SHA1 9dcfaf4e9d8a6437adfd2091c9b60ac90d317135 SHA256 30000334424ecd84b70947530668fc6e17b5b77f29ea2a8a0d798a07aa38bf0b
 DIST alienarena7_33-linux20091227.zip 299663490 RMD160 52b16d43bb8eee04567242440360df929b5be05a SHA1 6e02ae715ee0203d9adbe7898dcafd48c8bd6936 SHA256 5d5ab6ab16a8c277035b7b2cbeba96ba6f3cbcb14aa84217c9b41f54b3f6df74
 EBUILD alienarena-20091016.ebuild 2184 RMD160 c2259a9065bc9d42a9f7ffe8f6b65c4a52571812 SHA1 254ee41214be87491912bc56ad139c6458b73f30 SHA256 e7bed0eeb7880f1967a3db326552aace10e9827ae6fdb054d4b724193998203e
-EBUILD alienarena-20091227.ebuild 2197 RMD160 3643d299c4fb9daa4589c65d6ebd7f89abaf668a SHA1 09f7a11e6736b267563140ea4d4e21ef33610af4 SHA256 2d459b5a5cff52c0429c9afd5acb69d79a2e8611176e77ff9cce76ac219a6e12
-MISC ChangeLog 2981 RMD160 65f6a9de9c45b9c09a6c4066755f11a859da578c SHA1 44a951f8b3e13d73e336222280bc46b61c1124ad SHA256 8119ab331835bfc6eb8a1d58ef563882c116d7a7bd15ebc4047472d687a2d5fb
+EBUILD alienarena-20091227.ebuild 2233 RMD160 ed134af25500fa4d2befc5062866b5550f306577 SHA1 e2bb3a47dc53d30bb5d79feddeeb935195b14ab3 SHA256 f975615a514107db717eca9f9e30f78450171804c9d2f29025e6a2d86fb3cf6d
+MISC ChangeLog 3207 RMD160 62b77f6ad6f2d447a0437f2db5cdc66d9bd75e73 SHA1 902f916c23db9ebeb661319fd5cb07bcd7ed5404 SHA256 39ed6f9b44d756b3081c43965fc7c2f719778133f696c7712c47707abf1643a4
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-fps/alienarena/alienarena-20091227.ebuild b/games-fps/alienarena/alienarena-20091227.ebuild
index 60f7236a4246..3d6f543fcb5b 100644
--- a/games-fps/alienarena/alienarena-20091227.ebuild
+++ b/games-fps/alienarena/alienarena-20091227.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/alienarena/alienarena-20091227.ebuild,v 1.1 2009/12/29 05:09:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/alienarena-20091227.ebuild,v 1.2 2010/01/29 11:57:39 tupone Exp $
 
 EAPI=2
 inherit eutils games
@@ -37,6 +37,7 @@ S=${WORKDIR}/${MY_PN}/source
 
 src_prepare() {
 	rm -f ../*/*.so
+	epatch "${FILESDIR}"/${P}-jpeg8.patch
 	sed -i \
 		-e 's:\($(SHLIBLDFLAGS)\):$(LDFLAGS) \1:' \
 		Makefile \
diff --git a/games-fps/alienarena/files/alienarena-20090616-path-overflows.patch b/games-fps/alienarena/files/alienarena-20090616-path-overflows.patch
deleted file mode 100644
index 3d8aba46c3cb..000000000000
--- a/games-fps/alienarena/files/alienarena-20090616-path-overflows.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- source/game/acesrc/acebot_nodes.c
-+++ source/game/acesrc/acebot_nodes.c
-@@ -719,7 +719,7 @@
- void ACEND_SaveNodes()
- {
- 	FILE *pOut;
--	char filename[60];
-+	char filename[MAX_OSPATH];
- 	int i,j;
- 	int version = 1;
- 	
-@@ -760,7 +760,7 @@
- {
- 	FILE *pIn;
- 	int i,j;
--	char filename[60];
-+	char filename[MAX_OSPATH];
- 	int version;
- 
- 	strcpy(filename,BOTDIR"/botinfo/nav/");
---- source/game/acesrc/acebot_spawn.c
-+++ source/game/acesrc/acebot_spawn.c
-@@ -119,7 +119,7 @@
- 	int i, j, count, spawnkicknum;

- 	char *info;

- 	char *skin;

--	char bot_filename[128];

-+	char bot_filename[MAX_OSPATH];

- 	int found;

- 	int real_players, total_players;

- 	edict_t *cl_ent;

-@@ -226,7 +226,7 @@
- {

-     FILE *pIn;

- 	int count;

--	char bot_filename[128];

-+	char bot_filename[MAX_OSPATH];

- 

- 	//bots and configurations are loaded level specific

- 	if (((int)(dmflags->value) & DF_SKINTEAMS) || ctf->value || tca->value || cp->value)

---- source/ref_gl/r_model.c
-+++ source/ref_gl/r_model.c
-@@ -1689,7 +1689,7 @@
- 

- void R_BeginRegistration (char *model)

- {

--	char	fullname[MAX_QPATH];

-+	char	fullname[MAX_OSPATH];

-  	char    *path;

- 	cvar_t	*flushmap;

- 	FILE	*file;

diff --git a/games-fps/alienarena/files/alienarena-20091227-jpeg8.patch b/games-fps/alienarena/files/alienarena-20091227-jpeg8.patch
new file mode 100644
index 000000000000..d1bb328eed48
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-20091227-jpeg8.patch
@@ -0,0 +1,19 @@
+--- ref_gl/r_image.c.old	2010-01-29 12:35:29.000000000 +0100
++++ ref_gl/r_image.c	2010-01-29 12:37:02.000000000 +0100
+@@ -572,6 +572,8 @@
+ 

+ 	FS_FreeFile (pcx);

+ }

++

++#if JPEG_LIB_VERSION < 80

+ /*

+ =================================================================

+ 

+@@ -613,6 +615,7 @@
+     cinfo->src->bytes_in_buffer = len;

+     cinfo->src->next_input_byte = mem;

+ }

++#endif

+ 

+ #define DSTATE_START	200	/* after create_decompress */

+ #define DSTATE_INHEADER	201	/* reading header markers, no SOS yet */