Version bump.

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

4 files changed, 116 insertions, 9 deletions

diff --git a/media-libs/libmediainfo/ChangeLog b/media-libs/libmediainfo/ChangeLog
index 92b9af0f5e1f..35fd08efbb7b 100644
--- a/media-libs/libmediainfo/ChangeLog
+++ b/media-libs/libmediainfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libmediainfo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.37 2012/02/04 23:25:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.38 2012/03/16 07:07:26 radhermit Exp $
+
+*libmediainfo-0.7.54 (16 Mar 2012)
+
+  16 Mar 2012; Tim Harder <radhermit@gentoo.org> +libmediainfo-0.7.54.ebuild,
+  +files/libmediainfo-0.7.54-system-tinyxml.patch:
+  Version bump.
 
 *libmediainfo-0.7.53 (04 Feb 2012)
 
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 8c8f495139ad..e9339afaa275 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -3,24 +3,27 @@ Hash: SHA512
 
 AUX libmediainfo-0.7.48-system-tinyxml.patch 3262 RMD160 110d8b59369009f5f41c09cb75b4b709eea3d418 SHA1 5aad73e8e1c326d0f2ab2090f8b09eec7cfb534c SHA256 5d677a4cb0c772f7ac5bf6ce2fccab3186977ddaabdab5ef8d4cb37bd58399ce
 AUX libmediainfo-0.7.53-system-tinyxml.patch 911 RMD160 5ca248968d5d00fe276d3c6a0756ddaebd99f314 SHA1 b67a673a6649910e74b5d6ec21cb1ff1a73762e6 SHA256 ca670479d917e4b1b2cf981b60493f4e67125637102667ddf05e87e00538b5ce
+AUX libmediainfo-0.7.54-system-tinyxml.patch 569 RMD160 2a7cf14e12c68571af88a5742dcad2984ab39017 SHA1 5482d0ce53313a99b70cdad9615134900c8c23eb SHA256 984f26a749f119aedf633f453970256472cc14600f3e8d55506cf00709e1e002
 DIST libmediainfo_0.7.50.tar.bz2 896072 RMD160 fb0df7545beda3b7f515729c14fb42f926f830bd SHA1 a3cae3b1ae75d60a14fc7369f922602c48254d31 SHA256 68faa49142a5a1951199d7c1d592163c23392931466749d7deb16243c1ecbdec
 DIST libmediainfo_0.7.51.tar.bz2 893997 RMD160 d1ce2ac37de6a33889e9baaf758e7fd27d148785 SHA1 1f74421126b2637513f2658ed9f0883de075e34b SHA256 0435f53ef07d814201eeb3478265d142264fa25205ab247398ca94617dddbaaa
 DIST libmediainfo_0.7.52.tar.bz2 919590 RMD160 4d9484d5140789edc7d2fc5cd7b50c71aad47df0 SHA1 13693c4c4ecfdee4f78d2d05231927532274e759 SHA256 4ef151c46ab98f6665dd4eb0c2885bcdd0a37e5bb1223eea564422dec804a85f
 DIST libmediainfo_0.7.53.tar.bz2 938194 RMD160 9f54d63816f4b3fb257c8bdc4cfa16f2ff751d13 SHA1 6c0bfc77c9d999f3cc57035ce38236ff9a5acfaa SHA256 c4f259aebbc9e3d38471997b42c8ec06e8b5228c02eb645edc88c82e0005898d
+DIST libmediainfo_0.7.54.tar.bz2 946048 RMD160 71e04bedcdf3aaa5923bbdd55fc1dd35cd843b6f SHA1 783d2e895c98a8cf7839bc2a64c4f85f6004003b SHA256 bec7181e6fe0f9cc6391ed925255092d41e13568907751a2a34bd04f8000d642
 EBUILD libmediainfo-0.7.50.ebuild 1952 RMD160 c8183b456ff8ed7f6149d842272e0e0aad301a9e SHA1 2ee3d751e7806f4790fd352f30eaf239f369ca74 SHA256 050eab7c438bdbb0febb33abe0ed5e5589d3956ecbd49a699951be449a9cf5c8
 EBUILD libmediainfo-0.7.51.ebuild 1947 RMD160 0be5efb28fc6a9a520c7c80420af61e96b8df851 SHA1 6e8ccab2f96bb5a1b73018e701523ba12947060a SHA256 6ce184d1fb07cfd716e0cc2e5bf14b69b5f293bbe358e85ce4de00b532fde957
 EBUILD libmediainfo-0.7.52.ebuild 1954 RMD160 d01b02e391fff8850c4e1f0d6d9663c92b386183 SHA1 85c0f76f170ecfa703973189b3e18c7124c45ee3 SHA256 6eb8aebd7d78bcc95301e9d01af774fcc4fa4988fe392a02aa774f1a2d311db0
 EBUILD libmediainfo-0.7.53.ebuild 1968 RMD160 ea02570e273145e69eda64a99dc0b4635fbf2fc9 SHA1 ebb708e4690f59bcc57837f5791a4cf91bb5c328 SHA256 36d9c719cd1bbe4b67f5b8af55cca6f5cf1dc549a9947b6b91d9ca37bd08cb05
