[SCM] crtmpserver/master: Use pkg-config for detecting tinyxml, Closes: #713515

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 16a1213cb1991a68063791aa1e0db6da5a9ca2a1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 22 17:33:22 2013 +0200

    Use pkg-config for detecting tinyxml, Closes: #713515
    
    The detection of tinyxml fails in debian because the library is no
    longer installed into /usr/lib, is now in /usr/lib/$(ARCH_TRIPLET), for
    instance /usr/lib/x86_64-linux-gnu. The upstream included
    Find_tinyxml.cmake detects the Headers correctly, but breaks the build
    for failing to locate the libraries.
    
    Tinyxml ships a working pkg-config file, so let's use that one for now.

diff --git a/debian/control b/debian/control
index bdecd7e..a9d347b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Build-Depends:
  debhelper (>= 9),
  liblua5.1-0-dev,
  libssl-dev,
- libtinyxml-dev
+ libtinyxml-dev,
+ pkg-config
 Standards-Version: 3.9.3
 Homepage: http://www.rtmpd.com
 Vcs-Git: git://git.debian.org/pkg-multimedia/crtmpserver.git
diff --git a/debian/patches/20_use_pkgconfig_for_tinyxml.diff b/debian/patches/20_use_pkgconfig_for_tinyxml.diff
new file mode 100644
index 0000000..922945a
--- /dev/null
+++ b/debian/patches/20_use_pkgconfig_for_tinyxml.diff
@@ -0,0 +1,29 @@
+Author: Reinhard Tartler
+Description: Use pkg-config for detecting tinyxml
+Forwarded-Upstream: no
+Bug-Debian: #713515
+
+The detection of tinyxml fails in debian because the library is no
+longer installed into /usr/lib, is now in /usr/lib/$(ARCH_TRIPLET), for
+instance /usr/lib/x86_64-linux-gnu. The upstream included
+Find_tinyxml.cmake detects the Headers correctly, but breaks the build
+for failing to locate the libraries.
+
+Tinyxml ships a working pkg-config file, so let's use that one for now.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c85be4f..65e21a4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -117,10 +117,7 @@ ELSE($ENV{COMPILE_STATIC} MATCHES "1")
+ 		ADD_SUBDIRECTORY(lua lua)
+ 	ENDIF(NOT LUA_FOUND)
+ 
+-	INCLUDE(cmake_find_modules/Find_tinyxml.cmake)
+-	IF(NOT TINYXML_FOUND)
+-		ADD_SUBDIRECTORY(tinyxml tinyxml)
+-	ENDIF(NOT TINYXML_FOUND)
++       PKG_CHECK_MODULES(TINYXML REQUIRED tinyxml)
+ ENDIF($ENV{COMPILE_STATIC} MATCHES "1")
+ 
+ #disable file/line/function inside logging
diff --git a/debian/patches/series b/debian/patches/series
index 927d052..a132500 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 15_use_system_lua.diff
 16_add_header_install.diff
 18_enable_cmake_find_default_paths.diff
+20_use_pkgconfig_for_tinyxml.diff

-- 
crtmpserver packaging