From b71521e53970d0d17655689c98a1fcbac00e8bc1 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 25 Apr 2021 21:32:18 +0200 Subject: [PATCH] fluidsynth2: fix gcc2 patch --- .../patches/fluidsynth2-2.1.8-gcc2.patchset | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/media-sound/fluidsynth/patches/fluidsynth2-2.1.8-gcc2.patchset b/media-sound/fluidsynth/patches/fluidsynth2-2.1.8-gcc2.patchset index 92ffaedd7..5c902d3cb 100644 --- a/media-sound/fluidsynth/patches/fluidsynth2-2.1.8-gcc2.patchset +++ b/media-sound/fluidsynth/patches/fluidsynth2-2.1.8-gcc2.patchset @@ -5,20 +5,20 @@ Subject: Fix gcc2 build diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5e1a61b..fd25c2e 100644 +index ba2bcb5..ef78bd6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -188,7 +188,7 @@ if ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_C +@@ -189,7 +189,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" ) - - # prepend to build type specific flags, to allow users to override - set ( CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" ) + check_c_compiler_flag ( "-Werror=incompatible-pointer-types" HAVE_INCOMPATIBLE_POINTER_TYPES ) + if ( HAVE_INCOMPATIBLE_POINTER_TYPES ) + set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=incompatible-pointer-types" ) diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c -index f27d7eb..17a31d1 100644 +index ea26ed5..8f0078f 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) @@ -38,5 +38,5 @@ index f27d7eb..17a31d1 100644 #ifdef DEFAULT_SOUNDFONT fluid_settings_register_str(settings, "synth.default-soundfont", DEFAULT_SOUNDFONT, 0); -- -2.24.0 +2.30.0