From e5392eb7b2d4764e0ade5b1fe1b74b9db8b7e295 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 5 Feb 2007 23:23:12 +0000
Subject: Update to 1.0.7a:

Uploaded FluidSynth 1.0.7a with a bug fix for the build error that
occurred when neither LASH or LADCCA were enabled.  Also contains an
updated README-OSX from Ebrahim Mayat.
---
 audio/fluidsynth/Makefile         |  6 ++++--
 audio/fluidsynth/distinfo         | 10 +++++-----
 audio/fluidsynth/patches/patch-ae | 13 +++++++------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index 841426440fc..b38c6baf33d 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2006/12/15 14:34:19 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/05 23:23:12 wiz Exp $
 
-DISTNAME=	fluidsynth-1.0.7
+DISTNAME=	fluidsynth-1.0.7a
 CATEGORIES=	audio
 MASTER_SITES=	http://savannah.nongnu.org/download/fluid/
 
@@ -8,6 +8,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.nongnu.org/fluid/
 COMMENT=	Software synthesizer based on SoundFont2
 
+WRKSRC=		${WRKDIR}/fluidsynth-1.0.7
+
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LIBTOOL=		yes
diff --git a/audio/fluidsynth/distinfo b/audio/fluidsynth/distinfo
index 18c0e6d6870..f2334fff58d 100644
--- a/audio/fluidsynth/distinfo
+++ b/audio/fluidsynth/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2006/10/02 15:29:36 rillig Exp $
+$NetBSD: distinfo,v 1.6 2007/02/05 23:23:12 wiz Exp $
 
-SHA1 (fluidsynth-1.0.7.tar.gz) = ac1572bddfaa19f20e27f349964b9224a4198b3a
-RMD160 (fluidsynth-1.0.7.tar.gz) = 1ec41b1401c41cfa8edb8fa715a42616e8459d55
-Size (fluidsynth-1.0.7.tar.gz) = 1064474 bytes
+SHA1 (fluidsynth-1.0.7a.tar.gz) = c1ab6dc2913539ea868c6d56f23381650f25c964
+RMD160 (fluidsynth-1.0.7a.tar.gz) = c4d31711443c0dad42937a38a0360d114525d076
+Size (fluidsynth-1.0.7a.tar.gz) = 1064677 bytes
 SHA1 (patch-aa) = 0cd5f42d4df763ef358f1d8a05826e0626882bf2
 SHA1 (patch-ab) = 8b9f615cf81bab81e0e6fc8f3e1c1a589b29cd90
 SHA1 (patch-ac) = 238fb1ee72c54a57ff57930b8fa1f7777009d616
 SHA1 (patch-ad) = 36e62eb4efc1c380f9cb8cfc5777493c0162f719
-SHA1 (patch-ae) = a4385b093eed89f752bead6408400c97be065a41
+SHA1 (patch-ae) = 175f319f90e71361a60225bc2d8f2050215697ab
diff --git a/audio/fluidsynth/patches/patch-ae b/audio/fluidsynth/patches/patch-ae
index 0961484ccbb..d59e4a73595 100644
--- a/audio/fluidsynth/patches/patch-ae
+++ b/audio/fluidsynth/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2006/02/19 18:26:43 adam Exp $
+$NetBSD: patch-ae,v 1.2 2007/02/05 23:23:12 wiz Exp $
 
---- src/fluidsynth.c.orig	2006-02-19 19:20:31.000000000 +0100
+--- src/fluidsynth.c.orig	2006-02-20 11:29:58.000000000 +0000
 +++ src/fluidsynth.c
 @@ -214,9 +214,9 @@ int main(int argc, char** argv) 
    int audio_channels = 0;
@@ -35,18 +35,19 @@ $NetBSD: patch-ae,v 1.1 2006/02/19 18:26:43 adam Exp $
      case 'm':
        fluid_settings_setstr(settings, "midi.driver", optarg);
        break;
-@@ -418,12 +422,14 @@ int main(int argc, char** argv) 
-   SetPriorityClass(GetCurrentProcess(), REALTIME_PRIORITY_CLASS);
+@@ -419,6 +423,7 @@ int main(int argc, char** argv) 
  #endif
  
+ #ifdef LASH_ENABLED
 +#ifdef LASH_ENABLED
    /* connect to the lash server */
    if (connect_lash)
      {
-       enabled_lash = fluid_lash_connect (lash_args);
+@@ -426,6 +431,7 @@ int main(int argc, char** argv) 
        fluid_settings_setint (settings, "lash.enable", enabled_lash ? 1 : 0);
      }
+ #endif
 +#endif
-   
+ 
    /* The 'groups' setting is only relevant for LADSPA operation
     * If not given, set number groups to number of audio channels, because
-- 
cgit v1.2.3