Revision bump. Use the system tinyxml library.

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

4 files changed, 187 insertions, 10 deletions

diff --git a/media-libs/libmediainfo/ChangeLog b/media-libs/libmediainfo/ChangeLog
index 3449867eff6e..8ff8874662b9 100644
--- a/media-libs/libmediainfo/ChangeLog
+++ b/media-libs/libmediainfo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libmediainfo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.23 2011/08/17 05:14:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.24 2011/09/15 23:17:17 radhermit Exp $
+
+*libmediainfo-0.7.48-r1 (15 Sep 2011)
+
+  15 Sep 2011; Tim Harder <radhermit@gentoo.org>
+  +libmediainfo-0.7.48-r1.ebuild,
+  +files/libmediainfo-0.7.48-system-tinyxml.patch:
+  Revision bump. Use the system tinyxml library.
 
 *libmediainfo-0.7.48 (17 Aug 2011)
 
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 4fd9c8b34ee1..d00045ef7f5f 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA512
 
 AUX libmediainfo-0.7.44-libmms.patch 1576 RMD160 7fb26bbcff85d78018ee8b43de74f42a5fe4a808 SHA1 8535130c38f6b162f1e1df2fe6fd5aab30edc024 SHA256 49bafa2e7a40a7fdf10bd8b1ac319f5fcb6f0c9dd60d93a51986bf9e1284bd52
+AUX libmediainfo-0.7.48-system-tinyxml.patch 3262 RMD160 110d8b59369009f5f41c09cb75b4b709eea3d418 SHA1 5aad73e8e1c326d0f2ab2090f8b09eec7cfb534c SHA256 5d677a4cb0c772f7ac5bf6ce2fccab3186977ddaabdab5ef8d4cb37bd58399ce
 DIST libmediainfo_0.7.45.tar.bz2 898511 RMD160 71420c582c24c3341d750bfdab1f29c530f52ef3 SHA1 822239622d0b816c4f31d94f6965b4574f20d006 SHA256 7e1157341b2684b2b2c80650ed911463d873eecad9a06d4309144d5e4e9defe2
 DIST libmediainfo_0.7.46.tar.bz2 903366 RMD160 13b7afbe8fa9882738d967d3b681b15a24dbfe9e SHA1 1c7c788de25baa2919ccb9f3d671c201682b7030 SHA256 d120296425fac9dc7a15b2b6bc779fa0bf38acb2dd9a8c8ea3980dce55503b9c
 DIST libmediainfo_0.7.47.tar.bz2 907382 RMD160 987cdbd267ab86521a33be3307a58435fcedf20c SHA1 c1f2ed885437562a1d155757fb33b14ef67e1a36 SHA256 f9fdd285265ad4886a7e13ede093809dc0464253c551c7692c364fba0a800766
@@ -9,17 +10,18 @@ DIST libmediainfo_0.7.48.tar.bz2 913717 RMD160 345fb2b01dae244a7b52ce1e837089d72
 EBUILD libmediainfo-0.7.45.ebuild 1815 RMD160 61c4b3909a2b18135a2a44dd6562bd2da2c2d854 SHA1 c0b9d3d06ac71253e9c5367f22db304b1592965e SHA256 3aeb9b77a091c8bca472034f884c7e801656810182e1ce7c3e83b2890053dfe6
 EBUILD libmediainfo-0.7.46.ebuild 1820 RMD160 a38ec369deebb18fe9c2774fe04ad8f243864c60 SHA1 f78ba5b7c7f8a104478c3bf71b86c6e979da95a3 SHA256 b235bb5aa0e6a107b1371413912243f0c7cc07f7789a7166088eba89cd01436d
 EBUILD libmediainfo-0.7.47.ebuild 1820 RMD160 d791a9a8b84c2b0d49921b3a12cf5c439c95c331 SHA1 5b9f9726119db4a62b0d87db368eb395cf55c03f SHA256 2d25432a6a418f19793004a17e8c5799121f3bce99e0720d54144c73cfd3dd34
+EBUILD libmediainfo-0.7.48-r1.ebuild 1949 RMD160 f2e5770680a304acd1a5127a5f8bde1be5fbead2 SHA1 34dc4f01c855717dad181617b915692e02422e57 SHA256 1b321e0aa8afeda5f4d9e5d6f0c63a733e81da34d3fcc5233768edbe2edc727e
 EBUILD libmediainfo-0.7.48.ebuild 1767 RMD160 8127b79607309a9fdf5a9f6e28bb1e633e1706f1 SHA1 7db78d83673300a9355e019bbbecf8f103c1b7f0 SHA256 6c00890511288f421526b806f2affc4507472793bfa93ba26dfa099519162df8
