[SCM] openni/master: Add patch to use system wide libjpeg

[eighthave at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fee001131094cc3e1a6c57ecda1afdbc5f36df47
Author: Jochen Sprickerhof <jochen at sprickerhof.de>
Date:   Fri Jul 6 14:22:48 2012 +0200

    Add patch to use system wide libjpeg

diff --git a/debian/TODO b/debian/TODO
index a641a89..da38924 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -2,4 +2,3 @@ Fix:
 E: openni source: missing-build-dependency quilt
 W: openni-doc: embedded-javascript-library usr/share/doc/openni-unstable-doc/html/jquery.js
 E: libopenni: embedded-library usr/lib/libOpenNI.so: tinyxml
-E: libopenni: embedded-library usr/lib/libnimCodecs.so: libjpeg
diff --git a/debian/control b/debian/control
index 4cef8fe..9878651 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Build-Depends: debhelper (>= 7.0.50~),
                libusb-1.0-0-dev (>= 1.0.8),
                python (>= 2.6),
                doxygen,
-               graphviz
+               graphviz,
+               libjpeg-dev
 Standards-Version: 3.9.2
 Homepage: http://www.openni.org
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/openni.git
diff --git a/debian/patches/0007-Use-system-wide-libjpeg.patch b/debian/patches/0007-Use-system-wide-libjpeg.patch
new file mode 100644
index 0000000..5958fe0
--- /dev/null
+++ b/debian/patches/0007-Use-system-wide-libjpeg.patch
@@ -0,0 +1,38 @@
+From: Jochen Sprickerhof <jochen at sprickerhof.de>
+Date: Fri, 6 Jul 2012 09:52:58 +0200
+Subject: Use system wide libjpeg
+
+---
+ Platform/Linux/Build/Modules/nimCodecs/Makefile |   13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/Platform/Linux/Build/Modules/nimCodecs/Makefile b/Platform/Linux/Build/Modules/nimCodecs/Makefile
+index 600e371..9d69531 100644
+--- a/Platform/Linux/Build/Modules/nimCodecs/Makefile
++++ b/Platform/Linux/Build/Modules/nimCodecs/Makefile
+@@ -2,16 +2,21 @@ BIN_DIR = ../../../Bin
+ 
+ INC_DIRS = \
+ 	../../../../../Include \
+-	../../../../../Source \
+-	../../../../../Source/External/LibJPEG
++	../../../../../Source
+ 
+ SRC_FILES = \
+-	../../../../../Source/Modules/nimCodecs/*.cpp \
+-	../../../../../Source/External/LibJPEG/*.c
++	../../../../../Source/Modules/nimCodecs/*.cpp
+ 
+ LIB_NAME = nimCodecs
+ USED_LIBS = OpenNI
+ 
++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 ../../Common/CommonCppMakefile
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1515bc8..017699a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-Disable-SSE.patch
 0005-Silence-asserts.patch
 0006-Link-against-libGL.patch
+0007-Use-system-wide-libjpeg.patch

-- 
openni packaging