Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 0 additions & 10 deletions shared/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
17 changes: 9 additions & 8 deletions shared/packages.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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"
arguments = "-DZLIB_BUILD_TESTING=OFF -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_STATIC=ON"
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
Expand All @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
26 changes: 13 additions & 13 deletions shared/packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@
#######################################


ZLIB_URL="https://zlib.net/fossils/zlib-1.3.1.tar.gz"
ZLIB_ARGS="-DZLIB_BUILD_EXAMPLES=OFF"
ZLIB_DIR="zlib-1.3.1"
ZLIB_URL="https://zlib.net/fossils/zlib-1.3.2.tar.gz"
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.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"
Expand Down Expand Up @@ -65,17 +65,17 @@ 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"
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"
Expand Down
54 changes: 0 additions & 54 deletions shared/zlib-only-static.patch

This file was deleted.

6 changes: 0 additions & 6 deletions tvos/2_build_toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down