Skip to content

Commit

Permalink
aedi: patch fluidsynth sf3 support
Browse files Browse the repository at this point in the history
detection of sndfile vorbis/mpeg support is a bit broken right now
* native target doesn't detect it because of missing flac symbols, can be fixes with `-lFLAC` linker option
* cross-compiled target doesn't detect it even with the given linker option
  • Loading branch information
alexey-lysiuk committed Mar 28, 2024
1 parent 987517e commit e7336c4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
3 changes: 2 additions & 1 deletion aedi/target/library_tier2.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ def __init__(self, name='fluidsynth'):
def prepare_source(self, state: BuildState):
state.download_source(
'https://github.com/FluidSynth/fluidsynth/archive/refs/tags/v2.3.5.tar.gz',
'f89e8e983ecfb4a5b4f5d8c2b9157ed18d15ed2e36246fa782f18abaea550e0d')
'f89e8e983ecfb4a5b4f5d8c2b9157ed18d15ed2e36246fa782f18abaea550e0d',
patches='fluidsynth-sf3-support')

def configure(self, state: BuildState):
opts = state.options
Expand Down
11 changes: 11 additions & 0 deletions patch/fluidsynth-sf3-support.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/cmake_admin/FindSndFile.cmake
+++ b/cmake_admin/FindSndFile.cmake
@@ -70,7 +70,7 @@

# Check the features SndFile was built with
# 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(TRUE) #PC_SNDFILE_FOUND
if("vorbis" IN_LIST PC_SNDFILE_STATIC_LIBRARIES)
set(SndFile_WITH_EXTERNAL_LIBS TRUE)
endif()

0 comments on commit e7336c4

Please sign in to comment.