Bug#690006: fluidsynth: FTBFS

[Steven Chamberlain]

Control: tags -1 + patch

Hi,

On 08/10/12 23:00, Christoph Egger wrote:
> [ 10%] Building C object src/CMakeFiles/libfluidsynth.dir/drivers/fluid_pulse.c.o
> cd /build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/obj-x86_64-kfreebsd-gnu/src && /usr/bin/gcc  -Dlibfluidsynth_EXPORTS -DHAVE_CONFIG_H -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2  -O2 -g -fomit-frame-pointer -funroll-all-loops -finline-functions -DNDEBUG -Wall -W -Wpointer-arith -Wbad-function-cast -Wno-cast-qual -Wcast-align -Wstrict-prototypes -Wno-unused-parameter -Wdeclaration-after-statement -fPIC -I/build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/obj-x86_64-kfreebsd-gnu -I/build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/src -I/build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/src/drivers -I/build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/src/synth -I/build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/src/rvoice -I/build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/s
rc/midi -I/build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/src/utils -I/build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/src/sfloader -I/build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/src/bindings -I/build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/include -I/build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/obj-x86_64-kfreebsd-gnu/include -I/usr/include/glib-2.0 -I/usr/lib/x86_64-kfreebsd-gnu/glib-2.0/include    -o CMakeFiles/libfluidsynth.dir/drivers/fluid_pulse.c.o   -c /build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/src/drivers/fluid_pulse.c
> /build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/src/drivers/fluid_oss.c:49:0: warning: "SOUND_PCM_WRITE_CHANNELS" redefined [enabled by default]
> In file included from /build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/src/drivers/fluid_oss.c:35:0:
> /usr/include/sys/soundcard.h:791:0: note: this is the location of the previous definition
> /build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/src/drivers/fluid_oss.c: In function 'new_fluid_oss_audio_driver':
> /build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/src/drivers/fluid_oss.c:208:25: error: 'SOUND_PCM_WRITE_CHANNELS' undeclared (first use in this function)
> /build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/src/drivers/fluid_oss.c:208:25: note: each undeclared identifier is reported only once for each function it appears in
> /build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/src/drivers/fluid_oss.c: In function 'new_fluid_oss_audio_driver2':
> /build/buildd-fluidsynth_1.1.6-1-kfreebsd-amd64-3Nu5fI/fluidsynth-1.1.6/src/drivers/fluid_oss.c:323:25: error: 'SOUND_PCM_WRITE_CHANNELS' undeclared (first use in this function)
> make[3]: *** [src/CMakeFiles/libfluidsynth.dir/drivers/fluid_oss.c.o] Error 1

Regression was introduced by this upstream commit:

http://sourceforge.net/apps/trac/fluidsynth/changeset/444#file0

--- /trunk/fluidsynth/src/drivers/fluid_oss.c (revision 431)
+++ /trunk/fluidsynth/src/drivers/fluid_oss.c (revision 444)
@@ -46,5 +46,5 @@

 // Build issue on some systems (OSS 4.0)?
-#ifndef SOUND_PCM_WRITE_CHANNELS
+#ifdef SNDCTL_DSP_CHANNELS
   #define SOUND_PCM_WRITE_CHANNELS        SNDCTL_DSP_CHANNELS
 #endif


It's unclear what platform that 'fix' was targetting but it doesn't look
good.

I've tested on kfreebsd-amd64 and GNU/Linux amd64 with the above diff
reverted and that fixes the FTBFS.

Thanks!
Regards,
-- 
Steven Chamberlain
steven at pyro.eu.org