diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-09-07 00:19:51 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-09-07 00:19:51 +0000 |
| commit | 7110152359b748f9d1339ae17a9cea6ec0ab8ab4 (patch) | |
| tree | c8d937ecb7d1a192658905a1668f1378966905f7 /media-sound/pulseaudio | |
| parent | Added ~mips, as per bug #126850 (diff) | |
| download | gentoo-2-7110152359b748f9d1339ae17a9cea6ec0ab8ab4.tar.gz gentoo-2-7110152359b748f9d1339ae17a9cea6ec0ab8ab4.tar.bz2 gentoo-2-7110152359b748f9d1339ae17a9cea6ec0ab8ab4.zip | |
Add patch from upstream to not fail if SHM is not available.
(Portage version: 2.1.1_rc1-r5)
Diffstat (limited to 'media-sound/pulseaudio')
| -rw-r--r-- | media-sound/pulseaudio/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/pulseaudio/files/pulseaudio-0.9.5-noshm.patch | 42 | ||||
| -rw-r--r-- | media-sound/pulseaudio/pulseaudio-0.9.5-r3.ebuild | 3 |
3 files changed, 49 insertions, 2 deletions
diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog index d975c9d8e50a..bb1d90e68557 100644 --- a/media-sound/pulseaudio/ChangeLog +++ b/media-sound/pulseaudio/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/pulseaudio # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.29 2006/09/06 21:56:17 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.30 2006/09/07 00:19:51 flameeyes Exp $ + + 07 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/pulseaudio-0.9.5-noshm.patch, pulseaudio-0.9.5-r3.ebuild: + Add patch from upstream to not fail if SHM is not available. *pulseaudio-0.9.5-r3 (06 Sep 2006) diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.5-noshm.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.5-noshm.patch new file mode 100644 index 000000000000..b8719c371058 --- /dev/null +++ b/media-sound/pulseaudio/files/pulseaudio-0.9.5-noshm.patch @@ -0,0 +1,42 @@ +Index: src/pulse/context.c +=================================================================== +--- src/pulse/context.c (revision 1375) ++++ src/pulse/context.c (revision 1376) +@@ -98,6 +98,8 @@ + } + } + ++static void context_free(pa_context *c); ++ + pa_context *pa_context_new(pa_mainloop_api *mainloop, const char *name) { + pa_context *c; + +@@ -148,8 +150,17 @@ + #endif + pa_client_conf_env(c->conf); + +- c->mempool = pa_mempool_new(!c->conf->disable_shm); ++ if (!(c->mempool = pa_mempool_new(!c->conf->disable_shm))) { + ++ if (!c->conf->disable_shm) ++ c->mempool = pa_mempool_new(0); ++ ++ if (!c->mempool) { ++ context_free(c); ++ return NULL; ++ } ++ } ++ + return c; + } + +@@ -178,7 +189,8 @@ + if (c->playback_streams) + pa_dynarray_free(c->playback_streams, NULL, NULL); + +- pa_mempool_free(c->mempool); ++ if (c->mempool) ++ pa_mempool_free(c->mempool); + + if (c->conf) + pa_client_conf_free(c->conf); diff --git a/media-sound/pulseaudio/pulseaudio-0.9.5-r3.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.5-r3.ebuild index c9fa172e1c07..d23a3c5d363b 100644 --- a/media-sound/pulseaudio/pulseaudio-0.9.5-r3.ebuild +++ b/media-sound/pulseaudio/pulseaudio-0.9.5-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.5-r3.ebuild,v 1.1 2006/09/06 21:56:17 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.5-r3.ebuild,v 1.2 2006/09/07 00:19:51 flameeyes Exp $ inherit eutils libtool # autotools @@ -53,6 +53,7 @@ src_unpack() { epatch "${FILESDIR}/${P}-esdcompat.patch" epatch "${FILESDIR}/${P}-fbsd.patch" + epatch "${FILESDIR}/${P}-noshm.patch" # eautoreconf elibtoolize |