From 1418b42ea2263a68e047eeeaa10270b4f8332ed9 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Sat, 9 Apr 2011 09:57:34 +0000 Subject: Added amr plugin dependency, bug 356977 wrt Andrew Savchenko. Package-Manager: portage-2.1.9.45/cvs/Linux x86_64 --- media-libs/mediastreamer/ChangeLog | 8 +- media-libs/mediastreamer/Manifest | 5 +- .../mediastreamer/mediastreamer-2.7.3-r1.ebuild | 120 +++++++++++++++++++++ media-libs/mediastreamer/metadata.xml | 5 + 4 files changed, 135 insertions(+), 3 deletions(-) create mode 100644 media-libs/mediastreamer/mediastreamer-2.7.3-r1.ebuild diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog index 86e54b61f928..9adcc7b053d8 100644 --- a/media-libs/mediastreamer/ChangeLog +++ b/media-libs/mediastreamer/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/mediastreamer # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.35 2011/04/09 09:38:42 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.36 2011/04/09 09:57:34 pva Exp $ + +*mediastreamer-2.7.3-r1 (09 Apr 2011) + + 09 Apr 2011; Peter Volkov +mediastreamer-2.7.3-r1.ebuild, + metadata.xml: + Added amr plugin dependency, bug 356977 wrt Andrew Savchenko. 09 Apr 2011; Peter Volkov mediastreamer-2.7.3.ebuild, +files/mediastreamer-2.7.3-v4l-automagic.patch: diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest index 10bb221a36b5..9121b188441d 100644 --- a/media-libs/mediastreamer/Manifest +++ b/media-libs/mediastreamer/Manifest @@ -10,6 +10,7 @@ EBUILD mediastreamer-2.2.3_p1-r1.ebuild 3818 RMD160 bd2c86eb7f73d3baaadca3c30890 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 EBUILD mediastreamer-2.6.0.ebuild 4095 RMD160 e9c25b2c8a6b561a57cd02749d6d36a9469c1db1 SHA1 2d984bda4aff26e62a11ee2e2ec64a798876858e SHA256 dfb22069c4e698d7c609756babc8a4b76c5607f9a967b23ec9dfdbb31c02f467 +EBUILD mediastreamer-2.7.3-r1.ebuild 3728 RMD160 6f217b5aa64e4852dbf18b32f392c628e140d513 SHA1 b1b3387a8302afd87e60c9167a566e81e103f6d5 SHA256 f22d6677b8c357e0f94eb24ed9ff4fc527caaba3ff6f7e693144206ce40ee673 EBUILD mediastreamer-2.7.3.ebuild 3691 RMD160 7a6850e8bf7cd053e5210981cd48a83b75ffcc3c SHA1 2047bf86866a44d909cf9a7d73b7748e28ef7517 SHA256 4b4904e0922aec0c5a78192c82339c15d868375b597acbba4ab3b75ced41fd2c -MISC ChangeLog 5382 RMD160 5a13fc10d7f45d347c053df8ff1c96d26718ba63 SHA1 0145ff5366a482ff918f55026bc40c0604575e83 SHA256 1089c45ea1e82817e3f3f86015f7194bb72718ce5201b3a56c7db6aeb3867534 -MISC metadata.xml 380 RMD160 24797b26f9f2ef16ea5261c536ebed58e3903e97 SHA1 74bcc7d7e8bd26a92450ee714743a975ed595de0 SHA256 5cd96440722093ad63d25758891be2656d8c7f8b570eddfee1fbdce5860d237a +MISC ChangeLog 5579 RMD160 2d6538ec53880711e5856865efeb16f04f32c27b SHA1 3dc47de69177eb6315d055977a72344ed348431e SHA256 820c17a7a3e0065a2eabc04056bd3ccb85d30fa295fb8a8ef82b5d415d1a0c7d +MISC metadata.xml 531 RMD160 8c69e8bafc5b2b770b20d3f30352fc81e842e14c SHA1 369aa519353274364586f218538191596828a6f2 SHA256 25bc15caead165fa7563daefe69bfe714efb8e4970f9043751f7f78ea3669dcc diff --git a/media-libs/mediastreamer/mediastreamer-2.7.3-r1.ebuild b/media-libs/mediastreamer/mediastreamer-2.7.3-r1.ebuild new file mode 100644 index 000000000000..52dc6310f66c --- /dev/null +++ b/media-libs/mediastreamer/mediastreamer-2.7.3-r1.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.7.3-r1.ebuild,v 1.1 2011/04/09 09:57:34 pva Exp $ + +EAPI="4" + +inherit eutils autotools 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 examples gsm ilbc ipv6 jack oss portaudio +pulseaudio sdl +speex theora v4l2 video x264 X xv" +REQUIRED_USE="|| ( oss alsa jack portaudio coreaudio ) theora? ( video ) X? ( +video ) xv? ( X ) v4l2? ( video )" + +RDEPEND=">=net-libs/ortp-0.16.2[ipv6?] + 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 ) + pulseaudio? ( >=media-sound/pulseaudio-0.9.21 ) + speex? ( >=media-libs/speex-1.2_beta3 ) + video? ( + virtual/ffmpeg + v4l2? ( media-libs/libv4l + sys-kernel/linux-headers ) + theora? ( media-libs/libtheora ) + sdl? ( media-libs/libsdl[video,X] ) + X? ( x11-libs/libX11 + xv? ( x11-libs/libXv ) ) )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + xv? ( x11-proto/videoproto )" + +PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) ) + ilbc? ( media-plugins/mediastreamer-ilbc ) + video? ( x264? ( media-plugins/mediastreamer-x264 ) )" + +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}/${PN}-2.7.3-v4l-automagic.patch" + # linux/videodev.h dropped in 2.6.38 + sed -i -e 's:msv4l.c::' src/Makefile.am || die + eautoreconf + + # don't build examples in tests/ + sed -i -e "s:\(SUBDIRS = .*\) tests \(.*\):\1 \2:" Makefile.in \ + || die "patching Makefile.in failed" +} + +src_configure() { + # Mac OS X Audio Queue is an audio recording facility, available on + # 10.5 (Leopard, Darwin9) and onward + local macaqsnd="--disable-macaqsnd" + 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-artsc \ + $(use_enable alsa) \ + $(use_enable pulseaudio) \ + $(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_enable video) \ + $(use_enable v4l2 v4l) \ + $(use_enable v4l2 libv4l) \ + $(use_enable sdl) \ + $(use_enable X x11) \ + $(use_enable xv) +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc AUTHORS ChangeLog NEWS README + + 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 f8719c645053..d9fa7016f33c 100644 --- a/media-libs/mediastreamer/metadata.xml +++ b/media-libs/mediastreamer/metadata.xml @@ -6,7 +6,12 @@ volkmar@gentoo.org Mounir Lamouri + + pva@gentoo.org + Peter Volkov + + Use of AMR Narrow Band codec plugin Use of iLBC (RFC3951) codec plugin Enable video support -- cgit v1.2.3-65-gdbad