diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-07-18 17:43:40 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-07-18 17:43:40 +0000 |
| commit | 38b18fd333da4df56660a7957fb83af9fbf60b88 (patch) | |
| tree | 63f9c623d2ed8e0e6c2ee01fc8947bda1fbdd5ca /media-sound | |
| parent | Stable x86 for amarok (diff) | |
| download | gentoo-2-38b18fd333da4df56660a7957fb83af9fbf60b88.tar.gz gentoo-2-38b18fd333da4df56660a7957fb83af9fbf60b88.tar.bz2 gentoo-2-38b18fd333da4df56660a7957fb83af9fbf60b88.zip | |
Add patch to allow module-detect to work on FreeBSD.
(Portage version: 2.1.1_pre3-r1)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/pulseaudio/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/pulseaudio/files/pulseaudio-0.9.2-moduledetect.patch | 40 | ||||
| -rw-r--r-- | media-sound/pulseaudio/pulseaudio-0.9.2.ebuild | 3 |
3 files changed, 47 insertions, 2 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/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 |