Version bump.

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

3 files changed, 140 insertions, 2 deletions

diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog
index 6af66f494855..8bf6a4bbdeb0 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.24 2010/05/20 10:07:50 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.25 2010/05/20 12:48:24 pva Exp $
+
+*mediastreamer-2.4.0 (20 May 2010)
+
+  20 May 2010; Peter Volkov <pva@gentoo.org> +mediastreamer-2.4.0.ebuild:
+  Version bump.
 
   20 May 2010; Peter Volkov <pva@gentoo.org> mediastreamer-2.3.0-r1.ebuild:
   amd64 stable, bug 317235.
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index ae58b4bf2a8b..9c6061b97c55 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -3,9 +3,11 @@ 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.2.4.tar.gz 595031 RMD160 b1c191c382c6d33ad8b39711b25124a94720e7dd SHA1 52887da63d794597364bcc12c63fa5851affc89d SHA256 be85e97e827efd4d7473e2310291d0aa4d46387baa749a48999b2b67f0b3bd26
 DIST mediastreamer-2.3.0.tar.gz 669093 RMD160 8d656df1008025b91c3905ef69eb88c35c8741ab SHA1 eae7032fbbf5d31b3c47a54566d34a8b97e38405 SHA256 67b87a094da0b17be43919e67dffe7b5347bc4299f4d87165a8f27282ea7afbd
+DIST mediastreamer-2.4.0.tar.gz 717814 RMD160 1dd2f99a3a653d05485fffe9bcc387ede311e047 SHA1 5ceee28d087757e8f9a4ccd957f4db036709bfa1 SHA256 6ce191ba325d503424c9cebde2a283e64abbba8374bac466d4de39ba184012ed
 EBUILD mediastreamer-2.2.3_p1-r1.ebuild 3818 RMD160 bd2c86eb7f73d3baaadca3c308902087a3803d6b SHA1 f4f1ebc51d9c37e233b4cf4a1ab9fd85c8eee761 SHA256 53478afa2ddb03f3bf68864fc68f4b298fb3ad3425ba15f29ab9a1cae5263d38
 EBUILD mediastreamer-2.2.4.ebuild 3567 RMD160 ce83f0b19ee9fad19eb5c240e2ca5eef515b3058 SHA1 3e8e40866d6cb1a6bda7a65337e33b646814da43 SHA256 18e7024b0558ca62868b822d944675a37405738493b82d3424adc1d95186a8af
 EBUILD mediastreamer-2.3.0-r1.ebuild 3846 RMD160 7254de437cc1b93037ba78a712d7320fabc369d4 SHA1 0427364d892a5bf97f33302ff72ede2f1ff7a890 SHA256 24475e49c012fb7625a699b3e36103b8f2b6716566358dafd4858cb7b160efea
 EBUILD mediastreamer-2.3.0.ebuild 3522 RMD160 ebffcc448347c1f0abb10d43d31abfaf3e0a9cba SHA1 cc7f719ca9dc867e2d42167fb85a2b3313e55c74 SHA256 a5aeb2b3f9a4f35a2db351bd2d2b069abaa887463ff59957564324b78b7e800e
-MISC ChangeLog 3497 RMD160 fae4ccd1e2677e467e5ca4e009471bfd96f577a8 SHA1 1a285dfe537e163d609c6ebea679064aa07ed0f0 SHA256 480a4a3b00a5ebebca58645f4d0a9c63b56eb0e35e0ccc2c3dbced57ddb1b75f
+EBUILD mediastreamer-2.4.0.ebuild 4210 RMD160 c262e6b5e697cde47913ddbe5f6ca1e2100c800c SHA1 d868d7ac6ab4fdac2e65d65a6da8ed29ab8836af SHA256 f22124780129b0b039e25385e73473f065be371b5e456d3e0b4e262b17fd2d34
+MISC ChangeLog 3624 RMD160 9399338d43476af08b361423027d181f96f37660 SHA1 7d23a9f2b749864b99c3a9e6ce421a3f59e8e2f2 SHA256 8bcf946e163290c2c96cac095537ab2549cf0e40dd30f77beff2a7d5aa38f487
 MISC metadata.xml 380 RMD160 24797b26f9f2ef16ea5261c536ebed58e3903e97 SHA1 74bcc7d7e8bd26a92450ee714743a975ed595de0 SHA256 5cd96440722093ad63d25758891be2656d8c7f8b570eddfee1fbdce5860d237a
diff --git a/media-libs/mediastreamer/mediastreamer-2.4.0.ebuild b/media-libs/mediastreamer/mediastreamer-2.4.0.ebuild
new file mode 100644
index 000000000000..218008db0a63
--- /dev/null
+++ b/media-libs/mediastreamer/mediastreamer-2.4.0.ebuild
@@ -0,0 +1,131 @@
+# 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.4.0.ebuild,v 1.1 2010/05/20 12:48:24 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="http://download.savannah.nongnu.org/releases-noredirect/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.15.0_p1
+	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() {
+	# too hard to have a flexible lib dir in a clean way
+	sed -i -e "s:\(/usr/kde/3.5/\)lib:\1$(get_libdir):" configure.ac \
+		|| die "patching configure.ac failed"
+
+	# 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
+}