Add patch to allow module-detect to work on FreeBSD.

Package-Manager: portage-2.1.1_pre3-r1

4 files changed, 62 insertions, 13 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 1a31e70e2367..e74ba0580944 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.6 2006/07/17 15:38:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.7 2006/07/18 17:43:40 flameeyes Exp $
+
+  18 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/pulseaudio-0.9.2-moduledetect.patch, pulseaudio-0.9.2.ebuild:
+  Add patch to allow module-detect to work on FreeBSD.
 
   17 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   files/pulseaudio.conf.d, files/pulseaudio.init.d, pulseaudio-0.9.2.ebuild:
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 8c03707308e5..a2e02f856548 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -5,6 +5,10 @@ AUX pulseaudio-0.9.2-fbsd.patch 7798 RMD160 9539fc01a304ad7336cc738ebf0e0cc7cbe3
 MD5 8adda20be20f1e0443ff9d404a51ff4a files/pulseaudio-0.9.2-fbsd.patch 7798
 RMD160 9539fc01a304ad7336cc738ebf0e0cc7cbe3eb76 files/pulseaudio-0.9.2-fbsd.patch 7798
 SHA256 b3a6d9b5cebceaed986d2aaf06af34846efe9819cb12f4dae2c8d838dbc3ee4e files/pulseaudio-0.9.2-fbsd.patch 7798
+AUX pulseaudio-0.9.2-moduledetect.patch 1345 RMD160 21f145ac391f707819b2f68386e8fa23060a2af9 SHA1 9351d0cacc243da942935de5423dcde186daa208 SHA256 e0b148d7aa99b2826f06da6a451683206f328553403dd4f690d722a7387b3e91
+MD5 c5e0f26882cdaba00e98d218a364e04e files/pulseaudio-0.9.2-moduledetect.patch 1345
+RMD160 21f145ac391f707819b2f68386e8fa23060a2af9 files/pulseaudio-0.9.2-moduledetect.patch 1345
+SHA256 e0b148d7aa99b2826f06da6a451683206f328553403dd4f690d722a7387b3e91 files/pulseaudio-0.9.2-moduledetect.patch 1345
 AUX pulseaudio.conf.d 123 RMD160 bfbfaf15e5a7cac1e15ef34471b68ed7bf5a0883 SHA1 5f2a0b7791daacc23f3dbe56c8b2382e37137fd5 SHA256 64e2d11a13c31cd5c7cfad0fe07f2e80edcc15e23261b09ba73632a673ce3d45
 MD5 e714ef8f8dc4b4640fb0cbf247de6381 files/pulseaudio.conf.d 123
 RMD160 bfbfaf15e5a7cac1e15ef34471b68ed7bf5a0883 files/pulseaudio.conf.d 123
@@ -14,14 +18,14 @@ MD5 bc446921841aebd5e18d8a03f8ccf1c3 files/pulseaudio.init.d 550
 RMD160 af150a878919b31cf5f575ee9fe440936c5a15c2 files/pulseaudio.init.d 550
 SHA256 818f1ac8b1740d64818bac2e3c82b0ba42984a12469f51c374ef45aa7debc911 files/pulseaudio.init.d 550
 DIST pulseaudio-0.9.2.tar.gz 1100971 RMD160 32005e876868a507963d6ced53722dd9dd52cc78 SHA1 726a54651656c7d2bcfc6e4d45c7e0839c0519ff SHA256 b0e39ffffa19e0745da6ef2be1df353c3466991c82a191d83bdf4421387a463a
