fluidsynth2: bump version.

This commit is contained in:
Jerome Duval
2019-11-14 20:55:55 +01:00
parent 55c6984e59
commit 74e453f579
3 changed files with 11 additions and 10 deletions

View File

@@ -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="b68876d24c7fb34575ffa389bcfe8e61a24f1cf1da8ec6c3b2053efde98d0320"
CHECKSUM_SHA256="bfe82ccf1bf00ff5cfc18e2d9d1e5d95c6bd169a76a2dec14898d1ee0e0fac8a"
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.2.0"
libVersion="2.2.1"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="

View File

@@ -1,27 +1,28 @@
From 02dff4641fa2e4691947096c354859ce9f8aa565 Mon Sep 17 00:00:00 2001
From 9c30ce35e23b3cec58882b990864548901571353 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 b33a07c..b81214d 100644
index 9039c74..5a099ce 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 -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
diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c
index a4b00d0..007a3c3 100644
index 3436b76..124849e 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)
@@ -209,6 +209,7 @@ void fluid_synth_settings(fluid_settings_t *settings)
fluid_settings_register_str(settings, "midi.portname", "", 0);
#ifdef __HAIKU__
@@ -29,7 +30,7 @@ index a4b00d0..007a3c3 100644
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)
@@ -223,6 +224,7 @@ void fluid_synth_settings(fluid_settings_t *settings)
}
}
}
@@ -38,5 +39,5 @@ index a4b00d0..007a3c3 100644
#ifdef DEFAULT_SOUNDFONT
fluid_settings_register_str(settings, "synth.default-soundfont", DEFAULT_SOUNDFONT, 0);
--
2.21.0
2.23.0