Merge remote-tracking branch 'origin/release/2.3' into master

FluidSynth · Jan 3, 2024 · eabae3b · eabae3b
2 parents bd04f3f + 524c00b
commit eabae3b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/cmake_admin/FindInstPatch.cmake b/cmake_admin/FindInstPatch.cmake
@@ -37,7 +37,7 @@ find_path(
 
 find_library(
   InstPatch_LIBRARY
-  NAMES "instpatch-1.0"
+  NAMES "instpatch-1.0" "instpatch-2"
   HINTS "${PC_INSTPATCH_LIBDIR}")
 
 # Get version from pkg-config or read the config header

diff --git a/cmake_admin/FindOpus.cmake b/cmake_admin/FindOpus.cmake
@@ -53,13 +53,13 @@ find_library(
 
 # Get the version from pkg-config
 if(PC_OPUS_VERSION)
-  set(Opus_VERSION "${PC_OPUS_VERSION}")
+  set(Opus_VERSION "${PC_OPUS_VERSION}.0")
   set(OPUS_VERSION "${Opus_VERSION}")
   set(OPUS_VERSION_STRING "${Opus_VERSION}")
   string(REPLACE "." ";" _opus_version_list "${Opus_VERSION}")
   list(GET _opus_version_list 0 OPUS_VERSION_MAJOR)
   list(GET _opus_version_list 1 OPUS_VERSION_MINOR)
-  list(GET _opus_version_list 2 OPUS_VERSION_PATCH)
+  list(GET _opus_version_list 2 OPUS_VERSION_PATCH) # might be missing if zero, hence adding the .0 above
 else()
   message(STATUS "Unable to get Opus version without pkg-config.")
   set(Opus_VERSION)

diff --git a/cmake_admin/FindSndFile.cmake b/cmake_admin/FindSndFile.cmake
@@ -50,7 +50,7 @@ find_path(
 
 find_library(
   _sndfile_library
-  NAMES "sndfile"
+  NAMES "sndfile" "sndfile-1"
   HINTS "${PC_SNDFILE_LIBDIR}")
 
 # Get version from pkg-config or read the config header
@@ -69,7 +69,8 @@ elseif(SndFile_INCLUDE_DIR)
 endif()
 
 # Check the features SndFile was built with
-if(PC_SNDFILE_FOUND)
+# 2024-01-02: Recent versions of libsndfile don't seem to provide a pkgconfig file and older version who did are lacking private libraries like OGG.
+if(FALSE) #PC_SNDFILE_FOUND
   if("vorbis" IN_LIST PC_SNDFILE_STATIC_LIBRARIES)
     set(SndFile_WITH_EXTERNAL_LIBS TRUE)
   endif()

diff --git a/cmake_admin/Findmpg123.cmake b/cmake_admin/Findmpg123.cmake
@@ -92,7 +92,7 @@ find_package_handle_standard_args(
 # Create the targets
 foreach(_component libmpg123 libout123 libsyn123)
   if(mpg123_${_component}_FOUND AND NOT TARGET MPG123::${_component})
-    add_library(MPG123::${_component})
+    add_library(MPG123::${_component} UNKNOWN IMPORTED)
     set_target_properties(
       MPG123::${_component}
       PROPERTIES IMPORTED_LOCATION "${mpg123_${_component}_LIBRARY}"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -499,10 +499,6 @@ if ( TARGET PipeWire::PipeWire AND PIPEWIRE_SUPPORT ) # because pw_init() etc.
     target_link_libraries ( fluidsynth PRIVATE PipeWire::PipeWire )
 endif()
 
-if ( TARGET InstPatch::libinstpatch AND LIBINSTPATCH_SUPPORT )
-    target_link_libraries ( fluidsynth PRIVATE InstPatch::libinstpatch )
-endif()
-
 if ( TARGET LASH::LASH AND LASH_SUPPORT )
     target_link_libraries ( fluidsynth PRIVATE LASH::LASH )
 endif()

diff --git a/src/fluidsynth.c b/src/fluidsynth.c
@@ -29,9 +29,6 @@
 #define GETOPT_SUPPORT 1
 #endif
 
-#ifdef LIBINSTPATCH_SUPPORT
-#include <libinstpatch/libinstpatch.h>
-#endif
 #include "fluid_lash.h"
 
 #ifdef SYSTEMD_SUPPORT