From 4740a7b1b037c7479d01f244c3708696ff9a99ef Mon Sep 17 00:00:00 2001
From: Ghabry <1331889+Ghabry@users.noreply.github.com>
Date: Fri, 20 Feb 2026 18:54:48 +0000
Subject: [PATCH 1/3] Update libraries

---
 shared/packages.ini | 10 +++++-----
 shared/packages.sh  | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/shared/packages.ini b/shared/packages.ini
index 91b7e13b..6dcb0070 100644
--- a/shared/packages.ini
+++ b/shared/packages.ini
@@ -4,14 +4,14 @@ directory = "${section}-${version}"
 [zlib]
 version_major = 1
 version_minor = 3
-version_patch = 1
+version_patch = 2
 version = ${version_major}.${version_minor}.${version_patch}
 url = "https://zlib.net/fossils/zlib-${version}.tar.gz"
 arguments = "-DZLIB_BUILD_EXAMPLES=OFF"
 anitya_id = 5303
 
 [libpng]
-version = 1.6.53
+version = 1.6.55
 url = "https://download.sourceforge.net/libpng/libpng-${version}.tar.xz"
 arguments = "-DPNG_SHARED=OFF -DPNG_TOOLS=OFF -DPNG_TESTS=OFF"
 anitya_id = 1705
@@ -23,7 +23,7 @@ arguments = "-DFT_DISABLE_BZIP2=ON -DFT_DISABLE_BROTLI=ON"
 anitya_id = 854
 
 [harfbuzz]
-version = 12.3.0
+version = 12.3.2
 url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
 arguments = "-Dfreetype=enabled -Dicu=disabled -Dtests=disabled -Dutilities=disabled" # TODO disable subset
 anitya_id = 1299
@@ -37,7 +37,7 @@ anitya_id = 3648
 [expat]
 version_major = 2
 version_minor = 7
-version_patch = 3
+version_patch = 4
 version = ${version_major}.${version_minor}.${version_patch}
 version_url = ${version_major}_${version_minor}_${version_patch}
 url = "https://github.com/libexpat/libexpat/releases/download/R_${version_url}/expat-${version}.tar.bz2"
@@ -99,7 +99,7 @@ arguments = "-DWANT_PLAYER=OFF -DWANT_STATIC=ON"
 anitya_id = 9179
 
 [opus]
-version = 1.6
+version = 1.6.1
 url = "https://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"
 arguments = "-DOPUS_DISABLE_INTRINSICS=ON"
 anitya_id = 11081
diff --git a/shared/packages.sh b/shared/packages.sh
index 0f576755..881081a3 100644
--- a/shared/packages.sh
+++ b/shared/packages.sh
@@ -5,30 +5,30 @@
 #######################################
 
 
-ZLIB_URL="https://zlib.net/fossils/zlib-1.3.1.tar.gz"
+ZLIB_URL="https://zlib.net/fossils/zlib-1.3.2.tar.gz"
 ZLIB_ARGS="-DZLIB_BUILD_EXAMPLES=OFF"
-ZLIB_DIR="zlib-1.3.1"
+ZLIB_DIR="zlib-1.3.2"
 
-LIBPNG_URL="https://download.sourceforge.net/libpng/libpng-1.6.53.tar.xz"
+LIBPNG_URL="https://download.sourceforge.net/libpng/libpng-1.6.55.tar.xz"
 LIBPNG_ARGS="-DPNG_SHARED=OFF -DPNG_TOOLS=OFF -DPNG_TESTS=OFF"
-LIBPNG_DIR="libpng-1.6.53"
+LIBPNG_DIR="libpng-1.6.55"
 
 FREETYPE_URL="https://download.savannah.gnu.org/releases/freetype/freetype-2.14.1.tar.xz"
 FREETYPE_ARGS="-DFT_DISABLE_BZIP2=ON -DFT_DISABLE_BROTLI=ON"
 FREETYPE_DIR="freetype-2.14.1"
 
-HARFBUZZ_URL="https://github.com/harfbuzz/harfbuzz/releases/download/12.3.0/harfbuzz-12.3.0.tar.xz"
+HARFBUZZ_URL="https://github.com/harfbuzz/harfbuzz/releases/download/12.3.2/harfbuzz-12.3.2.tar.xz"
 HARFBUZZ_ARGS="-Dfreetype=enabled -Dicu=disabled -Dtests=disabled -Dutilities=disabled" # TODO disable subset
