fluidsynth 1.1.10 master
authorYaakov Selkowitz <yselkowi@redhat.com>
Thu, 22 Mar 2018 00:48:02 +0000 (19:48 -0500)
committerYaakov Selkowitz <yselkowi@redhat.com>
Thu, 22 Mar 2018 00:48:02 +0000 (19:48 -0500)
1.1.10-cygwin-dsound-winmm.patch [new file with mode: 0644]
1.1.5-cygwin-winmm.patch [deleted file]
1.1.5-vpath.patch [deleted file]
fluidsynth.cygport

diff --git a/1.1.10-cygwin-dsound-winmm.patch b/1.1.10-cygwin-dsound-winmm.patch
new file mode 100644 (file)
index 0000000..57f0ed6
--- /dev/null
@@ -0,0 +1,108 @@
+--- origsrc/fluidsynth-1.1.10/CMakeLists.txt   2018-02-24 11:32:40.000000000 -0600
++++ src/fluidsynth-1.1.10/CMakeLists.txt       2018-03-21 17:25:05.179553800 -0500
+@@ -88,7 +88,7 @@ if ( CMAKE_SYSTEM MATCHES "OS2" )
+ endif ( CMAKE_SYSTEM MATCHES "OS2" )
+ # Initialize the library directory name suffix.
+-if (NOT MINGW AND NOT MSVC)
++if (NOT WIN32 AND NOT CYGWIN)
+ if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+   set ( _init_lib_suffix "64" )
+ else ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+@@ -165,14 +165,14 @@ endif ( CMAKE_COMPILER_IS_GNUCC OR "${CM
+ unset ( WINDOWS_SUPPORT CACHE )
+ unset ( WINDOWS_LIBS CACHE )
+ unset ( MINGW32 CACHE )
+-if ( WIN32 )
++if ( WIN32 OR CYGWIN )
+   include ( CheckIncludeFiles )
+   check_include_file ( windows.h HAVE_WINDOWS_H )
+   check_include_file ( io.h HAVE_IO_H )
+   check_include_file ( dsound.h HAVE_DSOUND_H )
+   check_include_files ( "windows.h;mmsystem.h" HAVE_MMSYSTEM_H )
+   set ( WINDOWS_SUPPORT ${HAVE_WINDOWS_H} )
+-  set ( WINDOWS_LIBS "dsound;winmm;ws2_32" )
++  set ( WINDOWS_LIBS "dsound;winmm" )
+   set ( LIBFLUID_CPPFLAGS "-DFLUIDSYNTH_DLL_EXPORTS" )
+   set ( FLUID_CPPFLAGS "-DFLUIDSYNTH_NOT_A_DLL" )
+   if (NOT MSVC)
+@@ -183,12 +183,12 @@ if ( WIN32 )
+     set ( MINGW32 1 )
+     add_definitions ( -mms-bitfields )
+   endif  ( MINGW )
+-else ( WIN32 )
++else ( WIN32 OR CYGWIN )
+ # Check PThreads, but not in Windows
+   find_package ( Threads REQUIRED )
+   set ( HAVE_LIBPTHREAD ${Threads_FOUND} )
+   set ( LIBFLUID_LIBS "m" ${CMAKE_THREAD_LIBS_INIT} )
+-endif ( WIN32 )
++endif ( WIN32 OR CYGWIN )
+ # IBM OS/2
+ unset ( DART_SUPPORT CACHE )
+--- origsrc/fluidsynth-1.1.10/cmake_admin/FindOSS.cmake        2018-02-24 11:32:40.000000000 -0600
++++ src/fluidsynth-1.1.10/cmake_admin/FindOSS.cmake    2018-03-21 17:13:19.154167200 -0500
+@@ -20,7 +20,7 @@ FIND_PATH(MACHINE_OSS_INCLUDE_DIR "machi
+ SET(OSS_FOUND FALSE)
+-if ( NOT WIN32 )
++if ( NOT WIN32 AND NOT CYGWIN )
+     IF(LINUX_OSS_INCLUDE_DIR)
+             SET(OSS_FOUND TRUE)
+@@ -40,7 +40,7 @@ if ( NOT WIN32 )
+             SET(HAVE_MACHINE_SOUNDCARD_H 1)
+     ENDIF()
+-ENDIF(NOT WIN32)
++ENDIF(NOT WIN32 AND NOT CYGWIN)
+ MARK_AS_ADVANCED (
+       OSS_FOUND
+--- origsrc/fluidsynth-1.1.10/src/CMakeLists.txt       2018-02-24 11:32:40.000000000 -0600
++++ src/fluidsynth-1.1.10/src/CMakeLists.txt   2018-03-21 17:13:50.746488600 -0500
+@@ -304,7 +304,6 @@ elseif ( WIN32 )
+ else ( MACOSX_FRAMEWORK )
+   set_target_properties ( libfluidsynth
+     PROPERTIES
+-      PREFIX "lib"
+       OUTPUT_NAME "fluidsynth"
+       VERSION ${LIB_VERSION_INFO}
+       SOVERSION ${LIB_VERSION_CURRENT}
+--- origsrc/fluidsynth-1.1.10/src/drivers/fluid_dsound.c       2018-02-24 11:32:40.000000000 -0600
++++ src/fluidsynth-1.1.10/src/drivers/fluid_dsound.c   2018-03-21 13:36:20.628698300 -0500
+@@ -26,6 +26,7 @@
+ #include "fluid_sys.h"
+ #include "fluid_adriver.h"
+ #include "fluid_settings.h"
++#include <windows.h>
+ #include <mmsystem.h>
+ #include <dsound.h>
+--- origsrc/fluidsynth-1.1.10/src/drivers/fluid_winmidi.c      2018-02-24 11:32:40.000000000 -0600
++++ src/fluidsynth-1.1.10/src/drivers/fluid_winmidi.c  2018-03-21 13:17:58.331037100 -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.10/src/utils/fluidsynth_priv.h      2018-02-24 11:32:40.000000000 -0600
++++ src/fluidsynth-1.1.10/src/utils/fluidsynth_priv.h  2018-03-21 13:36:41.061748000 -0500
+@@ -140,6 +140,11 @@
+ #define WITHOUT_SERVER 1
+ #endif
++#ifdef __CYGWIN__
++#define DSOUND_SUPPORT 1
++#define WINMIDI_SUPPORT 1
++#endif
++
+ #include "fluidsynth.h"
diff --git a/1.1.5-cygwin-winmm.patch b/1.1.5-cygwin-winmm.patch
deleted file mode 100644 (file)
index 0a6c084..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
---- 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
deleted file mode 100644 (file)
index 9085e6a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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 \
index 49da90856f0c970c9905d02a077ab0de43170077..69093e255a9df9bbcb355f763f8446476c78655e 100644 (file)
@@ -1,15 +1,15 @@
+inherit cmake
+
 NAME="fluidsynth"
-VERSION=1.1.6
+VERSION=1.1.10
 RELEASE=1
 CATEGORY="Audio"
 SUMMARY="SoundFont software synthesizer"
 DESCRIPTION="FluidSynth is a real-time software synthesizer based on the
 SoundFont 2 specifications."
-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"
+HOMEPAGE="http://www.fluidsynth.org/"
+SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${VERSION}/fluidsynth-${VERSION}.tar.gz"
+PATCH_URI="1.1.10-cygwin-dsound-winmm.patch"
 
 PKG_NAMES="${NAME} lib${NAME}1 lib${NAME}-devel"
 fluidsynth_CONTENTS="usr/bin/*.exe usr/share/"
@@ -18,17 +18,16 @@ libfluidsynth1_SUMMARY="${SUMMARY} library"
 libfluidsynth1_CONTENTS="usr/bin/cygfluidsynth-1.dll"
 libfluidsynth_devel_CATEGORY="Libs"
 libfluidsynth_devel_SUMMARY="${SUMMARY} library"
-libfluidsynth_devel_CONTENTS="usr/include/ usr/lib/"
+libfluidsynth_devel_CONTENTS="
+       usr/include/fluidsynth*
+       usr/lib/libfluidsynth.dll.a
+       usr/lib/pkgconfig/fluidsynth.pc
+"
 
-# dbus-support:  only for RealtimeKit
-# oss-support:  requires both /dev/dsp and /dev/midi, we don't have the latter
-CYGCONF_ARGS="
-  --disable-alsa-support
-  --disable-oss-support
-  --disable-midishare
-  --disable-coreaudio
-  --disable-dbus-support
-  --disable-lash
-  --disable-ladcca
-  ac_cv_header_windows_h=no
+# dbus: only for RealtimeKit
+# portaudio: playback is just static
+CYGCMAKE_ARGS="
+       -Denable-dbus=OFF
+       -Denable-midishare=OFF
+       -Denable-portaudio=OFF
 "
This page took 0.027609 seconds and 5 git commands to generate.