Author: goneri Date: 2009-02-14 14:42:42 +0000 (Sat, 14 Feb 2009) New Revision: 8790
Added: packages/trunk/openarena/debian/openarena-server.docs packages/trunk/openarena/debian/openarena.docs packages/trunk/openarena/debian/patches/10_fix_build_and_binary_on_alpha.diff packages/trunk/openarena/debian/patches/10_remove_upstream_build_flags.diff packages/trunk/openarena/debian/patches/20_dont_build_shipped_jpeg.diff packages/trunk/openarena/debian/patches/30_link_against_local_libspeex.diff packages/trunk/openarena/debian/patches/series Removed: packages/trunk/openarena/debian/patches/00list Modified: packages/trunk/openarena/debian/changelog packages/trunk/openarena/debian/control packages/trunk/openarena/debian/copyright packages/trunk/openarena/debian/openarena-server.6 packages/trunk/openarena/debian/openarena.6 packages/trunk/openarena/debian/rules Log: Import the 0.8.1-1 branch Modified: packages/trunk/openarena/debian/changelog =================================================================== --- packages/trunk/openarena/debian/changelog 2009-02-14 14:38:14 UTC (rev 8789) +++ packages/trunk/openarena/debian/changelog 2009-02-14 14:42:42 UTC (rev 8790) @@ -1,3 +1,24 @@ +openarena (0.8.1-1) experimental; urgency=low + + * New upstream release + * Remove dfsg from version string because upstream no longer distributes + non-free code + * Update my email address where necessary + * Install documentation files in the binary packages openarena and + openarena-server + * Switch to quilt as patch management system + * Use quilt in debian/rules + * Import existing patches to quilt + * Drop dpatch and add quilt als build dependency + * Refresh/edit 10_remove_upstream_build_flags.diff: We want to keep + distribution-specific build flags in our rules file + * Add 20_dont_build_shipped_jpeg.diff to build against system jpeg library + (Closes: #495966) + * Add 30_link_against_local_libspeex.diff to build against system speex and + speexdsp libraries + + -- Bruno "Fuddl" Kleinert <[email protected]> Sun, 23 Nov 2008 23:19:22 +0100 + openarena (0.7.7+dfsg1-1) unstable; urgency=low * Remove non-free code/tools/lcc (Closes: #496346) Modified: packages/trunk/openarena/debian/control =================================================================== --- packages/trunk/openarena/debian/control 2009-02-14 14:38:14 UTC (rev 8789) +++ packages/trunk/openarena/debian/control 2009-02-14 14:42:42 UTC (rev 8790) @@ -2,8 +2,8 @@ Section: games Priority: optional Maintainer: Debian Games Team <[email protected]> -Uploaders: Bruno "Fuddl" Kleinert <[email protected]>, Ansgar Burchardt <[email protected]> -Build-Depends: debhelper (>= 5.0.51), libsdl1.2-dev, libopenal-dev, imagemagick, libcurl4-gnutls-dev, sharutils, dpatch, libvorbis-dev +Uploaders: Bruno "Fuddl" Kleinert <[email protected]>, Ansgar Burchardt <[email protected]> +Build-Depends: debhelper (>= 5.0.51), libsdl1.2-dev, libopenal-dev, imagemagick, libcurl4-gnutls-dev, sharutils, quilt, 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/trunk/openarena/debian/copyright =================================================================== --- packages/trunk/openarena/debian/copyright 2009-02-14 14:38:14 UTC (rev 8789) +++ packages/trunk/openarena/debian/copyright 2009-02-14 14:42:42 UTC (rev 8790) @@ -1,4 +1,4 @@ -This package was debianized by Bruno "Fuddl" Kleinert <[email protected]> on +This package was debianized by Bruno "Fuddl" Kleinert <[email protected]> on Sat, 30 Sep 2006 17:23:34 +0200. It was downloaded from http://openarena.ws/svn/source/076/ioquake3svn1288plus4.tar.bz2 Modified: packages/trunk/openarena/debian/openarena-server.6 =================================================================== --- packages/trunk/openarena/debian/openarena-server.6 2009-02-14 14:38:14 UTC (rev 8789) +++ packages/trunk/openarena/debian/openarena-server.6 2009-02-14 14:42:42 UTC (rev 8790) @@ -22,5 +22,5 @@ .SH AUTHOR openarena-server was written by the OpenArena Team. .PP -This manual page was written by Bruno "Fuddl" Kleinert <[email protected]>, +This manual page was written by Bruno "Fuddl" Kleinert <[email protected]>, for the Debian project (but may be used by others). Added: packages/trunk/openarena/debian/openarena-server.docs =================================================================== --- packages/trunk/openarena/debian/openarena-server.docs (rev 0) +++ packages/trunk/openarena/debian/openarena-server.docs 2009-02-14 14:42:42 UTC (rev 8790) @@ -0,0 +1 @@ +README Modified: packages/trunk/openarena/debian/openarena.6 =================================================================== --- packages/trunk/openarena/debian/openarena.6 2009-02-14 14:38:14 UTC (rev 8789) +++ packages/trunk/openarena/debian/openarena.6 2009-02-14 14:42:42 UTC (rev 8790) @@ -35,5 +35,5 @@ .SH AUTHOR openarena was written by the OpenArena Team. .PP -This manual page was written by Bruno "Fuddl" Kleinert <[email protected]>, +This manual page was written by Bruno "Fuddl" Kleinert <[email protected]>, for the Debian project (but may be used by others). Added: packages/trunk/openarena/debian/openarena.docs =================================================================== --- packages/trunk/openarena/debian/openarena.docs (rev 0) +++ packages/trunk/openarena/debian/openarena.docs 2009-02-14 14:42:42 UTC (rev 8790) @@ -0,0 +1,3 @@ +README +md4-readme.txt +voip-readme.txt Deleted: packages/trunk/openarena/debian/patches/00list =================================================================== --- packages/trunk/openarena/debian/patches/00list 2009-02-14 14:38:14 UTC (rev 8789) +++ packages/trunk/openarena/debian/patches/00list 2009-02-14 14:42:42 UTC (rev 8790) @@ -1,2 +0,0 @@ -10_fix_build_and_binary_on_alpha.dpatch -10_remove_upstream_build_flags.dpatch Added: packages/trunk/openarena/debian/patches/10_fix_build_and_binary_on_alpha.diff =================================================================== --- packages/trunk/openarena/debian/patches/10_fix_build_and_binary_on_alpha.diff (rev 0) +++ packages/trunk/openarena/debian/patches/10_fix_build_and_binary_on_alpha.diff 2009-02-14 14:42:42 UTC (rev 8790) @@ -0,0 +1,49 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_fix_build_and_binary_on_alpha.dpatch by Bruno "Fuddl" Kleinert <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix compile options to make oa build and run on alpha. + +...@dpatch@ +Index: openarena-0.8.1/Makefile +=================================================================== +--- openarena-0.8.1.orig/Makefile 2008-11-19 22:09:18.000000000 +0100 ++++ openarena-0.8.1/Makefile 2008-11-19 22:11:01.000000000 +0100 +@@ -216,7 +216,7 @@ + ifeq ($(PLATFORM),linux) + + ifeq ($(ARCH),alpha) +- ARCH=axp ++ ARCH=alpha + else + ifeq ($(ARCH),x86_64) + LIB=lib64 +@@ -291,6 +291,10 @@ + ifneq ($(USE_OPENAL_DLOPEN),1) + CLIENT_LDFLAGS += -lopenal + endif ++ else ++ ifeq ($(ARCH),alpha) ++ OPTIMIZE = -O3 -funroll-loops -fomit-frame-pointer ++ endif + endif + + ifeq ($(USE_CURL),1) +@@ -516,7 +520,7 @@ + ifeq ($(PLATFORM),freebsd) + + ifneq (,$(findstring alpha,$(shell uname -m))) +- ARCH=axp ++ ARCH=alpha + else #default to i386 + ARCH=i386 + endif #alpha test +@@ -536,7 +540,7 @@ + BASE_CFLAGS += -DUSE_CODEC_VORBIS + endif + +- ifeq ($(ARCH),axp) ++ ifeq ($(ARCH),alpha) + BASE_CFLAGS += -DNO_VM_COMPILED + RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \ + -fomit-frame-pointer -fexpensive-optimizations Property changes on: packages/trunk/openarena/debian/patches/10_fix_build_and_binary_on_alpha.diff ___________________________________________________________________ Name: svn:executable + * Added: packages/trunk/openarena/debian/patches/10_remove_upstream_build_flags.diff =================================================================== --- packages/trunk/openarena/debian/patches/10_remove_upstream_build_flags.diff (rev 0) +++ packages/trunk/openarena/debian/patches/10_remove_upstream_build_flags.diff 2009-02-14 14:42:42 UTC (rev 8790) @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_remove-upstream-build-flags.dpatch by Bruno "Fuddl" Kleinert <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove parts of upstream's Makefile.local to avoid hard wirde build flags. + +...@dpatch@ +diff -urNad openarena-0.8.1~/Makefile.local openarena-0.8.1/Makefile.local +--- openarena-0.8.1~/Makefile.local 2008-11-07 17:29:20.000000000 +0100 ++++ openarena-0.8.1/Makefile.local 2008-11-07 17:29:27.000000000 +0100 +@@ -3,10 +3,10 @@ + COPYDIR="/usr/local/games/openarena" + + #We want openAL +-USE_OPENAL=1 ++#USE_OPENAL=1 + + #Next we want to bind openAL on runtime. SDL sound will be used if openAL is not installed +-USE_OPENAL_DLOPEN=1 ++#USE_OPENAL_DLOPEN=1 + + #We want vorbis support! + USE_CODEC_VORBIS=1 Property changes on: packages/trunk/openarena/debian/patches/10_remove_upstream_build_flags.diff ___________________________________________________________________ Name: svn:executable + * Added: packages/trunk/openarena/debian/patches/20_dont_build_shipped_jpeg.diff =================================================================== --- packages/trunk/openarena/debian/patches/20_dont_build_shipped_jpeg.diff (rev 0) +++ packages/trunk/openarena/debian/patches/20_dont_build_shipped_jpeg.diff 2009-02-14 14:42:42 UTC (rev 8790) @@ -0,0 +1,206 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_dont_build_shipped_jpeg.dpatch by Bruno "Fuddl" Kleinert <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +...@dpatch@ +Index: openarena-0.8.1/Makefile +=================================================================== +--- openarena-0.8.1.orig/Makefile 2008-11-23 22:43:07.000000000 +0100 ++++ openarena-0.8.1/Makefile 2008-11-23 22:43:07.000000000 +0100 +@@ -158,7 +158,7 @@ + NDIR=$(MOUNT_DIR)/null + UIDIR=$(MOUNT_DIR)/ui + Q3UIDIR=$(MOUNT_DIR)/q3_ui +-JPDIR=$(MOUNT_DIR)/jpeg-6 ++#JPDIR=$(MOUNT_DIR)/jpeg-6 + SPEEXDIR=$(MOUNT_DIR)/libspeex + Q3ASMDIR=$(MOUNT_DIR)/tools/asm + LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg +@@ -286,6 +286,7 @@ + LDFLAGS=-ldl -lm + + CLIENT_LDFLAGS=$(shell sdl-config --libs) -lGL ++ CLIENT_LDFLAGS += -ljpeg + + ifeq ($(USE_OPENAL),1) + ifneq ($(USE_OPENAL_DLOPEN),1) +@@ -1283,42 +1284,6 @@ + $(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 \ + $(B)/client/tr_bloom.o \ +@@ -1894,8 +1859,8 @@ + $(B)/client/%.o: $(BLIBDIR)/%.c + $(DO_BOT_CC) + +-$(B)/client/%.o: $(JPDIR)/%.c +- $(DO_CC) ++#$(B)/client/%.o: $(JPDIR)/%.c ++# $(DO_CC) + + $(B)/client/%.o: $(SPEEXDIR)/%.c + $(DO_CC) +Index: openarena-0.8.1/code/renderer/tr_image_jpg.c +=================================================================== +--- openarena-0.8.1.orig/code/renderer/tr_image_jpg.c 2008-11-23 22:38:41.000000000 +0100 ++++ openarena-0.8.1/code/renderer/tr_image_jpg.c 2008-11-23 22:58:05.000000000 +0100 +@@ -31,7 +31,118 @@ + */ + + #define JPEG_INTERNALS +-#include "../jpeg-6/jpeglib.h" ++/*#include "../jpeg-6/jpeglib.h"*/ ++#include <jpeglib.h> ++#include <jerror.h> ++ ++#define INPUT_BUF_SIZE 4096 /* choose an efficiently fread'able size */ ++/* Expanded data source object for stdio input */ ++ ++typedef struct { ++ struct jpeg_source_mgr pub; /* public fields */ ++ ++ unsigned char *inbuf; /* source stream */ ++ size_t inbufbytes; ++ JOCTET * buffer; /* start of buffer */ ++ boolean start_of_file; /* have we gotten any data yet? */ ++} my_source_mgr; ++ ++typedef my_source_mgr * my_src_ptr; ++ ++void init_source (j_decompress_ptr cinfo) ++{ ++ my_src_ptr src = (my_src_ptr) cinfo->src; ++ ++ /* We reset the empty-input-file flag for each image, ++ * but we don't clear the input buffer. ++ * This is correct behavior for reading a series of images from one source. ++ */ ++ src->start_of_file = TRUE; ++} ++ ++boolean fill_input_buffer (j_decompress_ptr cinfo) ++{ ++ my_src_ptr src = (my_src_ptr) cinfo->src; ++ size_t nbytes = MIN(src->inbufbytes, INPUT_BUF_SIZE); ++ ++ if(!nbytes) ++ { ++ WARNMS(cinfo, JWRN_JPEG_EOF); ++ /* Insert a fake EOI marker */ ++ src->buffer[0] = (JOCTET) 0xFF; ++ src->buffer[1] = (JOCTET) JPEG_EOI; ++ nbytes = 2; ++ } ++ else ++ { ++ memcpy( src->buffer, src->inbuf, nbytes); ++ ++ src->inbuf += nbytes; ++ src->inbufbytes -= nbytes; ++ } ++ ++ src->pub.next_input_byte = src->buffer; ++ src->pub.bytes_in_buffer = nbytes; ++ src->start_of_file = FALSE; ++ ++ return TRUE; ++} ++ ++void skip_input_data (j_decompress_ptr cinfo, long num_bytes) ++{ ++ my_src_ptr src = (my_src_ptr) cinfo->src; ++ ++ /* Just a dumb implementation for now. Could use fseek() except ++ * it doesn't work on pipes. Not clear that being smart is worth ++ * any trouble anyway --- large skips are infrequent. ++ */ ++ if (num_bytes > 0) { ++ while (num_bytes > (long) src->pub.bytes_in_buffer) { ++ num_bytes -= (long) src->pub.bytes_in_buffer; ++ (void) fill_input_buffer(cinfo); ++ /* note we assume that fill_input_buffer will never return FALSE, ++ * so suspension need not be handled. ++ */ ++ } ++ src->pub.next_input_byte += (size_t) num_bytes; ++ src->pub.bytes_in_buffer -= (size_t) num_bytes; ++ } ++} ++ ++void term_source (j_decompress_ptr cinfo) {} ++ ++void jpeg_mem_src (j_decompress_ptr cinfo, unsigned char *inbuf, size_t size) ++{ ++ my_src_ptr src; ++ ++ /* The source object and input buffer are made permanent so that a series ++ * of JPEG images can be read from the same file by calling jpeg_stdio_src ++ * only before the first one. (If we discarded the buffer at the end of ++ * one image, we'd likely lose the start of the next one.) ++ * This makes it unsafe to use this manager and a different source ++ * manager serially with the same JPEG object. Caveat programmer. ++ */ ++ if (cinfo->src == NULL) { /* first time for this JPEG object? */ ++ cinfo->src = (struct jpeg_source_mgr *) ++ (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, ++ sizeof(my_source_mgr)); ++ src = (my_src_ptr) cinfo->src; ++ src->buffer = (JOCTET *) ++ (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, ++ INPUT_BUF_SIZE * sizeof(JOCTET)); ++ } ++ ++ src = (my_src_ptr) cinfo->src; ++ src->pub.init_source = init_source; ++ src->pub.fill_input_buffer = fill_input_buffer; ++ src->pub.skip_input_data = skip_input_data; ++ src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */ ++ src->pub.term_source = term_source; ++ src->inbuf = inbuf; ++ src->inbufbytes = size; ++ src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */ ++ src->pub.next_input_byte = NULL; /* until buffer loaded */ ++} + + void R_LoadJPG( const char *filename, unsigned char **pic, int *width, int *height ) { + /* This struct contains the JPEG decompression parameters and pointers to Property changes on: packages/trunk/openarena/debian/patches/20_dont_build_shipped_jpeg.diff ___________________________________________________________________ Name: svn:executable + * Added: packages/trunk/openarena/debian/patches/30_link_against_local_libspeex.diff =================================================================== --- packages/trunk/openarena/debian/patches/30_link_against_local_libspeex.diff (rev 0) +++ packages/trunk/openarena/debian/patches/30_link_against_local_libspeex.diff 2009-02-14 14:42:42 UTC (rev 8790) @@ -0,0 +1,187 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_link_against_local_libspeex.dpatch by Bruno "Fuddl" Kleinert <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +...@dpatch@ +Index: openarena-0.8.1/Makefile +=================================================================== +--- openarena-0.8.1.orig/Makefile 2008-11-19 22:11:32.000000000 +0100 ++++ openarena-0.8.1/Makefile 2008-11-19 22:16:00.000000000 +0100 +@@ -134,7 +134,7 @@ + endif + + ifndef USE_INTERNAL_SPEEX +-USE_INTERNAL_SPEEX=1 ++USE_INTERNAL_SPEEX=0 + endif + + ifndef USE_LOCAL_HEADERS +@@ -159,7 +159,7 @@ + UIDIR=$(MOUNT_DIR)/ui + Q3UIDIR=$(MOUNT_DIR)/q3_ui + JPDIR=$(MOUNT_DIR)/jpeg-6 +-SPEEXDIR=$(MOUNT_DIR)/libspeex ++#SPEEXDIR=$(MOUNT_DIR)/libspeex + Q3ASMDIR=$(MOUNT_DIR)/tools/asm + LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg + Q3CPPDIR=$(MOUNT_DIR)/tools/lcc/cpp +@@ -827,6 +827,7 @@ + BASE_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include + else + CLIENT_LDFLAGS += -lspeex ++ CLIENT_LDFLAGS += -lspeexdsp + endif + endif + +@@ -1373,49 +1374,49 @@ + endif + + ifeq ($(USE_VOIP),1) +-ifeq ($(USE_INTERNAL_SPEEX),1) +-Q3OBJ += \ +- $(B)/client/bits.o \ +- $(B)/client/buffer.o \ +- $(B)/client/cb_search.o \ +- $(B)/client/exc_10_16_table.o \ +- $(B)/client/exc_10_32_table.o \ +- $(B)/client/exc_20_32_table.o \ +- $(B)/client/exc_5_256_table.o \ +- $(B)/client/exc_5_64_table.o \ +- $(B)/client/exc_8_128_table.o \ +- $(B)/client/fftwrap.o \ +- $(B)/client/filterbank.o \ +- $(B)/client/filters.o \ +- $(B)/client/gain_table.o \ +- $(B)/client/gain_table_lbr.o \ +- $(B)/client/hexc_10_32_table.o \ +- $(B)/client/hexc_table.o \ +- $(B)/client/high_lsp_tables.o \ +- $(B)/client/jitter.o \ +- $(B)/client/kiss_fft.o \ +- $(B)/client/kiss_fftr.o \ +- $(B)/client/lpc.o \ +- $(B)/client/lsp.o \ +- $(B)/client/lsp_tables_nb.o \ +- $(B)/client/ltp.o \ +- $(B)/client/mdf.o \ +- $(B)/client/modes.o \ +- $(B)/client/modes_wb.o \ +- $(B)/client/nb_celp.o \ +- $(B)/client/preprocess.o \ +- $(B)/client/quant_lsp.o \ +- $(B)/client/resample.o \ +- $(B)/client/sb_celp.o \ +- $(B)/client/smallft.o \ +- $(B)/client/speex.o \ +- $(B)/client/speex_callbacks.o \ +- $(B)/client/speex_header.o \ +- $(B)/client/stereo.o \ +- $(B)/client/vbr.o \ +- $(B)/client/vq.o \ +- $(B)/client/window.o +-endif ++#ifeq ($(USE_INTERNAL_SPEEX),1) ++#Q3OBJ += \ ++# $(B)/client/bits.o \ ++# $(B)/client/buffer.o \ ++# $(B)/client/cb_search.o \ ++# $(B)/client/exc_10_16_table.o \ ++# $(B)/client/exc_10_32_table.o \ ++# $(B)/client/exc_20_32_table.o \ ++# $(B)/client/exc_5_256_table.o \ ++# $(B)/client/exc_5_64_table.o \ ++# $(B)/client/exc_8_128_table.o \ ++# $(B)/client/fftwrap.o \ ++# $(B)/client/filterbank.o \ ++# $(B)/client/filters.o \ ++# $(B)/client/gain_table.o \ ++# $(B)/client/gain_table_lbr.o \ ++# $(B)/client/hexc_10_32_table.o \ ++# $(B)/client/hexc_table.o \ ++# $(B)/client/high_lsp_tables.o \ ++# $(B)/client/jitter.o \ ++# $(B)/client/kiss_fft.o \ ++# $(B)/client/kiss_fftr.o \ ++# $(B)/client/lpc.o \ ++# $(B)/client/lsp.o \ ++# $(B)/client/lsp_tables_nb.o \ ++# $(B)/client/ltp.o \ ++# $(B)/client/mdf.o \ ++# $(B)/client/modes.o \ ++# $(B)/client/modes_wb.o \ ++# $(B)/client/nb_celp.o \ ++# $(B)/client/preprocess.o \ ++# $(B)/client/quant_lsp.o \ ++# $(B)/client/resample.o \ ++# $(B)/client/sb_celp.o \ ++# $(B)/client/smallft.o \ ++# $(B)/client/speex.o \ ++# $(B)/client/speex_callbacks.o \ ++# $(B)/client/speex_header.o \ ++# $(B)/client/stereo.o \ ++# $(B)/client/vbr.o \ ++# $(B)/client/vq.o \ ++# $(B)/client/window.o ++#endif + endif + + +@@ -1897,8 +1898,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) +Index: openarena-0.8.1/code/client/cl_cgame.c +=================================================================== +--- openarena-0.8.1.orig/code/client/cl_cgame.c 2008-11-19 22:09:18.000000000 +0100 ++++ openarena-0.8.1/code/client/cl_cgame.c 2008-11-19 22:11:41.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; + +Index: openarena-0.8.1/code/client/cl_main.c +=================================================================== +--- openarena-0.8.1.orig/code/client/cl_main.c 2008-11-19 22:09:18.000000000 +0100 ++++ openarena-0.8.1/code/client/cl_main.c 2008-11-19 22:11:41.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; +Index: openarena-0.8.1/code/client/client.h +=================================================================== +--- openarena-0.8.1.orig/code/client/client.h 2008-11-19 22:09:18.000000000 +0100 ++++ openarena-0.8.1/code/client/client.h 2008-11-19 22:11:41.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/trunk/openarena/debian/patches/30_link_against_local_libspeex.diff ___________________________________________________________________ Name: svn:executable + * Added: packages/trunk/openarena/debian/patches/series =================================================================== --- packages/trunk/openarena/debian/patches/series (rev 0) +++ packages/trunk/openarena/debian/patches/series 2009-02-14 14:42:42 UTC (rev 8790) @@ -0,0 +1,4 @@ +10_fix_build_and_binary_on_alpha.diff +10_remove_upstream_build_flags.diff +#20_dont_build_shipped_jpeg.diff +30_link_against_local_libspeex.diff Modified: packages/trunk/openarena/debian/rules =================================================================== --- packages/trunk/openarena/debian/rules 2009-02-14 14:38:14 UTC (rev 8789) +++ packages/trunk/openarena/debian/rules 2009-02-14 14:42:42 UTC (rev 8790) @@ -1,25 +1,35 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make - # copied from ioq3 make scripts Q3ARCH=$(shell uname -m | sed -e s/i.86/i386/) CFLAGS += -fsigned-char build: build-stamp -build-stamp: patch +build-stamp: patch-stamp dh_testdir - $(MAKE) USE_CURL_DLOPEN=0 \ + $(MAKE) USE_CURL=1 \ + USE_CURL_DLOPEN=0 \ USE_OPENAL=1 \ USE_OPENAL_DLOPEN=0 \ - USE_CODEC_VORBIS=1 \ - BUILD_GAME_QVM=0 \ + USE_VOIP=1 \ + USE_INTERNAL_SPEEX=0 \ DEFAULT_BASEDIR=/usr/share/games/openarena touch $@ -clean: clean-patched unpatch +patch-stamp: patch + touch patch-stamp + +patch: + QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 + +unpatch: + QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 + rm -f patch-stamp + rm -rf .pc + +clean: patch-stamp clean-patched unpatch clean-patched: dh_testdir dh_testroot @@ -33,8 +43,8 @@ dh_testroot dh_clean -k mkdir -p debian/tmp - cp build/release-linux-$(Q3ARCH)/ioquake3.$(Q3ARCH) debian/tmp/openarena - cp build/release-linux-$(Q3ARCH)/ioq3ded.$(Q3ARCH) debian/tmp/openarena-server + cp build/release-linux-$(Q3ARCH)/openarena.$(Q3ARCH) debian/tmp/openarena + cp build/release-linux-$(Q3ARCH)/oa_ded.$(Q3ARCH) debian/tmp/openarena-server uudecode -o openarena128.png debian/oa128.png.uu convert -scale 32x32 openarena128.png openarena32.xpm dh_install _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
