Version bump wrt bug #399737. Thanks to Andrew Savchenko for his effort on linphone ebuilds.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

6 files changed, 206 insertions, 7 deletions

diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog
index c9f0fc0e7e0c..08c50599047d 100644
--- a/media-libs/mediastreamer/ChangeLog
+++ b/media-libs/mediastreamer/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/mediastreamer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.55 2012/11/07 11:40:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.56 2012/11/19 21:28:03 mgorny Exp $
+
+*mediastreamer-2.8.2 (19 Nov 2012)
+
+  19 Nov 2012; Michał Górny <mgorny@gentoo.org>
+  +files/mediastreamer-2.8.2-autopoint.patch,
+  +files/mediastreamer-2.8.2-v4l-automagic.patch, +mediastreamer-2.8.2.ebuild,
+  metadata.xml:
+  Version bump wrt bug #399737. Thanks to Andrew Savchenko for his effort on
+  linphone ebuilds.
 
   07 Nov 2012; Alexis Ballier <aballier@gentoo.org>
   mediastreamer-2.7.3-r3.ebuild, +files/mediastreamer-2.7.3-ffmpeg-0.11.patch,
@@ -233,4 +242,3 @@
   +mediastreamer-2.2.3.ebuild:
   Initial commit. Actually, new-born (and bump) for this package removed a few
   months ago.
-
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index e6953da508ef..a4d860a3d0b1 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -5,14 +5,20 @@ AUX mediastreamer-2.7.3-ffmpeg-0.11.patch 3113 SHA256 a9c973a4e769f411a851553f2f
 AUX mediastreamer-2.7.3-sdl-build.patch 8006 SHA256 f143cf44b767e07ba7bff5572fe5f11950142ff0a36025a64db585aa048ab263 SHA512 eb828e1cac9c904b5401b1b68402b6fc02225968b4d95827442994a20c00b99c621679c52c08a14b31e6d647b39e479e1077097cea7207203eaf3673f592454c WHIRLPOOL 5549c8b19a438f34a4c10e7f31485c46ee4b94a2b71404027ba038fab08c81de0052107d5bfea25b49891d147abbe6a9d331378e59040fd1894c5c2f12447890
 AUX mediastreamer-2.7.3-v4l-automagic.patch 1083 SHA256 697cc9697504e57bb5810b7844eac34bfbae9c909f299ca5bb056b352c26bcfe SHA512 cb37f468fcf16d2cacc64b309cb58fb2b841f9962a01c6075079dfb55d8022ef245abb9f44e91a47e72081115603ffacd1020023d67a3f1dadc1fe411ebb2e67 WHIRLPOOL 833f1653e57c850583222b2b31de3e78a70b355b05d8b530864804bdeb1b888f3eb959f00dcaeb605047a4a460a5f13b777e2e6e7e8a2a9adda138e1493ca75f
 AUX mediastreamer-2.7.3-videoenc_282.patch 3581 SHA256 15f4f79ec44c8d4256ff146199299c89d24fdaaa4e8c40e9ca7c9ab178ef4306 SHA512 750b9d212dad04729b5607c83b55afcb3fafb0f4b9ce7dd174a996d31421883747d1d1703293b8b3e2b458094470da7eed003a52b8951fff2e81da2326824f26 WHIRLPOOL 381a80008fdadf5e7e075797183bb9f3fb328261ea75963e15238ad89bda039210c2e11e061b82c7acb438c5dd458d1434aaddc41bdf16d46d9f242620cf05e1
+AUX mediastreamer-2.8.2-autopoint.patch 710 SHA256 d19e1398755eccc8714b98d3ab53f671e31335e9d4c5456d8de8f89ddbc1cfb8 SHA512 fed068438d9624d91dbace156933bba2a6d1a785f5f2eca3053d443cf479bf66731cd0b2d32118dba376ac4d96f34de31a82c70170553d0de497fea238bf162a WHIRLPOOL 7cc86d7331dd9eba10c5f51cdd4105ce9246a345336598e3e3528a7d9684887ef995c1ca342275d636516ad71c0137205dc2e7ea5c3696004dbbdf0b10c011c5
+AUX mediastreamer-2.8.2-v4l-automagic.patch 918 SHA256 3b69a701045b440278a7cae4351fca5b7abfc8ac13937d16d65a141ec620655c SHA512 762b9c96b1a423ab7c7f7877f7e01ae3bf27d808715b32231fbacd8d57187ae01dd4bbd6fe08279e7c8c8816d385b31ff387ec356f407abb167ecfaac21a355f WHIRLPOOL 65c261775da4b2b1a6bbee80d67db196a7f6359f6cd558507438d91dbd43aa1f9e987d9ce69d12c93e966b4a94844cb82c3f953669328066bbf6df7e169d1948
 DIST mediastreamer-2.7.3.tar.gz 758146 SHA256 c3cbea285f1e85259b2ac06d3f1730b4258e280011598b91f5b90b8432bf1dc0 SHA512 f9ebfa12b1c760b5c24b5496466d92148a170ee2d522d9085db3fb72cc93f8e3e71ba1ae14f57d94a33b752450555c7d3ebf59267447203861247a8685e18259 WHIRLPOOL c1528bcca27c979ac29d6ccb6e32eac53ddd9e69d3f034056ad579d5ff6cd295c9224db6b841d6aa708e2c60251b192e85d6843342c14f8ead75d9f137c8d818
