fluidsynth 1.1.5
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Mon, 24 Oct 2011 02:08:11 +0000 (21:08 -0500)
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Mon, 24 Oct 2011 02:08:11 +0000 (21:08 -0500)
1.1.5-cygwin-winmm.patch [new file with mode: 0644]
1.1.5-vpath.patch [new file with mode: 0644]
fluidsynth-1.0.8-1.cygport [deleted file]
fluidsynth-1.0.8-1.src.patch [deleted file]
fluidsynth-1.1.5-1.cygport [new file with mode: 0644]
fluidsynth.hint [moved from bin.hint with 100% similarity]
libfluidsynth-devel.hint [moved from devel.hint with 73% similarity]
libfluidsynth1.hint [moved from lib.hint with 75% similarity]

diff --git a/1.1.5-cygwin-winmm.patch b/1.1.5-cygwin-winmm.patch
new file mode 100644 (file)
index 0000000..0a6c084
--- /dev/null
@@ -0,0 +1,75 @@
+--- origsrc/fluidsynth-1.1.5/configure.ac      2011-09-04 02:38:58.000000000 -0500
++++ src/fluidsynth-1.1.5/configure.ac  2011-10-23 19:22:47.857759600 -0500
+@@ -64,11 +64,17 @@ LIBFLUID_LIBS="-lm"
+ dnl Machine specific checks and defines
+ case "${host_os}" in
++cygwin*)
++  winmidi_support="yes"
++  LIBFLUID_LDFLAGS="-no-undefined"
++  LIBFLUID_LIBS="-lwinmm"
++  ;;
+ darwin*)
+   AC_DEFINE(DARWIN, 1, [Define if building for Mac OS X Darwin])
+   ;;
+ mingw*)
+   mingw32_support="yes"
++  winmidi_support="yes"
+   CFLAGS="$CFLAGS -mms-bitfields"
+   AC_DEFINE(MINGW32, 1, [Define if using the MinGW32 environment])
+   LIBFLUID_LIBS="-ldsound -lwinmm -lws2_32"
+@@ -95,6 +101,7 @@ AC_LIB_PROG_LD_GNU
+ AM_CONDITIONAL(GNU_LD_SUPPORT, test "x$with_gnu_ld" = "xyes")
+ AM_CONDITIONAL(MINGW32_SUPPORT, test "$mingw32_support" == "yes")
++AM_CONDITIONAL(WINMIDI_SUPPORT, test "$winmidi_support" == "yes")
+ AC_ARG_ENABLE(double, AS_HELP_STRING([--enable-double],
+       [double floating point for dsp (default=float)]),
+--- origsrc/fluidsynth-1.1.5/src/Makefile.am   2011-09-04 02:38:58.000000000 -0500
++++ src/fluidsynth-1.1.5/src/Makefile.am       2011-10-23 19:23:48.245464900 -0500
+@@ -33,7 +33,11 @@ fluid_portaudio = drivers/fluid_portaudi
+ endif
+ if MINGW32_SUPPORT
+-fluid_windows = fluid_dll.c drivers/fluid_dsound.c drivers/fluid_winmidi.c
++fluid_windows = fluid_dll.c drivers/fluid_dsound.c
++endif
++
++if WINMIDI_SUPPORT
++fluid_winmidi = drivers/fluid_winmidi.c
+ endif
+ if OSS_SUPPORT
+@@ -94,6 +98,7 @@ libfluidsynth_la_SOURCES = \
+       $(fluid_portaudio) \
+       $(fluid_pulse) \
+       $(fluid_windows) \
++      $(fluid_winmidi) \
+       $(fluid_dart) \
+       $(fluid_rtkit) \
+     utils/fluid_conv.c \
+--- origsrc/fluidsynth-1.1.5/src/drivers/fluid_winmidi.c       2011-09-04 02:38:58.000000000 -0500
++++ src/fluidsynth-1.1.5/src/drivers/fluid_winmidi.c   2011-10-23 20:11:41.446074700 -0500
+@@ -37,6 +37,8 @@
+ #include "fluid_midi.h"
+ #include "fluid_mdriver.h"
+ #include "fluid_settings.h"
++#include <windows.h>
++#include <mmsystem.h>
+ #define MIDI_SYSEX_MAX_SIZE     512
+ #define MIDI_SYSEX_BUF_COUNT    16
+--- origsrc/fluidsynth-1.1.5/src/utils/fluidsynth_priv.h       2011-09-04 02:38:58.000000000 -0500
++++ src/fluidsynth-1.1.5/src/utils/fluidsynth_priv.h   2011-10-23 20:10:39.732367100 -0500
+@@ -140,6 +140,10 @@
+ #define WITHOUT_SERVER 1
+ #endif
++#ifdef __CYGWIN__
++#define WINMIDI_SUPPORT 1
++#endif
++
+ #include "fluidsynth.h"
diff --git a/1.1.5-vpath.patch b/1.1.5-vpath.patch
new file mode 100644 (file)
index 0000000..9085e6a
--- /dev/null
@@ -0,0 +1,12 @@
+--- origsrc/fluidsynth-1.1.5/src/Makefile.am   2011-09-04 02:38:58.000000000 -0500
++++ src/fluidsynth-1.1.5/src/Makefile.am       2011-10-06 23:27:55.652714700 -0500
+@@ -164,7 +169,8 @@ libfluidsynth_la_SOURCES = \
+     bindings/fluid_ladspa.h \
+     bindings/fluid_filerenderer.c 
+-INCLUDES = -I$(top_srcdir)/include \
++INCLUDES = -I$(top_builddir)/include \
++  -I$(top_srcdir)/include \
+   -I$(top_srcdir)/src \
+   -I$(top_srcdir)/src/drivers \
+   -I$(top_srcdir)/src/synth \
diff --git a/fluidsynth-1.0.8-1.cygport b/fluidsynth-1.0.8-1.cygport
deleted file mode 100644 (file)
index b51089c..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION="SoundFont software synthesizer"
-HOMEPAGE="http://fluidsynth.resonance.org/"
-SRC_URI="http://download.savannah.gnu.org/releases/fluid/${P}.tar.gz"
-
-abi=1
-PKG_NAMES="${PN} lib${PN}${abi} lib${PN}-devel"
-PKG_HINTS="bin lib devel"
-PKG_CONTENTS[0]="usr/bin/*.exe usr/share/"
-PKG_CONTENTS[1]="usr/bin/*-${abi}.dll"
-PKG_CONTENTS[2]="usr/include/ usr/lib/"
-
-CYGCONF_ARGS="
-  --disable-alsa-support
-  --enable-oss-support
-  --disable-midishare
-  --disable-coreaudio
-  --disable-lash
-  --disable-ladcca
-  ac_cv_header_windows_h=no
-"
diff --git a/fluidsynth-1.0.8-1.src.patch b/fluidsynth-1.0.8-1.src.patch
deleted file mode 100644 (file)
index a8f1757..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
---- origsrc/fluidsynth-1.0.8/configure.ac      2007-11-17 15:32:03.000000000 -0600
-+++ src/fluidsynth-1.0.8/configure.ac  2008-07-18 01:49:42.171875000 -0500
-@@ -28,11 +28,11 @@
- dnl if any interfaces have been added: LT_AGE++
- dnl if any interfaces have been removed/changed (compatibility broken): LT_AGE=0
--LT_CURRENT=2
--LT_REVISION=2
--LT_AGE=1
-+_lt_CURRENT=2
-+_lt_REVISION=2
-+_lt_AGE=1
--LT_VERSION_INFO="${LT_CURRENT}:${LT_REVISION}:${LT_AGE}"
-+LT_VERSION_INFO="${_lt_CURRENT}:${_lt_REVISION}:${_lt_AGE}"
- AC_SUBST(LT_VERSION_INFO)
- AM_CONFIG_HEADER(src/config.h)
-@@ -63,10 +63,16 @@
- dnl Machine specific checks and defines
- case "${host_os}" in
-+cygwin*)
-+  winmidi_support="yes"
-+  LIBFLUID_LDFLAGS="-no-undefined"
-+  LIBFLUID_LIBS="-lwinmm"
-+  ;;
- darwin*)
-   AC_DEFINE(DARWIN, 1, [Define if building for Mac OS X Darwin])
-   ;;
- mingw*)
-+  winmidi_support="yes"
-   mingw32_support="yes"
-   CFLAGS="$CFLAGS -mms-bitfields"
-   AC_DEFINE(MINGW32, 1, [Define if using the MinGW32 environment])
-@@ -83,6 +89,7 @@
- AC_SUBST(FLUID_CPPFLAGS)
- AM_CONDITIONAL(MINGW32_SUPPORT, test "$mingw32_support" == "yes")
-+AM_CONDITIONAL(WINMIDI_SUPPORT, test "$winmidi_support" == "yes")
- AC_ARG_ENABLE(double, AS_HELP_STRING([--enable-double],
-       [double floating point for dsp (default=float)]),
---- origsrc/fluidsynth-1.0.8/src/Makefile.am   2007-11-11 14:06:28.000000000 -0600
-+++ src/fluidsynth-1.0.8/src/Makefile.am       2008-07-18 01:49:11.593750000 -0500
-@@ -14,7 +14,11 @@
- endif
- if MINGW32_SUPPORT
--fluid_windows = fluid_dll.c fluid_dsound.c fluid_winmidi.c
-+fluid_windows = fluid_dll.c fluid_dsound.c
-+endif
-+
-+if WINMIDI_SUPPORT
-+fluid_winmidi = fluid_winmidi.c
- endif
- if OSS_SUPPORT
-@@ -48,6 +52,7 @@
-       $(fluid_lash) \
-       $(fluid_oss) \
-       $(fluid_windows) \
-+      $(fluid_winmidi) \
-       fluid_adriver.c \
-       fluid_adriver.h \
-       fluid_chan.c \
---- origsrc/fluidsynth-1.0.8/src/fluidsynth_priv.h     2007-11-11 04:56:18.000000000 -0600
-+++ src/fluidsynth-1.0.8/src/fluidsynth_priv.h 2008-07-18 00:02:49.140625000 -0500
-@@ -137,6 +137,10 @@
- #define WITHOUT_SERVER 1
- #endif
-+#ifdef __CYGWIN__
-+#define WINMIDI_SUPPORT 1
-+#endif
-+
- #include "fluidsynth.h"
diff --git a/fluidsynth-1.1.5-1.cygport b/fluidsynth-1.1.5-1.cygport
new file mode 100644 (file)
index 0000000..e978258
--- /dev/null
@@ -0,0 +1,24 @@
+DESCRIPTION="SoundFont software synthesizer"
+HOMEPAGE="http://sourceforge.net/apps/trac/fluidsynth/"
+SRC_URI="mirror://sourceforge/fluidsynth/${P}.tar.bz2"
+
+PATCH_URI="1.1.5-cygwin-winmm.patch
+          1.1.5-vpath.patch"
+
+PKG_NAMES="${PN} lib${PN}1 lib${PN}-devel"
+fluidsynth_CONTENTS="usr/bin/*.exe usr/share/"
+libfluidsynth1_CONTENTS="usr/bin/cygfluidsynth-1.dll"
+libfluidsynth_devel_CONTENTS="usr/include/ usr/lib/"
+
+# dbus-support:  only for RealtimeKit
+CYGCONF_ARGS="
+  --disable-alsa-support
+  --disable-oss-support
+  --disable-midishare
+  --disable-coreaudio
+  --disable-dbus-support
+  --disable-lash
+  --disable-ladcca
+  --enable-portaudio
+  ac_cv_header_windows_h=no
+"
similarity index 100%
rename from bin.hint
rename to fluidsynth.hint
similarity index 73%
rename from devel.hint
rename to libfluidsynth-devel.hint
index 8550ac8ea138ea631353fedc9f9ca087a0b2029d..a4914fa0e143ac5c96cbcff5bb2576dca46cb51a 100644 (file)
@@ -1,5 +1,5 @@
 category: Audio
-requires: libfluidsynth1 readline w32api
+requires: libfluidsynth1 libglib2.0-devel readline libsndfile-devel
 external-source: fluidsynth
 sdesc: "SoundFont software synthesizer (libdevel)"
 ldesc: "FluidSynth is a real-time software synthesizer based on the
similarity index 75%
rename from lib.hint
rename to libfluidsynth1.hint
index 6fbdfda2df65b0c7b2d7af8cfa03640fb226110c..7704d9d24bb50a3428c11a9ee77fb52da4aaf173 100644 (file)
--- a/lib.hint
@@ -1,5 +1,5 @@
 category: Audio
-requires: libreadline6
+requires: libglib2.0_0 libportaudio2 libreadline7 libsndfile1
 external-source: fluidsynth
 sdesc: "SoundFont software synthesizer (runtime)"
 ldesc: "FluidSynth is a real-time software synthesizer based on the
This page took 0.027733 seconds and 5 git commands to generate.