diff options
Diffstat (limited to 'games-fps/openarena')
| -rw-r--r-- | games-fps/openarena/Manifest | 13 | ||||
| -rw-r--r-- | games-fps/openarena/files/openarena-0.8.1-makefile.patch | 321 | ||||
| -rw-r--r-- | games-fps/openarena/files/openarena-0.8.1-unbundling.patch | 194 | ||||
| -rw-r--r-- | games-fps/openarena/openarena-0.8.1-r1.ebuild | 84 |
4 files changed, 0 insertions, 612 deletions
diff --git a/games-fps/openarena/Manifest b/games-fps/openarena/Manifest index 75ea54d98f95..f1cae22ba3d8 100644 --- a/games-fps/openarena/Manifest +++ b/games-fps/openarena/Manifest @@ -1,22 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX openarena-0.8.1-makefile.patch 8516 RMD160 648b0f450fd59e0799ea80f0223d1737b104d1d0 SHA1 60ba8a00a01d19eacb8b3174e8ff9a03b0b2f607 SHA256 7ae39495718541f423f4f4fa641c5dd0c38087c3994d444ecd8029f27fd3bd88 -AUX openarena-0.8.1-unbundling.patch 5905 RMD160 4dcbe1ce8ddb0a694030f265f73ff6a5fb9aa102 SHA1 009701fd4dc8323416818b45b20acb197e37c86e SHA256 ad2965612329e5d817bb3b21b6b1b373cea474f268d85d6b79b1f164ff44f0aa AUX openarena-0.8.5-bots-strcpy-fix.patch 1138 RMD160 fea6d9d492f02f75b7ed267e5c3703df1e5b22bd SHA1 ba1fd93f412ab8dcbcd0062c8acaae3147f06c3e SHA256 d4bef896dc9fc7e8b8c94dcb744f88c03f76f5025deacce50de2cf7945fa71d3 AUX openarena-0.8.5-makefile.patch 8516 RMD160 648b0f450fd59e0799ea80f0223d1737b104d1d0 SHA1 60ba8a00a01d19eacb8b3174e8ff9a03b0b2f607 SHA256 7ae39495718541f423f4f4fa641c5dd0c38087c3994d444ecd8029f27fd3bd88 AUX openarena-0.8.5-unbundling.patch 5905 RMD160 4dcbe1ce8ddb0a694030f265f73ff6a5fb9aa102 SHA1 009701fd4dc8323416818b45b20acb197e37c86e SHA256 ad2965612329e5d817bb3b21b6b1b373cea474f268d85d6b79b1f164ff44f0aa DIST oa081.zip 318927645 RMD160 9009eaf581ad0bf19296418da1a16e2d43daec16 SHA1 526c39e51d0b53177b02bd490bf830f622f35ad5 SHA256 c96282de8bc2ac5781df58c6adbce4265376e36190af50d7528f51dc739b6d7d DIST oa085p.zip 42528474 RMD160 3ad339c007cfe54707a338f0d8795988646567a0 SHA1 70dd19c64adab348071c831d92dc4aa10f459110 SHA256 d360c4b095bc3b34d03d9a366b21c12052c3f9e9c57e86b17c8b2c038baa4719 DIST openarena-engine-0.8.1-1.tar.bz2 2951703 RMD160 123e9f70621fd856385c6ca7ad0580b81454d687 SHA1 6de345c0bebd87e1406cb07189537db99a422808 SHA256 430ba9b691c8085b946e004f0cc890995c7f8295498bd8c8ce744293a87274d2 -EBUILD openarena-0.8.1-r1.ebuild 2198 RMD160 2c46f9defc05efe5e83d4e03bdcb996f18296c5a SHA1 eb4c08622b43be7cb60d615f201482cd91d52242 SHA256 555cf6c85fd797e11292fb293be4bff45c7d3bd187b81eb1a1345131a954ce1f EBUILD openarena-0.8.5.ebuild 2422 RMD160 b0c1cbd3eabced15762c80783992d64debc120fc SHA1 89afa7b64f3016577a7af386dd71f0188973cf12 SHA256 10d16af335e0802395f9878acff84782e6e8f073eab8532fafeb051996412005 MISC ChangeLog 3684 RMD160 2b14963c601f89cdd10309db35a8a6d22f905754 SHA1 db25e6d7286cd839ac047b577daf4ea6051a981e SHA256 07fe7035e8d715fea065879886d405727dd2966e7e34719d96098c6bb4004a3d MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAkzBnSIACgkQNQqtfCuFneP1xACfWNaOYloaCI6BYp4nUd4+4sGK -nFsAnil3itxKrg3kwsb07S9szocoZ+Zz -=cRbh ------END PGP SIGNATURE----- diff --git a/games-fps/openarena/files/openarena-0.8.1-makefile.patch b/games-fps/openarena/files/openarena-0.8.1-makefile.patch deleted file mode 100644 index a716763d84f6..000000000000 --- a/games-fps/openarena/files/openarena-0.8.1-makefile.patch +++ /dev/null @@ -1,321 +0,0 @@ ---- openarena-engine-0.8.1/Makefile 2008-08-09 22:22:37.000000000 +0200 -+++ openarena-engine-0.8.1/Makefile.new 2009-01-07 19:33:31.000000000 +0100 -@@ -67,6 +67,10 @@ - - ifndef ARCH - ARCH=$(COMPILE_ARCH) -+else -+ ifeq ($(ARCH),amd64) -+ ARCH=x86_64 -+ endif - endif - export ARCH - -@@ -231,8 +231,7 @@ - endif - endif - -- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ -- -pipe -DUSE_ICON $(shell sdl-config --cflags) -+ BASE_CFLAGS = -fno-strict-aliasing -DUSE_ICON $(shell sdl-config --cflags) -I. - - ifeq ($(USE_OPENAL),1) - BASE_CFLAGS += -DUSE_OPENAL -@@ -283,29 +283,29 @@ - SHLIBCFLAGS=-fPIC - SHLIBLDFLAGS=-shared $(LDFLAGS) - -- THREAD_LDFLAGS=-lpthread -- LDFLAGS=-ldl -lm -+ THREAD_LIBS=-lpthread -+ LDLIBS=-ldl -lm -lz - -- CLIENT_LDFLAGS=$(shell sdl-config --libs) -lGL -+ CLIENT_LIBS=$(shell sdl-config --libs) -lGL -ljpeg - - ifeq ($(USE_OPENAL),1) - ifneq ($(USE_OPENAL_DLOPEN),1) -- CLIENT_LDFLAGS += -lopenal -+ CLIENT_LIBS += -lopenal - endif - endif - - ifeq ($(USE_CURL),1) - ifneq ($(USE_CURL_DLOPEN),1) -- CLIENT_LDFLAGS += -lcurl -+ CLIENT_LIBS += -lcurl - endif - endif - - ifeq ($(USE_CODEC_VORBIS),1) -- CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg -+ CLIENT_LIBS += -lvorbisfile -lvorbis -logg - endif - - ifeq ($(USE_MUMBLE),1) -- CLIENT_LDFLAGS += -lrt -+ CLIENT_LIBS += -lrt - endif - - ifeq ($(USE_LOCAL_HEADERS),1) -@@ -323,7 +322,7 @@ - endif - - DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 -- RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) -+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG - - else # ifeq Linux - -@@ -336,7 +336,7 @@ - - ifeq ($(PLATFORM),darwin) - HAVE_VM_COMPILED=true -- CLIENT_LDFLAGS= -+ CLIENT_LIBS= - OPTIMIZE= - - BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes -@@ -357,7 +357,7 @@ - ifeq ($(USE_OPENAL),1) - BASE_CFLAGS += -DUSE_OPENAL - ifneq ($(USE_OPENAL_DLOPEN),1) -- CLIENT_LDFLAGS += -framework OpenAL -+ CLIENT_LIBS += -framework OpenAL - else - BASE_CFLAGS += -DUSE_OPENAL_DLOPEN - endif -@@ -366,7 +366,7 @@ - ifeq ($(USE_CURL),1) - BASE_CFLAGS += -DUSE_CURL - ifneq ($(USE_CURL_DLOPEN),1) -- CLIENT_LDFLAGS += -lcurl -+ CLIENT_LIBS += -lcurl - else - BASE_CFLAGS += -DUSE_CURL_DLOPEN - endif -@@ -374,7 +374,7 @@ - - ifeq ($(USE_CODEC_VORBIS),1) - BASE_CFLAGS += -DUSE_CODEC_VORBIS -- CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg -+ CLIENT_LIBS += -lvorbisfile -lvorbis -logg - endif - - BASE_CFLAGS += -D_THREAD_SAFE=1 -@@ -387,7 +387,7 @@ - # the file has been modified by each build. - LIBSDLMAIN=$(B)/libSDLmain.a - LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDLmain.a -- CLIENT_LDFLAGS += -framework Cocoa -framework IOKit -framework OpenGL \ -+ CLIENT_LIBS += -framework Cocoa -framework IOKit -framework OpenGL \ - $(LIBSDIR)/macosx/libSDL-1.2.0.dylib - - OPTIMIZE += -ffast-math -falign-loops=16 -@@ -441,7 +441,7 @@ - ifeq ($(USE_OPENAL_DLOPEN),1) - BASE_CFLAGS += -DUSE_OPENAL_DLOPEN - else -- CLIENT_LDFLAGS += $(OPENAL_LDFLAGS) -+ CLIENT_LIBS += $(OPENAL_LDFLAGS) - endif - endif - -@@ -461,8 +461,8 @@ - - BINEXT=.exe - -- LDFLAGS= -lws2_32 -lwinmm -- CLIENT_LDFLAGS = -mwindows -lgdi32 -lole32 -lopengl32 -+ LDLIBS= -lws2_32 -lwinmm -+ CLIENT_LIBS = -mwindows -lgdi32 -lole32 -lopengl32 - - ifeq ($(USE_CURL),1) - BASE_CFLAGS += -DUSE_CURL -@@ -470,9 +470,9 @@ - ifneq ($(USE_CURL_DLOPEN),1) - ifeq ($(USE_LOCAL_HEADERS),1) - BASE_CFLAGS += -DCURL_STATICLIB -- CLIENT_LDFLAGS += $(LIBSDIR)/win32/libcurl.a -+ CLIENT_LIBS += $(LIBSDIR)/win32/libcurl.a - else -- CLIENT_LDFLAGS += $(CURL_LIBS) -+ CLIENT_LIBS += $(CURL_LIBS) - endif - endif - endif -@@ -480,9 +480,9 @@ - ifeq ($(USE_CODEC_VORBIS),1) - #Sago: Here I get vorbis to compile in Windows: - ifeq ($(PLATFORM),mingw32) -- CLIENT_LDFLAGS += $(LIBSDIR)/win32/libvorbisfile.a $(LIBSDIR)/win32/libvorbis.a $(LIBSDIR)/win32/libogg.a -+ CLIENT_LIBS += $(LIBSDIR)/win32/libvorbisfile.a $(LIBSDIR)/win32/libvorbis.a $(LIBSDIR)/win32/libogg.a - else -- CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg -+ CLIENT_LIBS += -lvorbisfile -lvorbis -logg - endif - endif - -@@ -496,14 +496,14 @@ - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) - - # libmingw32 must be linked before libSDLmain -- CLIENT_LDFLAGS += -lmingw32 -+ CLIENT_LIBS += -lmingw32 - ifeq ($(USE_LOCAL_HEADERS),1) - BASE_CFLAGS += -I$(SDLHDIR)/include -- CLIENT_LDFLAGS += $(LIBSDIR)/win32/libSDLmain.a \ -+ CLIENT_LIBS += $(LIBSDIR)/win32/libSDLmain.a \ - $(LIBSDIR)/win32/libSDL.dll.a - else - BASE_CFLAGS += $(SDL_CFLAGS) -- CLIENT_LDFLAGS += $(SDL_LIBS) -+ CLIENT_LIBS += $(SDL_LIBS) - endif - - -@@ -561,22 +561,22 @@ - SHLIBCFLAGS=-fPIC - SHLIBLDFLAGS=-shared $(LDFLAGS) - -- THREAD_LDFLAGS=-lpthread -+ THREAD_LIBS=-lpthread - # don't need -ldl (FreeBSD) -- LDFLAGS=-lm -+ LDLIBS=-lm -lz - -- CLIENT_LDFLAGS = -+ CLIENT_LIBS = - -- CLIENT_LDFLAGS += $(shell sdl-config --libs) -lGL -+ CLIENT_LIBS += $(shell sdl-config --libs) -lGL - - ifeq ($(USE_OPENAL),1) - ifneq ($(USE_OPENAL_DLOPEN),1) -- CLIENT_LDFLAGS += $(THREAD_LDFLAGS) -lopenal -+ CLIENT_LIBS += $(THREAD_LIBS) -lopenal - endif - endif - - ifeq ($(USE_CODEC_VORBIS),1) -- CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg -+ CLIENT_LIBS += -lvorbisfile -lvorbis -logg - endif - - else # ifeq freebsd -@@ -618,21 +618,21 @@ - SHLIBCFLAGS=-fPIC - SHLIBLDFLAGS=-shared $(LDFLAGS) - -- THREAD_LDFLAGS=-lpthread -- LDFLAGS=-lm -+ THREAD_LIBS=-lpthread -+ LDLIBS=-lm -lz - -- CLIENT_LDFLAGS = -+ CLIENT_LIBS = - -- CLIENT_LDFLAGS += $(shell sdl-config --libs) -lGL -+ CLIENT_LIBS += $(shell sdl-config --libs) -lGL - - ifeq ($(USE_OPENAL),1) - ifneq ($(USE_OPENAL_DLOPEN),1) -- CLIENT_LDFLAGS += $(THREAD_LDFLAGS) -lossaudio -lopenal -+ CLIENT_LIBS += $(THREAD_LIBS) -lossaudio -lopenal - endif - endif - - ifeq ($(USE_CODEC_VORBIS),1) -- CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg -+ CLIENT_LIBS += -lvorbisfile -lvorbis -logg - endif - - else # ifeq openbsd -@@ -647,11 +647,11 @@ - ARCH=i386 - endif - -- LDFLAGS=-lm -+ LDLIBS=-lm -lz - SHLIBEXT=so - SHLIBCFLAGS=-fPIC - SHLIBLDFLAGS=-shared $(LDFLAGS) -- THREAD_LDFLAGS=-lpthread -+ THREAD_LIBS=-lpthread - - BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes - -@@ -686,9 +686,9 @@ - SHLIBCFLAGS= - SHLIBLDFLAGS=-shared - -- LDFLAGS=-ldl -lm -lgen -+ LDLIBS=-ldl -lm -lgen -lz - # FIXME: The X libraries probably aren't necessary? -- CLIENT_LDFLAGS=-L/usr/X11/$(LIB) $(shell sdl-config --libs) -lGL \ -+ CLIENT_LIBS=-L/usr/X11/$(LIB) $(shell sdl-config --libs) -lGL \ -- -lX11 -lXext -lm -+ -lX11 -lXext -lm -ljpeg - - else # ifeq IRIX -@@ -736,7 +736,7 @@ - BASE_CFLAGS += -m32 - LDFLAGS += -m32 - BASE_CFLAGS += -I/usr/X11/include/NVIDIA -- CLIENT_LDFLAGS += -L/usr/X11/lib/NVIDIA -R/usr/X11/lib/NVIDIA -+ CLIENT_LIBS += -L/usr/X11/lib/NVIDIA -R/usr/X11/lib/NVIDIA - endif - endif - -@@ -752,12 +752,12 @@ - SHLIBCFLAGS=-fPIC - SHLIBLDFLAGS=-shared $(LDFLAGS) - -- THREAD_LDFLAGS=-lpthread -- LDFLAGS=-lsocket -lnsl -ldl -lm -+ THREAD_LIBS=-lpthread -+ LDLIBS=-lsocket -lnsl -ldl -lm -lz - - BOTCFLAGS=-O0 - -- CLIENT_LDFLAGS +=$(shell sdl-config --libs) -lGL -+ CLIENT_LIBS +=$(shell sdl-config --libs) -lGL -ljpeg - - else # ifeq sunos - -@@ -825,7 +825,7 @@ - ifeq ($(USE_INTERNAL_SPEEX),1) - BASE_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include - else -- CLIENT_LDFLAGS += -lspeex -+ CLIENT_LIBS += -lspeex -lspeexdsp - endif - endif - -@@ -1421,13 +1421,13 @@ - - $(B)/openarena.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) - $(echo_cmd) "LD $@" -- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \ -- $(LDFLAGS) $(LIBSDLMAIN) -+ $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) \ -+ $(LDFLAGS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(LDLIBS) - - $(B)/openarena-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) - $(echo_cmd) "LD $@" -- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ -- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) -+ $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \ -+ $(LDFLAGS) $(THREAD_LIBS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(LDLIBS) - - ifneq ($(strip $(LIBSDLMAIN)),) - ifneq ($(strip $(LIBSDLMAINSRC)),) -@@ -1553,7 +1553,7 @@ - - $(B)/oa_ded.$(ARCH)$(BINEXT): $(Q3DOBJ) - $(echo_cmd) "LD $@" -- $(Q)$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) -+ $(Q)$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) $(LDLIBS) - - - diff --git a/games-fps/openarena/files/openarena-0.8.1-unbundling.patch b/games-fps/openarena/files/openarena-0.8.1-unbundling.patch deleted file mode 100644 index 687668e602b8..000000000000 --- a/games-fps/openarena/files/openarena-0.8.1-unbundling.patch +++ /dev/null @@ -1,194 +0,0 @@ ---- openarena-engine-0.8.1/Makefile.old 2010-03-06 21:51:19.000000000 +0100 -+++ openarena-engine-0.8.1/Makefile 2010-03-06 21:58:01.000000000 +0100 -@@ -1278,41 +1278,7 @@ - $(B)/client/l_script.o \ - $(B)/client/l_struct.o \ - \ -- $(B)/client/jcapimin.o \ -- $(B)/client/jcapistd.o \ -- $(B)/client/jchuff.o \ -- $(B)/client/jcinit.o \ -- $(B)/client/jccoefct.o \ -- $(B)/client/jccolor.o \ -- $(B)/client/jfdctflt.o \ -- $(B)/client/jcdctmgr.o \ -- $(B)/client/jcphuff.o \ -- $(B)/client/jcmainct.o \ -- $(B)/client/jcmarker.o \ -- $(B)/client/jcmaster.o \ -- $(B)/client/jcomapi.o \ -- $(B)/client/jcparam.o \ -- $(B)/client/jcprepct.o \ -- $(B)/client/jcsample.o \ -- $(B)/client/jdapimin.o \ -- $(B)/client/jdapistd.o \ - $(B)/client/jdatasrc.o \ -- $(B)/client/jdcoefct.o \ -- $(B)/client/jdcolor.o \ -- $(B)/client/jddctmgr.o \ -- $(B)/client/jdhuff.o \ -- $(B)/client/jdinput.o \ -- $(B)/client/jdmainct.o \ -- $(B)/client/jdmarker.o \ -- $(B)/client/jdmaster.o \ -- $(B)/client/jdpostct.o \ -- $(B)/client/jdsample.o \ -- $(B)/client/jdtrans.o \ -- $(B)/client/jerror.o \ -- $(B)/client/jidctflt.o \ -- $(B)/client/jmemmgr.o \ -- $(B)/client/jmemnobs.o \ -- $(B)/client/jutils.o \ - \ - $(B)/client/tr_animation.o \ - $(B)/client/tr_backend.o \ ---- openarena-engine-0.8.1/code/qcommon/unzip.h.old 2010-03-06 21:59:46.000000000 +0100 -+++ openarena-engine-0.8.1/code/qcommon/unzip.h 2010-03-06 22:00:58.000000000 +0100 -@@ -19,6 +19,8 @@ - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - =========================================================================== - */ -+#include <zconf.h> -+#include <zlib.h> - - #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP) - /* like the STRICT of WIN32, we define a pointer that cannot be converted -@@ -80,6 +82,7 @@ - typedef void* (*alloc_func) (void* opaque, unsigned int items, unsigned int size); - typedef void (*free_func) (void* opaque, void* address); - -+#if 0 - struct internal_state; - - typedef struct z_stream_s { -@@ -105,6 +108,7 @@ - - typedef z_stream *z_streamp; - -+#endif - - /* file_in_zip_read_info_s contain internal information about a file in zipfile, - when reading and decompress it */ ---- openarena-engine-0.8.1/code/qcommon/unzip.c.old 2010-03-06 22:01:40.000000000 +0100 -+++ openarena-engine-0.8.1/code/qcommon/unzip.c 2010-03-06 22:03:35.000000000 +0100 -@@ -49,7 +49,7 @@ - ftp://ftp.cdrom.com/pub/infozip/doc/appnote-970311-iz.zip - PkWare has also a specification at : - ftp://ftp.pkware.com/probdesc.zip */ -- -+#if 0 - /* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.1.3, July 9th, 1998 - -@@ -955,6 +955,7 @@ - // static const char * zError OF((int err)); - // static int inflateSyncPoint OF((z_streamp z)); - // static const uLong * get_crc_table OF((void)); -+#endif - - typedef unsigned char uch; - typedef unsigned short ush; -@@ -2248,6 +2249,8 @@ - return (int)uReadThis; - } - -+#if 0 -+ - /* infblock.h -- header to use infblock.c - * Copyright (C) 1995-1998 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h -@@ -4295,3 +4298,4 @@ - } - - -+#endif ---- openarena-engine-0.8.1/code/jpeg-6/jdatasrc.c.old 2010-03-10 09:13:25.000000000 +0100 -+++ openarena-engine-0.8.1/code/jpeg-6/jdatasrc.c 2010-03-10 09:23:39.000000000 +0100 -@@ -16,9 +16,15 @@ - - - /* this is not a core library module, so it doesn't define JPEG_INTERNALS */ --#include "jinclude.h" --#include "jpeglib.h" --#include "jerror.h" -+#include <stdio.h> -+#include <string.h> -+#include <jpeglib.h> -+#include <jerror.h> -+#undef METHODDEF -+#define METHODDEF static -+#undef GLOBAL -+#define GLOBAL -+#define SIZEOF(object) ((size_t) sizeof(object)) - - #ifndef MIN - #define MIN(a, b) ((a)<(b)?(a):(b)) -@@ -189,7 +195,7 @@ - */ - - GLOBAL void --jpeg_mem_src (j_decompress_ptr cinfo, unsigned char *inbuf, size_t size) -+jpeg_mem_src (j_decompress_ptr cinfo, unsigned char *inbuf, unsigned long size) - { - my_src_ptr src; - ---- openarena-engine-0.8.1/code/renderer/tr_image_jpg.c.old 2010-03-10 09:30:30.000000000 +0100 -+++ openarena-engine-0.8.1/code/renderer/tr_image_jpg.c 2010-03-10 10:17:42.000000000 +0100 -@@ -31,7 +31,7 @@ - */ - - #define JPEG_INTERNALS --#include "../jpeg-6/jpeglib.h" -+#include <jpeglib.h> - - void R_LoadJPG( const char *filename, unsigned char **pic, int *width, int *height ) { - /* This struct contains the JPEG decompression parameters and pointers to -@@ -128,7 +128,10 @@ - } - - memcount = pixelcount * 4; -- row_stride = cinfo.output_width * cinfo.output_components; -+ if (3 == cinfo.output_components) -+ row_stride = cinfo.output_width * 4; -+ else -+ row_stride = cinfo.output_width * cinfo.output_components; - - out = ri.Malloc(memcount); - -@@ -141,14 +144,26 @@ - /* Here we use the library's state variable cinfo.output_scanline as the - * loop counter, so that we don't have to keep track ourselves. - */ -+ buf = out; - while (cinfo.output_scanline < cinfo.output_height) { - /* jpeg_read_scanlines expects an array of pointers to scanlines. - * Here the array is only one element long, but you could ask for - * more than one scanline at a time if that's more convenient. - */ -- buf = ((out+(row_stride*cinfo.output_scanline))); - buffer = &buf; - (void) jpeg_read_scanlines(&cinfo, buffer, 1); -+ if (3 == cinfo.output_components) { -+ /* turn RGB into RGBA */ -+ int ioffset = cinfo.output_width * 3 - 1; -+ int ooffset = cinfo.output_width * 4 - 1; -+ do { -+ buf[ooffset--] = 255; -+ buf[ooffset--] = buf[ioffset--]; -+ buf[ooffset--] = buf[ioffset--]; -+ buf[ooffset--] = buf[ioffset--]; -+ } while (ioffset > 0); -+ } -+ buf += row_stride; - } - - buf = out; -@@ -173,7 +188,7 @@ - buf[--dindex] = greyshade; - } while(sindex); - } -- else -+ else if (4 == cinfo.output_components) - { - // clear all the alphas to 255 - int i; diff --git a/games-fps/openarena/openarena-0.8.1-r1.ebuild b/games-fps/openarena/openarena-0.8.1-r1.ebuild deleted file mode 100644 index 288941b6c443..000000000000 --- a/games-fps/openarena/openarena-0.8.1-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/openarena/openarena-0.8.1-r1.ebuild,v 1.6 2010/05/23 21:25:31 pacho Exp $ - -EAPI=2 -inherit eutils flag-o-matic versionator games - -MY_PV=$(delete_all_version_separators) - -DESCRIPTION="Open-source replacement for Quake 3 Arena" -HOMEPAGE="http://openarena.ws/" -SRC_URI="http://download.tuxfamily.org/openarena/rel/${MY_PV}/oa${MY_PV}.zip - http://openarena.ws/svn/source/${MY_PV}/${PN}-engine-${PV}-1.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+curl +openal +vorbis" - -RDEPEND="virtual/opengl - media-libs/libsdl[joystick,opengl,video] - media-libs/speex - media-libs/jpeg - x11-libs/libXext - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - curl? ( net-misc/curl ) - openal? ( media-libs/openal ) - vorbis? ( media-libs/libvorbis )" -DEPEND="${RDEPEND} - app-arch/unzip" - -MY_S=${WORKDIR}/${PN}-engine-${PV} -BUILD_DIR=${PN}-build -DIR=${GAMES_DATADIR}/${PN} - -src_prepare() { - cd "${WORKDIR}" - epatch "${FILESDIR}"/${P}-makefile.patch \ - "${FILESDIR}"/${P}-unbundling.patch - sed -i \ - -e '/ALDRIVER_DEFAULT/s/libopenal.so.0/libopenal.so/' \ - "${MY_S}"/code/client/snd_openal.c \ - || die "sed failed" - cd "${MY_S}" - touch jpegint.h -} - -src_compile() { - local myopts - - # enable voip, disable mumble - # also build always server and use smp by default - myopts="USE_INTERNAL_SPEEX=0 USE_VOIP=1 USE_MUMBLE=0 - BUILD_SERVER=1 BUILD_CLIENT_SMP=1 USE_LOCAL_HEADERS=0" - use curl || myopts="${myopts} USE_CURL=0" - use openal || myopts="${myopts} USE_OPENAL=0" - use vorbis || myopts="${myopts} USE_CODEC_VORBIS=0" - - cd "${MY_S}" - emake \ - V=1 \ - DEFAULT_BASEDIR="${DIR}" \ - BR="${BUILD_DIR}" \ - ${myopts} \ - || die "emake failed" -} - -src_install() { - cd "${MY_S}"/"${BUILD_DIR}" - newgamesbin openarena-smp.* "${PN}" || die "binary install failed" - newgamesbin oa_ded.* "${PN}-ded" || die "dedicated binary not found" - cd "${S}" - - insinto "${DIR}" - doins -r baseoa missionpack || die "doins -r failed" - - dodoc CHANGES CREDITS LINUXNOTES README - newicon "${MY_S}"/misc/quake3.png ${PN}.png - make_desktop_entry ${PN} "OpenArena" - - prepgamesdirs -} |