[SCM] libmediainfo/master: Drop 0001-Don-t-expose-tinyxml-dependency.patch (applied upstream)
hyperair at users.alioth.debian.org
hyperair at users.alioth.debian.org
Sun Apr 22 13:52:02 UTC 2012
The following commit has been merged in the master branch:
commit 2527bf2b17554465b27d8bb809dbed50e077b4d3
Author: Chow Loong Jin <hyperair at debian.org>
Date: Sun Apr 22 19:50:37 2012 +0800
Drop 0001-Don-t-expose-tinyxml-dependency.patch (applied upstream)
diff --git a/debian/patches/0001-Don-t-expose-tinyxml-dependency.patch b/debian/patches/0001-Don-t-expose-tinyxml-dependency.patch
deleted file mode 100644
index 9640588..0000000
--- a/debian/patches/0001-Don-t-expose-tinyxml-dependency.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
index f20c3fb..da1c148 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Don-t-expose-tinyxml-dependency.patch
0002-Drop-direct-linkage-of-libzen-in-.pc.patch
--
libmediainfo packaging
More information about the pkg-multimedia-commits
mailing list