diff options
| author | marino <marino> | 2012-08-24 06:35:20 +0000 |
|---|---|---|
| committer | marino <marino> | 2012-08-24 06:35:20 +0000 |
| commit | f2173a5a3dedd00c193fe957e3bd9d7740bd5275 (patch) | |
| tree | 5369dd0cf118e6e240d1cf168b5473e29850178f /audio/fluidsynth | |
| parent | 1d08763ced1f03f0fefb73bf95dc56353dc586c3 (diff) | |
| download | pkgsrc-f2173a5a3dedd00c193fe957e3bd9d7740bd5275.tar.gz | |
audio/fluidsynth: Fix DragonFly regression with v1.1.6
Fluidsynth was redefining a properly-defined macro to null based on an
apparently flawed assumption. Add a condition to check if the macro is
defined before redefining.
This modified patch may fix more than just DragonFly.
Diffstat (limited to 'audio/fluidsynth')
| -rw-r--r-- | audio/fluidsynth/distinfo | 4 | ||||
| -rw-r--r-- | audio/fluidsynth/patches/patch-aa | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/audio/fluidsynth/distinfo b/audio/fluidsynth/distinfo index 8e054478de1..bde311a8a25 100644 --- a/audio/fluidsynth/distinfo +++ b/audio/fluidsynth/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.12 2012/08/19 21:39:40 adam Exp $ +$NetBSD: distinfo,v 1.13 2012/08/24 06:35:20 marino Exp $ SHA1 (fluidsynth-1.1.6.tar.bz2) = 1d45fc3263d85f867efd809bdacb5d6116243c35 RMD160 (fluidsynth-1.1.6.tar.bz2) = 27b17e1e097004dd3cf8fb88d8e4499eeb339ea8 Size (fluidsynth-1.1.6.tar.bz2) = 823783 bytes -SHA1 (patch-aa) = 1819b1e969b4b98dc7677cdfbff624be3f3ec666 +SHA1 (patch-aa) = 16279c3f937b903cdfbc1a26b67606500e33a546 SHA1 (patch-ac) = 81ca2243404a4fd1a3f93da82116c276db7fb42c SHA1 (patch-ad) = edb221360d033804d04c15560a80e9d08e8406bc SHA1 (patch-ae) = a536d0d16e7b4a138e69b0b0d91f2926e0675e45 diff --git a/audio/fluidsynth/patches/patch-aa b/audio/fluidsynth/patches/patch-aa index c9be99e42ae..a96a9db81dc 100644 --- a/audio/fluidsynth/patches/patch-aa +++ b/audio/fluidsynth/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2012/01/28 13:15:32 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2012/08/24 06:35:20 marino Exp $ ---- src/drivers/fluid_oss.c.orig 2011-09-04 07:38:58.000000000 +0000 +--- src/drivers/fluid_oss.c.orig 2012-08-16 04:01:13.000000000 +0000 +++ src/drivers/fluid_oss.c -@@ -42,6 +42,12 @@ +@@ -42,10 +42,16 @@ #include <errno.h> #include <sys/poll.h> @@ -15,6 +15,11 @@ $NetBSD: patch-aa,v 1.3 2012/01/28 13:15:32 wiz Exp $ #define BUFFER_LENGTH 512 // Build issue on some systems (OSS 4.0)? +-#ifdef SNDCTL_DSP_CHANNELS ++#if defined (SNDCTL_DSP_CHANNELS) && !defined (SOUND_PCM_WRITE_CHANNELS) + #define SOUND_PCM_WRITE_CHANNELS SNDCTL_DSP_CHANNELS + #endif + @@ -101,7 +107,7 @@ static void fluid_oss_midi_run(void* d); void fluid_oss_audio_driver_settings(fluid_settings_t* settings) |