[patch] Backport of Fedora's -syslibs.patch

tremulous-1.1.0-system_jpeg.patch (text/plain), 11.87 KB, created by Samuli Suominen (RETIRED) on 2010-03-03 17:57:21 UTC

diff -ruN tremulous-1.1.0-src.orig/Makefile tremulous-1.1.0-src/Makefile
--- tremulous-1.1.0-src.orig/Makefile	2010-03-03 19:39:13.000000000 +0200
+++ tremulous-1.1.0-src/Makefile	2010-03-03 19:39:57.000000000 +0200
@@ -91,6 +91,10 @@
 USE_OPENAL=1
 endif
 
+ifndef USE_SYSTEM_JPEG
+USE_SYSTEM_JPEG=1
+endif
+
 ifndef USE_OPENAL_DLOPEN
 USE_OPENAL_DLOPEN=0
 endif
@@ -193,6 +197,10 @@
     endif
   endif
 
+  ifeq ($(USE_SYSTEM_JPEG),1)
+      BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
+  endif
+
   ifeq ($(USE_CURL),1)
     BASE_CFLAGS += -DUSE_CURL=1
     ifeq ($(USE_CURL_DLOPEN),1)
@@ -269,6 +277,10 @@
     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
   endif
 
+  ifeq ($(USE_SYSTEM_JPEG),1)
+    CLIENT_LDFLAGS += -ljpeg
+  endif
+
   ifeq ($(ARCH),x86)
     # linux32 make ...
     BASE_CFLAGS += -m32
@@ -928,6 +940,33 @@
   $(B)/client/vm.o \
   $(B)/client/vm_interpreted.o \
   \
+  $(B)/client/tr_animation.o \
+  $(B)/client/tr_backend.o \
+  $(B)/client/tr_bloom.o \
+  $(B)/client/tr_bsp.o \
+  $(B)/client/tr_cmds.o \
+  $(B)/client/tr_curve.o \
+  $(B)/client/tr_flares.o \
+  $(B)/client/tr_font.o \
+  $(B)/client/tr_image.o \
+  $(B)/client/tr_init.o \
+  $(B)/client/tr_light.o \
+  $(B)/client/tr_main.o \
+  $(B)/client/tr_marks.o \
+  $(B)/client/tr_mesh.o \
+  $(B)/client/tr_model.o \
+  $(B)/client/tr_noise.o \
+  $(B)/client/tr_scene.o \
+  $(B)/client/tr_shade.o \
+  $(B)/client/tr_shade_calc.o \
+  $(B)/client/tr_shader.o \
+  $(B)/client/tr_shadows.o \
+  $(B)/client/tr_sky.o \
+  $(B)/client/tr_surface.o \
+  $(B)/client/tr_world.o \
+
+ifneq ($(USE_SYSTEM_JPEG),1)
+  Q3OBJ += \
   $(B)/client/jcapimin.o \
   $(B)/client/jchuff.o   \
   $(B)/client/jcinit.o \
