[SCM] fluidsynth/master: fix FTBFS

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 423aac14818cad29e2d1d4fb198c61282fc5c3ad
Author: Christoph Egger <christoph at debian.org>
Date:   Thu Jan 17 23:18:13 2013 +0100

    fix FTBFS
    
    Closes: #690006

diff --git a/debian/patches/10-ftbfs-bug-690006.patch b/debian/patches/10-ftbfs-bug-690006.patch
new file mode 100644
index 0000000..b7157fc
--- /dev/null
+++ b/debian/patches/10-ftbfs-bug-690006.patch
@@ -0,0 +1,16 @@
+From: Christoph Egger <christoph at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690006
+Description: Revert broken patch from release 1.1.6
+
+diff --git a/src/drivers/fluid_oss.c b/src/drivers/fluid_oss.c
+index 840dad1..40761db 100644
+--- a/src/drivers/fluid_oss.c
++++ b/src/drivers/fluid_oss.c
+@@ -45,7 +45,7 @@
+ #define BUFFER_LENGTH 512
+ 
+ // Build issue on some systems (OSS 4.0)?
+-#ifdef SNDCTL_DSP_CHANNELS
++#ifndef SOUND_PCM_WRITE_CHANNELS
+   #define SOUND_PCM_WRITE_CHANNELS        SNDCTL_DSP_CHANNELS
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index bf95dad..898537c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+10-ftbfs-bug-690006.patch
 1001-revert_abi_break_114.patch

-- 
fluidsynth packaging