From 923719584a387342bd9fa7d6ab3733ce771259e9 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 24 Jun 2019 20:02:06 +0200 Subject: [PATCH] fluidsynth, bump version (#3944) * move binary to tools package, use included testcase --- ...-2.0.4.recipe => fluidsynth2-2.0.5.recipe} | 56 +++++++++++++++---- .../patches/fluidsynth2-2.0.5-gcc2.patchset | 42 ++++++++++++++ ....4.patchset => fluidsynth2-2.0.5.patchset} | 0 3 files changed, 86 insertions(+), 12 deletions(-) rename media-sound/fluidsynth/{fluidsynth2-2.0.4.recipe => fluidsynth2-2.0.5.recipe} (63%) create mode 100644 media-sound/fluidsynth/patches/fluidsynth2-2.0.5-gcc2.patchset rename media-sound/fluidsynth/patches/{fluidsynth2-2.0.4.patchset => fluidsynth2-2.0.5.patchset} (100%) diff --git a/media-sound/fluidsynth/fluidsynth2-2.0.4.recipe b/media-sound/fluidsynth/fluidsynth2-2.0.5.recipe similarity index 63% rename from media-sound/fluidsynth/fluidsynth2-2.0.4.recipe rename to media-sound/fluidsynth/fluidsynth2-2.0.5.recipe index 5d5ca09ff..707dfb770 100644 --- a/media-sound/fluidsynth/fluidsynth2-2.0.4.recipe +++ b/media-sound/fluidsynth/fluidsynth2-2.0.5.recipe @@ -6,21 +6,31 @@ without a SoundFont compatible soundcard. Fluidsynth can perform as a virtual \ MIDI device and read in SMF (.mid) files directly. Another function is its \ ability to send audio data to a Raw or Wave file." HOMEPAGE="http://www.fluidsynth.org/" -COPYRIGHT="2007-2019 Josh Green, Pedro Lopez-Cabanillas, David Henningsson" +COPYRIGHT="2017-2019 Tom Moebert + 2007-2019 Josh Green + 2007-2019 Pedro Lopez-Cabanillas + 2007-2019 David Henningsson + 2000-2019 Peter Hanappe" LICENSE="GNU LGPL v2.1" -REVISION="4" +REVISION="1" SOURCE_URI="https://github.com/FluidSynth/fluidsynth/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="2c065de87e9c9ba0311ebf2f4828a4fd76f1f5cc7d1d93dd80d7a048d7d2a76c" +CHECKSUM_SHA256="69b244512883491e7e66b4d0151c61a0d6d867d4d2828c732563be0f78abcc51" SOURCE_DIR="fluidsynth-$portVersion" PATCHES="fluidsynth2-$portVersion.patchset" +if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then + PATCHES="$PATCHES + fluidsynth2-$portVersion-gcc2.patchset" +fi -ARCHITECTURES="?x86_gcc2 x86_64" +ARCHITECTURES="x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="x86" +libVersion="2.1.2" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" fluidsynth2$secondaryArchSuffix = $portVersion - cmd:fluidsynth - lib:libfluidsynth$secondaryArchSuffix = 2.1.1 compat >= 2 + lib:libfluidsynth$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -39,7 +49,7 @@ REQUIRES=" PROVIDES_devel=" fluidsynth2${secondaryArchSuffix}_devel = $portVersion - devel:libfluidsynth$secondaryArchSuffix = 2.1.1 compat >= 2 + devel:libfluidsynth$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" fluidsynth2$secondaryArchSuffix == $portVersion base @@ -48,6 +58,17 @@ CONFLICTS_devel=" fluidsynth${secondaryArchSuffix}_devel " +SUMMARY_tools="$SUMMARY (fluidsynth binary)" +DESCRIPTION_tools="$DESCRIPTION (fluidsynth binary)" +PROVIDES_tools=" + fluidsynth2${secondaryArchSuffix}_tools = $portVersion + cmd:fluidsynth$secondaryArchSuffix = $portVersion + " +REQUIRES_tools=" + fluidsynth2$secondaryArchSuffix == $portVersion base + haiku$secondaryArchSuffix + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libFLAC$secondaryArchSuffix @@ -68,14 +89,20 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " +defineDebugInfoPackage fluidsynth2$secondaryArchSuffix \ + "$libDir"/libfluidsynth.so.$libVersion \ + "$(getPackagePrefix tools)/$relativeBinDir"/fluidsynth + BUILD() { mkdir -p build cd build cmake .. \ -DCMAKE_INSTALL_PREFIX=$prefix \ + -DBIN_INSTALL_DIR=$binDir \ -DLIB_INSTALL_DIR=$libDir \ - -DINCLUDE_INSTALL_DIR=$includeDir + -DINCLUDE_INSTALL_DIR=$includeDir \ + -DMAN_INSTALL_DIR=$manDir/man1 make $jobArgs } @@ -84,14 +111,19 @@ INSTALL() cd build make install - mkdir -p $(dirname $manDir) - mv $prefix/share/man $manDir - rm -rf $prefix/share - prepareInstalledDevelLib libfluidsynth fixPkgconfig # devel package packageEntries devel \ $developDir + packageEntries tools \ + $binDir \ + $manDir +} + +TEST() +{ + cd build + make check } diff --git a/media-sound/fluidsynth/patches/fluidsynth2-2.0.5-gcc2.patchset b/media-sound/fluidsynth/patches/fluidsynth2-2.0.5-gcc2.patchset new file mode 100644 index 000000000..e60bf13d3 --- /dev/null +++ b/media-sound/fluidsynth/patches/fluidsynth2-2.0.5-gcc2.patchset @@ -0,0 +1,42 @@ +From 02dff4641fa2e4691947096c354859ce9f8aa565 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sat, 22 Jun 2019 08:26:38 +0200 +Subject: Fix gcc2 build + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b33a07c..b81214d 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_ + 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" ) ++ 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 +diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c +index a4b00d0..007a3c3 100644 +--- a/src/synth/fluid_synth.c ++++ b/src/synth/fluid_synth.c +@@ -214,6 +214,7 @@ void fluid_synth_settings(fluid_settings_t *settings) + fluid_settings_register_str(settings, "midi.portname", "", 0); + + #ifdef __HAIKU__ ++ { + char midiSettings[PATH_MAX] = ""; + if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, midiSettings, sizeof(midiSettings)) == B_OK) { + strcat(midiSettings, "/Media/midi_settings"); +@@ -228,6 +229,7 @@ void fluid_synth_settings(fluid_settings_t *settings) + } + } + } ++ } + #else + #ifdef DEFAULT_SOUNDFONT + fluid_settings_register_str(settings, "synth.default-soundfont", DEFAULT_SOUNDFONT, 0); +-- +2.21.0 + diff --git a/media-sound/fluidsynth/patches/fluidsynth2-2.0.4.patchset b/media-sound/fluidsynth/patches/fluidsynth2-2.0.5.patchset similarity index 100% rename from media-sound/fluidsynth/patches/fluidsynth2-2.0.4.patchset rename to media-sound/fluidsynth/patches/fluidsynth2-2.0.5.patchset