r8345 - in packages/branches/openarena/openarena-0.8.1/debian: . patches
Bruno Fuddl-guestquot; Fuddl" Kleinert
fuddl-guest at alioth.debian.org
Fri Nov 7 18:10:41 UTC 2008
Author: fuddl-guest
Date: 2008-11-07 18:10:40 +0000 (Fri, 07 Nov 2008)
New Revision: 8345
Added:
packages/branches/openarena/openarena-0.8.1/debian/patches/30_link_against_local_libspeex.dpatch
Modified:
packages/branches/openarena/openarena-0.8.1/debian/changelog
packages/branches/openarena/openarena-0.8.1/debian/control
packages/branches/openarena/openarena-0.8.1/debian/patches/00list
packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.dpatch
packages/branches/openarena/openarena-0.8.1/debian/rules
Log:
+ add a patch to build against speex* packages, instead of compiling the shipped verseion
* my jpeg patch obviously broke jpeg support :(
Modified: packages/branches/openarena/openarena-0.8.1/debian/changelog
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/changelog 2008-11-07 16:34:23 UTC (rev 8344)
+++ packages/branches/openarena/openarena-0.8.1/debian/changelog 2008-11-07 18:10:40 UTC (rev 8345)
@@ -10,8 +10,10 @@
distribution-specific build flags in our rules file
* Add 20_dont_build_shipped_jpeg.dpatch to build against system jpeg library
(Closes: #495966)
+ * Add 30_link_against_local_libspeex.dpatch to build against system speex and
+ speexdsp libraries
- -- Bruno "Fuddl" Kleinert <fuddl at debian.org> Fri, 07 Nov 2008 17:31:16 +0100
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org> Fri, 07 Nov 2008 19:07:12 +0100
openarena (0.7.7+dfsg1-1) unstable; urgency=low
Modified: packages/branches/openarena/openarena-0.8.1/debian/control
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/control 2008-11-07 16:34:23 UTC (rev 8344)
+++ packages/branches/openarena/openarena-0.8.1/debian/control 2008-11-07 18:10:40 UTC (rev 8345)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Bruno "Fuddl" Kleinert <fuddl at debian.org>, Ansgar Burchardt <ansgar at 43-1.org>
-Build-Depends: debhelper (>= 5.0.51), libsdl1.2-dev, libopenal-dev, imagemagick, libcurl4-gnutls-dev, sharutils, dpatch, libvorbis-dev, libjpeg62-dev
+Build-Depends: debhelper (>= 5.0.51), libsdl1.2-dev, libopenal-dev, imagemagick, libcurl4-gnutls-dev, sharutils, dpatch, libvorbis-dev, libjpeg62-dev, libspeexdsp-dev
Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/openarena/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/openarena/?op=log
Modified: packages/branches/openarena/openarena-0.8.1/debian/patches/00list
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/patches/00list 2008-11-07 16:34:23 UTC (rev 8344)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/00list 2008-11-07 18:10:40 UTC (rev 8345)
@@ -1,3 +1,4 @@
10_fix_build_and_binary_on_alpha.dpatch
10_remove_upstream_build_flags.dpatch
20_dont_build_shipped_jpeg.dpatch
+30_link_against_local_libspeex.dpatch
Modified: packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.dpatch
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.dpatch 2008-11-07 16:34:23 UTC (rev 8344)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.dpatch 2008-11-07 18:10:40 UTC (rev 8345)
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad openarena-0.8.1~/Makefile openarena-0.8.1/Makefile
---- openarena-0.8.1~/Makefile 2008-11-07 16:50:41.000000000 +0100
-+++ openarena-0.8.1/Makefile 2008-11-07 16:59:42.000000000 +0100
+--- openarena-0.8.1~/Makefile 2008-11-07 18:58:48.000000000 +0100
++++ openarena-0.8.1/Makefile 2008-11-07 18:58:48.000000000 +0100
@@ -158,7 +158,7 @@
NDIR=$(MOUNT_DIR)/null
UIDIR=$(MOUNT_DIR)/ui
@@ -17,14 +17,14 @@
SPEEXDIR=$(MOUNT_DIR)/libspeex
Q3ASMDIR=$(MOUNT_DIR)/tools/asm
LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg
-@@ -233,6 +233,7 @@
+@@ -286,6 +286,7 @@
+ LDFLAGS=-ldl -lm
- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
- -pipe -DUSE_ICON $(shell sdl-config --cflags)
+ CLIENT_LDFLAGS=$(shell sdl-config --libs) -lGL
+ CLIENT_LDFLAGS += -ljpeg
ifeq ($(USE_OPENAL),1)
- BASE_CFLAGS += -DUSE_OPENAL
+ ifneq ($(USE_OPENAL_DLOPEN),1)
@@ -1283,42 +1284,6 @@
$(B)/client/l_script.o \
$(B)/client/l_struct.o \
@@ -79,3 +79,53 @@
$(B)/client/%.o: $(SPEEXDIR)/%.c
$(DO_CC)
+diff -urNad openarena-0.8.1~/code/renderer/tr_image_jpg.c openarena-0.8.1/code/renderer/tr_image_jpg.c
+--- openarena-0.8.1~/code/renderer/tr_image_jpg.c 2008-11-07 18:58:16.000000000 +0100
++++ openarena-0.8.1/code/renderer/tr_image_jpg.c 2008-11-07 19:02:20.000000000 +0100
+@@ -31,7 +31,9 @@
+ */
+
+ #define JPEG_INTERNALS
+-#include "../jpeg-6/jpeglib.h"
++/*#include "../jpeg-6/jpeglib.h"*/
++#include <jpeglib.h>
++#include <jerror.h>
+
+ void R_LoadJPG( const char *filename, unsigned char **pic, int *width, int *height ) {
+ /* This struct contains the JPEG decompression parameters and pointers to
+@@ -59,6 +61,7 @@
+ int len;
+ byte *fbuffer;
+ byte *buf;
++ FILE *infile;
+
+ /* In this example we want to open the input file before doing anything else,
+ * so that the setjmp() error recovery below can assume the file is open.
+@@ -70,6 +73,9 @@
+ if (!fbuffer || len < 0) {
+ return;
+ }
++ puts("USING DEBIAN PATCH");
++ if((infile = fopen((char *) filename, "rb")) == NULL)
++ return;
+
+ /* Step 1: allocate and initialize JPEG decompression object */
+
+@@ -85,7 +91,8 @@
+
+ /* Step 2: specify data source (eg, a file) */
+
+- jpeg_mem_src(&cinfo, fbuffer, len);
++ /*jpeg_mem_src(&cinfo, fbuffer, len);*/
++ jpeg_stdio_src(&cinfo, infile);
+
+ /* Step 3: read file parameters with jpeg_read_header() */
+
+@@ -210,6 +217,7 @@
+ */
+
+ /* And we're done! */
++ fclose(infile);
+ }
+
+
Added: packages/branches/openarena/openarena-0.8.1/debian/patches/30_link_against_local_libspeex.dpatch
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/patches/30_link_against_local_libspeex.dpatch (rev 0)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/30_link_against_local_libspeex.dpatch 2008-11-07 18:10:40 UTC (rev 8345)
@@ -0,0 +1,73 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_link_against_local_libspeex.dpatch by Bruno "Fuddl" Kleinert <fuddl at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad openarena-0.8.1~/Makefile openarena-0.8.1/Makefile
+--- openarena-0.8.1~/Makefile 2008-11-07 18:45:35.000000000 +0100
++++ openarena-0.8.1/Makefile 2008-11-07 18:48:23.000000000 +0100
+@@ -827,7 +827,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
+
+@@ -1862,8 +1862,8 @@
+ #$(B)/client/%.o: $(JPDIR)/%.c
+ # $(DO_CC)
+
+-$(B)/client/%.o: $(SPEEXDIR)/%.c
+- $(DO_CC)
++#$(B)/client/%.o: $(SPEEXDIR)/%.c
++# $(DO_CC)
+
+ $(B)/client/%.o: $(RDIR)/%.c
+ $(DO_CC)
+diff -urNad openarena-0.8.1~/code/client/cl_cgame.c openarena-0.8.1/code/client/cl_cgame.c
+--- openarena-0.8.1~/code/client/cl_cgame.c 2008-11-07 18:45:24.000000000 +0100
++++ openarena-0.8.1/code/client/cl_cgame.c 2008-11-07 18:45:36.000000000 +0100
+@@ -26,6 +26,10 @@
+ #include "../botlib/botlib.h"
+
+ #include "libmumblelink.h"
++#ifdef USE_VOIP
++ #include <speex/speex.h>
++ #include <speex/speex_preprocess.h>
++#endif
+
+ extern botlib_export_t *botlib_export;
+
+diff -urNad openarena-0.8.1~/code/client/cl_main.c openarena-0.8.1/code/client/cl_main.c
+--- openarena-0.8.1~/code/client/cl_main.c 2008-11-07 18:45:24.000000000 +0100
++++ openarena-0.8.1/code/client/cl_main.c 2008-11-07 18:45:37.000000000 +0100
+@@ -28,6 +28,11 @@
+ #include "libmumblelink.h"
+ #endif
+
++#ifdef USE_VOIP
++#include <speex/speex.h>
++#include <speex/speex_preprocess.h>
++#endif
++
+ #ifdef USE_MUMBLE
+ cvar_t *cl_useMumble;
+ cvar_t *cl_mumbleScale;
+diff -urNad openarena-0.8.1~/code/client/client.h openarena-0.8.1/code/client/client.h
+--- openarena-0.8.1~/code/client/client.h 2008-11-07 18:45:24.000000000 +0100
++++ openarena-0.8.1/code/client/client.h 2008-11-07 18:45:37.000000000 +0100
+@@ -35,8 +35,8 @@
+ #endif /* USE_CURL */
+
+ #ifdef USE_VOIP
+-#include "speex/speex.h"
+-#include "speex/speex_preprocess.h"
++#include <speex/speex.h>
++#include <speex/speex_preprocess.h>
+ #endif
+
+ // file full of random crap that gets used to create cl_guid
Property changes on: packages/branches/openarena/openarena-0.8.1/debian/patches/30_link_against_local_libspeex.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/branches/openarena/openarena-0.8.1/debian/rules
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/rules 2008-11-07 16:34:23 UTC (rev 8344)
+++ packages/branches/openarena/openarena-0.8.1/debian/rules 2008-11-07 18:10:40 UTC (rev 8345)
@@ -15,6 +15,7 @@
USE_CURL_DLOPEN=0 \
USE_OPENAL=1 \
USE_OPENAL_DLOPEN=0 \
+ USE_INTERNAL_SPEEX=0 \
DEFAULT_BASEDIR=/usr/share/games/openarena
touch $@
More information about the Pkg-games-commits
mailing list