[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.1-7-17-g7521e4f
Simon McVittie
smcv at debian.org
Wed Jul 21 22:46:41 UTC 2010
The following commit has been merged in the master branch:
commit dba3aedcf6ec1624b1525beb46b656fe62fbbaf2
Author: Simon McVittie <smcv at debian.org>
Date: Sun Jul 18 20:42:42 2010 +0100
Refresh patch queue
diff --git a/debian/patches/00_import_game_logic.diff b/debian/patches/0001-Import-game-logic-from-openarena-modSDK-0.8.1.patch
similarity index 100%
rename from debian/patches/00_import_game_logic.diff
rename to debian/patches/0001-Import-game-logic-from-openarena-modSDK-0.8.1.patch
diff --git a/debian/patches/0001-Fix-segfault-when-deleting-non-existent-ban-address-.patch b/debian/patches/0002-Fix-segfault-when-deleting-non-existent-ban-address-.patch
similarity index 100%
rename from debian/patches/0001-Fix-segfault-when-deleting-non-existent-ban-address-.patch
rename to debian/patches/0002-Fix-segfault-when-deleting-non-existent-ban-address-.patch
diff --git a/debian/patches/0002-Fix-build-and-resulting-binary-on-alpha.patch b/debian/patches/0003-Fix-build-and-resulting-binary-on-alpha.patch
similarity index 97%
rename from debian/patches/0002-Fix-build-and-resulting-binary-on-alpha.patch
rename to debian/patches/0003-Fix-build-and-resulting-binary-on-alpha.patch
index 55a2250..27e3250 100644
--- a/debian/patches/0002-Fix-build-and-resulting-binary-on-alpha.patch
+++ b/debian/patches/0003-Fix-build-and-resulting-binary-on-alpha.patch
@@ -8,7 +8,7 @@ Bug-Debian: http://bugs.debian.org/410555
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
-index 979ab89..50e4118 100644
+index 6145bb4..d11257a 100644
--- a/Makefile
+++ b/Makefile
@@ -216,7 +216,7 @@ MKDIR=mkdir
diff --git a/debian/patches/0003-Remove-hard-wired-build-flags.patch b/debian/patches/0004-Remove-hard-wired-build-flags.patch
similarity index 100%
rename from debian/patches/0003-Remove-hard-wired-build-flags.patch
rename to debian/patches/0004-Remove-hard-wired-build-flags.patch
diff --git a/debian/patches/0004-Build-against-recent-system-speex-and-speexdsp-libra.patch b/debian/patches/0005-Build-against-recent-system-speex-and-speexdsp-libra.patch
similarity index 99%
rename from debian/patches/0004-Build-against-recent-system-speex-and-speexdsp-libra.patch
rename to debian/patches/0005-Build-against-recent-system-speex-and-speexdsp-libra.patch
index e6b6d3d..21b61cc 100644
--- a/debian/patches/0004-Build-against-recent-system-speex-and-speexdsp-libra.patch
+++ b/debian/patches/0005-Build-against-recent-system-speex-and-speexdsp-libra.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] Build against (recent) system speex and speexdsp libraries
4 files changed, 59 insertions(+), 49 deletions(-)
diff --git a/Makefile b/Makefile
-index 50e4118..6cb0d41 100644
+index d11257a..0fad630 100644
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,7 @@ USE_VOIP=1
diff --git a/debian/patches/0005-Fix-FTBFS-on-kFreeBSD.patch b/debian/patches/0006-Fix-FTBFS-on-kFreeBSD.patch
similarity index 97%
rename from debian/patches/0005-Fix-FTBFS-on-kFreeBSD.patch
rename to debian/patches/0006-Fix-FTBFS-on-kFreeBSD.patch
index 0f5dfb1..90dd26c 100644
--- a/debian/patches/0005-Fix-FTBFS-on-kFreeBSD.patch
+++ b/debian/patches/0006-Fix-FTBFS-on-kFreeBSD.patch
@@ -9,7 +9,7 @@ Bug-Debian: http://bugs.debian.org/413617
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
-index 6cb0d41..eee4c96 100644
+index 0fad630..1926e04 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
diff --git a/debian/patches/0006-Use-memmove-instead-of-strcpy-for-overlapping-memory.patch b/debian/patches/0007-Use-memmove-instead-of-strcpy-for-overlapping-memory.patch
similarity index 100%
rename from debian/patches/0006-Use-memmove-instead-of-strcpy-for-overlapping-memory.patch
rename to debian/patches/0007-Use-memmove-instead-of-strcpy-for-overlapping-memory.patch
diff --git a/debian/patches/0007-Fix-spelling-error.patch b/debian/patches/0008-Fix-spelling-error.patch
similarity index 100%
rename from debian/patches/0007-Fix-spelling-error.patch
rename to debian/patches/0008-Fix-spelling-error.patch
diff --git a/debian/patches/20_dont_build_shipped_jpeg.patch b/debian/patches/20_dont_build_shipped_jpeg.patch
deleted file mode 100644
index 7eb9768..0000000
--- a/debian/patches/20_dont_build_shipped_jpeg.patch
+++ /dev/null
@@ -1,206 +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@
-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
diff --git a/debian/patches/series b/debian/patches/series
index aa30ae7..cff69dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,8 @@
-00_import_game_logic.diff
-0001-Fix-segfault-when-deleting-non-existent-ban-address-.patch
-0002-Fix-build-and-resulting-binary-on-alpha.patch
-0003-Remove-hard-wired-build-flags.patch
-0004-Build-against-recent-system-speex-and-speexdsp-libra.patch
-0005-Fix-FTBFS-on-kFreeBSD.patch
-0006-Use-memmove-instead-of-strcpy-for-overlapping-memory.patch
-0007-Fix-spelling-error.patch
+0001-Import-game-logic-from-openarena-modSDK-0.8.1.patch
+0002-Fix-segfault-when-deleting-non-existent-ban-address-.patch
+0003-Fix-build-and-resulting-binary-on-alpha.patch
+0004-Remove-hard-wired-build-flags.patch
+0005-Build-against-recent-system-speex-and-speexdsp-libra.patch
+0006-Fix-FTBFS-on-kFreeBSD.patch
+0007-Use-memmove-instead-of-strcpy-for-overlapping-memory.patch
+0008-Fix-spelling-error.patch
--
Packaging for the OpenArena engine
More information about the Pkg-games-commits
mailing list