Skip to content

Commit e3982aa

Browse files
authored
[fluidsynth] Use gcem from vcpkg (#48827)
1 parent cf66926 commit e3982aa

File tree

5 files changed

+39
-5
lines changed

5 files changed

+39
-5
lines changed

ports/fluidsynth/fix-gcem.patch

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 2bb396ba..25d3557b 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -364,7 +364,7 @@ if ( WIN32 )
6+
endif ( MINGW )
7+
endif ( WIN32 )
8+
9+
-find_package ( GCEM REQUIRED )
10+
+find_package ( gcem CONFIG REQUIRED )
11+
12+
set ( LIBFLUID_LIBS ${MATH_LIBRARY} )
13+
if (NOT ((CMAKE_SYSTEM_NAME MATCHES "SunOS") OR (osal STREQUAL "embedded")))
14+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
15+
index cc43d691..3021d54f 100644
16+
--- a/src/CMakeLists.txt
17+
+++ b/src/CMakeLists.txt
18+
@@ -295,7 +295,7 @@ target_include_directories ( libfluidsynth-OBJ PRIVATE
19+
${FluidSynth_SOURCE_DIR}/src/sfloader
20+
${FluidSynth_SOURCE_DIR}/src/bindings
21+
${FluidSynth_SOURCE_DIR}/include
22+
- ${GCEM_INCLUDE_DIR}
23+
+ ${gcem_INCLUDE_DIRS}
24+
)
25+
26+
if ( LIBFLUID_CPPFLAGS )

ports/fluidsynth/portfile.cmake

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ vcpkg_from_github(
44
REF "v${VERSION}"
55
SHA512 0e897a1a3e1499150c26dc0ce4fc1fa4e5323cd84e0f1b6cdf305b4cfd3fd46cbefddf490241e8645a9bd291e485a830d109b1c7a83e13b816f0345839c4c36c
66
HEAD_REF master
7+
PATCHES fix-gcem.patch
78
)
89
# Do not use or install FindSndFileLegacy.cmake and its deps
910
file(REMOVE
@@ -14,6 +15,7 @@ file(REMOVE
1415
"${SOURCE_PATH}/cmake_admin/FindOpus.cmake"
1516
"${SOURCE_PATH}/cmake_admin/FindSndFileLegacy.cmake"
1617
"${SOURCE_PATH}/cmake_admin/FindVorbis.cmake"
18+
"${SOURCE_PATH}/cmake_admin/FindGCEM.cmake"
1719
)
1820

1921
vcpkg_check_features(
@@ -56,15 +58,14 @@ foreach(_option IN LISTS OPTIONS_TO_DISABLE IGNORED_OPTIONS)
5658
list(APPEND DISABLED_OPTIONS "-D${_option}:BOOL=OFF")
5759
endforeach()
5860

59-
vcpkg_find_acquire_program(PKGCONFIG)
6061
vcpkg_cmake_configure(
6162
SOURCE_PATH "${SOURCE_PATH}"
6263
OPTIONS
6364
${FEATURE_OPTIONS}
6465
${ENABLED_OPTIONS}
6566
${DISABLED_OPTIONS}
66-
"-Dosal=cpp11"
67-
"-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
67+
"-Dosal=cpp11"
68+
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
6869
MAYBE_UNUSED_VARIABLES
6970
${OPTIONS_TO_DISABLE}
7071
enable-coverage
@@ -85,6 +86,6 @@ file(REMOVE_RECURSE
8586
"${CURRENT_PACKAGES_DIR}/share/man")
8687

8788
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
88-
89+
8990
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
9091

ports/fluidsynth/vcpkg.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "fluidsynth",
33
"version": "2.5.1",
4+
"port-version": 1,
45
"description": "FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.",
56
"homepage": "https://github.com/FluidSynth/fluidsynth",
67
"license": "LGPL-2.1-or-later",
@@ -10,6 +11,7 @@
1011
"name": "alsa",
1112
"platform": "linux"
1213
},
14+
"gcem",
1315
{
1416
"name": "vcpkg-cmake",
1517
"host": true

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3034,7 +3034,7 @@
30343034
},
30353035
"fluidsynth": {
30363036
"baseline": "2.5.1",
3037-
"port-version": 0
3037+
"port-version": 1
30383038
},
30393039
"flux": {
30403040
"baseline": "0.4.0",

versions/f-/fluidsynth.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "f98a0709faac3d5b5f86276086a59e8b9917942f",
5+
"version": "2.5.1",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "65ac79b7827cf71b8b3be865360d69c37268dec8",
510
"version": "2.5.1",

0 commit comments

Comments
 (0)