Skip to content

Commit 033e89b

Browse files
committed
fluidsynth: remove
FluidSynth 2.5.0 no longer requires glib so has been reintegrated with dosbox-staging
1 parent 2ea2805 commit 033e89b

File tree

12 files changed

+9
-221
lines changed

12 files changed

+9
-221
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ jobs:
6161
cp $(<$GITHUB_WORKSPACE/deps-macos.txt) $GITHUB_WORKSPACE/deps/arm64/release
6262
chmod 644 $GITHUB_WORKSPACE/deps/arm64/release/*
6363
64-
echo "*** libfluidsynth transitive deps:"
65-
otool -L libfluidsynth.3.dylib
66-
6764
echo "*** libslirp transitive deps:"
6865
otool -L libslirp.dylib
6966
@@ -167,9 +164,6 @@ jobs:
167164
cp $(<$GITHUB_WORKSPACE/deps-linux.txt) $GITHUB_WORKSPACE/deps/release
168165
chmod 644 $GITHUB_WORKSPACE/deps/release/*
169166
170-
echo "*** libfluidsynth transitive deps:"
171-
ldd libfluidsynth.so.3
172-
173167
echo "*** libslirp transitive deps:"
174168
ldd libslirp.so
175169

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ This repository contains various external dependencies (typically dynamic
44
libraries) required by [DOSBox Staging](https://github.com/dosbox-staging/dosbox-staging).
55

66
Certain dependencies can take a very long time to compile on Windows. For
7-
example, FluidSynth and Slirp usually take 20-30 minutes to compile from
8-
scratch due to their dependence on `glib` which requires vcpkg to build an
7+
example, Slirp usually takes 20-30 minutes to compile from
8+
scratch due to its dependency on `glib` which requires vcpkg to build an
99
entire MSYS2 toolchain first. The situation is better on macOS and Linux, but
1010
compiling these two from scratch still takes about 5-7 minutes. The solution
1111
is to build these rarely changing artifacts outside the DOSBox Staging CI
@@ -42,7 +42,7 @@ library on each platform:
4242
### Windows
4343

4444
```
45-
dumpbin /dependents fluidsynth-3.dll
45+
dumpbin /dependents slirp-0.dll
4646
```
4747

4848
Note `dumpbin` does *not* perform a recursive lookup; you'll need to traverse
@@ -59,13 +59,13 @@ c:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.43.3480
5959
This will list all transitive dynamic dependencies recursively:
6060

6161
```
62-
otool -L libfluidsynth.3.dylib
62+
otool -L libslirp.dylib
6363
```
6464

6565
### Linux
6666

6767
This will list all transitive dynamic dependencies recursively:
6868

6969
```
70-
ldd libfluidsynth.so.3
70+
ldd libslirp.so
7171
```

deps-linux.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
libfluidsynth.so.3 libslirp.so libglib-2.0.so.0 libpcre2-8.so.0
1+
libslirp.so libglib-2.0.so.0 libpcre2-8.so.0

deps-macos.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
libfluidsynth.3.dylib libslirp.dylib libglib-2.0.0.dylib libgthread-2.0.0.dylib libintl.8.dylib libpcre2-8.0.14.0.dylib
1+
libslirp.dylib libglib-2.0.0.dylib libgthread-2.0.0.dylib libintl.8.dylib libpcre2-8.0.14.0.dylib

deps-windows-debug.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
libfluidsynth-3.dll slirp-0.dll glib-2.0-0.dll iconv-2.dll intl-8.dll pcre2-8d.dll
1+
slirp-0.dll glib-2.0-0.dll iconv-2.dll intl-8.dll pcre2-8d.dll

deps-windows-release.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
libfluidsynth-3.dll slirp-0.dll glib-2.0-0.dll iconv-2.dll intl-8.dll pcre2-8.dll
1+
slirp-0.dll glib-2.0-0.dll iconv-2.dll intl-8.dll pcre2-8.dll

vcpkg-ports/fluidsynth/gentables.patch

Lines changed: 0 additions & 51 deletions
This file was deleted.

vcpkg-ports/fluidsynth/pkgconfig-opensles.diff

Lines changed: 0 additions & 12 deletions
This file was deleted.

vcpkg-ports/fluidsynth/portfile.cmake

Lines changed: 0 additions & 81 deletions
This file was deleted.

vcpkg-ports/fluidsynth/usage

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)