r8380 - in packages/branches/openarena/openarena-0.8.1/debian: . patches
Bruno Fuddl-guestquot; Fuddl" Kleinert
fuddl-guest at alioth.debian.org
Tue Nov 11 18:52:59 UTC 2008
Author: fuddl-guest
Date: 2008-11-11 18:52:59 +0000 (Tue, 11 Nov 2008)
New Revision: 8380
Added:
packages/branches/openarena/openarena-0.8.1/debian/patches/10_fix_build_and_binary_on_alpha.diff
packages/branches/openarena/openarena-0.8.1/debian/patches/10_remove_upstream_build_flags.diff
packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.diff
packages/branches/openarena/openarena-0.8.1/debian/patches/30_link_against_local_libspeex.diff
packages/branches/openarena/openarena-0.8.1/debian/patches/series
Removed:
packages/branches/openarena/openarena-0.8.1/debian/patches/00list
packages/branches/openarena/openarena-0.8.1/debian/patches/10_fix_build_and_binary_on_alpha.dpatch
packages/branches/openarena/openarena-0.8.1/debian/patches/10_remove_upstream_build_flags.dpatch
packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.dpatch
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/rules
Log:
* drop dpatch, use quilt. dpatch really got on my nerves
Modified: packages/branches/openarena/openarena-0.8.1/debian/changelog
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/changelog 2008-11-11 17:58:33 UTC (rev 8379)
+++ packages/branches/openarena/openarena-0.8.1/debian/changelog 2008-11-11 18:52:59 UTC (rev 8380)
@@ -6,14 +6,18 @@
* Update my email address where necessary
* Install documentation files in the binary packages openarena and
openarena-server
- * Refresh/edit 10_remove_upstream_build_flags.dpatch: We want to keep
+ * 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.dpatch to build against system jpeg library
+ * Add 20_dont_build_shipped_jpeg.diff to build against system jpeg library
(Closes: #495966)
- * Add 30_link_against_local_libspeex.dpatch to build against system speex and
+ * Add 30_link_against_local_libspeex.diff to build against system speex and
speexdsp libraries
- -- Bruno "Fuddl" Kleinert <fuddl at debian.org> Fri, 07 Nov 2008 19:07:12 +0100
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org> Tue, 11 Nov 2008 19:50:48 +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-11 17:58:33 UTC (rev 8379)
+++ packages/branches/openarena/openarena-0.8.1/debian/control 2008-11-11 18:52:59 UTC (rev 8380)
@@ -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, libspeexdsp-dev
+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
Deleted: packages/branches/openarena/openarena-0.8.1/debian/patches/00list
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/patches/00list 2008-11-11 17:58:33 UTC (rev 8379)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/00list 2008-11-11 18:52:59 UTC (rev 8380)
@@ -1,4 +0,0 @@
-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
Added: packages/branches/openarena/openarena-0.8.1/debian/patches/10_fix_build_and_binary_on_alpha.diff
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/patches/10_fix_build_and_binary_on_alpha.diff (rev 0)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/10_fix_build_and_binary_on_alpha.diff 2008-11-11 18:52:59 UTC (rev 8380)
@@ -0,0 +1,48 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix_build_and_binary_on_alpha.dpatch by Bruno "Fuddl" Kleinert <fuddl at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix compile options to make oa build and run on alpha.
+
+ at DPATCH@
+diff -urNad openarena-0.7.6~/Makefile openarena-0.7.6/Makefile
+--- openarena-0.7.6~/Makefile 2008-04-06 01:56:55.000000000 +0200
++++ openarena-0.7.6/Makefile 2008-04-23 23:22:50.484924113 +0200
+@@ -180,7 +180,7 @@
+ ifeq ($(PLATFORM),linux)
+
+ ifeq ($(ARCH),alpha)
+- ARCH=axp
++ ARCH=alpha
+ else
+ ifeq ($(ARCH),x86_64)
+ LIB=lib64
+@@ -255,6 +255,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)
+@@ -455,7 +459,7 @@
+ ifeq ($(PLATFORM),freebsd)
+
+ ifneq (,$(findstring alpha,$(shell uname -m)))
+- ARCH=axp
++ ARCH=alpha
+ else #default to i386
+ ARCH=i386
+ endif #alpha test
+@@ -475,7 +479,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/branches/openarena/openarena-0.8.1/debian/patches/10_fix_build_and_binary_on_alpha.diff
___________________________________________________________________
Name: svn:executable
+ *
Deleted: packages/branches/openarena/openarena-0.8.1/debian/patches/10_fix_build_and_binary_on_alpha.dpatch
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/patches/10_fix_build_and_binary_on_alpha.dpatch 2008-11-11 17:58:33 UTC (rev 8379)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/10_fix_build_and_binary_on_alpha.dpatch 2008-11-11 18:52:59 UTC (rev 8380)
@@ -1,48 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_fix_build_and_binary_on_alpha.dpatch by Bruno "Fuddl" Kleinert <fuddl at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix compile options to make oa build and run on alpha.
-
- at DPATCH@
-diff -urNad openarena-0.7.6~/Makefile openarena-0.7.6/Makefile
---- openarena-0.7.6~/Makefile 2008-04-06 01:56:55.000000000 +0200
-+++ openarena-0.7.6/Makefile 2008-04-23 23:22:50.484924113 +0200
-@@ -180,7 +180,7 @@
- ifeq ($(PLATFORM),linux)
-
- ifeq ($(ARCH),alpha)
-- ARCH=axp
-+ ARCH=alpha
- else
- ifeq ($(ARCH),x86_64)
- LIB=lib64
-@@ -255,6 +255,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)
-@@ -455,7 +459,7 @@
- ifeq ($(PLATFORM),freebsd)
-
- ifneq (,$(findstring alpha,$(shell uname -m)))
-- ARCH=axp
-+ ARCH=alpha
- else #default to i386
- ARCH=i386
- endif #alpha test
-@@ -475,7 +479,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
Added: packages/branches/openarena/openarena-0.8.1/debian/patches/10_remove_upstream_build_flags.diff
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/patches/10_remove_upstream_build_flags.diff (rev 0)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/10_remove_upstream_build_flags.diff 2008-11-11 18:52:59 UTC (rev 8380)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_remove-upstream-build-flags.dpatch by Bruno "Fuddl" Kleinert <fuddl at debian.org>
+##
+## 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.
+
+ at 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/branches/openarena/openarena-0.8.1/debian/patches/10_remove_upstream_build_flags.diff
___________________________________________________________________
Name: svn:executable
+ *
Deleted: packages/branches/openarena/openarena-0.8.1/debian/patches/10_remove_upstream_build_flags.dpatch
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/patches/10_remove_upstream_build_flags.dpatch 2008-11-11 17:58:33 UTC (rev 8379)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/10_remove_upstream_build_flags.dpatch 2008-11-11 18:52:59 UTC (rev 8380)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_remove-upstream-build-flags.dpatch by Bruno "Fuddl" Kleinert <fuddl at debian.org>
-##
-## 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.
-
- at 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
Added: packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.diff
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.diff (rev 0)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.diff 2008-11-11 18:52:59 UTC (rev 8380)
@@ -0,0 +1,151 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_dont_build_shipped_jpeg.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-11 18:26:10.000000000 +0100
++++ openarena-0.8.1/Makefile 2008-11-11 18:26:10.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)
+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-11 18:26:01.000000000 +0100
++++ openarena-0.8.1/code/renderer/tr_image_jpg.c 2008-11-11 18:56:35.000000000 +0100
+@@ -31,7 +31,33 @@
+ */
+
+ #define JPEG_INTERNALS
+-#include "../jpeg-6/jpeglib.h"
++/*#include "../jpeg-6/jpeglib.h"*/
++#include <jpeglib.h>
++#include <jerror.h>
++
++
++static void LoadJPG_init_source(j_decompress_ptr cinfo) {
++}
++
++static boolean LoadJPG_fill_input_buffer(j_decompress_ptr cinfo) {
++ return TRUE;
++}
++
++static void LoadJPG_skip_input_data(j_decompress_ptr cinfo, long num_bytes) {
++ if(num_bytes < 1)
++ return;
++ if(cinfo->src->bytes_in_buffer - num_bytes < 0) {
++ cinfo->src->next_input_byte += cinfo->src->bytes_in_buffer;
++ cinfo->src->bytes_in_buffer = 0;
++ } else {
++ cinfo->src->next_input_byte += num_bytes;
++ cinfo->src->bytes_in_buffer -= num_bytes;
++ }
++ return;
++}
++
++static void LoadJPG_term_source(j_decompress_ptr cinfo) {
++}
+
+ 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 +85,7 @@
+ int len;
+ byte *fbuffer;
+ byte *buf;
++ struct jpeg_source_mgr jpeg_src_mgr;
+
+ /* 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 +97,14 @@
+ if (!fbuffer || len < 0) {
+ return;
+ }
++ jpeg_src_mgr.next_input_byte = (JOCTET *) fbuffer;
++ jpeg_src_mgr.bytes_in_buffer = (size_t) len;
++ jpeg_src_mgr.init_source = LoadJPG_init_source;
++ jpeg_src_mgr.fill_input_buffer = LoadJPG_fill_input_buffer;
++ jpeg_src_mgr.skip_input_data = LoadJPG_skip_input_data;
++ jpeg_src_mgr.resync_to_restart = jpeg_resync_to_restart;
++ jpeg_src_mgr.term_source = LoadJPG_term_source;
++ cinfo.src = &jpeg_src_mgr;
+
+ /* Step 1: allocate and initialize JPEG decompression object */
+
+@@ -85,7 +120,7 @@
+
+ /* Step 2: specify data source (eg, a file) */
+
+- jpeg_mem_src(&cinfo, fbuffer, len);
++ /*jpeg_mem_src(&cinfo, fbuffer, len);*/
+
+ /* Step 3: read file parameters with jpeg_read_header() */
+
Property changes on: packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.diff
___________________________________________________________________
Name: svn:executable
+ *
Deleted: 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-11 17:58:33 UTC (rev 8379)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.dpatch 2008-11-11 18:52:59 UTC (rev 8380)
@@ -1,151 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_dont_build_shipped_jpeg.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-11 18:26:10.000000000 +0100
-+++ openarena-0.8.1/Makefile 2008-11-11 18:26:10.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)
-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-11 18:26:01.000000000 +0100
-+++ openarena-0.8.1/code/renderer/tr_image_jpg.c 2008-11-11 18:56:35.000000000 +0100
-@@ -31,7 +31,33 @@
- */
-
- #define JPEG_INTERNALS
--#include "../jpeg-6/jpeglib.h"
-+/*#include "../jpeg-6/jpeglib.h"*/
-+#include <jpeglib.h>
-+#include <jerror.h>
-+
-+
-+static void LoadJPG_init_source(j_decompress_ptr cinfo) {
-+}
-+
-+static boolean LoadJPG_fill_input_buffer(j_decompress_ptr cinfo) {
-+ return TRUE;
-+}
-+
-+static void LoadJPG_skip_input_data(j_decompress_ptr cinfo, long num_bytes) {
-+ if(num_bytes < 1)
-+ return;
-+ if(cinfo->src->bytes_in_buffer - num_bytes < 0) {
-+ cinfo->src->next_input_byte += cinfo->src->bytes_in_buffer;
-+ cinfo->src->bytes_in_buffer = 0;
-+ } else {
-+ cinfo->src->next_input_byte += num_bytes;
-+ cinfo->src->bytes_in_buffer -= num_bytes;
-+ }
-+ return;
-+}
-+
-+static void LoadJPG_term_source(j_decompress_ptr cinfo) {
-+}
-
- 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 +85,7 @@
- int len;
- byte *fbuffer;
- byte *buf;
-+ struct jpeg_source_mgr jpeg_src_mgr;
-
- /* 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 +97,14 @@
- if (!fbuffer || len < 0) {
- return;
- }
-+ jpeg_src_mgr.next_input_byte = (JOCTET *) fbuffer;
-+ jpeg_src_mgr.bytes_in_buffer = (size_t) len;
-+ jpeg_src_mgr.init_source = LoadJPG_init_source;
-+ jpeg_src_mgr.fill_input_buffer = LoadJPG_fill_input_buffer;
-+ jpeg_src_mgr.skip_input_data = LoadJPG_skip_input_data;
-+ jpeg_src_mgr.resync_to_restart = jpeg_resync_to_restart;
-+ jpeg_src_mgr.term_source = LoadJPG_term_source;
-+ cinfo.src = &jpeg_src_mgr;
-
- /* Step 1: allocate and initialize JPEG decompression object */
-
-@@ -85,7 +120,7 @@
-
- /* Step 2: specify data source (eg, a file) */
-
-- jpeg_mem_src(&cinfo, fbuffer, len);
-+ /*jpeg_mem_src(&cinfo, fbuffer, len);*/
-
- /* Step 3: read file parameters with jpeg_read_header() */
-
Added: 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 (rev 0)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/30_link_against_local_libspeex.diff 2008-11-11 18:52:59 UTC (rev 8380)
@@ -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.diff
___________________________________________________________________
Name: svn:executable
+ *
Deleted: 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 2008-11-11 17:58:33 UTC (rev 8379)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/30_link_against_local_libspeex.dpatch 2008-11-11 18:52:59 UTC (rev 8380)
@@ -1,73 +0,0 @@
-#! /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
Added: packages/branches/openarena/openarena-0.8.1/debian/patches/series
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/patches/series (rev 0)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/series 2008-11-11 18:52:59 UTC (rev 8380)
@@ -0,0 +1,3 @@
+10_fix_build_and_binary_on_alpha.diff
+10_remove_upstream_build_flags.diff
+20_dont_build_shipped_jpeg.diff
Modified: packages/branches/openarena/openarena-0.8.1/debian/rules
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/rules 2008-11-11 17:58:33 UTC (rev 8379)
+++ packages/branches/openarena/openarena-0.8.1/debian/rules 2008-11-11 18:52:59 UTC (rev 8380)
@@ -1,8 +1,6 @@
#!/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/)
@@ -19,7 +17,18 @@
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
More information about the Pkg-games-commits
mailing list