[SCM] crtmpserver/master: Fixup patch 20_use_pkgconfig_for_tinyxml
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Jun 22 15:43:59 UTC 2013
The following commit has been merged in the master branch:
commit 649b90d10429c3f20acd8d89654974caf7713d6f
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Jun 22 17:33:22 2013 +0200
Fixup patch 20_use_pkgconfig_for_tinyxml
The first version was incomplete.
diff --git a/debian/patches/20_use_pkgconfig_for_tinyxml.diff b/debian/patches/20_use_pkgconfig_for_tinyxml.diff
index 922945a..8105bd8 100644
--- a/debian/patches/20_use_pkgconfig_for_tinyxml.diff
+++ b/debian/patches/20_use_pkgconfig_for_tinyxml.diff
@@ -11,10 +11,17 @@ 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
+@@ -48,7 +48,7 @@ INCLUDE(cmake_find_modules/Find_dl.cmake
+ INCLUDE(cmake_find_modules/pch_support.cmake)
+ INCLUDE(CMakeDetermineSystem)
+ INCLUDE(TestBigEndian)
+-
++INCLUDE(FindPkgConfig)
+
+ #setup the endianess if not already defined in toolchain file
+ if(NOT DEFINED NO_ENDIANESS)
@@ -117,10 +117,7 @@ ELSE($ENV{COMPILE_STATIC} MATCHES "1")
ADD_SUBDIRECTORY(lua lua)
ENDIF(NOT LUA_FOUND)
--
crtmpserver packaging
More information about the pkg-multimedia-commits
mailing list