Bug#430366: pulseaudio: FTBFS on GNU/kFreeBSD

[Petr Salinger]

Package: pulseaudio
Severity: important
Version: 0.9.6-1
Tags: patch
User: [EMAIL PROTECTED]
Usertags: kfreebsd


Hi,

the current version fails to build on GNU/kFreeBSD.

It needs small tweak in source and OS specific
build-depends and pulseaudio.install.
Please find attached patch with that.

It would also be nice if you can ask upstream
to include change in src/pulsecore/core-util.c.
The extra ";" is required by newer gcc.

Thanks in advance

                        Petr
diff -u pulseaudio-0.9.6/debian/control pulseaudio-0.9.6/debian/control
--- pulseaudio-0.9.6/debian/control
+++ pulseaudio-0.9.6/debian/control
@@ -6,7 +6,9 @@
 Build-Depends: debhelper (>= 5), cdbs, quilt, autotools-dev, m4,
     libltdl3-dev, liboil0.3-dev (>= 0.3.0) | liboil-dev, libsamplerate0-dev,
     libsndfile1-dev (>= 1.0.10) | libsndfile-dev, libx11-dev,
-    x11proto-core-dev, libxt-dev, libcap-dev, libasound-dev, libglib2.0-dev,
+    x11proto-core-dev, libxt-dev, libglib2.0-dev,
+    libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], 
+    libasound-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
     libavahi-client-dev, libjack0.100.0-dev, libwrap0-dev,
     liblircclient-dev, libgconf2-dev, libhal-dev, libasyncns-dev,
     libatomic-ops-dev
diff -u pulseaudio-0.9.6/debian/rules pulseaudio-0.9.6/debian/rules
--- pulseaudio-0.9.6/debian/rules
+++ pulseaudio-0.9.6/debian/rules
@@ -8,6 +8,10 @@
        mkdir -p $(CURDIR)/debian/tmp/usr/share/lintian
        cp -a $(CURDIR)/debian/overrides $(CURDIR)/debian/tmp/usr/share/lintian
 
+clean::
+       grep -v -e alsa -e evdev debian/pulseaudio.install > 
debian/pulseaudio.install.kfreebsd-i386
+       grep -v -e alsa -e evdev debian/pulseaudio.install > 
debian/pulseaudio.install.kfreebsd-amd64
+
 DEB_CONFIGURE_EXTRA_FLAGS = --with-realtime-group=pulse-rt
 DEB_FIXPERMS_EXCLUDE = usr/bin/pulseaudio
 DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-0.9/modules
only in patch2:
unchanged:
--- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c
+++ pulseaudio-0.9.6/src/pulsecore/core-util.c
@@ -544,6 +544,7 @@
         cap_free(caps);
     }
 #endif
+    ;
 }
 
 /* Reset the priority to normal, inverting the changes made by 
pa_raise_priority() */