Skip to content

Commit 2a91d78

Browse files
committed
Update fluidsynth, Fix icudata version detection
1 parent 15e9cdc commit 2a91d78

3 files changed

Lines changed: 6 additions & 11 deletions

File tree

shared/packages.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ arguments = "--disable-http --disable-examples"
111111
anitya_id = 10353
112112

113113
[fluidsynth]
114-
version = 2.5.2
114+
version = 2.5.3
115115
url = "https://github.com/FluidSynth/fluidsynth/archive/refs/tags/v${version}.tar.gz"
116116
arguments = "-DLIB_SUFFIX='' -Denable-alsa=OFF -Denable-aufile=OFF -Denable-dbus=OFF -Denable-ipv6=OFF -Denable-jack=OFF -Denable-ladspa=OFF -Denable-libinstpatch=OFF -Denable-libsndfile=OFF -Denable-midishare=OFF -Denable-network=OFF -Denable-oss=OFF -Denable-dsound=OFF -Denable-wasapi=OFF -Denable-waveout=OFF -Denable-winmidi=OFF -Denable-sdl3=OFF -Denable-pulseaudio=OFF -Denable-pipewire=OFF -Denable-readline=OFF -Denable-threads=OFF -Denable-openmp=OFF -Denable-unicode=OFF -Denable-native-dls=OFF"
117117
anitya_id = 10437
@@ -157,7 +157,8 @@ anitya_id = 379847
157157

158158
[icudata]
159159
version_major = 78
160-
version = ${version_major}
160+
version_minor = 2
161+
version = ${version_major}.${version_minor}
161162
_ini_comment = empty on purpose, otherwise polluted by default section
162163
directory =
163164
url = https://ci.easyrpg.org/job/icudata/lastSuccessfulBuild/artifact/icudata${version_major}_all.tar.gz

shared/packages.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77

88
ZLIB_URL="https://zlib.net/fossils/zlib-1.3.2.tar.gz"
9-
ZLIB_ARGS="-DZLIB_BUILD_EXAMPLES=OFF"
9+
ZLIB_ARGS="-DZLIB_BUILD_TESTING=OFF -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_STATIC=ON"
1010
ZLIB_DIR="zlib-1.3.2"
1111

1212
LIBPNG_URL="https://download.sourceforge.net/libpng/libpng-1.6.55.tar.xz"
@@ -73,9 +73,9 @@ OPUSFILE_URL="https://github.com/xiph/opusfile/releases/download/v0.12/opusfile-
7373
OPUSFILE_ARGS="--disable-http --disable-examples"
7474
OPUSFILE_DIR="opusfile-0.12"
7575

76-
FLUIDSYNTH_URL="https://github.com/FluidSynth/fluidsynth/archive/refs/tags/v2.5.2.tar.gz"
76+
FLUIDSYNTH_URL="https://github.com/FluidSynth/fluidsynth/archive/refs/tags/v2.5.3.tar.gz"
7777
FLUIDSYNTH_ARGS="-DLIB_SUFFIX='' -Denable-alsa=OFF -Denable-aufile=OFF -Denable-dbus=OFF -Denable-ipv6=OFF -Denable-jack=OFF -Denable-ladspa=OFF -Denable-libinstpatch=OFF -Denable-libsndfile=OFF -Denable-midishare=OFF -Denable-network=OFF -Denable-oss=OFF -Denable-dsound=OFF -Denable-wasapi=OFF -Denable-waveout=OFF -Denable-winmidi=OFF -Denable-sdl3=OFF -Denable-pulseaudio=OFF -Denable-pipewire=OFF -Denable-readline=OFF -Denable-threads=OFF -Denable-openmp=OFF -Denable-unicode=OFF -Denable-native-dls=OFF"
78-
FLUIDSYNTH_DIR="fluidsynth-2.5.2"
78+
FLUIDSYNTH_DIR="fluidsynth-2.5.3"
7979

8080
FLUIDLITE_URL="https://github.com/divideconcept/FluidLite/archive/4a01cf1c67419e71da971d209f2855bbf4f3bab8.zip"
8181
FLUIDLITE_ARGS="-DFLUIDLITE_BUILD_STATIC=ON -DFLUIDLITE_BUILD_SHARED=OFF"

tvos/2_build_toolchain.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ if [ ! -f .patches-applied ]; then
2222

2323
patches_common
2424

25-
verbosemsg "FluidSynth"
26-
(cd $FLUIDSYNTH_DIR
27-
# Fix using unsupported flag
28-
perl -pi -e "s#Darwin|iOS#Darwin|iOS|tvOS#" CMakeLists.txt
29-
)
30-
3125
touch .patches-applied
3226
fi
3327

0 commit comments

Comments
 (0)