Author: fuddl-guest
Date: 2008-11-19 21:46:50 +0000 (Wed, 19 Nov 2008)
New Revision: 8439
Modified:
packages/branches/openarena/openarena-0.8.1/debian/patches/30_link_against_local_libspeex.diff
packages/branches/openarena/openarena-0.8.1/debian/rules
Log:
* debian patch to build against system speex* libraries. not yet tested if it
will work
Modified:
packages/branches/openarena/openarena-0.8.1/debian/patches/30_link_against_local_libspeex.diff
===================================================================
---
packages/branches/openarena/openarena-0.8.1/debian/patches/30_link_against_local_libspeex.diff
2008-11-19 21:45:52 UTC (rev 8438)
+++
packages/branches/openarena/openarena-0.8.1/debian/patches/30_link_against_local_libspeex.diff
2008-11-19 21:46:50 UTC (rev 8439)
@@ -7,8 +7,8 @@
@DPATCH@
Index: openarena-0.8.1/Makefile
===================================================================
---- openarena-0.8.1.orig/Makefile 2008-11-14 00:03:50.000000000 +0100
-+++ openarena-0.8.1/Makefile 2008-11-14 00:06:29.000000000 +0100
+--- 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
@@ -35,6 +35,99 @@
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)
@@ -48,8 +141,8 @@
$(DO_CC)
Index: openarena-0.8.1/code/client/cl_cgame.c
===================================================================
---- openarena-0.8.1.orig/code/client/cl_cgame.c 2008-11-14
00:03:50.000000000 +0100
-+++ openarena-0.8.1/code/client/cl_cgame.c 2008-11-14 00:03:53.000000000
+0100
+--- 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"
@@ -63,8 +156,8 @@
Index: openarena-0.8.1/code/client/cl_main.c
===================================================================
---- openarena-0.8.1.orig/code/client/cl_main.c 2008-11-14 00:03:50.000000000
+0100
-+++ openarena-0.8.1/code/client/cl_main.c 2008-11-14 00:03:53.000000000
+0100
+--- 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
@@ -79,8 +172,8 @@
cvar_t *cl_mumbleScale;
Index: openarena-0.8.1/code/client/client.h
===================================================================
---- openarena-0.8.1.orig/code/client/client.h 2008-11-14 00:03:50.000000000
+0100
-+++ openarena-0.8.1/code/client/client.h 2008-11-14 00:03:53.000000000
+0100
+--- 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 */
Modified: packages/branches/openarena/openarena-0.8.1/debian/rules
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/rules 2008-11-19
21:45:52 UTC (rev 8438)
+++ packages/branches/openarena/openarena-0.8.1/debian/rules 2008-11-19
21:46:50 UTC (rev 8439)
@@ -13,7 +13,8 @@
USE_CURL_DLOPEN=0 \
USE_OPENAL=1 \
USE_OPENAL_DLOPEN=0 \
- USE_INTERNAL_SPEEX=1 \
+ USE_VOIP=1 \
+ USE_INTERNAL_SPEEX=0 \
DEFAULT_BASEDIR=/usr/share/games/openarena
touch $@
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