-HARFBUZZ_DIR="harfbuzz-12.3.0"
+HARFBUZZ_DIR="harfbuzz-12.3.2"
 
 PIXMAN_URL="https://cairographics.org/releases/pixman-0.46.4.tar.gz"
 PIXMAN_ARGS="-Dtests=disabled -Ddemos=disabled -Dlibpng=disabled"
 PIXMAN_DIR="pixman-0.46.4"
 
-EXPAT_URL="https://github.com/libexpat/libexpat/releases/download/R_2_7_3/expat-2.7.3.tar.bz2"
+EXPAT_URL="https://github.com/libexpat/libexpat/releases/download/R_2_7_4/expat-2.7.4.tar.bz2"
 EXPAT_ARGS="-DEXPAT_BUILD_TOOLS=OFF -DEXPAT_BUILD_EXAMPLES=OFF \
 -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_DOCS=OFF -DEXPAT_SHARED_LIBS=OFF"
-EXPAT_DIR="expat-2.7.3"
+EXPAT_DIR="expat-2.7.4"
 
 LIBOGG_URL="https://downloads.xiph.org/releases/ogg/libogg-1.3.6.tar.xz"
 LIBOGG_DIR="libogg-1.3.6"
@@ -65,9 +65,9 @@ WILDMIDI_URL="https://github.com/Mindwerks/wildmidi/archive/wildmidi-0.4.6.tar.g
 WILDMIDI_DIR="wildmidi-wildmidi-0.4.6"
 WILDMIDI_ARGS="-DWANT_PLAYER=OFF -DWANT_STATIC=ON"
 
-OPUS_URL="https://downloads.xiph.org/releases/opus/opus-1.6.tar.gz"
+OPUS_URL="https://downloads.xiph.org/releases/opus/opus-1.6.1.tar.gz"
 OPUS_ARGS="-DOPUS_DISABLE_INTRINSICS=ON"
-OPUS_DIR="opus-1.6"
+OPUS_DIR="opus-1.6.1"
 
 OPUSFILE_URL="https://github.com/xiph/opusfile/releases/download/v0.12/opusfile-0.12.tar.gz"
 OPUSFILE_ARGS="--disable-http --disable-examples"

From 15e9cdccf6f58b3c2ac30cf6aa7383a99dcad095 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 23 Feb 2026 14:27:50 +0100
Subject: [PATCH 2/3] zlib 1.3.2: Has a new CMakeLists file

---
 shared/common.sh              | 10 -------
 shared/packages.ini           |  2 +-
 shared/zlib-only-static.patch | 54 -----------------------------------
 3 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 shared/zlib-only-static.patch

