Changes 1.0.8:

* Bug fixes

7 files changed, 45 insertions, 47 deletions

diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index b38c6baf33d..068ab66cf78 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2007/02/05 23:23:12 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/12/16 15:18:28 adam Exp $
 
-DISTNAME=	fluidsynth-1.0.7a
+DISTNAME=	fluidsynth-1.0.8
 CATEGORIES=	audio
 MASTER_SITES=	http://savannah.nongnu.org/download/fluid/
 
@@ -8,8 +8,6 @@ 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 f2334fff58d..5e0a77a1c91 100644
--- a/audio/fluidsynth/distinfo
+++ b/audio/fluidsynth/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2007/02/05 23:23:12 wiz Exp $
+$NetBSD: distinfo,v 1.7 2007/12/16 15:18:29 adam Exp $
 
-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) = 175f319f90e71361a60225bc2d8f2050215697ab
+SHA1 (fluidsynth-1.0.8.tar.gz) = 1f5fd9964a7212f772905724497abd46ab1e2536
+RMD160 (fluidsynth-1.0.8.tar.gz) = 1f647625ed8937f480401836f3b6f7819fa46ab9
+Size (fluidsynth-1.0.8.tar.gz) = 1267922 bytes
+SHA1 (patch-aa) = 5a45b13669c928a10f6bddc0bfdd351a7cd863fc
+SHA1 (patch-ab) = 5bd951cdbc23fc69a5bd6cd09418505ee8447235
+SHA1 (patch-ac) = 8b4b9b5bad17d06b77f725d50fa0b98867103228
+SHA1 (patch-ad) = 2a02680082b86c4cd0f6e5ff54ccf69a865fcf1e
+SHA1 (patch-ae) = 44d56acc0288220a865548a883094e6b4fc891eb
diff --git a/audio/fluidsynth/patches/patch-aa b/audio/fluidsynth/patches/patch-aa
index fff40b6c3fd..701b8797bee 100644
--- a/audio/fluidsynth/patches/patch-aa
+++ b/audio/fluidsynth/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/04/25 13:53:37 adam Exp $
+$NetBSD: patch-aa,v 1.2 2007/12/16 15:18:29 adam Exp $
 
---- src/fluid_oss.c.orig	Wed Mar  3 03:02:28 2004
+--- src/fluid_oss.c.orig	2007-09-19 08:10:57.000000000 +0200
 +++ src/fluid_oss.c
 @@ -43,6 +43,12 @@
  #include <errno.h>
