Version bump.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 136 insertions, 2 deletions

diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog
index 05a384d6e6ee..1905859ace86 100644
--- a/media-libs/mediastreamer/ChangeLog
+++ b/media-libs/mediastreamer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mediastreamer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.29 2010/07/18 12:33:11 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.30 2010/07/23 09:15:32 pva Exp $
+
+*mediastreamer-2.6.0 (23 Jul 2010)
+
+  23 Jul 2010; Peter Volkov <pva@gentoo.org> +mediastreamer-2.6.0.ebuild:
+  Version bump.
 
   18 Jul 2010; <nixnut@gentoo.org> mediastreamer-2.3.0-r1.ebuild:
   ppc stable #317235
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index d46bf17f2c0d..30f8c16c9132 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -3,8 +3,10 @@ DIST mediastreamer-2.2.3.tar.gz 581001 RMD160 ca84cf2f415099ad2fb9219aadfebc1aa2
 DIST mediastreamer-2.2.3_p1-linphone-3.1.1.patch.tgz 67833 RMD160 4b6096a989eeea869f10376fd6632b1ffb655054 SHA1 ce4141723c40d36f856723e3073d110577fcbb68 SHA256 1aef7c853e6e76f9137dbaf6c575995a2c9816ae464770e819eadacb81778f67
 DIST mediastreamer-2.3.0.tar.gz 669093 RMD160 8d656df1008025b91c3905ef69eb88c35c8741ab SHA1 eae7032fbbf5d31b3c47a54566d34a8b97e38405 SHA256 67b87a094da0b17be43919e67dffe7b5347bc4299f4d87165a8f27282ea7afbd
 DIST mediastreamer-2.5.0.tar.gz 722241 RMD160 80843719b6329dfb2dea9acb9f9b2717f79e5c6b SHA1 38200d3dd730376a1ed9ecb71c8d3cb2b73b9361 SHA256 aef06bd61491909e852080bec4c40ff5330f9c74ffafe64805d6ad3121539468
+DIST mediastreamer-2.6.0.tar.gz 728710 RMD160 a3936ad2b6a6a4f1798729a1c1362c5bf90fae2d SHA1 fc4ea1c4c0d453c6e2e60ae71c53930715bd2f5b SHA256 2817ddc7a48e5b7a0deb96df4daea7e62227ab08a37acb6a9e8db587721f3351
 EBUILD mediastreamer-2.2.3_p1-r1.ebuild 3818 RMD160 bd2c86eb7f73d3baaadca3c308902087a3803d6b SHA1 f4f1ebc51d9c37e233b4cf4a1ab9fd85c8eee761 SHA256 53478afa2ddb03f3bf68864fc68f4b298fb3ad3425ba15f29ab9a1cae5263d38
 EBUILD mediastreamer-2.3.0-r1.ebuild 3847 RMD160 6476120db21958071d930f1dbc43bc1db3b1ea2d SHA1 084a373e4139c782c5c784625b6cd1b7bb082f6c SHA256 33c8f48eba5ee865de37eab53cf185d3e8f0587ea666e21c33c20a95a72559d6
 EBUILD mediastreamer-2.5.0.ebuild 4166 RMD160 1be347cc0366f575ee77befb44a3995dad7642cb SHA1 486f1b49dfbc65cb719b364373e9491d669308b4 SHA256 fe26d84b36f3eaf1bc17949e376ac9d9228e811df295ba62106fbbd1966c15bb
-MISC ChangeLog 4238 RMD160 fb2b036e6381bf6e80276fe1d1310774d947ab47 SHA1 7566bc3e767db99c7b277b21ff54038cc131e283 SHA256 2c1149953c544ac51e294a765ba785f200e6b56880ce89cd97700e4d00087b74
+EBUILD mediastreamer-2.6.0.ebuild 4003 RMD160 601d27ca62f16df72499149a14ecd1598449ffe6 SHA1 0771b392d130d4c59ba3bacb724f68903fe88746 SHA256 c1bbcacc07a4df4fa36e1c1f4ead1a25b077c97c675ceceed205063ae0b3b295
+MISC ChangeLog 4362 RMD160 0b7991f5ecbea62c0fe699cefb54c91a94c3840e SHA1 29bb1e2543e3aadf068491f3117d035bd08dffd8 SHA256 215038ec189b647c843525cac70a23a75ab31647f6a0166e3659add4afa92895
 MISC metadata.xml 380 RMD160 24797b26f9f2ef16ea5261c536ebed58e3903e97 SHA1 74bcc7d7e8bd26a92450ee714743a975ed595de0 SHA256 5cd96440722093ad63d25758891be2656d8c7f8b570eddfee1fbdce5860d237a