+DIST mediastreamer-2.8.2.tar.gz 882966 SHA256 a62ebb008913db6e03e27bd1ec30bb560ae4219da5255c0e91853b5e894a4f33 SHA512 2041d9fbba0f831aea6bdd3259b21742a37cfdbdf473b0bc4f20bd730371395ddf2866804ae496e9864adf5fcd0d24e03193d5d8feadd54e6ff0b3adda01ff60 WHIRLPOOL cecd47766dff3df76271b3209f7f967a00165861283c34633361a07bf8a416e63d5c5c6dd364a1558f1f865803eaf4a1888bd3bcf42cb0e159b12107045b61ab
 EBUILD mediastreamer-2.7.3-r3.ebuild 4031 SHA256 4bb13d8d040c4f1fabb00ccdec94b603955645c7942593727e73acb2e3a10ab6 SHA512 ad830ecd2b894f1c85c9b1ebff016c9bd9ebdf0133c5feb61c1627497cfb85f7e788515f329161d5064b5a0633ee513c0c6a212090d54b3443f91d5252d7014f WHIRLPOOL fc53ba9141439e9b66ef3cd6bf21035de95269a13204e7c72cab34f8e96ac8272d7a277f443366c5186230607fdc5963406cf4dbdb9b4c5b3b14ebce2469fb88
