Version bump.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

3 files changed, 105 insertions, 1 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/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 {} +
+}