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

[Bruno Fuddl-guestquot; Fuddl" Kleinert]

Author: fuddl-guest
Date: 2008-11-12 22:38:49 +0000 (Wed, 12 Nov 2008)
New Revision: 8397

Modified:
   packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.diff
   packages/branches/openarena/openarena-0.8.1/debian/rules
Log:
* changed some stuff to be tested 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-12 14:07:00 UTC (rev 8396)
+++ packages/branches/openarena/openarena-0.8.1/debian/patches/20_dont_build_shipped_jpeg.diff	2008-11-12 22:38:49 UTC (rev 8397)
@@ -5,9 +5,10 @@
 ## DP: No description.
 
 @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
+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
 @@ -158,7 +158,7 @@
  NDIR=$(MOUNT_DIR)/null
  UIDIR=$(MOUNT_DIR)/ui
@@ -79,10 +80,11 @@
  
  $(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 @@
+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 @@
   */
  
  #define JPEG_INTERNALS
@@ -93,6 +95,7 @@
 +
 +
 +static void LoadJPG_init_source(j_decompress_ptr cinfo) {
++	cinfo->src->start_of_file = TRUE;
 +}
 +
 +static boolean LoadJPG_fill_input_buffer(j_decompress_ptr cinfo) {
@@ -104,10 +107,10 @@
 +		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;
++		cinfo->src->bytes_in_buffer = (size_t) 0;
 +	} else {
-+		cinfo->src->next_input_byte += num_bytes;
-+		cinfo->src->bytes_in_buffer -= num_bytes;
++		cinfo->src->next_input_byte += (size_t) num_bytes;
++		cinfo->src->bytes_in_buffer -= (size_t) num_bytes;
 +	}
 +	return;
 +}
@@ -117,30 +120,30 @@
  
  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 @@
+@@ -59,6 +86,7 @@
    int len;
    byte	*fbuffer;
    byte  *buf;
-+  struct jpeg_source_mgr jpeg_src_mgr;
++  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 +97,14 @@
+@@ -70,6 +98,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;
++  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;
++  LoadJPG_jpeg_src_mgr.fill_input_buffer = LoadJPG_fill_input_buffer;
++  LoadJPG_jpeg_src_mgr.skip_input_data = LoadJPG_skip_input_data;
++  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 +120,7 @@
+@@ -85,7 +121,7 @@
  
    /* Step 2: specify data source (eg, a file) */
  

Modified: packages/branches/openarena/openarena-0.8.1/debian/rules
===================================================================
--- packages/branches/openarena/openarena-0.8.1/debian/rules	2008-11-12 14:07:00 UTC (rev 8396)
+++ packages/branches/openarena/openarena-0.8.1/debian/rules	2008-11-12 22:38:49 UTC (rev 8397)
@@ -13,7 +13,7 @@
 			USE_CURL_DLOPEN=0 \
 			USE_OPENAL=1 \
 			USE_OPENAL_DLOPEN=0 \
-			USE_INTERNAL_SPEEX=0 \
+			USE_INTERNAL_SPEEX=1 \
 			DEFAULT_BASEDIR=/usr/share/games/openarena
 	touch $@