-MISC ChangeLog 8644 SHA256 a37af9fba24f2f0b69655683694e7451216d58616943f1504da431c475de5d5f SHA512 7df777171fb8086c1fe7fa52494a04282357864ca6cca2d3ffce63febb46da2a1a50c5c5e376d34ae1714e0ac1978d91dd38b3cb65f5ed1a334fb87620cb1c68 WHIRLPOOL 7a0ea4b28a0692793137408dd13f099c4fad78f20b7651c60477be4ef054a9157e0eadd3cad9e41eee27c22667533019966b1cd01348285c75026ae4cd95c13e
-MISC metadata.xml 531 SHA256 2111114806e8fd78f00032bce515e07f1030ca6eea7abec49483354aef50e9c8 SHA512 b5aa66d697c7cb58045287b70465cc2d7e81b06bd32b5944d6cf4efeb017bfa52078f0ecc96c2a392db94c4a0b8ef9df0104e2d4794959295efb903181e658c1 WHIRLPOOL aff8c3ab535da84cd3a1bc019b42ffaf1b7f0276baf16b35d740117481d1932c716874e89603e3cea99ca2f8680ebd664ce5629578ed5b78d7f8d2035bb4f2fd
+EBUILD mediastreamer-2.8.2.ebuild 3847 SHA256 ea41766857d7b5fad4b82f1517043a0b35e3fcf024a1ef01ff434b67de381b5b SHA512 19cbdd1de3247f63aa798fa819fe6104bee056f2b98cde4e46e16b63af46ec17e999ba79a3f663cece66f1c21976e607abc67c6fbd6c5ad5aa56e1b08040a9ef WHIRLPOOL 90a7c0e63e43d6e3f7d582fa2794d43c043444e722faedb7b0d6211397ba6f8cd7a6b5a639d166e27f8c449476a0826b40d51cd37bdd3fc335efabddc028e759
+MISC ChangeLog 8966 SHA256 10534c3d2d18a5a33e06247d555b882ba2f5be8f0e3df97b38452c13f82b29ec SHA512 c208a8ff14872f1001fbcbe1b64a0adb63751b42e6672cdc3498b5c9b46948712954de46a814cdcfe50eec676c716912a56ed984bfb68b6963972e1b322b728c WHIRLPOOL 01abd3a1f810ac83c18f0c8543c52e293feec0774cae52aa5bdf327419bf7d59f34f6abe8e0d6fd66e7ddba060956a29058ea8a62d5a7915b76d175e82c1c73d
+MISC metadata.xml 692 SHA256 4b5e0883c43d876bd92c5264430dbe5695cb6cf8fcdd5e2b54182d70c7ef1fd0 SHA512 acf0b246b29a3caf572c5c3d3d52c823263b5b29e5a50de019ff0a38677a8787ffb93e1f77275e318cf026724077d0587302299a9d45e9f1a2052a40e63be325 WHIRLPOOL 8243695a0748372293448d282642b820b1de06dcd01264ceafd0259cdfe81c0be9241e14536bec3c9a5fc8aabbf12d2046aed7405a110b3a4f0f64125c35886b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCaSKoACgkQvFcC4BYPU0o1XwCeIwXjngBWgNje36iuXlGwAo9A
-XM8AnjmPIyzy69CzhUqyZDlQHl760ZlA
-=5K4Z
+iJwEAQEIAAYFAlCqpLYACgkQfXuS5UK5QB3/nAP+LyMBK5ybymchQZ5qS0Cgd+wU
+TiytHxUbou7/msJqtIzBC77zgyQoQ3T+wSrqK/BVrQMlGJmM+fWGVGtZNV3Rq2Pj
+7TxQVpV15KErhht0ptwsDrv+MBniyyScIjW0hbhy0hbrgzr9VWvjh9LsM5CBjuK0
+PwQWl/z9/z7LwVcKmt0=
+=yypY
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.8.2-autopoint.patch b/media-libs/mediastreamer/files/mediastreamer-2.8.2-autopoint.patch
new file mode 100644
index 000000000000..5704234af060
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.8.2-autopoint.patch
@@ -0,0 +1,17 @@
+--- mediastreamer-2.8.2/configure.ac.orig	2012-06-01 16:31:34.000000000 +0400
++++ mediastreamer-2.8.2/configure.ac	2012-06-01 16:36:08.586809086 +0400
+@@ -191,13 +191,13 @@
+ if test "$mingw_found" != "yes" ; then
+ 	dnl gettext macro does not work properly under mingw. And we want to use the one provided by GTK.
+ 	AM_GNU_GETTEXT([external])
+-	AM_GNU_GETTEXT_VERSION([0.18])
+ 	LIBS="$LIBS $LIBINTL"
+ else
+ 	AC_DEFINE(ENABLE_NLS,1,[Tells whether localisation is possible])
+ 	AC_DEFINE(HAVE_GETTEXT,1,[Tells wheter localisation is possible])
+ 	LIBS="$LIBS -lintl"
+ fi
++AM_GNU_GETTEXT_VERSION([0.18])
+ 
+ AM_CONDITIONAL(BUILD_MACOSX, test x$macosx_found = xyes)
+ AM_CONDITIONAL(BUILD_IOS, test x$ios_found = xyes)
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.8.2-v4l-automagic.patch b/media-libs/mediastreamer/files/mediastreamer-2.8.2-v4l-automagic.patch
new file mode 100644
index 000000000000..0c33274dd798
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.8.2-v4l-automagic.patch
@@ -0,0 +1,30 @@
+--- configure.ac.orig	2012-02-22 20:29:04.000000000 +0400
++++ configure.ac	2012-05-15 16:13:02.979041146 +0400
+@@ -624,6 +624,16 @@
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,  "${package_prefix}/share" ,[path of data])
+ AC_SUBST(PACKAGE_DATA_DIR)
+ 
++AC_ARG_ENABLE(v4l,
++      [  --disable-v4l       Disable usage of v4l],
++      [case "${enableval}" in
++        yes) v4l=yes ;;
++        no)  v4l=no ;;
++        *) AC_MSG_ERROR(bad value ${enableval} for --disable-v4l) ;;
++      esac],[v4l=yes])
++
++if test "$v4l" = "yes" ; then
++
+ dnl check for video4linux headers
+ AC_CHECK_HEADERS(linux/videodev.h linux/videodev2.h)
+ if test "${ac_cv_header_linux_videodev_h}" = "yes" ; then
+@@ -690,6 +700,10 @@
+       esac],[tests=yes])
+ AM_CONDITIONAL(ENABLE_TESTS, test x$tests = xyes)
+ 
++fi
++
++AM_CONDITIONAL(BUILD_V4L, test x$found_v4l = xyes )
++
+ 
+ dnl ##################################################
+ dnl # Check for doxygen
diff --git a/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild b/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild
new file mode 100644
index 000000000000..20e793a455af
--- /dev/null
+++ b/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild,v 1.1 2012/11/19 21:28:03 mgorny Exp $
+
+EAPI="4"
+
+inherit autotools eutils multilib
+
+DESCRIPTION="Mediastreaming library for telephony application"
+HOMEPAGE="http://www.linphone.org/"
+SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Many cameras will not work or will crash an application if mediastreamer2 is
+# not built with v4l2 support (taken from configure.ac)
+# TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
+IUSE="+alsa amr bindist coreaudio debug doc examples g726 g729 gsm ilbc
+	ipv6 oss portaudio pulseaudio sdl silk +speex static-libs theora v4l
+	video x264 X"
+
+REQUIRED_USE="|| ( oss alsa portaudio coreaudio pulseaudio )
+	video? ( || ( sdl X ) )
+	theora? ( video )
+	X? ( video )
+	v4l? ( video )"
+
+RDEPEND=">=net-libs/ortp-0.17[ipv6?]
+	alsa? ( media-libs/alsa-lib )
+	g726? ( >=media-libs/spandsp-0.0.6_pre1 )
+	gsm? ( media-sound/gsm )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
+	speex? ( >=media-libs/speex-1.2_beta3 )
+	video? (
+		virtual/ffmpeg
+		v4l? ( media-libs/libv4l
+			sys-kernel/linux-headers )
+		theora? ( media-libs/libtheora )
+		sdl? ( media-libs/libsdl[video,X] )
+		X? ( x11-libs/libX11
+			x11-libs/libXv ) )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/videoproto
+	doc? ( app-doc/doxygen )"
+
+PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
+	g729? ( !bindist? ( media-plugins/mediastreamer-bcg729 ) )
+	ilbc? ( media-plugins/mediastreamer-ilbc )
+	video? ( x264? ( media-plugins/mediastreamer-x264 ) )
+	silk? ( !bindist? ( media-plugins/mediastreamer-silk ) )"
+
+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"
+
+	epatch "${FILESDIR}/${P}-v4l-automagic.patch" \
+		"${FILESDIR}/${P}-autopoint.patch"
+
+	# linux/videodev.h dropped in 2.6.38
+	sed -i -e 's:linux/videodev.h ::' configure.ac || die
+
+	# don't build examples in tests/
+	sed -i -e "/SUBDIRS/s/ tests//" Makefile.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		--datadir="${EPREFIX}"/usr/share/${PN}
+		# arts is deprecated
+		--disable-artsc
+		# don't want -Werror
+		--disable-strict
+		--disable-libv4l1
+		# don't use bundled libs
+		--enable-external-ortp
+		$(use_enable alsa)
+		$(use_enable pulseaudio)
+		$(use_enable coreaudio macsnd)
+		$(use_enable debug)
+		$(use_enable g726 spandsp )
+		$(use_enable gsm)
+		$(use_enable ipv6)
+		$(use_enable oss)
+		$(use_enable portaudio)
+		$(use_enable speex)
+		$(use_enable static-libs static)
+		$(use_enable theora)
+		$(use_enable video)
+		$(use_enable v4l)
+		$(use_enable v4l libv4l2)
+		$(use_enable sdl)
+		$(use_enable X x11)
+		$(use_enable X xv)
+
+		$(use doc || echo ac_cv_path_DOXYGEN=false)
+	)
+
+	# 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
+		myeconfargs+=( --enable-macaqsnd )
+	else
+		myeconfargs+=( --disable-macaqsnd )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	prune_libtool_files
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins tests/*.c
+	fi
+}
diff --git a/media-libs/mediastreamer/metadata.xml b/media-libs/mediastreamer/metadata.xml
index 875a63b93933..42e1ac2bf546 100644
--- a/media-libs/mediastreamer/metadata.xml
+++ b/media-libs/mediastreamer/metadata.xml
@@ -12,7 +12,10 @@
 	</maintainer>
 	<use>
 		<flag name="amr">Use of AMR Narrow Band codec plugin</flag>
+		<flag name="g726">Support g726 codec</flag>
+		<flag name="g729">Use g726 codec plugin</flag>
 		<flag name="ilbc">Use of iLBC (RFC3951) codec plugin</flag>
+		<flag name="silk">Use silk (skype protocol) codec plugin</flag>
 		<flag name="video">Enable video support</flag>
 	</use>
 </pkgmetadata>