Version bump.

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

4 files changed, 116 insertions, 9 deletions

diff --git a/media-libs/libmediainfo/ChangeLog b/media-libs/libmediainfo/ChangeLog
index ad8e1a89b456..663c8188056e 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.41 2012/04/12 23:45:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.42 2012/05/03 13:03:47 radhermit Exp $
+
+*libmediainfo-0.7.57 (03 May 2012)
+
+  03 May 2012; Tim Harder <radhermit@gentoo.org> +libmediainfo-0.7.57.ebuild,
+  +files/libmediainfo-0.7.57-system-tinyxml.patch:
+  Version bump.
 
 *libmediainfo-0.7.56 (12 Apr 2012)
 
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 6dbf8bba75d0..6f1b431a3c05 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -3,22 +3,25 @@ Hash: SHA512
 
 AUX libmediainfo-0.7.48-system-tinyxml.patch 3262 RMD160 110d8b59369009f5f41c09cb75b4b709eea3d418 SHA1 5aad73e8e1c326d0f2ab2090f8b09eec7cfb534c SHA256 5d677a4cb0c772f7ac5bf6ce2fccab3186977ddaabdab5ef8d4cb37bd58399ce
 AUX libmediainfo-0.7.54-system-tinyxml.patch 569 RMD160 2a7cf14e12c68571af88a5742dcad2984ab39017 SHA1 5482d0ce53313a99b70cdad9615134900c8c23eb SHA256 984f26a749f119aedf633f453970256472cc14600f3e8d55506cf00709e1e002
+AUX libmediainfo-0.7.57-system-tinyxml.patch 579 RMD160 d253a0b6d5f5fbee0d0b2f34c94488922642eefe SHA1 8c679ed6099ebd0bc060030a6d95fc45c4dc0b6f SHA256 fc3f8980e924747cf451e08961b575d118478c01d56c237f3babc70d007ea71b
 DIST libmediainfo_0.7.51.tar.bz2 893997 RMD160 d1ce2ac37de6a33889e9baaf758e7fd27d148785 SHA1 1f74421126b2637513f2658ed9f0883de075e34b SHA256 0435f53ef07d814201eeb3478265d142264fa25205ab247398ca94617dddbaaa
 DIST libmediainfo_0.7.54.tar.bz2 946048 RMD160 71e04bedcdf3aaa5923bbdd55fc1dd35cd843b6f SHA1 783d2e895c98a8cf7839bc2a64c4f85f6004003b SHA256 bec7181e6fe0f9cc6391ed925255092d41e13568907751a2a34bd04f8000d642
 DIST libmediainfo_0.7.56.tar.bz2 946819 RMD160 74e4584a2018264d5fc1d27f14c089fe6df3fc05 SHA1 742723207cc89048ae414ee07516cc56a567f6f3 SHA256 4aafbb10c568798b5eebc436499b7a327c54bc0a258f470ce8b00d86121f12cf
+DIST libmediainfo_0.7.57.tar.bz2 935473 RMD160 f311d53e6f2078fa2dd4d30585aee9ce7ffa8896 SHA1 24d884f082298378cb2a57eba7bae03feb55f55e SHA256 35673e41b7fd91687a08644902534814c7102de4d66de9da655ee908ca642317
 EBUILD libmediainfo-0.7.51.ebuild 1949 RMD160 5b0e05f336eb8e1d07ca015360ef4a05c89f8678 SHA1 160e98d6f373804111f2e5394e497838d65b8188 SHA256 d38c84acf0cd8b089a601a69477ca92f0371cbc6fa74ef9a21cd65daf850ab6d
 EBUILD libmediainfo-0.7.54.ebuild 1968 RMD160 15972ffe0e44cf2b77b190dfb3783f236175daf9 SHA1 d89ebc5872e2c0fa629ce58f61c7d8f422e1b3e3 SHA256 3dd651673dd36f65cadc8817e8fbbe5bd961647cc5f92ecd2c5bd1cbd4299d66
 EBUILD libmediainfo-0.7.56.ebuild 1976 RMD160 eb92d4e721d78dbb4001db55d6bbb73a494862ff SHA1 dd84301d3055671368c3af040476ce0adb67380d SHA256 6c4f03e728e32a856b3de4540e26f6547719a9593857b2e2bc3042d805875275
