3 files changed, 52 insertions, 3 deletions
diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index b061ffd7cb06..2f3a5840f4f7 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.25 2006/09/02 11:14:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.26 2006/09/02 11:33:59 flameeyes Exp $
+
+  02 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/pulseaudio-0.9.5-fbsd.patch, pulseaudio-0.9.5.ebuild:
+  Add patch to build on FreeBSD, and re add ~x86-fbsd keyword.
 
   02 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
   pulseaudio-0.9.5.ebuild:
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.5-fbsd.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.5-fbsd.patch
new file mode 100644
index 000000000000..d1105774d65f
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-0.9.5-fbsd.patch
@@ -0,0 +1,44 @@
+Index: src/utils/padsp.c
+===================================================================
+--- src/utils/padsp.c	(revision 1358)
++++ src/utils/padsp.c	(working copy)
+@@ -53,6 +53,11 @@
+ #include <pulsecore/llist.h>
+ #include <pulsecore/gccmacro.h>
+ 
++/* On some systems SIOCINQ isn't defined, but FIONREAD is just an alias */
++#if !defined(SIOCINQ) && defined(FIONREAD)
++# define SIOCINQ FIONREAD
++#endif
++
+ typedef enum {
+     FD_INFO_MIXER,
+     FD_INFO_STREAM,
+Index: src/modules/oss-util.c
+===================================================================
+--- src/modules/oss-util.c	(revision 1358)
++++ src/modules/oss-util.c	(working copy)
+@@ -93,7 +93,11 @@
+     
+     pa_log_debug("capabilities:%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+                  *pcaps & DSP_CAP_BATCH ? " BATCH" : "",
++#ifdef DSP_CAP_BIND
+                  *pcaps & DSP_CAP_BIND ? " BIND" : "",
++#else
++		 "",
++#endif
+                  *pcaps & DSP_CAP_COPROC ? " COPROC" : "",
+                  *pcaps & DSP_CAP_DUPLEX ? " DUPLEX" : "",
+ #ifdef DSP_CAP_FREERATE                     
+@@ -112,7 +116,11 @@
+ #else
+                  "",
+ #endif
++#ifdef DSP_CAP_MULTI
+                  *pcaps & DSP_CAP_MULTI ? " MULTI" : "",
++#else
++		 "",
++#endif
+ #ifdef DSP_CAP_OUTPUT
+                  *pcaps & DSP_CAP_OUTPUT ? " OUTPUT" : "",
+ #else
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.5.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.5.ebuild
index 12a8707dfea8..c8320f7783d7 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.5.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.5.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.ebuild,v 1.2 2006/09/02 11:14:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.5.ebuild,v 1.3 2006/09/02 11:33:59 flameeyes Exp $
 
 inherit eutils libtool # autotools
 
@@ -10,7 +10,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="alsa avahi caps jack lirc oss tcpd X hal"
 
@@ -52,6 +52,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${PN}-0.9.2-esdcompat.patch"
+	epatch "${FILESDIR}/${P}-fbsd.patch"
 
 	# eautoreconf
 	elibtoolize