Unbundling speex and zlib. Partially fix bug #255453

(Portage version: 2.1.7.17/cvs/Linux i686)

2 files changed, 125 insertions, 0 deletions

diff --git a/games-fps/openarena/files/openarena-0.8.1-makefile.patch b/games-fps/openarena/files/openarena-0.8.1-makefile.patch
index bb556119802c..eb6a6f6a93d6 100644
--- a/games-fps/openarena/files/openarena-0.8.1-makefile.patch
+++ b/games-fps/openarena/files/openarena-0.8.1-makefile.patch
@@ -19,3 +19,12 @@
  
  else # ifeq Linux
  
+@@ -821,7 +821,7 @@
+   ifeq ($(USE_INTERNAL_SPEEX),1)
+     BASE_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
+   else
+-    CLIENT_LDFLAGS += -lspeex
++    CLIENT_LDFLAGS += -lspeex -lspeexdsp
+   endif
+ endif
+ 
diff --git a/games-fps/openarena/files/openarena-0.8.1-zlib.patch b/games-fps/openarena/files/openarena-0.8.1-zlib.patch
new file mode 100644
index 000000000000..ba163e8a3338
--- /dev/null
+++ b/games-fps/openarena/files/openarena-0.8.1-zlib.patch
@@ -0,0 +1,116 @@
+--- 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
+@@ -283,7 +283,7 @@
+   SHLIBLDFLAGS=-shared $(LDFLAGS)
+ 
+   THREAD_LDFLAGS=-lpthread
+-  LDFLAGS=-ldl -lm
++  LDFLAGS=-ldl -lm -lz
+ 
+   CLIENT_LDFLAGS=$(shell sdl-config --libs) -lGL
+ 
+@@ -560,7 +560,7 @@
+ 
+   THREAD_LDFLAGS=-lpthread
+   # don't need -ldl (FreeBSD)
+-  LDFLAGS=-lm
++  LDFLAGS=-lm -lz
+ 
+   CLIENT_LDFLAGS =
+ 
+@@ -616,7 +616,7 @@
+   SHLIBLDFLAGS=-shared $(LDFLAGS)
+ 
+   THREAD_LDFLAGS=-lpthread
+-  LDFLAGS=-lm
++  LDFLAGS=-lm -lz
+ 
+   CLIENT_LDFLAGS =
+ 
+@@ -644,7 +644,7 @@
+     ARCH=i386
+   endif
+ 
+-  LDFLAGS=-lm
++  LDFLAGS=-lm -lz
+   SHLIBEXT=so
+   SHLIBCFLAGS=-fPIC
+   SHLIBLDFLAGS=-shared $(LDFLAGS)
+@@ -683,7 +683,7 @@
+   SHLIBCFLAGS=
+   SHLIBLDFLAGS=-shared
+ 
+-  LDFLAGS=-ldl -lm -lgen
++  LDFLAGS=-ldl -lm -lgen -lz
+   # FIXME: The X libraries probably aren't necessary?
+   CLIENT_LDFLAGS=-L/usr/X11/$(LIB) $(shell sdl-config --libs) -lGL \
+     -lX11 -lXext -lm
+@@ -750,7 +750,7 @@
+   SHLIBLDFLAGS=-shared $(LDFLAGS)
+ 
+   THREAD_LDFLAGS=-lpthread
+-  LDFLAGS=-lsocket -lnsl -ldl -lm
++  LDFLAGS=-lsocket -lnsl -ldl -lm -lz
+ 
+   BOTCFLAGS=-O0
+ 
+--- 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