From: Hauke Wintjen <hwintjen@rimpl-consulting.de>
Date: Fri, 29 Mar 2013 21:21:36 +0000 (+0100)
Subject: Use system wide libjpeg
X-Git-Tag: archive/raspbian/2.2.0.33+dfsg-12+rpi1^2~15
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8f74f96c8aa51047e75b9f1da985e95a0ddade16;p=openni2.git

Use system wide libjpeg


Gbp-Pq: Name 0003-Use-system-wide-libjpeg.patch
---

diff --git a/Source/Core/Makefile b/Source/Core/Makefile
index a3bb73f..ef877e7 100644
--- a/Source/Core/Makefile
+++ b/Source/Core/Makefile
@@ -5,14 +5,12 @@ BIN_DIR = ../../Bin
 INC_DIRS = \
 	../../Include \
 	../../ThirdParty/PSCommon/XnLib/Include \
-	../Drivers/OniFile/Formats \
-	../../ThirdParty/LibJPEG
+	../Drivers/OniFile/Formats
 
 SRC_FILES = \
 	*.cpp \
 	../Drivers/OniFile/Formats/XnCodec.cpp \
-	../Drivers/OniFile/Formats/XnStreamCompression.cpp \
-	../../ThirdParty/LibJPEG/*.c \
+	../Drivers/OniFile/Formats/XnStreamCompression.cpp
 
 ifeq ("$(OSTYPE)","Darwin")
 	INC_DIRS += /opt/local/include
@@ -23,7 +21,7 @@ endif
 LIB_NAME = OpenNI2
 
 LIB_DIRS = ../../ThirdParty/PSCommon/XnLib/Bin/$(PLATFORM)-$(CFG)
-USED_LIBS = XnLib dl pthread
+USED_LIBS = XnLib dl pthread jpeg
 ifneq ("$(OSTYPE)","Darwin")
         USED_LIBS += rt  
 endif
@@ -32,4 +30,11 @@ DEFINES += OPENNI2_EXPORT
 
 CFLAGS += -Wall
 
+ifeq ($(shell ld -ljpeg -o /dev/null 1>&2 2> /dev/null; echo $$?), 0)
+  USED_LIBS += jpeg
+else
+  INC_DIRS  += ../../ThirdParty/LibJPEG
+  SRC_FILES += ../../ThirdParty/LibJPEG/*.c
+endif
+
 include ../../ThirdParty/PSCommon/BuildSystem/CommonCppMakefile
diff --git a/Source/Drivers/OniFile/Makefile b/Source/Drivers/OniFile/Makefile
index 69daf8f..0c2e6ed 100644
--- a/Source/Drivers/OniFile/Makefile
+++ b/Source/Drivers/OniFile/Makefile
@@ -6,15 +6,12 @@ INC_DIRS = \
 	. \
 	../../../Include \
 	../../../ThirdParty/PSCommon/XnLib/Include \
-	../../../ThirdParty/LibJPEG \
 	Formats
 
 SRC_FILES = \
 	*.cpp \
 	Formats/*.cpp \
-	XnLibExtensions/*.cpp \
-	../../../ThirdParty/LibJPEG/*.c
-
+	XnLibExtensions/*.cpp
 
 ifeq ("$(OSTYPE)","Darwin")
 	INC_DIRS += /opt/local/include
@@ -25,7 +22,7 @@ endif
 LIB_NAME = OniFile
 
 LIB_DIRS = ../../../ThirdParty/PSCommon/XnLib/Bin/$(PLATFORM)-$(CFG)
-USED_LIBS = XnLib pthread 
+USED_LIBS = XnLib pthread jpeg
 ifneq ("$(OSTYPE)","Darwin")
         USED_LIBS += rt  
 endif
diff --git a/Source/Drivers/PS1080/Makefile b/Source/Drivers/PS1080/Makefile
index fdcc213..aedfef5 100644
--- a/Source/Drivers/PS1080/Makefile
+++ b/Source/Drivers/PS1080/Makefile
@@ -16,8 +16,7 @@ SRC_FILES = \
 	DriverImpl/*.cpp\
 	Formats/*.cpp	\
 	Include/*.cpp	\
-	Sensor/*.cpp	\
-	../../../ThirdParty/LibJPEG/*.c
+	Sensor/*.cpp
 
 
 ifeq ("$(OSTYPE)","Darwin")
@@ -30,7 +29,7 @@ LIB_NAME = PS1080
 
 LIB_DIRS += ../../../ThirdParty/PSCommon/XnLib/Bin/$(PLATFORM)-$(CFG)
 LIB_DIRS += $(BIN_DIR)/$(PLATFORM)-$(CFG)
-USED_LIBS = XnLib dl pthread DepthUtils
+USED_LIBS = XnLib dl pthread DepthUtils jpeg
 ifneq ("$(OSTYPE)","Darwin")
         USED_LIBS += rt usb-1.0 udev
 else