diff --git a/media-sound/fluidsynth/fluidsynth2-2.1.1.recipe b/media-sound/fluidsynth/fluidsynth2-2.1.8.recipe similarity index 96% rename from media-sound/fluidsynth/fluidsynth2-2.1.1.recipe rename to media-sound/fluidsynth/fluidsynth2-2.1.8.recipe index 3b4b61ca5..2f26c0ebf 100644 --- a/media-sound/fluidsynth/fluidsynth2-2.1.1.recipe +++ b/media-sound/fluidsynth/fluidsynth2-2.1.8.recipe @@ -12,9 +12,9 @@ COPYRIGHT="2017-2019 Tom Moebert 2007-2019 David Henningsson 2000-2019 Peter Hanappe" LICENSE="GNU LGPL v2.1" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/FluidSynth/fluidsynth/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="966d0393591b505d694e51cbf653387007144e9ae0b8705d82ec7d943d31d348" +CHECKSUM_SHA256="a254efceff5d99f8d658d12d25318317f37307e6df852ec9baeb7da173496967" SOURCE_DIR="fluidsynth-$portVersion" PATCHES="fluidsynth2-$portVersion.patchset" if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then @@ -25,7 +25,7 @@ fi ARCHITECTURES="x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="x86" -libVersion="2.3.1" +libVersion="2.3.8" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" diff --git a/media-sound/fluidsynth/patches/fluidsynth2-2.1.1-gcc2.patchset b/media-sound/fluidsynth/patches/fluidsynth2-2.1.8-gcc2.patchset similarity index 100% rename from media-sound/fluidsynth/patches/fluidsynth2-2.1.1-gcc2.patchset rename to media-sound/fluidsynth/patches/fluidsynth2-2.1.8-gcc2.patchset diff --git a/media-sound/fluidsynth/patches/fluidsynth2-2.1.1.patchset b/media-sound/fluidsynth/patches/fluidsynth2-2.1.8.patchset similarity index 96% rename from media-sound/fluidsynth/patches/fluidsynth2-2.1.1.patchset rename to media-sound/fluidsynth/patches/fluidsynth2-2.1.8.patchset index c6a403913..48f7513a0 100644 --- a/media-sound/fluidsynth/patches/fluidsynth2-2.1.1.patchset +++ b/media-sound/fluidsynth/patches/fluidsynth2-2.1.8.patchset @@ -1,11 +1,11 @@ -From 74f0f4c325a36389ca3698408c28d4360ab21ae0 Mon Sep 17 00:00:00 2001 +From 10f025af5784293e46582664eada1f3e401c4ba0 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 e6f1fe7..fb8c073 100644 +index 595e6a4..ba2bcb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,8 @@ @@ -35,7 +35,7 @@ index e6f1fe7..fb8c073 100644 if ( CMAKE_SIZEOF_VOID_P EQUAL 8 ) set ( _init_lib_suffix "64" ) else ( CMAKE_SIZEOF_VOID_P EQUAL 8 ) -@@ -166,8 +168,10 @@ check_include_file ( getopt.h HAVE_GETOPT_H ) +@@ -167,8 +169,10 @@ check_include_file ( getopt.h HAVE_GETOPT_H ) check_include_file ( stdint.h HAVE_STDINT_H ) include ( TestInline ) include ( TestVLA ) @@ -46,7 +46,7 @@ index e6f1fe7..fb8c073 100644 unset ( LIBFLUID_CPPFLAGS CACHE ) unset ( LIBFLUID_LIBS CACHE ) -@@ -205,6 +209,11 @@ if ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_C +@@ -212,6 +216,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" ) @@ -58,7 +58,7 @@ index e6f1fe7..fb8c073 100644 # Windows unset ( WINDOWS_LIBS CACHE ) unset ( DSOUND_SUPPORT CACHE ) -@@ -274,7 +283,11 @@ if ( WIN32 ) +@@ -281,7 +290,11 @@ if ( WIN32 ) else ( WIN32 ) # Check PThreads, but not in Windows find_package ( Threads REQUIRED ) @@ -70,7 +70,7 @@ index e6f1fe7..fb8c073 100644 endif ( WIN32 ) # IBM OS/2 -@@ -592,6 +605,11 @@ else(NOT enable-pkgconfig) +@@ -599,6 +612,11 @@ else(NOT enable-pkgconfig) endif ( READLINE_FOUND ) endif ( enable-readline ) @@ -100,7 +100,7 @@ index e8868ce..23eb4d5 100644 set ( MISC_REPORT "${MISC_REPORT} LADSPA support: yes\n" ) else ( LADSPA_SUPPORT ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e043b91..689bae3 100644 +index 356bb73..a010df4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -97,6 +97,10 @@ if ( SDL2_SUPPORT ) @@ -137,7 +137,7 @@ index 6b5b5e0..ef36364 100644 #cmakedefine STDC_HEADERS @STDC_HEADERS@ diff --git a/src/drivers/fluid_adriver.c b/src/drivers/fluid_adriver.c -index b03a701..7547cb1 100644 +index c2d1f09..7e94688 100644 --- a/src/drivers/fluid_adriver.c +++ b/src/drivers/fluid_adriver.c @@ -100,6 +100,16 @@ static const fluid_audriver_definition_t fluid_audio_drivers[] = @@ -322,7 +322,7 @@ index 0000000..2871948 +} + diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c -index c61101a..f27d7eb 100644 +index 1e0b29f..ea26ed5 100644 --- a/src/synth/fluid_synth.c +++ b/src/synth/fluid_synth.c @@ -27,6 +27,10 @@ @@ -363,10 +363,10 @@ index c61101a..f27d7eb 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 5dae878..0b80541 100644 +index 7c7db76..839fc29 100644 --- a/src/utils/fluid_sys.h +++ b/src/utils/fluid_sys.h -@@ -698,7 +698,7 @@ enum +@@ -702,7 +702,7 @@ enum sample data. */ @@ -376,5 +376,5 @@ index 5dae878..0b80541 100644 #define fluid_munlock(_p,_n) munlock(_p,_n) #else -- -2.24.0 +2.30.0