diff --git a/media-libs/mediastreamer/mediastreamer-2.6.0.ebuild b/media-libs/mediastreamer/mediastreamer-2.6.0.ebuild
new file mode 100644
index 000000000000..73d473d461ca
--- /dev/null
+++ b/media-libs/mediastreamer/mediastreamer-2.6.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.6.0.ebuild,v 1.1 2010/07/23 09:15:32 pva Exp $
+
+EAPI="3"
+
+inherit eutils autotools multilib
+
+DESCRIPTION="Mediastreaming library for telephony application"
+HOMEPAGE="http://www.linphone.org/index.php/eng/code_review/mediastreamer2"
+SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
+IUSE="+alsa coreaudio debug examples gsm ilbc ipv6 jack oss portaudio +speex theora video v4l2 x264 X"
+
+RDEPEND=">=net-libs/ortp-0.16.2
+	alsa? ( media-libs/alsa-lib )
+	gsm? ( media-sound/gsm )
+	jack? ( >=media-libs/libsamplerate-0.0.13
+		media-sound/jack-audio-connection-kit )
+	portaudio? ( media-libs/portaudio )
+	speex? ( >=media-libs/speex-1.2_beta3 )
+	video? ( media-libs/libsdl[video,X]
+		media-video/ffmpeg
+		theora? ( media-libs/libtheora )
+		v4l2? ( media-libs/libv4l
+			sys-kernel/linux-headers )
+		X? ( x11-libs/libX11 ) )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+PDEPEND="ilbc? ( media-plugins/mediastreamer-ilbc )
+	video? ( x264? ( media-plugins/mediastreamer-x264 ) )"
+
+# TODO:
+# run-time test for ipv6 : does it need ortp[ipv6] ?
+
+# NOTES:
+# in some way, v4l support is auto-magic but keeping it like that atm
+
+pkg_setup() {
+	if ! use oss && ! use alsa && ! use jack && ! use portaudio && ! use coreaudio;
+	then
+		eerror "You must enable at least oss, alsa, jack, portaudio or coreaudio"
+		eerror "Please, re-emerge ${PN} with one of this USE flag enabled"
+		die
+	fi
+
+	if ! use video && ( use theora || use X || use v4l2 ); then
+		ewarn "X, theora and v4l2 support are enabled if video USE flag is enabled"
+		ewarn "If you want X, theora or v4l support, consider re-emerge with USE=\"video\""
+	fi
+
+	if use video && ! use v4l2; then
+		ewarn "Many cameras will not work or will crash your application if ${PN} is"
+		ewarn "not built with v4l2 support. Please, enable USE='v4l2'."
+	fi
+}
+
+src_prepare() {
+	# respect user's CFLAGS
+	sed -i -e "s:-O2::;s: -g::" configure.ac || die "patching configure.ac failed"
+
+	# change default paths
+	sed -i -e "s:\(\${prefix}/\)lib:\1$(get_libdir):" \
+		-e "s:\(prefix/share\):\1/${PN}:" configure.ac \
+		|| die "patching configure.ac failed"
+
+	# fix html doc installation dir
+	sed -i -e "s:\$(pkgdocdir):\$(docdir):" help/Makefile.am \
+		|| die "patching help/Makefile.am failed"
+	sed -i -e "s:\(doc_htmldir=\).*:\1\$(htmldir):" help/Makefile.am \
+		|| die "patching help/Makefile.am failed"
+
+	eautoreconf
+
+	# don't build examples in tests/
+	sed -i -e "s:\(SUBDIRS = .*\) tests \(.*\):\1 \2:" Makefile.in \
+		|| die "patching Makefile.in failed"
+}
+
+src_configure() {
+	local macaqsnd="--disable-macaqsnd"
+	# Mac OS X Audio Queue is an audio recording facility, available on
+	# 10.5 (Leopard, Darwin9) and onward
+	if use coreaudio && [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -ge 9 ]];
+	then
+		macaqsnd="--enable-macaqsnd"
+	fi
+	# strict: don't want -Werror
+	# external-ortp: don't use bundled libs
+	# arts: arts is deprecated
+	econf \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--datadir="${EPREFIX}"/usr/share/${PN} \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--disable-strict \
+		--enable-external-ortp \
+		--disable-dependency-tracking \
+		--disable-artsc \
+		$(use_enable alsa) \
+		$(use_enable coreaudio macsnd) ${macaqsnd} \
+		$(use_enable debug) \
+		$(use_enable gsm) \
+		$(use_enable ipv6) \
+		$(use_enable jack) \
+		$(use_enable oss) \
+		$(use_enable portaudio) \
+		$(use_enable speex) \
+		$(use_enable theora) \
+		$(use video && use_enable v4l2 libv4l || echo --disable-libv4l) \
+		$(use_enable video) \
+		$(use_enable X x11)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins tests/*.c || die "doins failed"
+	fi
+}