[SCM] libmediainfo/master: Don't expose tinyxml dependency

[hyperair at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 739b1ec2b6f35a99e48ae93d876948e5f118880f
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Thu Jan 26 11:20:06 2012 +0800

    Don't expose tinyxml dependency

diff --git a/debian/patches/0001-Don-t-expose-tinyxml-dependency.patch b/debian/patches/0001-Don-t-expose-tinyxml-dependency.patch
new file mode 100644
index 0000000..9640588
--- /dev/null
+++ b/debian/patches/0001-Don-t-expose-tinyxml-dependency.patch
@@ -0,0 +1,35 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Date: Thu, 26 Jan 2012 10:51:13 +0800
+Subject: Don't expose tinyxml dependency
+
+---
+ Project/GNU/Library/configure.ac |   15 +++++----------
+ 1 files changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
+index f3f57c4..08f7ca1 100755
+--- a/Project/GNU/Library/configure.ac
++++ b/Project/GNU/Library/configure.ac
+@@ -521,16 +521,11 @@ dnl -------------------------------------------------------------------------
+ dnl libtinyxml
+ dnl
+ if test "$with_libtinyxml" = "yes"; then
+-	if pkg-config --exists tinyxml; then
+-		CXXFLAGS="$CXXFLAGS $(pkg-config --cflags tinyxml)"
+-		MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags tinyxml)"
+-		MediaInfoLib_LIBS="$MediaInfoLib_LIBS $(pkg-config --libs tinyxml)"
+-		MediaInfoLib_Requires="$MediaInfoLib_Requires tinyxml"
+-		using_libtinyxml="system"
+-		AM_CONDITIONAL(COMPILE_TINYXML, false)
+-	else
+-		AC_MSG_ERROR([libtinyxml is not found, please install development package of libtinyxml])
+-	fi
++	PKG_CHECK_MODULES([TINYXML], [tinyxml])
++	CXXFLAGS="$CXXFLAGS $TINYXML_CXXFLAGS"
++	LIBS="$LIBS $TINYXML_LIBS"
++	AM_CONDITIONAL(COMPILE_TINYXML, false)
++	using_libtinyxml="system"
+ else
+ 	CXXFLAGS="$CXXFLAGS -I../../../Source/ThirdParty/tinyxml"
+ 	using_libtinyxml="internal"
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bb31f67
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Don-t-expose-tinyxml-dependency.patch

-- 
libmediainfo packaging