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

[eighthave at users.alioth.debian.org]

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

    Add patch to use system wide tinyxml

diff --git a/debian/TODO b/debian/TODO
index da38924..20281ce 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,4 +1,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
diff --git a/debian/control b/debian/control
index 9878651..a5bc82c 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Build-Depends: debhelper (>= 7.0.50~),
                python (>= 2.6),
                doxygen,
                graphviz,
-               libjpeg-dev
+               libjpeg-dev,
+               libtinyxml-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/0008-Use-system-wide-tinyxml.patch b/debian/patches/0008-Use-system-wide-tinyxml.patch
new file mode 100644
index 0000000..46eb06d
--- /dev/null
+++ b/debian/patches/0008-Use-system-wide-tinyxml.patch
@@ -0,0 +1,42 @@
+From: Jochen Sprickerhof <jochen at sprickerhof.de>
+Date: Fri, 6 Jul 2012 10:01:46 +0200
+Subject: Use system wide tinyxml
+
+---
+ Platform/Linux/Build/OpenNI/Makefile |   13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/Platform/Linux/Build/OpenNI/Makefile b/Platform/Linux/Build/OpenNI/Makefile
+index 2f99e3c..8c0a74d 100644
+--- a/Platform/Linux/Build/OpenNI/Makefile
++++ b/Platform/Linux/Build/OpenNI/Makefile
+@@ -4,13 +4,11 @@ BIN_DIR = ../../Bin
+ 
+ INC_DIRS = \
+ 	../../../../Include \
+-	../../../../Source \
+-	../../../../Source/External/TinyXml
++	../../../../Source
+ 
+ SRC_FILES = \
+ 	../../../../Source/OpenNI/*.cpp \
+-	../../../../Source/OpenNI/Linux/*.cpp \
+-	../../../../Source/External/TinyXml/*.cpp
++	../../../../Source/OpenNI/Linux/*.cpp
+ 
+ ifeq ("$(OSTYPE)","Darwin")
+ 	INC_DIRS += /opt/local/include
+@@ -25,6 +23,13 @@ ifneq ("$(OSTYPE)","Darwin")
+ endif
+ DEFINES = XN_EXPORTS
+ 
++ifeq ($(shell ld -ltinyxml -o /dev/null 1>&2 2> /dev/null; echo $$?), 0)
++  USED_LIBS += tinyxml
++else
++  INC_DIRS  += ../../../../Source/External/TinyXml
++  SRC_FILES += ../../../../Source/External/TinyXml/*.cpp
++endif
++
+ include ../Common/CommonCppMakefile
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 017699a..1bd872e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-Silence-asserts.patch
 0006-Link-against-libGL.patch
 0007-Use-system-wide-libjpeg.patch
+0008-Use-system-wide-tinyxml.patch

-- 
openni packaging