@@ -961,32 +1000,10 @@
   $(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 \
-  $(B)/client/tr_bsp.o \
-  $(B)/client/tr_cmds.o \
-  $(B)/client/tr_curve.o \
-  $(B)/client/tr_flares.o \
-  $(B)/client/tr_font.o \
-  $(B)/client/tr_image.o \
-  $(B)/client/tr_init.o \
-  $(B)/client/tr_light.o \
-  $(B)/client/tr_main.o \
-  $(B)/client/tr_marks.o \
-  $(B)/client/tr_mesh.o \
-  $(B)/client/tr_model.o \
-  $(B)/client/tr_noise.o \
-  $(B)/client/tr_scene.o \
-  $(B)/client/tr_shade.o \
-  $(B)/client/tr_shade_calc.o \
-  $(B)/client/tr_shader.o \
-  $(B)/client/tr_shadows.o \
-  $(B)/client/tr_sky.o \
-  $(B)/client/tr_surface.o \
-  $(B)/client/tr_world.o \
+  $(B)/client/jutils.o
+else
+  Q3OBJ += $(B)/client/jpeg_memsrc.o
+endif
 
 ifeq ($(ARCH),x86)
   Q3OBJ += \
@@ -1284,8 +1301,12 @@
 $(B)/client/%.o: $(BLIBDIR)/%.c
 	$(DO_BOT_CC)
 
+ifneq ($(USE_SYSTEM_JPEG),1)
 $(B)/client/%.o: $(JPDIR)/%.c
 	$(DO_CC)
+else
+$(B)/client/jmemnobs.o : $(JPDIR)/jmemnobs.c; $(DO_CC)  $(GL_CFLAGS) $(MINGW_CFLAGS)
+endif
 
 $(B)/client/%.o: $(RDIR)/%.c
 	$(DO_CC)
diff -ruN tremulous-1.1.0-src.orig/renderer/jpeg_memsrc.c tremulous-1.1.0-src/renderer/jpeg_memsrc.c
--- tremulous-1.1.0-src.orig/renderer/jpeg_memsrc.c	1970-01-01 02:00:00.000000000 +0200
+++ tremulous-1.1.0-src/renderer/jpeg_memsrc.c	2010-03-03 19:40:01.000000000 +0200
@@ -0,0 +1,163 @@
+/*
+* memsrc.c
+*
+* Copyright (C) 1994-1996, Thomas G. Lane.
+* This file is part of the Independent JPEG Group's software.
+* For conditions of distribution and use, see the accompanying README file.
+*
+* This file contains decompression data source routines for the case of
+* reading JPEG data from a memory buffer that is preloaded with the entire
+* JPEG file. This would not seem especially useful at first sight, but
+* a number of people have asked for it.
+* This is really just a stripped-down version of jdatasrc.c. Comparison
+* of this code with jdatasrc.c may be helpful in seeing how to make
+* custom source managers for other purposes.
+*/
+
+/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
+#include <stdio.h>
+#include <jpeglib.h>
+#include <jerror.h>
+
+
+/* Expanded data source object for memory input */
+
+typedef struct {
+struct jpeg_source_mgr pub; /* public fields */
+
+JOCTET eoi_buffer[2]; /* a place to put a dummy EOI */
+} my_source_mgr;
+
+typedef my_source_mgr * my_src_ptr;
+
+
+/*
+* Initialize source --- called by jpeg_read_header
+* before any data is actually read.
+*/
+
+METHODDEF(void)
+init_source (j_decompress_ptr cinfo)
+{
+/* No work, since jpeg_memory_src set up the buffer pointer and count.
+* Indeed, if we want to read multiple JPEG images from one buffer,
+* this *must* not do anything to the pointer.
+*/
+}
+
+
+/*
+* Fill the input buffer --- called whenever buffer is emptied.
+*
+* In this application, this routine should never be called; if it is called,
+* the decompressor has overrun the end of the input buffer, implying we
+* supplied an incomplete or corrupt JPEG datastream. A simple error exit
+* might be the most appropriate response.
+*
+* But what we choose to do in this code is to supply dummy EOI markers
+* in order to force the decompressor to finish processing and supply
+* some sort of output image, no matter how corrupted.
+*/
+
+METHODDEF(boolean)
+fill_input_buffer (j_decompress_ptr cinfo)
+{
+my_src_ptr src = (my_src_ptr) cinfo->src;
+
+WARNMS(cinfo, JWRN_JPEG_EOF);
+
+/* Create a fake EOI marker */
+src->eoi_buffer[0] = (JOCTET) 0xFF;
+src->eoi_buffer[1] = (JOCTET) JPEG_EOI;
+src->pub.next_input_byte = src->eoi_buffer;
+src->pub.bytes_in_buffer = 2;
+
+return TRUE;
+}
+
+
+/*
+* Skip data --- used to skip over a potentially large amount of
+* uninteresting data (such as an APPn marker).
+*
+* If we overrun the end of the buffer, we let fill_input_buffer deal with
+* it. An extremely large skip could cause some time-wasting here, but
+* it really isn't supposed to happen ... and the decompressor will never
+* skip more than 64K anyway.
+*/
+
+METHODDEF(void)
+skip_input_data (j_decompress_ptr cinfo, long num_bytes)
+{
+my_src_ptr src = (my_src_ptr) cinfo->src;
+
+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;
+}
+}
+
+
+/*
+* An additional method that can be provided by data source modules is the
+* resync_to_restart method for error recovery in the presence of RST markers.
+* For the moment, this source module just uses the default resync method
+* provided by the JPEG library. That method assumes that no backtracking
+* is possible.
+*/
+
+
+/*
+* Terminate source --- called by jpeg_finish_decompress
+* after all data has been read. Often a no-op.
+*
+* NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
+* application must deal with any cleanup that should happen even
+* for error exit.
+*/
+
+METHODDEF(void)
+term_source (j_decompress_ptr cinfo)
+{
+/* no work necessary here */
+}
+
+
+/*
+* Prepare for input from a memory buffer.
+*/
+
+GLOBAL(void)
+jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer, size_t bufsize)
+{
+my_src_ptr src;
+
+/* The source object is made permanent so that a series of JPEG images
+* can be read from a single buffer by calling jpeg_memory_src
+* only before the first 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->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->pub.next_input_byte = buffer;
+src->pub.bytes_in_buffer = bufsize;
+}
diff -ruN tremulous-1.1.0-src.orig/renderer/jpeg_memsrc.h tremulous-1.1.0-src/renderer/jpeg_memsrc.h
--- tremulous-1.1.0-src.orig/renderer/jpeg_memsrc.h	1970-01-01 02:00:00.000000000 +0200
+++ tremulous-1.1.0-src/renderer/jpeg_memsrc.h	2010-03-03 19:40:01.000000000 +0200
@@ -0,0 +1,5 @@
+#include <stdio.h>
+#include <jpeglib.h>
+
+void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
+  size_t bufsize);
diff -ruN tremulous-1.1.0-src.orig/src/jpeg-6/jmemnobs.c tremulous-1.1.0-src/src/jpeg-6/jmemnobs.c
--- tremulous-1.1.0-src.orig/src/jpeg-6/jmemnobs.c	2010-03-03 19:39:13.000000000 +0200
+++ tremulous-1.1.0-src/src/jpeg-6/jmemnobs.c	2010-03-03 19:39:57.000000000 +0200
@@ -16,11 +16,23 @@
  */
 
 #include "../renderer/tr_local.h"
+#ifdef USE_SYSTEM_JPEG
+#include <stdio.h>
+#include <stdlib.h>
+#include <jpeglib.h>
+
+#undef GLOBAL
+#define GLOBAL
+#define FAR
 
+typedef void * backing_store_ptr;
+
+#else
 #define JPEG_INTERNALS
 #include "jinclude.h"
 #include "jpeglib.h"
 #include "jmemsys.h"		/* import the system-dependent declarations */
+#endif
 
 /*
  * Memory allocation and ri.Freeing are controlled by the regular library
@@ -83,7 +95,13 @@
 jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
 			 long total_bytes_needed)
 {
-  ERREXIT(cinfo, JERR_NO_BACKING_STORE);
+#ifdef USE_SYSTEM_JPEG
+  fprintf(stderr,
+    "jmemnobs.c: jpeg_open_backing_store() call, this should never happen!\n");
+  exit(1);
+#else
+ERREXIT(cinfo, JERR_NO_BACKING_STORE);
+#endif
 }
 
 
diff -ruN tremulous-1.1.0-src.orig/src/renderer/tr_image.c tremulous-1.1.0-src/src/renderer/tr_image.c
--- tremulous-1.1.0-src.orig/src/renderer/tr_image.c	2010-03-03 19:39:13.000000000 +0200
+++ tremulous-1.1.0-src/src/renderer/tr_image.c	2010-03-03 19:39:57.000000000 +0200
@@ -31,8 +31,13 @@
  * You may also wish to include "jerror.h".
  */
 
+#ifdef USE_SYSTEM_JPEG
+#include <jpeglib.h>
+#include "jpeg_memsrc.h"
+#else
 #define JPEG_INTERNALS
 #include "../jpeg-6/jpeglib.h"
+#endif
 
 #include "../qcommon/puff.h"
 
@@ -1409,6 +1414,12 @@
   unsigned char *out;
   byte	*fbuffer;
   byte  *buf;
+  size_t bufsize;
+#ifdef USE_SYSTEM_JPEG
+  int i,j;
+  byte *inptr, *outptr;
+#endif
+
 
   /* 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.
@@ -1416,7 +1427,7 @@
    * requires it in order to read binary files.
    */
 
-  ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
+  bufsize = ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
   if (!fbuffer) {
 	return;
   }
@@ -1434,8 +1445,11 @@
   jpeg_create_decompress(&cinfo);
 
   /* Step 2: specify data source (eg, a file) */
-
+#ifdef USE_SYSTEM_JPEG
+  jpeg_memory_src(&cinfo, fbuffer, bufsize);
+#else
   jpeg_stdio_src(&cinfo, fbuffer);
+#endif
 
   /* Step 3: read file parameters with jpeg_read_header() */
 
@@ -1478,7 +1492,7 @@
   }
 
   memcount = pixelcount * 4;
