Skip to content

Vita: Disable ICU mutex code (deadlocks on startup), bump libpng #199

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

Merged
Ghabry merged 2 commits into from
Apr 14, 2025
Merged

Vita: Disable ICU mutex code (deadlocks on startup), bump libpng #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d954134
Vita: Disable ICU mutex code (deadlocks on startup)
Ghabry Apr 12, 2025
a1ac8ed
libpng: Update to 1.6.47 (wrong antiya id)
Ghabry Apr 12, 2025
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
6 changes: 3 additions & 3 deletions shared/libpng-custom-cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -Nur libpng-1.6.39-orig/scripts/genout.cmake.in libpng-1.6.39/scripts/genout.cmake.in
--- libpng-1.6.39-orig/scripts/genout.cmake.in 2022-11-20 22:53:23.000000000 +0100
+++ libpng-1.6.39/scripts/genout.cmake.in 2024-06-09 18:38:38.953706845 +0200
diff -Nur libpng-1.6.39-orig/scripts/cmake/genout.cmake.in libpng-1.6.39/scripts/cmake/genout.cmake.in
--- libpng-1.6.39-orig/scripts/cmake/genout.cmake.in 2022-11-20 22:53:23.000000000 +0100
+++ libpng-1.6.39/scripts/cmake/genout.cmake.in 2024-06-09 18:38:38.953706845 +0200
@@ -14,6 +14,7 @@

set(AWK "@AWK@")
Expand Down
6 changes: 3 additions & 3 deletions shared/packages.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ arguments = "-DZLIB_BUILD_EXAMPLES=OFF"
anitya_id = 5303

[libpng]
version = 1.6.39
version = 1.6.47
url = "https://download.sourceforge.net/libpng/libpng-${version}.tar.xz"
arguments = "-DPNG_SHARED=OFF -DPNG_EXECUTABLES=OFF -DPNG_TESTS=OFF"
anitya_id = 15294
anitya_id = 1705

[freetype]
version = 2.13.3
Expand Down Expand Up @@ -159,7 +159,7 @@ version_major = 76
version_minor = 1
version = ${version_major}-${version_minor}
_ini_comment = empty on purpose, otherwise polluted by default section
directory =
directory =
url = https://ci.easyrpg.org/job/icudata/lastSuccessfulBuild/artifact/icudata${version_major}_all.tar.gz
files = "icudt*.dat"
anitya_id = 16134
Expand Down
4 changes: 2 additions & 2 deletions shared/packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ ZLIB_URL="https://zlib.net/fossils/zlib-1.3.1.tar.gz"
ZLIB_ARGS="-DZLIB_BUILD_EXAMPLES=OFF"
ZLIB_DIR="zlib-1.3.1"

LIBPNG_URL="https://download.sourceforge.net/libpng/libpng-1.6.39.tar.xz"
LIBPNG_URL="https://download.sourceforge.net/libpng/libpng-1.6.47.tar.xz"
LIBPNG_ARGS="-DPNG_SHARED=OFF -DPNG_EXECUTABLES=OFF -DPNG_TESTS=OFF"
LIBPNG_DIR="libpng-1.6.39"
LIBPNG_DIR="libpng-1.6.47"

FREETYPE_URL="https://download.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.xz"
FREETYPE_ARGS="-DFT_DISABLE_BZIP2=ON -DFT_DISABLE_BROTLI=ON"
Expand Down
3 changes: 3 additions & 0 deletions vita/2_build_toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ if [ ! -f .patches-applied ]; then
)

# Fix icu build
# Remove mutexes (crashes)
patch -Np0 < $SCRIPT_DIR/../shared/extra/icu-no-mutex.patch
# Vita specific fixes
patch -Np0 < $SCRIPT_DIR/icu-vita.patch

# Disable vita2dlib jpeg dependency
Expand Down