From 5c69ba812d40325c5e8266f2fbcd9efb14ce712d Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Fri, 11 Mar 2011 22:34:23 +0000
Subject: [PATCH 2/2] allow use of system libjpeg (6b or later)

Loosely based on the patch from Fedora, but with a considerably smaller
diffstat, and with the default and the sense of the variable switched.

Bug: https://bugzilla.icculus.org/show_bug.cgi?id=4564
---
 Makefile                     |   27 +++++++++++++++++++++++----
 code/renderer/tr_image_jpg.c |   13 +++++++++++--
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index bfba8fd..352db47 100644
--- a/Makefile
+++ b/Makefile
@@ -151,6 +151,11 @@ ifndef USE_INTERNAL_ZLIB
 USE_INTERNAL_ZLIB=1
 endif
 
+# If disabled, we require libjpeg 6b or later, ideally 8 or later
+ifndef USE_INTERNAL_JPEG
+USE_INTERNAL_JPEG=1
+endif
+
 ifndef USE_LOCAL_HEADERS
 USE_LOCAL_HEADERS=1
 endif
@@ -908,6 +913,13 @@ else
   LIBS += -lz
 endif
 
+ifeq ($(USE_INTERNAL_JPEG),1)
+  BASE_CFLAGS += -DUSE_INTERNAL_JPEG
+  BASE_CFLAGS += -I$(JPDIR)
+else
+  LIBS += -ljpeg
+endif
+
 ifdef DEFAULT_BASEDIR
   BASE_CFLAGS += -DDEFAULT_BASEDIR=\\\"$(DEFAULT_BASEDIR)\\\"
 endif
@@ -1397,8 +1409,11 @@ Q3OBJ = \
   $(B)/client/l_memory.o \
   $(B)/client/l_precomp.o \
   $(B)/client/l_script.o \
-  $(B)/client/l_struct.o \
-  \
+  $(B)/client/l_struct.o
+
+
+ifeq ($(USE_INTERNAL_JPEG),1)
+Q3OBJ += \
   $(B)/client/jcapimin.o \
   $(B)/client/jcapistd.o \
   $(B)/client/jccoefct.o  \
@@ -1433,8 +1448,10 @@ Q3OBJ = \
   $(B)/client/jidctflt.o \
   $(B)/client/jmemmgr.o \
   $(B)/client/jmemnobs.o \
-  $(B)/client/jutils.o \
-  \
+  $(B)/client/jutils.o
+endif
+
+Q3OBJ += \
   $(B)/client/tr_animation.o \
   $(B)/client/tr_backend.o \
   $(B)/client/tr_bsp.o \
@@ -2065,8 +2082,10 @@ $(B)/client/%.o: $(CMDIR)/%.c
 $(B)/client/%.o: $(BLIBDIR)/%.c
 	$(DO_BOT_CC)
 
+ifeq ($(USE_INTERNAL_JPEG),1)
 $(B)/client/%.o: $(JPDIR)/%.c
 	$(DO_CC)
+endif
 
 $(B)/client/%.o: $(SPEEXDIR)/%.c
 	$(DO_CC)
diff --git a/code/renderer/tr_image_jpg.c b/code/renderer/tr_image_jpg.c
index 0a57276..e9f0310 100644
--- a/code/renderer/tr_image_jpg.c
+++ b/code/renderer/tr_image_jpg.c
@@ -30,8 +30,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  * You may also wish to include "jerror.h".
  */
 
-#define JPEG_INTERNALS
-#include "../jpeg-6b/jpeglib.h"
+#ifdef USE_INTERNAL_JPEG
+#   define JPEG_INTERNALS
+#   include "../jpeg-6b/jpeglib.h"
+#else
+#   include <jpeglib.h>
+
+#   if JPEG_LIB_VERSION < 80
+        /* for system libjpeg < 8 we do still need one modification */
+#       include "../jpeg-6b/jdatasrc.c"
+#   endif
+#endif
 
 void R_LoadJPG( const char *filename, unsigned char **pic, int *width, int *height ) {
   /* This struct contains the JPEG decompression parameters and pointers to
-- 
1.7.4.1