mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 14:38:51 +02:00
fluidsynth2: bump version.
This commit is contained in:
Jerome Duval
@@ -1,25 +1,24 @@
|
||||
|
||||
From 9c30ce35e23b3cec58882b990864548901571353 Mon Sep 17 00:00:00 2001
|
||||
From 1eff2e12357cfd1abf9379276aa769d8aa0c0876 Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Sat, 22 Jun 2019 08:26:38 +0200
|
||||
Subject: Fix gcc2 build
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 9039c74..5a099ce 100644
|
||||
index 5e1a61b..fd25c2e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -182,7 +182,7 @@ if ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_
|
||||
@@ -188,7 +188,7 @@ if ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_C
|
||||
endif ( NOT APPLE AND NOT OS2 )
|
||||
|
||||
|
||||
# define some warning flags
|
||||
- set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wno-unused-parameter -Wdeclaration-after-statement -Werror=implicit-function-declaration" )
|
||||
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wcast-qual -Wstrict-prototypes" )
|
||||
|
||||
if ( CMAKE_C_COMPILER_ID STREQUAL "Intel" )
|
||||
# icc needs the restrict flag to recognize C99 restrict pointers
|
||||
|
||||
# prepend to build type specific flags, to allow users to override
|
||||
set ( CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" )
|
||||
diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c
|
||||
index 3436b76..124849e 100644
|
||||
index f27d7eb..17a31d1 100644
|
||||
--- a/src/synth/fluid_synth.c
|
||||
+++ b/src/synth/fluid_synth.c
|
||||
@@ -209,6 +209,7 @@ void fluid_synth_settings(fluid_settings_t *settings)
|
||||
@@ -39,5 +38,5 @@ index 3436b76..124849e 100644
|
||||
#ifdef DEFAULT_SOUNDFONT
|
||||
fluid_settings_register_str(settings, "synth.default-soundfont", DEFAULT_SOUNDFONT, 0);
|
||||
--
|
||||
2.23.0
|
||||
2.24.0
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
From a1e84fb39c3b2fbbd4e5cd9c84250467d01ec9d7 Mon Sep 17 00:00:00 2001
|
||||
From 74f0f4c325a36389ca3698408c28d4360ab21ae0 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 14 Apr 2019 17:27:45 +1000
|
||||
Subject: Add Haiku MediaKit support
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b759259..9622a62 100644
|
||||
index e6f1fe7..fb8c073 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -20,7 +20,8 @@
|
||||
@@ -18,15 +18,15 @@ index b759259..9622a62 100644
|
||||
set ( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_admin )
|
||||
|
||||
# FluidSynth package name
|
||||
@@ -69,6 +70,7 @@ option ( enable-network "enable network support (requires BSD sockets)" on )
|
||||
option ( enable-oss "compile OSS support (if it is available)" on )
|
||||
@@ -74,6 +75,7 @@ option ( enable-oss "compile OSS support (if it is available)" on )
|
||||
option ( enable-dsound "compile DirectSound support (if it is available)" on )
|
||||
option ( enable-waveout "compile Windows WaveOut support (if it is available)" on )
|
||||
option ( enable-winmidi "compile Windows MIDI support (if it is available)" on )
|
||||
+option ( enable-haiku "compile Haiku MediaKit audio support (if it is available)" on )
|
||||
option ( enable-sdl2 "compile SDL2 audio support (if it is available)" on )
|
||||
option ( enable-pkgconfig "use pkg-config to locate fluidsynth's (mostly optional) dependencies" on )
|
||||
option ( enable-pulseaudio "compile PulseAudio support (if it is available)" on )
|
||||
option ( enable-readline "compile readline lib line editing (if it is available)" on )
|
||||
@@ -92,7 +94,7 @@ if ( CMAKE_SYSTEM MATCHES "OS2" )
|
||||
@@ -102,7 +104,7 @@ if ( CMAKE_SYSTEM MATCHES "OS2" )
|
||||
endif ( CMAKE_SYSTEM MATCHES "OS2" )
|
||||
|
||||
# Initialize the library directory name suffix.
|
||||
@@ -35,7 +35,7 @@ index b759259..9622a62 100644
|
||||
if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
|
||||
set ( _init_lib_suffix "64" )
|
||||
else ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
|
||||
@@ -156,8 +158,10 @@ check_include_file ( getopt.h HAVE_GETOPT_H )
|
||||
@@ -166,8 +168,10 @@ check_include_file ( getopt.h HAVE_GETOPT_H )
|
||||
check_include_file ( stdint.h HAVE_STDINT_H )
|
||||
include ( TestInline )
|
||||
include ( TestVLA )
|
||||
@@ -46,9 +46,9 @@ index b759259..9622a62 100644
|
||||
|
||||
unset ( LIBFLUID_CPPFLAGS CACHE )
|
||||
unset ( LIBFLUID_LIBS CACHE )
|
||||
@@ -189,6 +193,11 @@ if ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_
|
||||
|
||||
endif ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "Intel" )
|
||||
@@ -205,6 +209,11 @@ if ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_C
|
||||
endif (CMAKE_C_COMPILER_ID STREQUAL "Intel" )
|
||||
endif ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "Intel" )
|
||||
|
||||
+# Haiku
|
||||
+if ( HAIKU )
|
||||
@@ -56,12 +56,12 @@ index b759259..9622a62 100644
|
||||
+endif ( HAIKU )
|
||||
+
|
||||
# Windows
|
||||
unset ( WINDOWS_SUPPORT CACHE )
|
||||
unset ( WINDOWS_LIBS CACHE )
|
||||
@@ -256,7 +265,11 @@ else ( WIN32 )
|
||||
unset ( DSOUND_SUPPORT CACHE )
|
||||
@@ -274,7 +283,11 @@ if ( WIN32 )
|
||||
else ( WIN32 )
|
||||
# Check PThreads, but not in Windows
|
||||
find_package ( Threads REQUIRED )
|
||||
set ( HAVE_LIBPTHREAD ${Threads_FOUND} )
|
||||
+if ( HAIKU )
|
||||
+ set ( LIBFLUID_LIBS "network;bsd;be;media" ${CMAKE_THREAD_LIBS_INIT} )
|
||||
+else ( HAIKU )
|
||||
@@ -70,25 +70,25 @@ index b759259..9622a62 100644
|
||||
endif ( WIN32 )
|
||||
|
||||
# IBM OS/2
|
||||
@@ -538,6 +551,11 @@ else(NOT enable-pkgconfig)
|
||||
endif ( LADSPA_SUPPORT )
|
||||
endif ( enable-ladspa )
|
||||
|
||||
@@ -592,6 +605,11 @@ else(NOT enable-pkgconfig)
|
||||
endif ( READLINE_FOUND )
|
||||
endif ( enable-readline )
|
||||
|
||||
+ unset ( HAIKU_SUPPORT CACHE )
|
||||
+ if ( enable-haiku )
|
||||
+ set ( HAIKU_SUPPORT 1 )
|
||||
+ endif ( enable-haiku )
|
||||
+
|
||||
+
|
||||
endif(NOT enable-pkgconfig)
|
||||
|
||||
unset ( AUFILE_SUPPORT CACHE )
|
||||
diff --git a/cmake_admin/report.cmake b/cmake_admin/report.cmake
|
||||
index e25a989..be77acc 100644
|
||||
index e8868ce..23eb4d5 100644
|
||||
--- a/cmake_admin/report.cmake
|
||||
+++ b/cmake_admin/report.cmake
|
||||
@@ -86,6 +86,12 @@ else ( WINMIDI_SUPPORT )
|
||||
message ( "WinMidi support: no" )
|
||||
endif ( WINMIDI_SUPPORT )
|
||||
@@ -135,6 +135,12 @@ else ( DBUS_SUPPORT )
|
||||
set ( MISC_REPORT "${MISC_REPORT} D-Bus: no\n" )
|
||||
endif ( DBUS_SUPPORT )
|
||||
|
||||
+if ( HAIKU_SUPPORT )
|
||||
+ message ( "Haiku MediaKit support: yes" )
|
||||
@@ -97,15 +97,15 @@ index e25a989..be77acc 100644
|
||||
+endif ( HAIKU_SUPPORT )
|
||||
+
|
||||
if ( LADSPA_SUPPORT )
|
||||
message ( "LADSPA support: yes" )
|
||||
set ( MISC_REPORT "${MISC_REPORT} LADSPA support: yes\n" )
|
||||
else ( LADSPA_SUPPORT )
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index a0ba53d..b96dfb5 100644
|
||||
index e043b91..689bae3 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -86,6 +86,10 @@ if ( WINMIDI_SUPPORT )
|
||||
set ( fluid_winmidi_SOURCES drivers/fluid_winmidi.c )
|
||||
endif ( WINMIDI_SUPPORT )
|
||||
@@ -97,6 +97,10 @@ if ( SDL2_SUPPORT )
|
||||
include_directories ( ${SDL2_INCLUDE_DIRS} )
|
||||
endif ( SDL2_SUPPORT )
|
||||
|
||||
+if ( HAIKU_SUPPORT )
|
||||
+ set ( fluid_haiku_SOURCES drivers/fluid_haiku.cpp )
|
||||
@@ -114,21 +114,21 @@ index a0ba53d..b96dfb5 100644
|
||||
if ( OSS_SUPPORT )
|
||||
set ( fluid_oss_SOURCES drivers/fluid_oss.c )
|
||||
endif ( OSS_SUPPORT )
|
||||
@@ -249,6 +253,7 @@ add_library ( libfluidsynth-OBJ OBJECT
|
||||
${fluid_pulse_SOURCES}
|
||||
@@ -281,6 +285,7 @@ add_library ( libfluidsynth-OBJ OBJECT
|
||||
${fluid_dsound_SOURCES}
|
||||
${fluid_waveout_SOURCES}
|
||||
${fluid_winmidi_SOURCES}
|
||||
+ ${fluid_haiku_SOURCES}
|
||||
${fluid_sdl2_SOURCES}
|
||||
${fluid_libinstpatch_SOURCES}
|
||||
${libfluidsynth_SOURCES}
|
||||
${public_HEADERS}
|
||||
${public_main_HEADER}
|
||||
diff --git a/src/config.cmake b/src/config.cmake
|
||||
index 2d1d786..9ff3e29 100644
|
||||
index 6b5b5e0..ef36364 100644
|
||||
--- a/src/config.cmake
|
||||
+++ b/src/config.cmake
|
||||
@@ -199,6 +199,9 @@
|
||||
/* Define to enable Windows MIDI driver */
|
||||
#cmakedefine WINMIDI_SUPPORT @WINMIDI_SUPPORT@
|
||||
@@ -202,6 +202,9 @@
|
||||
/* Define to enable SDL2 audio driver */
|
||||
#cmakedefine SDL2_SUPPORT @SDL2_SUPPORT@
|
||||
|
||||
+/* Define to enable Haiku MediaKit audio driver */
|
||||
+#cmakedefine HAIKU_SUPPORT @HAIKU_SUPPORT@
|
||||
@@ -137,10 +137,10 @@ index 2d1d786..9ff3e29 100644
|
||||
#cmakedefine STDC_HEADERS @STDC_HEADERS@
|
||||
|
||||
diff --git a/src/drivers/fluid_adriver.c b/src/drivers/fluid_adriver.c
|
||||
index 4311c46..bf4a84b 100644
|
||||
index b03a701..7547cb1 100644
|
||||
--- a/src/drivers/fluid_adriver.c
|
||||
+++ b/src/drivers/fluid_adriver.c
|
||||
@@ -80,6 +80,16 @@ static const fluid_audriver_definition_t fluid_audio_drivers[] =
|
||||
@@ -100,6 +100,16 @@ static const fluid_audriver_definition_t fluid_audio_drivers[] =
|
||||
},
|
||||
#endif
|
||||
|
||||
@@ -158,7 +158,7 @@ index 4311c46..bf4a84b 100644
|
||||
{
|
||||
"coreaudio",
|
||||
diff --git a/src/drivers/fluid_adriver.h b/src/drivers/fluid_adriver.h
|
||||
index 5cfc688..ace6353 100644
|
||||
index ebd6652..3878fe2 100644
|
||||
--- a/src/drivers/fluid_adriver.h
|
||||
+++ b/src/drivers/fluid_adriver.h
|
||||
@@ -57,6 +57,13 @@ void delete_fluid_alsa_audio_driver(fluid_audio_driver_t *p);
|
||||
@@ -322,12 +322,12 @@ index 0000000..2871948
|
||||
+}
|
||||
+
|
||||
diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c
|
||||
index 15e167a..2bcf167 100644
|
||||
index c61101a..f27d7eb 100644
|
||||
--- a/src/synth/fluid_synth.c
|
||||
+++ b/src/synth/fluid_synth.c
|
||||
@@ -26,6 +26,10 @@
|
||||
#include "fluid_sfont.h"
|
||||
@@ -27,6 +27,10 @@
|
||||
#include "fluid_defsfont.h"
|
||||
#include "fluid_instpatch.h"
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#include <FindDirectory.h>
|
||||
@@ -336,7 +336,7 @@ index 15e167a..2bcf167 100644
|
||||
#ifdef TRAP_ON_FPE
|
||||
#define _GNU_SOURCE
|
||||
#include <fenv.h>
|
||||
@@ -209,8 +213,25 @@ void fluid_synth_settings(fluid_settings_t *settings)
|
||||
@@ -204,8 +208,25 @@ void fluid_synth_settings(fluid_settings_t *settings)
|
||||
fluid_settings_register_int(settings, "synth.lock-memory", 1, 0, 1, FLUID_HINT_TOGGLED);
|
||||
fluid_settings_register_str(settings, "midi.portname", "", 0);
|
||||
|
||||
@@ -363,10 +363,10 @@ index 15e167a..2bcf167 100644
|
||||
|
||||
fluid_settings_register_int(settings, "synth.polyphony", 256, 1, 65535, 0);
|
||||
diff --git a/src/utils/fluid_sys.h b/src/utils/fluid_sys.h
|
||||
index 9f2d6f6..f3d1464 100644
|
||||
index 5dae878..0b80541 100644
|
||||
--- a/src/utils/fluid_sys.h
|
||||
+++ b/src/utils/fluid_sys.h
|
||||
@@ -687,7 +687,7 @@ enum
|
||||
@@ -698,7 +698,7 @@ enum
|
||||
sample data.
|
||||
*/
|
||||
|
||||
@@ -376,5 +376,5 @@ index 9f2d6f6..f3d1464 100644
|
||||
#define fluid_munlock(_p,_n) munlock(_p,_n)
|
||||
#else
|
||||
--
|
||||
2.21.0
|
||||
2.24.0
|
||||
|
||||
Reference in New Issue
Block a user