r8411 - in packages/branches/openarena/openarena-0.8.1/debian: . patches

Bruno Fuddl-guestquot; Fuddl" Kleinert fuddl-guest at alioth.debian.org
Thu Nov 13 23:54:57 UTC 2008


Author: fuddl-guest
Date: 2008-11-13 23:54:57 +0000 (Thu, 13 Nov 2008)
New Revision: 8411

Modified:
   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
   packages/branches/openarena/openarena-0.8.1/debian/rules
Log:
* delay libjpeg issues. no success so far, not even with fmemopen (huh?!)
* re-enable speex patch. hack on tomorrow


Modified: 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	2008-11-13 23:45:28 UTC (rev 8410)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.diff	2008-11-13 23:54:57 UTC (rev 8411)
@@ -7,8 +7,8 @@
 @DPATCH@
 Index: openarena-0.8.1/Makefile
 ===================================================================
---- openarena-0.8.1.orig/Makefile	2008-11-12 22:36:03.000000000 +0100
-+++ openarena-0.8.1/Makefile	2008-11-12 22:36:03.000000000 +0100
+--- openarena-0.8.1.orig/Makefile	2008-11-13 21:57:42.000000000 +0100
++++ openarena-0.8.1/Makefile	2008-11-13 21:57:42.000000000 +0100
 @@ -158,7 +158,7 @@
  NDIR=$(MOUNT_DIR)/null
  UIDIR=$(MOUNT_DIR)/ui
@@ -82,9 +82,9 @@
  	$(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-12 22:33:37.000000000 +0100
-+++ openarena-0.8.1/code/renderer/tr_image_jpg.c	2008-11-12 23:36:53.000000000 +0100
-@@ -31,7 +31,34 @@
+--- openarena-0.8.1.orig/code/renderer/tr_image_jpg.c	2008-11-13 21:57:30.000000000 +0100
++++ openarena-0.8.1/code/renderer/tr_image_jpg.c	2008-11-13 23:53:57.000000000 +0100
+@@ -31,7 +31,35 @@
   */
  
  #define JPEG_INTERNALS
@@ -93,7 +93,7 @@
 +#include <jpeglib.h>
 +#include <jerror.h>
 +
-+
++/*
 +static void LoadJPG_init_source(j_decompress_ptr cinfo) {
 +	cinfo->src->start_of_file = TRUE;
 +}
@@ -117,21 +117,26 @@
 +
 +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 +86,7 @@
+@@ -59,6 +87,10 @@
    int len;
    byte	*fbuffer;
    byte  *buf;
++  FILE *memfile;
++  /*
 +  struct jpeg_source_mgr LoadJPG_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 +98,14 @@
+@@ -70,6 +102,16 @@
    if (!fbuffer || len < 0) {
  	return;
    }
++  /*
 +  LoadJPG_jpeg_src_mgr.next_input_byte = (JOCTET *) fbuffer;
 +  LoadJPG_jpeg_src_mgr.bytes_in_buffer = (size_t) len;
 +  LoadJPG_jpeg_src_mgr.init_source = LoadJPG_init_source;
@@ -140,15 +145,29 @@
 +  LoadJPG_jpeg_src_mgr.resync_to_restart = jpeg_resync_to_restart;
 +  LoadJPG_jpeg_src_mgr.term_source = LoadJPG_term_source;
 +  cinfo.src = &LoadJPG_jpeg_src_mgr;
++  */
  
    /* Step 1: allocate and initialize JPEG decompression object */
  
-@@ -85,7 +121,7 @@
+@@ -85,7 +127,12 @@
  
    /* Step 2: specify data source (eg, a file) */
  
 -  jpeg_mem_src(&cinfo, fbuffer, len);
 +  /*jpeg_mem_src(&cinfo, fbuffer, len);*/
++  if((memfile = fmemopen((void *) fbuffer, (size_t) len, "rb")) == NULL) {
++		puts("fmemopen() failed");
++		return;
++  }
++  jpeg_stdio_src(&cinfo, memfile);
  
    /* Step 3: read file parameters with jpeg_read_header() */
  
+@@ -210,6 +257,7 @@
+    */
+ 
+   /* And we're done! */
++  fclose(memfile);
+ }
+ 
+ 

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-13 23:45:28 UTC (rev 8410)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/30_link_against_local_libspeex.diff	2008-11-13 23:54:57 UTC (rev 8411)
@@ -5,21 +5,39 @@
 ## DP: No description.
 
 @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)
+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
+@@ -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 += -lspeex -lspeexdsp
+     CLIENT_LDFLAGS += -lspeex
++	CLIENT_LDFLAGS += -lspeexdsp
    endif
  endif
  
-@@ -1862,8 +1862,8 @@
- #$(B)/client/%.o: $(JPDIR)/%.c
- #	$(DO_CC)
+@@ -1897,8 +1898,8 @@
+ $(B)/client/%.o: $(JPDIR)/%.c
+ 	$(DO_CC)
  
 -$(B)/client/%.o: $(SPEEXDIR)/%.c
 -	$(DO_CC)
@@ -28,9 +46,10 @@
  
  $(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
+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
 @@ -26,6 +26,10 @@
  #include "../botlib/botlib.h"
  
@@ -42,9 +61,10 @@
  
  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
+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
 @@ -28,6 +28,11 @@
  #include "libmumblelink.h"
  #endif
@@ -57,9 +77,10 @@
  #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
+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
 @@ -35,8 +35,8 @@
  #endif /* USE_CURL */
  

Modified: packages/branches/openarena/openarena-0.8.1/debian/patches/series
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/patches/series	2008-11-13 23:45:28 UTC (rev 8410)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/series	2008-11-13 23:54:57 UTC (rev 8411)
@@ -1,3 +1,4 @@
 10_fix_build_and_binary_on_alpha.diff
 10_remove_upstream_build_flags.diff
-20_dont_build_shipped_jpeg.diff
+#20_dont_build_shipped_jpeg.diff
+30_link_against_local_libspeex.diff

Modified: packages/branches/openarena/openarena-0.8.1/debian/rules
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/rules	2008-11-13 23:45:28 UTC (rev 8410)
+++ packages/branches/openarena/openarena-0.8.1/debian/rules	2008-11-13 23:54:57 UTC (rev 8411)
@@ -7,7 +7,7 @@
 CFLAGS += -fsigned-char
 
 build: build-stamp
-build-stamp: patch
+build-stamp: patch-stamp
 	dh_testdir
 	$(MAKE) USE_CURL=1 \
 			USE_CURL_DLOPEN=0 \




More information about the Pkg-games-commits mailing list