-MISC ChangeLog 4060 RMD160 4d5d34c2adb1665d0ab5d566fc688693450824f4 SHA1 17edb34d21bc468c8ee0b06408e7622342a8856c SHA256 715229b3c380fcf6b5f206c72a680b83b0905c006b766c3b41ebf30f99c94a22
+MISC ChangeLog 4283 RMD160 497182f1c7f22a34f085a1a1462191a6b9e45605 SHA1 ff8dd14d356a8ae408332c4b5519c0f67d3934a6 SHA256 629a6817983a70d7d54866373a7728fe00dc2ad611a316b24a7a56b7d0f701e6
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOS04+AAoJEEqz6FtPBkyjhbMH/jf1KxPcHzKP29uO6VRaAYgS
-aR1Xf1mS4hefIqhoFxQ36aWxu/9ggpfJUoFNbiz9d3zRUO6QdPUtqZIqPDIRSfMM
-U7/BwLfOJLRktQAM61P7g2pkUpBPxaUMpYQIokk+2Pyb8bOyEOQgDNINPrEP+jJ/
-XVCWpYgXTqoJNFmFSiw/5lmd1/BvrNlguHDkxXaBXm+ebi03f34rs+4OqsmhZC1q
-fsiLSxrn6mDKWENgPwZKvoykO7mlZfAsG9Popfwh1omO26kaXqFGDah4oNl9aVM/
-OCCBIEJiqmkox+AbAtVti8D9nR3PBHVbMtbZCskpDjsasEruAazq/FbzS0c5L1o=
-=HSfy
+iQEcBAEBCgAGBQJOcoeGAAoJEEqz6FtPBkyj8gsH/3SbUZHE7TV7UM67YbqWPs+S
+YLjhKdOdGLj5F4SuHOyeaUFgmXQ3JGPFdTWzUKgaEc348KtNegelTojlfhXxqIHh
+Kg9IaoejKRKKiWW4eJ1hb7XPe+LKRQ6mIKVROKq7OXzsOC0JBv+/N5HI31hVrQUp
+4BOm+Fvrzay2kfEZV+DDf5P1Qc2b7YQGDm7LjNlbrO/YZrhGh/GKxiPe7t3jwMNt
+rYaKe7hLIbV5Frn1cuM2ACvhvKI9xSYfrL3PV7Ypg9z6ZFVgUmBEU8k7bj+r/a0Z
+1dVhtXkKlAoApUA5aTRMPWD66b467d7cp2PECB+t6+oP446W5fyKzMrrAQx2KbY=
+=Mca8
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmediainfo/files/libmediainfo-0.7.48-system-tinyxml.patch b/media-libs/libmediainfo/files/libmediainfo-0.7.48-system-tinyxml.patch
new file mode 100644
index 000000000000..a429a2939021
--- /dev/null
+++ b/media-libs/libmediainfo/files/libmediainfo-0.7.48-system-tinyxml.patch
@@ -0,0 +1,87 @@
+--- MediaInfoLib.orig/Project/GNU/Library/configure.ac
++++ MediaInfoLib/Project/GNU/Library/configure.ac
+@@ -308,6 +308,14 @@
+ dnl #########################################################################
+ 
+ dnl -------------------------------------------------------------------------
++dnl tinyxml
++dnl
++
++LIBS="$LIBS -ltinyxml"
++MediaInfoLib_LIBS="$MediaInfoLib_LIBS -ltinyxml"
++MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static -ltinyxml"
++
++dnl -------------------------------------------------------------------------
+ dnl zlib
+ dnl
+ 
+--- MediaInfoLib.orig/Project/GNU/Library/libmediainfo.pc.in
++++ MediaInfoLib/Project/GNU/Library/libmediainfo.pc.in
+@@ -3,10 +3,10 @@
+ libdir=@libdir@

+ includedir=@includedir@

+ Unicode=@MediaInfoLib_Unicode@

+-Libs_Static=@libdir@/libmediainfo.a ${libdir}/libzen.a -lpthread -lz

++Libs_Static=@libdir@/libmediainfo.a ${libdir}/libzen.a -lpthread -lz -ltinyxml

+ 

+ Name: libmediainfo

+ Version: @PACKAGE_VERSION@

+ Description: MediaInfoLib

+-Libs: -L@libdir@ -lmediainfo -lzen -lz -lpthread

++Libs: -L@libdir@ -lmediainfo -lzen -lz -lpthread -ltinyxml

+ Cflags: -I@includedir@

+--- MediaInfoLib.orig/Source/MediaInfo/Multiple/File_Dcp.cpp
++++ MediaInfoLib/Source/MediaInfo/Multiple/File_Dcp.cpp
+@@ -40,7 +40,7 @@
+ #include "MediaInfo/Multiple/File__ReferenceFilesHelper.h"

