Skip to content

Update libraries #213

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.

Sign up for GitHub

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

Open
Ghabry wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update libraries #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1980629
Update libraries
Ghabry Jan 9, 2026
544603c
zlib & ICU updates
Ghabry Jan 10, 2026
4d573ef
fluidsynth: Migrate to 2.5
Ghabry Jan 10, 2026
f72cb46
ICU: Adapt no-mutex patch to ICU 78
Ghabry Jan 10, 2026
f610dbb
Build fixes
Ghabry Jan 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/2_build_toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ function build() {
install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS
install_lib_cmake $OPUS_DIR $OPUS_ARGS
install_lib $OPUSFILE_DIR $OPUSFILE_ARGS
install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS
install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS -Dosal=cpp11 -DANDROID_ABI=21
install_lib_cmake $NLOHMANNJSON_DIR $NLOHMANNJSON_ARGS
install_lib_meson $INIH_DIR $INIH_ARGS
install_lib $LHASA_DIR $LHASA_ARGS
Expand Down
2 changes: 1 addition & 1 deletion emscripten/2_build_toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ install_lib $SPEEXDSP_DIR $SPEEXDSP_ARGS
#install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS
install_lib_cmake $OPUS_DIR $OPUS_ARGS -DOPUS_STACK_PROTECTOR=OFF
install_lib $OPUSFILE_DIR $OPUSFILE_ARGS
install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS
install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS -Dosal=embedded
install_lib_cmake $NLOHMANNJSON_DIR $NLOHMANNJSON_ARGS
install_lib_meson $INIH_DIR $INIH_ARGS
#install_lib $LHASA_DIR $LHASA_ARGS
Expand Down
2 changes: 1 addition & 1 deletion ios/2_build_toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function build() {
install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS
install_lib_cmake $OPUS_DIR $OPUS_ARGS
install_lib $OPUSFILE_DIR $OPUSFILE_ARGS
install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS -DCMAKE_MACOSX_BUNDLE=OFF
install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS -Dosal=cpp11 -DCMAKE_MACOSX_BUNDLE=OFF
install_lib_cmake $NLOHMANNJSON_DIR $NLOHMANNJSON_ARGS
install_lib_meson $INIH_DIR $INIH_ARGS
install_lib $LHASA_DIR $LHASA_ARGS
Expand Down
2 changes: 1 addition & 1 deletion linux-static/2_build_toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ install_lib $SPEEXDSP_DIR $SPEEXDSP_ARGS
install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS
install_lib_cmake $OPUS_DIR $OPUS_ARGS
install_lib $OPUSFILE_DIR $OPUSFILE_ARGS
install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS
install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS -Dosal=cpp11
install_lib_cmake $NLOHMANNJSON_DIR $NLOHMANNJSON_ARGS
install_lib_meson $INIH_DIR $INIH_ARGS
install_lib $LHASA_DIR $LHASA_ARGS
Expand Down
2 changes: 1 addition & 1 deletion macos/2_build_toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function build() {
install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS
install_lib_cmake $OPUS_DIR $OPUS_ARGS
install_lib $OPUSFILE_DIR $OPUSFILE_ARGS
install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS
install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS -Dosal=cpp11
install_lib_cmake $NLOHMANNJSON_DIR $NLOHMANNJSON_ARGS
install_lib_meson $INIH_DIR $INIH_ARGS
install_lib $LHASA_DIR $LHASA_ARGS
Expand Down
10 changes: 0 additions & 10 deletions shared/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,16 +380,6 @@ function patches_common {
)
fi

# FluidSynth: Shim glib and disable all optional features
if [ -d "$FLUIDSYNTH_DIR" ]; then
verbosemsg "fluidsynth"

(cd $FLUIDSYNTH_DIR
patch -Np1 < $_SCRIPT_DIR/fluidsynth-no-glib.patch
patch -Np1 < $_SCRIPT_DIR/fluidsynth-no-deps.patch
)
fi

# nlohmann json: Install pkgconfig/cmake into lib (share is deleted by us)
if [ -d "$NLOHMANNJSON_DIR" ]; then
verbosemsg "nlohmann_json"
Expand Down
28 changes: 11 additions & 17 deletions shared/extra/icu-no-mutex.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -Naur icu-orig/source/common/umutex.cpp icu/source/common/umutex.cpp
--- icu-orig/source/common/umutex.cpp 2024-09-01 18:41:49.755849773 +0200
+++ icu/source/common/umutex.cpp 2024-09-01 18:42:05.278763995 +0200
diff '--color=auto' -Naur icu-orig/source/common/umutex.cpp icu/source/common/umutex.cpp
--- icu-orig/source/common/umutex.cpp 2026-01-10 13:01:30.482645434 +0100
+++ icu/source/common/umutex.cpp 2026-01-10 13:02:25.470686875 +0100
@@ -44,20 +44,25 @@
*************************************************************************************************/

Expand Down Expand Up @@ -90,37 +90,31 @@ diff -Naur icu-orig/source/common/umutex.cpp icu/source/common/umutex.cpp

U_NAMESPACE_END
diff '--color=auto' -Naur icu-orig/source/common/umutex.h icu/source/common/umutex.h
--- icu-orig/source/common/umutex.h 2024-09-01 18:41:49.732517070 +0200
+++ icu/source/common/umutex.h 2024-09-01 18:42:05.278763995 +0200
@@ -227,15 +227,22 @@
--- icu-orig/source/common/umutex.h 2026-01-10 13:01:30.439842550 +0100
+++ icu/source/common/umutex.h 2026-01-10 13:05:18.460584542 +0100
@@ -213,15 +213,18 @@

// requirements for C++ BasicLockable, allows UMutex to work with std::lock_guard
void lock() {
U_COMMON_API void lock() {
+#if 0
std::mutex *m = fMutex.load(std::memory_order_acquire);
if (m == nullptr) { m = getMutex(); }
m->lock();
+#endif
+ }
+ void unlock() {
+#if 0
+ fMutex.load(std::memory_order_relaxed)->unlock();
+#endif
}
- void unlock() { fMutex.load(std::memory_order_relaxed)->unlock(); }
- U_COMMON_API void unlock() { fMutex.load(std::memory_order_relaxed)->unlock(); }
+ U_COMMON_API void unlock() { }

static void cleanup();
U_COMMON_API static void cleanup();

private:
+#if 0
alignas(std::mutex) char fStorage[sizeof(std::mutex)] {};
std::atomic<std::mutex *> fMutex { nullptr };

@@ -250,6 +257,7 @@
@@ -236,6 +239,7 @@
* be nullptr.
*/
std::mutex *getMutex();
+#endif
};


86 changes: 0 additions & 86 deletions shared/fluidsynth-no-deps.patch
View file
Open in desktop

This file was deleted.

Loading
Loading