[SCM] openni-sensor-avin2-sensorkinect/master: Add patch to use system wide libjpeg

[jspricke-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 94c93a84b2d0298e6f09fe96bdf51c3af0bf6c56
Author: Jochen Sprickerhof <jochen at sprickerhof.de>
Date:   Thu Jul 12 05:35:49 2012 +0200

    Add patch to use system wide libjpeg

diff --git a/debian/TODO b/debian/TODO
index 71693ca..fd1f06d 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,6 +1,5 @@
 Fix:
 E: openni-sensor-avin2-sensorkinect source: missing-build-dependency quilt
-E: openni-sensor-primesense-kinect: embedded-library usr/lib/libXnFormats.so: libjpeg
 W: openni-sensor-primesense-kinect: new-package-should-close-itp-bug
 W: openni-sensor-primesense-kinect: wrong-bug-number-in-closes l3:#XXXXXX
 W: openni-sensor-primesense-kinect: binary-without-manpage usr/bin/XnSensorServer
diff --git a/debian/patches/0005-Use-system-wide-libjpeg.patch b/debian/patches/0005-Use-system-wide-libjpeg.patch
new file mode 100644
index 0000000..62b291d
--- /dev/null
+++ b/debian/patches/0005-Use-system-wide-libjpeg.patch
@@ -0,0 +1,45 @@
+From: Jochen Sprickerhof <jochen at sprickerhof.de>
+Date: Thu, 12 Jul 2012 05:34:17 +0200
+Subject: Use system wide libjpeg
+
+---
+ Platform/Linux/Build/XnFormats/Makefile | 11 ++++++++---
+ Source/XnFormats/XnStreamCompression.h  |  2 +-
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/Platform/Linux/Build/XnFormats/Makefile b/Platform/Linux/Build/XnFormats/Makefile
+index 4a04486..09b2812 100644
+--- a/Platform/Linux/Build/XnFormats/Makefile
++++ b/Platform/Linux/Build/XnFormats/Makefile
+@@ -1,10 +1,15 @@
+ SRC_FILES = \
+-			../../../../Source/XnFormats/*.cpp \
+-			../../../../Source/External/LibJPEG/*.c
++			../../../../Source/XnFormats/*.cpp
+ 
+ LIB_NAME = XnFormats
+ USED_LIBS = XnCore OpenNI
+ DEFINES = XN_FORMATS_EXPORTS
+-INC_DIRS = ../../../../Source/External/LibJPEG
++
++ifeq ($(shell ld -ljpeg -o /dev/null 1>&2 2> /dev/null; echo $$?), 0)
++  USED_LIBS += jpeg
++else
++  INC_DIRS  += ../../../../Source/External/LibJPEG
++  SRC_FILES += ../../../../Source/External/LibJPEG/*.c
++endif
+ 
+ include ../EngineLibMakefile
+diff --git a/Source/XnFormats/XnStreamCompression.h b/Source/XnFormats/XnStreamCompression.h
+index d49723c..06549f5 100644
+--- a/Source/XnFormats/XnStreamCompression.h
++++ b/Source/XnFormats/XnStreamCompression.h
+@@ -27,7 +27,7 @@
+ //---------------------------------------------------------------------------
+ #include "XnFormats.h"
+ #include <XnOS.h>
+-#include <External/LibJPEG/jpeglib.h>
++#include <jpeglib.h>
+ #include <setjmp.h>
+ 
+ //---------------------------------------------------------------------------
diff --git a/debian/patches/series b/debian/patches/series
index 780103c..c40c130 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Disable-SSE.patch
 0003-Don-t-write-log-file-upon-OpenNI-invocation.patch
 0004-Add-SONAME-to-libraries.patch
+0005-Use-system-wide-libjpeg.patch

-- 
openni-sensor-avin2-sensorkinect packaging