@@ -85,7 +85,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/25 13:53:37 adam Exp $
 +    devname = DEVOSSAUDIO;
    }
    if (stat(devname, &devstat) == -1) {
-     FLUID_LOG(FLUID_ERR, "Device <%s> does not exists", devname);    
+     FLUID_LOG(FLUID_ERR, "Device <%s> does not exists", devname);
 @@ -380,6 +398,13 @@ new_fluid_oss_audio_driver2(fluid_settin
      goto error_recovery;
    }
@@ -108,7 +108,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/25 13:53:37 adam Exp $
  
    return (fluid_audio_driver_t*) dev;
  
-@@ -644,7 +670,7 @@ fluid_oss_audio_run2(void* d)
+@@ -642,7 +668,7 @@ fluid_oss_audio_run2(void* d)
  
  void fluid_oss_midi_driver_settings(fluid_settings_t* settings)
  {
@@ -117,7 +117,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/25 13:53:37 adam Exp $
  }
  
  /*
-@@ -657,8 +683,10 @@ new_fluid_oss_midi_driver(fluid_settings
+@@ -655,8 +681,10 @@ new_fluid_oss_midi_driver(fluid_settings
    int err;
    fluid_oss_midi_driver_t* dev;
    pthread_attr_t attr;
@@ -126,9 +126,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/25 13:53:37 adam Exp $
    struct sched_param priority;
 +#endif
    char* device;
-   
+ 
    /* not much use doing anything */
-@@ -689,7 +717,7 @@ new_fluid_oss_midi_driver(fluid_settings
+@@ -687,7 +715,7 @@ new_fluid_oss_midi_driver(fluid_settings
    /* get the device name. if none is specified, use the default device. */
    fluid_settings_getstr(settings, "midi.oss.device", &device);
    if (device == NULL) {
@@ -137,7 +137,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/25 13:53:37 adam Exp $
    }
  
    /* open the default hardware device. only use midi in. */
-@@ -706,6 +734,14 @@ new_fluid_oss_midi_driver(fluid_settings
+@@ -704,6 +732,14 @@ new_fluid_oss_midi_driver(fluid_settings
      FLUID_LOG(FLUID_ERR, "Couldn't initialize midi thread attributes");
      goto error_recovery;
    }
@@ -152,10 +152,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/25 13:53:37 adam Exp $
    /* use fifo scheduling. if it fails, use default scheduling. */
    while (1) {
      err = pthread_attr_setschedpolicy(&attr, sched);
-@@ -737,6 +773,7 @@ new_fluid_oss_midi_driver(fluid_settings
+@@ -735,6 +771,7 @@ new_fluid_oss_midi_driver(fluid_settings
      }
      break;
-   }  
+   }
 +#endif /* __NetBSD__ */
    return (fluid_midi_driver_t*) dev;
  
diff --git a/audio/fluidsynth/patches/patch-ab b/audio/fluidsynth/patches/patch-ab
index 282e5a18f78..4d6f7a357ae 100644
--- a/audio/fluidsynth/patches/patch-ab
+++ b/audio/fluidsynth/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/04/25 13:53:37 adam Exp $
+$NetBSD: patch-ab,v 1.2 2007/12/16 15:18:29 adam Exp $
 
---- src/fluid_sys.c.orig	Fri Mar 26 01:20:55 2004
+--- src/fluid_sys.c.orig	2007-11-11 20:47:30.000000000 +0100
 +++ src/fluid_sys.c
-@@ -630,8 +630,10 @@ new_fluid_timer(int msec, fluid_timer_ca
+@@ -709,8 +709,10 @@ new_fluid_timer(int msec, fluid_timer_ca
  {
    pthread_attr_t *attr = NULL;
    pthread_attr_t rt_attr;
@@ -13,16 +13,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/04/25 13:53:37 adam Exp $
    int err;
  
    fluid_timer_t* timer = FLUID_NEW(fluid_timer_t);
-@@ -647,6 +649,7 @@ new_fluid_timer(int msec, fluid_timer_ca
+@@ -726,6 +728,7 @@ new_fluid_timer(int msec, fluid_timer_ca
    timer->auto_destroy = auto_destroy;
  
-   err = pthread_attr_init(&rt_attr); 
+   err = pthread_attr_init(&rt_attr);
 +#if !defined(__NetBSD__)
    if (err == 0) {
  	  err = pthread_attr_setschedpolicy(&rt_attr, SCHED_FIFO);
  	  if (err == 0) {
-@@ -657,6 +660,7 @@ new_fluid_timer(int msec, fluid_timer_ca
- 		  } 
+@@ -736,6 +739,7 @@ new_fluid_timer(int msec, fluid_timer_ca
+ 		  }
  	  }
    }
 +#endif
diff --git a/audio/fluidsynth/patches/patch-ac b/audio/fluidsynth/patches/patch-ac
index 22755adbf30..3246a66faaf 100644
--- a/audio/fluidsynth/patches/patch-ac
+++ b/audio/fluidsynth/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.4 2006/10/02 15:29:36 rillig Exp $
+$NetBSD: patch-ac,v 1.5 2007/12/16 15:18:29 adam Exp $
 
---- configure.orig	2006-02-19 10:38:11.000000000 +0100
-+++ configure	2006-10-02 17:27:18.000000000 +0200
-@@ -21101,7 +21101,7 @@ esac
+--- configure.orig	2007-11-17 22:32:16.000000000 +0100
++++ configure
+@@ -20727,7 +20727,7 @@ esac
  
  
  
--if test "$mingw32_support" == "yes"; then
-+if test "$mingw32_support" = "yes"; then
+- if test "$mingw32_support" == "yes"; then
++ if test "$mingw32_support" = "yes"; then
    MINGW32_SUPPORT_TRUE=
    MINGW32_SUPPORT_FALSE='#'
  else
-@@ -21310,7 +21310,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -20899,7 +20899,7 @@ cat >>confdefs.h <<\_ACEOF
  _ACEOF
  
  else
diff --git a/audio/fluidsynth/patches/patch-ad b/audio/fluidsynth/patches/patch-ad
index 9d581101c4e..1cd8eb61388 100644
--- a/audio/fluidsynth/patches/patch-ad
+++ b/audio/fluidsynth/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2005/10/31 15:23:54 tv Exp $
+$NetBSD: patch-ad,v 1.2 2007/12/16 15:18:29 adam Exp $
 
---- src/fluid_sys.h.orig	2003-03-11 11:57:51.000000000 -0500
+--- src/fluid_sys.h.orig	2007-11-11 20:30:20.000000000 +0100
 +++ src/fluid_sys.h
-@@ -261,7 +261,7 @@ extern fluid_profile_data_t fluid_profil
+@@ -268,7 +268,7 @@ extern fluid_profile_data_t fluid_profil
      sample data.
   */
  
diff --git a/audio/fluidsynth/patches/patch-ae b/audio/fluidsynth/patches/patch-ae
index d59e4a73595..ac38ee6225b 100644
--- a/audio/fluidsynth/patches/patch-ae
+++ b/audio/fluidsynth/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2007/02/05 23:23:12 wiz Exp $
+$NetBSD: patch-ae,v 1.3 2007/12/16 15:18:29 adam Exp $
 
---- src/fluidsynth.c.orig	2006-02-20 11:29:58.000000000 +0000
+--- src/fluidsynth.c.orig	2007-11-11 11:09:48.000000000 +0100
 +++ src/fluidsynth.c
-@@ -214,9 +214,9 @@ int main(int argc, char** argv) 
+@@ -212,9 +212,9 @@ int main(int argc, char** argv)
    int audio_channels = 0;
    int with_server = 0;
    int dump = 0;
@@ -13,7 +13,7 @@ $NetBSD: patch-ae,v 1.2 2007/02/05 23:23:12 wiz Exp $
    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) 
+@@ -237,7 +237,9 @@ int main(int argc, char** argv)
        {"audio-groups", 1, 0, 'G'},
        {"chorus", 1, 0, 'C'},
        {"connect-jack-outputs", 0, 0, 'j'},
@@ -23,7 +23,7 @@ $NetBSD: patch-ae,v 1.2 2007/02/05 23:23:12 wiz Exp $
        {"dump", 0, 0, 'd'},
        {"gain", 1, 0, 'g'},
        {"help", 0, 0, 'h'},
-@@ -345,9 +347,11 @@ int main(int argc, char** argv) 
+@@ -343,9 +345,11 @@ int main(int argc, char** argv)
        audio_channels = atoi(optarg);
        fluid_settings_setint(settings, "synth.audio-channels", audio_channels);
        break;
@@ -35,7 +35,7 @@ $NetBSD: patch-ae,v 1.2 2007/02/05 23:23:12 wiz Exp $
      case 'm':
        fluid_settings_setstr(settings, "midi.driver", optarg);
        break;
-@@ -419,6 +423,7 @@ int main(int argc, char** argv) 
+@@ -417,6 +421,7 @@ int main(int argc, char** argv)
  #endif
  
  #ifdef LASH_ENABLED
@@ -43,7 +43,7 @@ $NetBSD: patch-ae,v 1.2 2007/02/05 23:23:12 wiz Exp $
    /* connect to the lash server */
    if (connect_lash)
      {
-@@ -426,6 +431,7 @@ int main(int argc, char** argv) 
+@@ -424,6 +429,7 @@ int main(int argc, char** argv)
        fluid_settings_setint (settings, "lash.enable", enabled_lash ? 1 : 0);
      }
  #endif