From c3b3c0a153602e24a14602b30bc81027085f532b Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Sun, 19 Feb 2006 18:26:43 +0000
Subject: Changes 1.0.7: LASH support has been added. Improved command line
 argument handling. AMD-64 bugfixes Few synthesis bugfixes. Other
 miscellaneous improvements.

---
 audio/fluidsynth/Makefile         |  4 +--
 audio/fluidsynth/buildlink3.mk    |  4 +--
 audio/fluidsynth/distinfo         | 11 +++++----
 audio/fluidsynth/patches/patch-ac |  6 ++---
 audio/fluidsynth/patches/patch-ae | 52 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 65 insertions(+), 12 deletions(-)
 create mode 100644 audio/fluidsynth/patches/patch-ae

(limited to 'audio')

diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index 16ed8985779..1306808ab4e 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2005/11/08 00:59:37 tv Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/19 18:26:43 adam Exp $
 
-DISTNAME=	fluidsynth-1.0.6
+DISTNAME=	fluidsynth-1.0.7
 CATEGORIES=	audio
 MASTER_SITES=	http://savannah.nongnu.org/download/fluid/
 
diff --git a/audio/fluidsynth/buildlink3.mk b/audio/fluidsynth/buildlink3.mk
index dd1c4c116f5..e2620861f3b 100644
--- a/audio/fluidsynth/buildlink3.mk
+++ b/audio/fluidsynth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/04/25 13:53:37 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/02/19 18:26:43 adam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FLUIDSYNTH_BUILDLINK3_MK:=	${FLUIDSYNTH_BUILDLINK3_MK}+
@@ -17,4 +17,4 @@ BUILDLINK_PKGSRCDIR.fluidsynth?=	../../audio/fluidsynth
 
 .include "../../devel/readline/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/fluidsynth/distinfo b/audio/fluidsynth/distinfo
index d0114aa51df..8af79d01278 100644
--- a/audio/fluidsynth/distinfo
+++ b/audio/fluidsynth/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.3 2005/10/31 15:23:54 tv Exp $
+$NetBSD: distinfo,v 1.4 2006/02/19 18:26:43 adam Exp $
 
-SHA1 (fluidsynth-1.0.6.tar.gz) = 8ef8c851d3b8ad1c458485a7d9aa13b1a70b7d9c
-RMD160 (fluidsynth-1.0.6.tar.gz) = 7699dae455816844d80c204c99cf11efd8fb6d64
-Size (fluidsynth-1.0.6.tar.gz) = 1022289 bytes
+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 (patch-aa) = 0cd5f42d4df763ef358f1d8a05826e0626882bf2
 SHA1 (patch-ab) = 8b9f615cf81bab81e0e6fc8f3e1c1a589b29cd90
-SHA1 (patch-ac) = b8c2b2aa180beeb5aa0292f2cce31f68a903a39d
+SHA1 (patch-ac) = 70ec9f3fef081d0b1a5a9528ee2c57310f586cfc
 SHA1 (patch-ad) = 36e62eb4efc1c380f9cb8cfc5777493c0162f719
+SHA1 (patch-ae) = a4385b093eed89f752bead6408400c97be065a41
diff --git a/audio/fluidsynth/patches/patch-ac b/audio/fluidsynth/patches/patch-ac
index 98036d32cd6..4271d9cccf8 100644
--- a/audio/fluidsynth/patches/patch-ac
+++ b/audio/fluidsynth/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2005/07/14 12:49:34 adam Exp $
+$NetBSD: patch-ac,v 1.3 2006/02/19 18:26:43 adam Exp $
 
---- configure.orig	2005-06-11 22:04:33.000000000 +0000
+--- configure.orig	2006-02-19 10:38:11.000000000 +0100
 +++ configure
-@@ -20432,7 +20432,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -21310,7 +21310,7 @@ cat >>confdefs.h <<\_ACEOF
  _ACEOF
  
  else
diff --git a/audio/fluidsynth/patches/patch-ae b/audio/fluidsynth/patches/patch-ae
new file mode 100644
index 00000000000..0961484ccbb
--- /dev/null
+++ b/audio/fluidsynth/patches/patch-ae
@@ -0,0 +1,52 @@
+$NetBSD: patch-ae,v 1.1 2006/02/19 18:26:43 adam Exp $
+
+--- src/fluidsynth.c.orig	2006-02-19 19:20:31.000000000 +0100
++++ src/fluidsynth.c
+@@ -214,9 +214,9 @@ int main(int argc, char** argv) 
+   int audio_channels = 0;
+   int with_server = 0;
+   int dump = 0;
+-  int connect_lash = 1;
+   char *optchars = "a:C:c:df:G:g:hijK:L:lm:no:R:r:sVvz:";
+ #ifdef LASH_ENABLED
++  int connect_lash = 1;
+   int enabled_lash = 0;		/* set to TRUE if lash gets enabled */
+   fluid_lash_args_t *lash_args;
+ 
+@@ -239,7 +239,9 @@ int main(int argc, char** argv) 
+       {"audio-groups", 1, 0, 'G'},
+       {"chorus", 1, 0, 'C'},
+       {"connect-jack-outputs", 0, 0, 'j'},
++#ifdef LASH_ENABLED
+       {"disable-lash", 0, 0, 'l'},
++#endif
+       {"dump", 0, 0, 'd'},
+       {"gain", 1, 0, 'g'},
+       {"help", 0, 0, 'h'},
+@@ -345,9 +347,11 @@ int main(int argc, char** argv) 
+       audio_channels = atoi(optarg);
+       fluid_settings_setint(settings, "synth.audio-channels", audio_channels);
+       break;
++#ifdef LASH_ENABLED
+     case 'l':			/* disable LASH */
+       connect_lash = 0;
+       break;
++#endif
+     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);
+ #endif
+ 
++#ifdef LASH_ENABLED
+   /* connect to the lash server */
+   if (connect_lash)
+     {
+       enabled_lash = fluid_lash_connect (lash_args);
+       fluid_settings_setint (settings, "lash.enable", enabled_lash ? 1 : 0);
+     }
++#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