diff --git a/shared/common.sh b/shared/common.sh
index cfd01e26..4621b872 100644
--- a/shared/common.sh
+++ b/shared/common.sh
@@ -321,16 +321,6 @@ function icu_force_data_install {
 function patches_common {
 	_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-	# zlib: Install pkgconfig into lib and only build static library
-	if [ -d "$ZLIB_DIR" ]; then
-		verbosemsg "zlib"
-
-		(cd $ZLIB_DIR
-			perl -pi -e 's#/share/pkgconfig#/lib/pkgconfig#' CMakeLists.txt
-			patch -Np1 < $_SCRIPT_DIR/zlib-only-static.patch
-		)
-	fi
-
 	# png: move cmake configuration, fix using compiler with arguments
 	if [ -d "$LIBPNG_DIR" ]; then
 		verbosemsg "libpng"
diff --git a/shared/packages.ini b/shared/packages.ini
index 6dcb0070..c3b550ab 100644
--- a/shared/packages.ini
+++ b/shared/packages.ini
@@ -7,7 +7,7 @@ version_minor = 3
 version_patch = 2
 version = ${version_major}.${version_minor}.${version_patch}
 url = "https://zlib.net/fossils/zlib-${version}.tar.gz"
-arguments = "-DZLIB_BUILD_EXAMPLES=OFF"
+arguments = "-DZLIB_BUILD_TESTING=OFF -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_STATIC=ON"
 anitya_id = 5303
 
 [libpng]
diff --git a/shared/zlib-only-static.patch b/shared/zlib-only-static.patch
deleted file mode 100644
index 60e3f8d3..00000000
--- a/shared/zlib-only-static.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -123,9 +123,11 @@ set(ZLIB_SRCS
- )
- 
- if(NOT MINGW)
-+    if(BUILD_SHARED_LIBS)
-     set(ZLIB_DLL_SRCS
-         win32/zlib1.rc # If present will override custom build rule below.
-     )
-+    endif()
- endif()
- 
- # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
-@@ -146,15 +148,17 @@ if(MINGW)
-                             -I ${CMAKE_CURRENT_BINARY_DIR}
-                             -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-                             -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
-+    if(BUILD_SHARED_LIBS)
-     set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
-+    endif()
- endif(MINGW)
- 
--add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-+add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
- target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
--add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
--target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-+if (BUILD_SHARED_LIBS)
- set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
- set_target_properties(zlib PROPERTIES SOVERSION 1)
-+endif()
- 
- if(NOT CYGWIN)
-     # This property causes shared libraries on Linux to have the full version
-@@ -169,7 +173,7 @@ endif()
- 
- if(UNIX)
-     # On unix-like platforms the library is almost always called libz
--   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
-+   set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
-    if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX))
-      set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
-    endif()
-@@ -179,7 +183,7 @@ elseif(BUILD_SHARED_LIBS AND WIN32)
- endif()
- 
- if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
--    install(TARGETS zlib zlibstatic
-+    install(TARGETS zlib 
-         RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
-         ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
-         LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )

From 2a91d780b4ec0491f47b83f299733791a2d489cf Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 23 Feb 2026 14:28:14 +0100
Subject: [PATCH 3/3] Update fluidsynth, Fix icudata version detection

---
 shared/packages.ini       | 5 +++--
 shared/packages.sh        | 6 +++---
 tvos/2_build_toolchain.sh | 6 ------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/shared/packages.ini b/shared/packages.ini
index c3b550ab..f047077b 100644
--- a/shared/packages.ini
+++ b/shared/packages.ini
@@ -111,7 +111,7 @@ arguments = "--disable-http --disable-examples"
 anitya_id = 10353
 
 [fluidsynth]
-version = 2.5.2
+version = 2.5.3
 url = "https://github.com/FluidSynth/fluidsynth/archive/refs/tags/v${version}.tar.gz"
 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"
 anitya_id = 10437
@@ -157,7 +157,8 @@ anitya_id = 379847
 
 [icudata]
 version_major = 78
-version = ${version_major}
+version_minor = 2
+version = ${version_major}.${version_minor}
 _ini_comment = empty on purpose, otherwise polluted by default section
 directory = 
 url = https://ci.easyrpg.org/job/icudata/lastSuccessfulBuild/artifact/icudata${version_major}_all.tar.gz
diff --git a/shared/packages.sh b/shared/packages.sh
index 881081a3..17b82c0b 100644
--- a/shared/packages.sh
+++ b/shared/packages.sh
@@ -6,7 +6,7 @@
 
 
 ZLIB_URL="https://zlib.net/fossils/zlib-1.3.2.tar.gz"
-ZLIB_ARGS="-DZLIB_BUILD_EXAMPLES=OFF"
+ZLIB_ARGS="-DZLIB_BUILD_TESTING=OFF -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_STATIC=ON"
 ZLIB_DIR="zlib-1.3.2"
 
 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-
 OPUSFILE_ARGS="--disable-http --disable-examples"
 OPUSFILE_DIR="opusfile-0.12"
 
-FLUIDSYNTH_URL="https://github.com/FluidSynth/fluidsynth/archive/refs/tags/v2.5.2.tar.gz"
+FLUIDSYNTH_URL="https://github.com/FluidSynth/fluidsynth/archive/refs/tags/v2.5.3.tar.gz"
 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"
-FLUIDSYNTH_DIR="fluidsynth-2.5.2"
+FLUIDSYNTH_DIR="fluidsynth-2.5.3"
 
 FLUIDLITE_URL="https://github.com/divideconcept/FluidLite/archive/4a01cf1c67419e71da971d209f2855bbf4f3bab8.zip"
 FLUIDLITE_ARGS="-DFLUIDLITE_BUILD_STATIC=ON -DFLUIDLITE_BUILD_SHARED=OFF"
diff --git a/tvos/2_build_toolchain.sh b/tvos/2_build_toolchain.sh
index 05d60cbe..2c77ad67 100755
--- a/tvos/2_build_toolchain.sh
+++ b/tvos/2_build_toolchain.sh
@@ -22,12 +22,6 @@ if [ ! -f .patches-applied ]; then
 
 	patches_common
 
-	verbosemsg "FluidSynth"
-	(cd $FLUIDSYNTH_DIR
-		# Fix using unsupported flag
-		perl -pi -e "s#Darwin|iOS#Darwin|iOS|tvOS#" CMakeLists.txt
-	)
-
 	touch .patches-applied
 fi