Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix libinstpatch and sndfile not being discovered on Windows #1299

Merged
merged 12 commits into from
Jan 3, 2024

Conversation

derselbst
Copy link
Member

@derselbst derselbst commented Jan 2, 2024

libinstpatch and sndfile are using different library filenames on Windows. Previously, the CMake scripts were only looking for their Unix names resulting in the libraries not being found. This PR fixes it, and therefore implicitly restores DLS support for the precompiled Windows binaries.

In addition, we're no longer relying on sndfile's pkgconfig file to report correct private libs to figure out whether it has OGG / Vorbis support. This change restores SF3 support for precompiled Windows binaries.

This latter change revealed two more problems: 1) parsing of the OPUS_VERSION was broken and could led to an index-out-of-range error, and 2) the logic in Findmpg123 was missing the IMPORTED keyword.

Fixes #1298

@derselbst derselbst added this to the 2.3 milestone Jan 2, 2024
Copy link

sonarcloud bot commented Jan 2, 2024

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@derselbst derselbst changed the base branch from master to release/2.3 January 3, 2024 12:50
@derselbst derselbst merged commit 524c00b into release/2.3 Jan 3, 2024
42 of 74 checks passed
@derselbst derselbst deleted the debug-1298 branch January 3, 2024 12:53
DominusExult added a commit to DominusExult/fluidsynth-sans-glib that referenced this pull request Mar 6, 2024
* commit '683270db64302e59d26b9610514af1cfe0a80493':
  Bump to 2.3.5
  Fix libinstpatch and sndfile not being discovered on Windows (FluidSynth#1299)
  Update FreeBSD CI: Drop 12.4 and add 14.0
  Fix some rounding issues due to double promotion (FluidSynth#1286)
  Bump to 2.3.4
  Fix player termination after stopping and restarting (FluidSynth#1273)
  fix for issue FluidSynth#1268: Pipewire's Jack implementation not found (FluidSynth#1269)
  Fix issue with CMake Xcode generator (FluidSynth#1266)
  Refurbish CI (FluidSynth#1267)
  Fallback to IPv4 when creating socket if IPv6 is not available (FluidSynth#1208) (FluidSynth#1265)
  Turn off pending notes and issue a warning (FluidSynth#1264)
  Fix incorrect way of turning CMAKE_INSTALL_LIBDIR absolute (FluidSynth#1261)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to load DLS files in fluidsynth 2.3.4 Windows builds.
1 participant