From a55b455b367be0c5968429eade046af06dddc6f5 Mon Sep 17 00:00:00 2001 From: Alfredo Tupone Date: Fri, 29 Jan 2010 11:57:39 +0000 Subject: Fix build with >=media-libs/jpeg-8 Bug #302093 by Xake (Portage version: 2.1.6.13/cvs/Linux i686) --- games-fps/alienarena/ChangeLog | 9 +++- games-fps/alienarena/alienarena-20091227.ebuild | 5 ++- .../files/alienarena-20090616-path-overflows.patch | 51 ---------------------- .../files/alienarena-20091227-jpeg8.patch | 19 ++++++++ 4 files changed, 29 insertions(+), 55 deletions(-) delete mode 100644 games-fps/alienarena/files/alienarena-20090616-path-overflows.patch create mode 100644 games-fps/alienarena/files/alienarena-20091227-jpeg8.patch (limited to 'games-fps/alienarena') 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 + -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/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 */ -- cgit v1.2.3-65-gdbad