+ #include "ZenLib/Dir.h"

+ #include "ZenLib/FileName.h"

+-#include "ZenLib/TinyXml/tinyxml.h"

++#include <tinyxml.h>

+ //---------------------------------------------------------------------------

+ 

+ namespace MediaInfoLib

+--- MediaInfoLib.orig/Source/MediaInfo/Multiple/File_Dxw.cpp
++++ MediaInfoLib/Source/MediaInfo/Multiple/File_Dxw.cpp
+@@ -40,7 +40,7 @@
+ #include "MediaInfo/Multiple/File__ReferenceFilesHelper.h"

+ #include "ZenLib/Dir.h"

+ #include "ZenLib/FileName.h"

+-#include "ZenLib/TinyXml/tinyxml.h"

++#include <tinyxml.h>

+ #include "ZenLib/Format/Http/Http_Utils.h"

+ //---------------------------------------------------------------------------

+ 

+--- MediaInfoLib.orig/Source/MediaInfo/Multiple/File_Ism.cpp
++++ MediaInfoLib/Source/MediaInfo/Multiple/File_Ism.cpp
+@@ -40,7 +40,7 @@
+ #include "MediaInfo/Multiple/File__ReferenceFilesHelper.h"

+ #include "ZenLib/Dir.h"

+ #include "ZenLib/FileName.h"

+-#include "ZenLib/TinyXml/tinyxml.h"

++#include <tinyxml.h>

+ #include "ZenLib/Format/Http/Http_Utils.h"

+ //---------------------------------------------------------------------------

+ 

+--- MediaInfoLib.orig/Source/MediaInfo/Multiple/File_P2_Clip.cpp
++++ MediaInfoLib/Source/MediaInfo/Multiple/File_P2_Clip.cpp
+@@ -40,7 +40,7 @@
+ #include "MediaInfo/Multiple/File__ReferenceFilesHelper.h"

+ #include "ZenLib/Dir.h"

+ #include "ZenLib/FileName.h"

+-#include "ZenLib/TinyXml/tinyxml.h"

++#include <tinyxml.h>

+ //---------------------------------------------------------------------------

+ 

+ namespace MediaInfoLib

+--- MediaInfoLib.orig/Source/MediaInfo/Multiple/File_Xdcam_Clip.cpp
++++ MediaInfoLib/Source/MediaInfo/Multiple/File_Xdcam_Clip.cpp
+@@ -40,7 +40,7 @@
+ #include "ZenLib/Dir.h"

+ #include "ZenLib/File.h"

+ #include "ZenLib/FileName.h"

+-#include "ZenLib/TinyXml/tinyxml.h"

++#include <tinyxml.h>

+ //---------------------------------------------------------------------------

+ 

+ namespace MediaInfoLib

diff --git a/media-libs/libmediainfo/libmediainfo-0.7.48-r1.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.48-r1.ebuild
new file mode 100644
index 000000000000..4f7147c4259b
--- /dev/null
+++ b/media-libs/libmediainfo/libmediainfo-0.7.48-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/libmediainfo-0.7.48-r1.ebuild,v 1.1 2011/09/15 23:17:17 radhermit Exp $
+
+EAPI="4"
+
+inherit autotools multilib flag-o-matic eutils
+
+MY_PN="MediaInfo"
+DESCRIPTION="MediaInfo libraries"
+HOMEPAGE="http://mediainfo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mediainfo/source/${PN}/${PV}/${PN}_${PV}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl doc mms static-libs"
+
+RDEPEND="sys-libs/zlib
+	>=dev-libs/tinyxml-2.6.2[stl]
+	>=media-libs/libzen-0.4.20[static-libs=]
+	curl? ( net-misc/curl )
+	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_PN}Lib/Project/GNU/Library"
+
+src_prepare() {
+	pushd "${WORKDIR}"/${MY_PN}Lib > /dev/null
+	epatch "${FILESDIR}"/${P}-system-tinyxml.patch
+	popd > /dev/null
+
+	# Don't force -O2 by default
+	sed -i -e "s:-O2::" configure.ac
+
+	append-flags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
+	append-flags -DTIXML_USE_STL
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_with curl libcurl) \
+		$(use_with mms libmms) \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs staticlibs)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd "${WORKDIR}/${MY_PN}Lib/Source/Doc"
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	default
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins "${S}"/${PN}.pc
+
+	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
+		insinto /usr/include/${MY_PN}/${x}
+		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
+	done
+
+	insinto /usr/include/${MY_PN}DLL
+	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
+
+	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
+	if use doc; then
+		dohtml -r "${WORKDIR}"/${MY_PN}Lib/Doc/*
+	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}