-MISC ChangeLog 6770 RMD160 b4e42f9cc209fa97f48cb54bccc0730f1cbaab45 SHA1 e552e169a55781a7bee765f344f48442f981095e SHA256 00250842c20134fcb0a6b341aa83170fc940614ee533ffcddd4c738965bc4e79
+EBUILD libmediainfo-0.7.57.ebuild 1968 RMD160 9e5ec2d2c8c28a508249079fa23d71b45062c08b SHA1 3a5b6f22e4b14921970f1399d3af8e824b09d846 SHA256 a4690866a0dbbc0024d031c97fe5c3883522839395e6aeebd5a83e9e0e9c3ba3
+MISC ChangeLog 6952 RMD160 67d1884c2c1c230b74087dc71c04b6d67506ba73 SHA1 ac16faf78ac2449318b5db2e7399786ec6481814 SHA256 59ca17141d2d9d204e80d633613920ffe64179aa6f9380b7344b08c63007fba7
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPh2k1AAoJEEqz6FtPBkyjI50IALgsvgV5NDGTN0bVvT+IQ+4d
-C6SoquFufljMCrbSgbqV5Fej4JjxuHxfhZZ4LC+z5EWyHyXEMgxXfrte3QCaGJFV
-X22Y3zVkEdjUIiKzjQITLTjvp/Payy5/Gq/ed27FZJ35mRhYogluisTaQWa+p8+W
-LNups34AmBkqrTYRrIwTiDJjNtomADtvDB7UjfcCsWmkzuWltUxcBnyconmDGU5x
-lfCynYyD3g1KZjAG5cNql10gSASjrXjckvKca3vFQvyCMCmKh+fGClI0Lp2c8Ft5
-OWrHNnRqpVpQWezJf5hyu9ezCWy5EDCoqOveEAuWzBdrTyRKmQs8R++vFo33i8g=
-=oXYK
+iQEcBAEBCgAGBQJPooI8AAoJEEqz6FtPBkyjyHQH/2SBLDL6rVXR/lgtkSIkWYpo
+4PrS0OiqGLhp2urTfeyRbq4JizMH3NrD0hP4TnNdud26QAM/I1UUOcPLbKkG3OPY
+yo9GyzZ1XXiaW8qmv4UzvU6Sn2Ev5nm0E9Jl1RzsLEKC497OeQ5qdWIBuIF6urW8
+h4qBEUN87DmW2cKMd5MftiyQQiaSirWXQzNS15EcyGXLl9v5AyPfbpXIB6TyZY/4
+SDPF9xfHdkgeJ/l8Jxm1u4FTtaaegZ7AHJzX3YcNFSDl89f5oPcZfnHd+nA05n1r
+VoNEAbgRek90T+ai/py6G7GQ1/6GwV75cIYI7JULTdtAm+JIWYG29NJNrzCOg2Q=
+=0kf7
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmediainfo/files/libmediainfo-0.7.57-system-tinyxml.patch b/media-libs/libmediainfo/files/libmediainfo-0.7.57-system-tinyxml.patch
new file mode 100644
index 000000000000..ba6a46b5b122
--- /dev/null
+++ b/media-libs/libmediainfo/files/libmediainfo-0.7.57-system-tinyxml.patch
@@ -0,0 +1,16 @@
+--- MediaInfoLib/Project/GNU/Library/configure.ac
++++ MediaInfoLib/Project/GNU/Library/configure.ac
+@@ -524,11 +524,8 @@
+ dnl libtinyxml2
+ dnl
+ if test "$with_libtinyxml2" = "yes"; then
+-	PKG_CHECK_MODULES([TINYXML2], [tinyxml2])
+-	CXXFLAGS="$CXXFLAGS $TINYXML2_CXXFLAGS"
+-	MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $TINYXML2_CXXFLAGS"
+-	LIBS="$LIBS $TINYXML2_LIBS"
+-	MediaInfoLib_LIBS="$MediaInfoLib_LIBS $TINYXML2_LIBS"
++	LIBS="$LIBS -ltinyxml"
++	MediaInfoLib_LIBS="$MediaInfoLib_LIBS -ltinyxml"
+ 	AM_CONDITIONAL(COMPILE_TINYXML2, false)
+ 	using_libtinyxml2="system"
+ else
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.57.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.57.ebuild
new file mode 100644
index 000000000000..9ac47a0c7f6f
--- /dev/null
+++ b/media-libs/libmediainfo/libmediainfo-0.7.57.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.57.ebuild,v 1.1 2012/05/03 13:03:47 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.26[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 {} +
+}