-MISC ChangeLog 6150 RMD160 784d9cd6d6ab57b59d7d7667b8a7ea79aa3b552b SHA1 2b6e5e7fb7138c1a19448999c480f7c9934760e2 SHA256 32134b76be78093787afbfab27c64d15cc4dcc6b9de3df1e7ffa0ecb5deb185b
+EBUILD libmediainfo-0.7.54.ebuild 1968 RMD160 15972ffe0e44cf2b77b190dfb3783f236175daf9 SHA1 d89ebc5872e2c0fa629ce58f61c7d8f422e1b3e3 SHA256 3dd651673dd36f65cadc8817e8fbbe5bd961647cc5f92ecd2c5bd1cbd4299d66
+MISC ChangeLog 6332 RMD160 fde6110aa133681d0d9484cc8e22f63ad823f738 SHA1 04df9d18d308b0a50b6920759377be1c4250c8f4 SHA256 8d4f8d6eb3120a8392f08466325201cfa296abdcddab61cbfd0fc983e88f3014
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPLb51AAoJEEqz6FtPBkyjBogH/1YBxyQ56k4gaYiinSWA8GOb
-6v1BxVmZC3k3S80joHyCr5SPSabO7KOAJH0czfI6Rr4D2mWYld4XrXIkGCTLqnQw
-gS94OXb2ie7e/0uw8KLOW7+Y2+KRwUYbr9uTPUOHf8Wln629hOg+3aiohPqFAUGe
-0z2HnActq2yvkkzyDTlhtDwwNtEN4xDF+YLI/xqJkw/5QqoOja2yr+W8UWPKziNZ
-ycNwIMcPTeQgE06sL86T0aq6Krj7IrG0w+H5J+YG5+K+GN7X5Ugbn/SvNKsB4/Q2
-VBYURsCEUcJS7RXX9aiVsZ/Ylmv9lyXVp0IQyv/7nUiPudJQbdhi4GDVVnMjqfc=
-=CNgA
+iQEcBAEBCgAGBQJPYua0AAoJEEqz6FtPBkyjyUAIALifNVyw1NltKoFfipDpUuBn
+lmpPh4zbRbpmxBHcQ/Kc7zBrRqaO2WBqImcFXPv1jMv4MFwKH87+jD99bAKSWJtM
+InxuFEq2gPSidK4l7qkkIZfq3QucSFWUbe6G0DzcrOCP9D4sCS0YuBySs2Csp3CV
+dJMGvE0CbaFU+WilVamictkohfx7oma+AdrZUyk1Nsx5hwYvCL8gueWAchI6XgmD
+AlNknErq4Yk66qS1JRPQFCRVG5zjK7U56F0XKZTYqMA8axgKh6Rq3EqKc0gvrs6O
+P7MFcTD62HaMX+KzBsfM2jgEAP4O2LyUnYGFs/rCO/NOwXpxAV2fYzNgrGhD4jI=
+=za3b
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmediainfo/files/libmediainfo-0.7.54-system-tinyxml.patch b/media-libs/libmediainfo/files/libmediainfo-0.7.54-system-tinyxml.patch
new file mode 100644
index 000000000000..2ff2f78209e3
--- /dev/null
+++ b/media-libs/libmediainfo/files/libmediainfo-0.7.54-system-tinyxml.patch
@@ -0,0 +1,16 @@
+--- MediaInfoLib/Project/GNU/Library/configure.ac
++++ MediaInfoLib/Project/GNU/Library/configure.ac
+@@ -524,11 +524,8 @@
+ dnl libtinyxml
+ dnl
+ if test "$with_libtinyxml" = "yes"; then
+-	PKG_CHECK_MODULES([TINYXML], [tinyxml])
+-	CXXFLAGS="$CXXFLAGS $TINYXML_CXXFLAGS"
+-	MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $TINYXML_CXXFLAGS"
+-	LIBS="$LIBS $TINYXML_LIBS"
+-	MediaInfoLib_LIBS="$MediaInfoLib_LIBS $TINYXML_LIBS"
++	LIBS="$LIBS -ltinyxml"
++	MediaInfoLib_LIBS="$MediaInfoLib_LIBS -ltinyxml"
+ 	AM_CONDITIONAL(COMPILE_TINYXML, false)
+ 	using_libtinyxml="system"
+ else
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.54.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.54.ebuild
new file mode 100644
index 000000000000..232e9a6b1078
--- /dev/null
+++ b/media-libs/libmediainfo/libmediainfo-0.7.54.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/libmediainfo-0.7.54.ebuild,v 1.1 2012/03/16 07:07:26 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.25[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 \
+		--with-libtinyxml \
+		$(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 {} +
+}