Add patch from upstream to not fail if SHM is not available.

Package-Manager: portage-2.1.1_rc1-r5

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index d975c9d8e50aa3706bc38da15b99e583531d44f2..bb1d90e685575b26b48efbd7445ad99f17edaae8 100644 (file)
--- 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/Manifest b/media-sound/pulseaudio/Manifest
index 78d9b811620b3af16c29833a0e247042d46ba524..520298fa70f8f39cedb3642ae80ebf2da40bb4b1 100644 (file)
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -9,6 +9,10 @@ AUX pulseaudio-0.9.5-fbsd.patch 1312 RMD160 bf57c80ad041b3c8f848eb90dd3c94164a04
 MD5 d8651b2b0d4adc4a99c33438ffe2a8a5 files/pulseaudio-0.9.5-fbsd.patch 1312
 RMD160 bf57c80ad041b3c8f848eb90dd3c94164a041540 files/pulseaudio-0.9.5-fbsd.patch 1312
 SHA256 a0c27008aa8a2de3253b2b1bc44bb9a7e874cc208c83c533b792b9d98e94b17a files/pulseaudio-0.9.5-fbsd.patch 1312
+AUX pulseaudio-0.9.5-noshm.patch 1011 RMD160 0f718066f3b1c8a1f99b251f724a80d6d3035f72 SHA1 9c5aa8a498a7b142fa1a8e50cbefb6304446cfb2 SHA256 f9bfa3cd101298626d19aed857f04256a5b82566c2c7fa1fbda98cab0b47d3d6
+MD5 932a8d8ed808663d119b8220423ffeff files/pulseaudio-0.9.5-noshm.patch 1011
+RMD160 0f718066f3b1c8a1f99b251f724a80d6d3035f72 files/pulseaudio-0.9.5-noshm.patch 1011
+SHA256 f9bfa3cd101298626d19aed857f04256a5b82566c2c7fa1fbda98cab0b47d3d6 files/pulseaudio-0.9.5-noshm.patch 1011
 AUX pulseaudio.conf.d 275 RMD160 6317cb5be41a768428056c0057d8f5b1f189e804 SHA1 22ed7f1de0f2a18a608c5e9a91635ee66addac4d SHA256 c03661e8cc902d27ff6b52f291207f2b008957571b942abdd92a873a52aae0dd
 MD5 bf7487ba2c48fc8a56bca41c97a18934 files/pulseaudio.conf.d 275
 RMD160 6317cb5be41a768428056c0057d8f5b1f189e804 files/pulseaudio.conf.d 275
@@ -18,14 +22,14 @@ MD5 0fa5631e3565ce5dcde726884d1ebf6c files/pulseaudio.init.d-2 586
 RMD160 8cff812d629fce32b5cdf59b628c77adda4990e1 files/pulseaudio.init.d-2 586
 SHA256 ad899956fa99bcb9c52f3ee31af1cedd9ea4f86edd885e1885aab06f396f34e6 files/pulseaudio.init.d-2 586
 DIST pulseaudio-0.9.5.tar.gz 1145930 RMD160 67f0cef89588453e347a2af5f641c9f953d4ef4b SHA1 c69c5a1f3e0cdc0c79f2ec3860e6aa02a049405e SHA256 cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6
-EBUILD pulseaudio-0.9.5-r3.ebuild 3583 RMD160 7813432e698220f35f9f0fc75b5d32c987cea9c3 SHA1 dc5dd52e29692a5e857b3d40a737e7a9bfaac416 SHA256 593b9edef013e06f66a21c727bb627e2086bb562f255a5c3555ee9bdefeca2e9
-MD5 24399fdeb86b503c0543ce78aa24c4bb pulseaudio-0.9.5-r3.ebuild 3583
-RMD160 7813432e698220f35f9f0fc75b5d32c987cea9c3 pulseaudio-0.9.5-r3.ebuild 3583
-SHA256 593b9edef013e06f66a21c727bb627e2086bb562f255a5c3555ee9bdefeca2e9 pulseaudio-0.9.5-r3.ebuild 3583
-MISC ChangeLog 6223 RMD160 8707bed026c3337bd0aa5e0851052c5ce1d08d53 SHA1 675fb468a5e419146d52579965ec1e006353bbd2 SHA256 e7a583325b35a8ba5c04d145d39a5554c5c8651c96f2166c31ff3b02c96df35b
-MD5 ffeb917a3444bc429f2d5885a70c27fc ChangeLog 6223
-RMD160 8707bed026c3337bd0aa5e0851052c5ce1d08d53 ChangeLog 6223
-SHA256 e7a583325b35a8ba5c04d145d39a5554c5c8651c96f2166c31ff3b02c96df35b ChangeLog 6223
+EBUILD pulseaudio-0.9.5-r3.ebuild 3622 RMD160 444a9ef59bc9abf332f8b31d01ef18bf38e0a82e SHA1 2b2990facf1feabfe1c00443328b80d9e8f6b968 SHA256 2536e96312f54220644e40b72ac56e98195fac16ddab01d485b2051b183008f6
+MD5 dffc3ecbbe29cbcbe5a79f7777c4abbf pulseaudio-0.9.5-r3.ebuild 3622
+RMD160 444a9ef59bc9abf332f8b31d01ef18bf38e0a82e pulseaudio-0.9.5-r3.ebuild 3622
+SHA256 2536e96312f54220644e40b72ac56e98195fac16ddab01d485b2051b183008f6 pulseaudio-0.9.5-r3.ebuild 3622
+MISC ChangeLog 6407 RMD160 201ea1b2210505ad5d8a56e4adf40c63264b71e5 SHA1 5f1b228931673693b1c17429fc53b955bf5c6640 SHA256 dec5caf50acbbbeb371e7e588cd758db285eaf256f33169eaec71c5d722e076f
+MD5 dac9cf234ea14d087e29ab558525d04e ChangeLog 6407
+RMD160 201ea1b2210505ad5d8a56e4adf40c63264b71e5 ChangeLog 6407
+SHA256 dec5caf50acbbbeb371e7e588cd758db285eaf256f33169eaec71c5d722e076f ChangeLog 6407
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -36,7 +40,7 @@ SHA256 ab6179a1918a6773c82406c18c5c491c6c286ffa6b1934f53eadec3f11e1e62d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE/0QIAiZjviIA2XgRAuX+AKDi56kHnAKOvRbMp7c2xvf4EbiUwQCdHJmA
-0wPDkzm510e6n958XE6q7rY=
-=rmBt
+iD8DBQFE/2W4AiZjviIA2XgRAr4AAKCbm1p18GvviSzFDfMFrfi6gdGOcwCgjWdX
+fc1mk51QxZ3mY5jK6To2xWI=
+=i8yV
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..b8719c3
--- /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 c9fa172e1c07fe1a960155c87b903b6b91401ba1..d23a3c5d363bb88a15c604306bfb7c4d4a5dbab8 100644 (file)
--- 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