-EBUILD pulseaudio-0.9.2.ebuild 3248 RMD160 f66c57dad3a106eac79e782fd046d86b53c5d6a0 SHA1 52950eacba41fae767cae2933eb7efeb2398f28b SHA256 416497250b7b138d205ba555026e24536ed8ea153ca2a6610316546fc7a1ad49
-MD5 67e46fdef0b991e7c3323d47b732478c pulseaudio-0.9.2.ebuild 3248
-RMD160 f66c57dad3a106eac79e782fd046d86b53c5d6a0 pulseaudio-0.9.2.ebuild 3248
-SHA256 416497250b7b138d205ba555026e24536ed8ea153ca2a6610316546fc7a1ad49 pulseaudio-0.9.2.ebuild 3248
-MISC ChangeLog 1484 RMD160 b81532fc345288e1c2b7a18e175901e60b1b31fa SHA1 4ca1a2cee1ca1245852c9e78633d851f59401602 SHA256 6424e6a515dfaf60e00fdf4a7bb6a9c25f1a2d24834b55d9810ed7bd2d29eebe
-MD5 132b9b98f3a4bf049e4368ff97a46869 ChangeLog 1484
-RMD160 b81532fc345288e1c2b7a18e175901e60b1b31fa ChangeLog 1484
-SHA256 6424e6a515dfaf60e00fdf4a7bb6a9c25f1a2d24834b55d9810ed7bd2d29eebe ChangeLog 1484
+EBUILD pulseaudio-0.9.2.ebuild 3294 RMD160 ae50639cd692ca60622acc2e938ed71379acc0f8 SHA1 9c9602b69b6f3d35779fc19d5ba47c02e8f2b3ef SHA256 34118050d53a2a2e1790e71ce93582ffa117d4fe27b182e60cbba5803ba4543b
+MD5 1467ae7ce453c2d6b0df545a320d7090 pulseaudio-0.9.2.ebuild 3294
+RMD160 ae50639cd692ca60622acc2e938ed71379acc0f8 pulseaudio-0.9.2.ebuild 3294
+SHA256 34118050d53a2a2e1790e71ce93582ffa117d4fe27b182e60cbba5803ba4543b pulseaudio-0.9.2.ebuild 3294
+MISC ChangeLog 1664 RMD160 a8ea51cadb51fc317aa65994837db9f3c42af82f SHA1 ec94c7c735b959ed9f135722289fb2a4fc15a131 SHA256 4ddcf9326d0402aaddcd10a528ba64fbbacbb0148f9e69d261c8453fdfe5ce3e
+MD5 234bb6004e6430c6cf81aa39139280e2 ChangeLog 1664
+RMD160 a8ea51cadb51fc317aa65994837db9f3c42af82f ChangeLog 1664
+SHA256 4ddcf9326d0402aaddcd10a528ba64fbbacbb0148f9e69d261c8453fdfe5ce3e ChangeLog 1664
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -32,7 +36,7 @@ SHA256 1b50b0a6de74d80653dd9c4ef669d42e2ffb109e12b3e125a7e9b7f6573aee9b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEu67+AiZjviIA2XgRApwLAJ9hV/cdTnL4wn/BF0qDg7TXxGLLggCeL5/F
-YBi7YuODAim0jjx/jU5NDSM=
-=0mGj
+iD8DBQFEvR3YAiZjviIA2XgRAgeiAJ4lRGYZgHV1347nn2FRbUMO6y9rgwCgx9nL
+Y1Oxgn9MGLcA7a/S0sidHLA=
+=9azB
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.2-moduledetect.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.2-moduledetect.patch
new file mode 100644
index 000000000000..bcb18c185a34
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-0.9.2-moduledetect.patch
@@ -0,0 +1,40 @@
+Index: pulseaudio-0.9.2/src/modules/module-detect.c
+===================================================================
+--- pulseaudio-0.9.2.orig/src/modules/module-detect.c
++++ pulseaudio-0.9.2/src/modules/module-detect.c
+@@ -135,23 +135,28 @@ static int detect_oss(pa_core *c, int ju
+         line[strcspn(line, "\r\n")] = 0;
+ 
+         if (!b) {
+-            b = strcmp(line, "Audio devices:") == 0;
++	     b = strcmp(line, "Audio devices:") == 0 || strcmp(line, "Installed devices:") == 0;
+             continue;
+         }
+ 
+         if (line[0] == 0)
+             break;
+         
+-        if (sscanf(line, "%u: ", &device) != 1)
+-            continue;
+-
+-        if (device == 0)
++        if (sscanf(line, "%u: ", &device) == 1) {
++	  if (device == 0)
+             snprintf(args, sizeof(args), "device=/dev/dsp");
+-        else
++	  else
+             snprintf(args, sizeof(args), "device=/dev/dsp%u", device);
+         
+-        if (!pa_module_load(c, "module-oss", args))
++	  if (!pa_module_load(c, "module-oss", args))
++            continue;
++	} else if (sscanf(line, "pcm%u: ", &device) == 1) {
++	  /* FreeBSD support, the device are named /dev/dsp0.0, dsp0.1 and so on */
++	  snprintf(args, sizeof(args), "device=/dev/dsp%u.0", device);
++	  
++	  if (!pa_module_load(c, "module-oss", args))
+             continue;
++	}
+ 
+         n++;
+ 
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.2.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.2.ebuild
index 227eb3d36ee1..d8924d3e6b6e 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.2.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.2.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.2.ebuild,v 1.4 2006/07/17 15:38:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.2.ebuild,v 1.5 2006/07/18 17:43:39 flameeyes Exp $
 
 inherit eutils libtool autotools
 
@@ -50,6 +50,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-fbsd.patch"
+	epatch "${FILESDIR}/${P}-moduledetect.patch"
 
 	eautoreconf
 	elibtoolize