-  row_stride = cinfo.output_width * cinfo.output_components;
+  row_stride = cinfo.output_width * 4;
 
   out = ri.Malloc(memcount);
 
@@ -1499,6 +1513,21 @@
 	buf = ((out+(row_stride*cinfo.output_scanline)));
 	buffer = &buf;
     (void) jpeg_read_scanlines(&cinfo, buffer, 1);
+#ifdef USE_SYSTEM_JPEG
+    /* we have RGB data, we need to expand this out to ARGB */
+    inptr = buf + cinfo.output_width * 3 - 1;
+    outptr = buf + row_stride - 1;
+
+    for (i = 0; i < cinfo.output_width; i++) {
+      /* endian dependent? maybe for big endian this must be done after the
+         color/pixel copy? */
+      *outptr-- = 255;
+      for (j = 0; j < 3; j++) {
+        JOCTET color = *inptr--;
+        *outptr-- = color;
+      }
+    }
+#endif
   }
   
   buf = out;
@@ -1617,6 +1646,7 @@
   return TRUE;
 }
 
+#ifndef USE_SYSTEM_JPEG
 
 /*
  * Compression initialization.
@@ -1709,6 +1739,8 @@
   return row_ctr;
 }
 
+#endif
+
 /*
  * Terminate destination --- called by jpeg_finish_compress
  * after all data has been written.  Usually needs to flush buffer.