summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2010-12-04 14:50:05 +0000
committerPeter Volkov <pva@gentoo.org>2010-12-04 14:50:05 +0000
commit840a2b125fe0df4162a21a1fd8807572ff12bc15 (patch)
tree1b6fcaa482ceba76dd407b61d7cb5e50062924b8 /media-libs/mediastreamer
parentsmall correction to patch before we populate to the mirrors (diff)
downloadhistorical-840a2b125fe0df4162a21a1fd8807572ff12bc15.tar.gz
historical-840a2b125fe0df4162a21a1fd8807572ff12bc15.tar.bz2
historical-840a2b125fe0df4162a21a1fd8807572ff12bc15.zip
Fix automagick dependency on pulseaudio, bug #347163, thank Markus Oehme for report.
Package-Manager: portage-2.1.9.25/cvs/Linux x86_64
Diffstat (limited to 'media-libs/mediastreamer')
-rw-r--r--media-libs/mediastreamer/ChangeLog6
-rw-r--r--media-libs/mediastreamer/Manifest4
-rw-r--r--media-libs/mediastreamer/mediastreamer-2.6.0.ebuild6
3 files changed, 11 insertions, 5 deletions
diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog
index 1905859ace86..337cec42272a 100644
--- a/media-libs/mediastreamer/ChangeLog
+++ b/media-libs/mediastreamer/ChangeLog
@@ -1,6 +1,10 @@
# 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.30 2010/07/23 09:15:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.31 2010/12/04 14:50:05 pva Exp $
+
+ 04 Dec 2010; Peter Volkov <pva@gentoo.org> mediastreamer-2.6.0.ebuild:
+ Fix automagick dependency on pulseaudio, bug #347163, thank Markus Oehme for
+ report.
*mediastreamer-2.6.0 (23 Jul 2010)
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index 30f8c16c9132..737c5a73658c 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -7,6 +7,6 @@ DIST mediastreamer-2.6.0.tar.gz 728710 RMD160 a3936ad2b6a6a4f1798729a1c1362c5bf9
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
-EBUILD mediastreamer-2.6.0.ebuild 4003 RMD160 601d27ca62f16df72499149a14ecd1598449ffe6 SHA1 0771b392d130d4c59ba3bacb724f68903fe88746 SHA256 c1bbcacc07a4df4fa36e1c1f4ead1a25b077c97c675ceceed205063ae0b3b295
-MISC ChangeLog 4362 RMD160 0b7991f5ecbea62c0fe699cefb54c91a94c3840e SHA1 29bb1e2543e3aadf068491f3117d035bd08dffd8 SHA256 215038ec189b647c843525cac70a23a75ab31647f6a0166e3659add4afa92895
+EBUILD mediastreamer-2.6.0.ebuild 4092 RMD160 b9bc2d0abbe04fb60e408ed8a4af3f53791fdcda SHA1 c04a0f06d29ee4833be075ac638e7efb36d50d5b SHA256 2e2e9996d80fe82b2c6ee659bc4d16c59e8a5146ff6584c0d1f5bd7068453dc0
+MISC ChangeLog 4525 RMD160 a2ac991bf09029aca4fd7d9c3057ebb9e5ee1caf SHA1 6e66e1fd0c701f0e13c9770122e1f52a1f639047 SHA256 39f64a0b63b5ab31666370edeeb4bd800d06aa56f04add4991afb029cfa507a3
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
index 73d473d461ca..a554196e38ad 100644
--- a/media-libs/mediastreamer/mediastreamer-2.6.0.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.6.0.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.6.0.ebuild,v 1.2 2010/12/04 14:50:05 pva Exp $
EAPI="3"
@@ -13,7 +13,7 @@ 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"
+IUSE="+alsa coreaudio debug examples gsm ilbc ipv6 jack oss portaudio pulseaudio +speex theora video v4l2 x264 X"
RDEPEND=">=net-libs/ortp-0.16.2
alsa? ( media-libs/alsa-lib )
@@ -21,6 +21,7 @@ RDEPEND=">=net-libs/ortp-0.16.2
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? ( media-libs/libsdl[video,X]
media-video/ffmpeg
@@ -101,6 +102,7 @@ src_configure() {
--disable-dependency-tracking \
--disable-artsc \
$(use_enable alsa) \
+ $(use_enable pulseaudio) \
$(use_enable coreaudio macsnd) ${macaqsnd} \
$(use_enable debug) \
$(use_enable gsm) \