Skip to content

Commit 3e0d87c

Browse files
GhabryGhabry
authored
Merge pull request #216 from EasyRPG/update/libraries
Automatic library update
2 parents 9dac569 + 2a91d78 commit 3e0d87c

5 files changed

Lines changed: 22 additions & 91 deletions

File tree

‎shared/common.sh‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -321,16 +321,6 @@ function icu_force_data_install {
321321
function patches_common {
322322
_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
323323

324-
# zlib: Install pkgconfig into lib and only build static library
325-
if [ -d "$ZLIB_DIR" ]; then
326-
verbosemsg "zlib"
327-
328-
(cd $ZLIB_DIR
329-
perl -pi -e 's#/share/pkgconfig#/lib/pkgconfig#' CMakeLists.txt
330-
patch -Np1 < $_SCRIPT_DIR/zlib-only-static.patch
331-
)
332-
fi
333-
334324
# png: move cmake configuration, fix using compiler with arguments
335325
if [ -d "$LIBPNG_DIR" ]; then
336326
verbosemsg "libpng"

‎shared/packages.ini‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ directory = "${section}-${version}"
44
[zlib]
55
version_major = 1
66
version_minor = 3
7-
version_patch = 1
7+
version_patch = 2
88
version = ${version_major}.${version_minor}.${version_patch}
99
url = "https://zlib.net/fossils/zlib-${version}.tar.gz"
10-
arguments = "-DZLIB_BUILD_EXAMPLES=OFF"
10+
arguments = "-DZLIB_BUILD_TESTING=OFF -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_STATIC=ON"
1111
anitya_id = 5303
1212

1313
[libpng]
14-
version = 1.6.53
14+
version = 1.6.55
1515
url = "https://download.sourceforge.net/libpng/libpng-${version}.tar.xz"
1616
arguments = "-DPNG_SHARED=OFF -DPNG_TOOLS=OFF -DPNG_TESTS=OFF"
1717
anitya_id = 1705
@@ -23,7 +23,7 @@ arguments = "-DFT_DISABLE_BZIP2=ON -DFT_DISABLE_BROTLI=ON"
2323
anitya_id = 854
2424

2525
[harfbuzz]
26-
version = 12.3.0
26+
version = 12.3.2
2727
url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
2828
arguments = "-Dfreetype=enabled -Dicu=disabled -Dtests=disabled -Dutilities=disabled" # TODO disable subset
2929
anitya_id = 1299
@@ -37,7 +37,7 @@ anitya_id = 3648
3737
[expat]
3838
version_major = 2
3939
version_minor = 7
40-
version_patch = 3
40+
version_patch = 4
4141
version = ${version_major}.${version_minor}.${version_patch}
4242
version_url = ${version_major}_${version_minor}_${version_patch}
4343
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"
9999
anitya_id = 9179
100100

101101
[opus]
102-
version = 1.6
102+
version = 1.6.1
103103
url = "https://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"
104104
arguments = "-DOPUS_DISABLE_INTRINSICS=ON"
105105
anitya_id = 11081
@@ -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: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@
55
#######################################
66

77

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

12-
LIBPNG_URL="https://download.sourceforge.net/libpng/libpng-1.6.53.tar.xz"
12+
LIBPNG_URL="https://download.sourceforge.net/libpng/libpng-1.6.55.tar.xz"
1313
LIBPNG_ARGS="-DPNG_SHARED=OFF -DPNG_TOOLS=OFF -DPNG_TESTS=OFF"
14-
LIBPNG_DIR="libpng-1.6.53"
14+
LIBPNG_DIR="libpng-1.6.55"
1515

1616
FREETYPE_URL="https://download.savannah.gnu.org/releases/freetype/freetype-2.14.1.tar.xz"
1717
FREETYPE_ARGS="-DFT_DISABLE_BZIP2=ON -DFT_DISABLE_BROTLI=ON"
1818
FREETYPE_DIR="freetype-2.14.1"
1919

20-
HARFBUZZ_URL="https://github.com/harfbuzz/harfbuzz/releases/download/12.3.0/harfbuzz-12.3.0.tar.xz"
20+
HARFBUZZ_URL="https://github.com/harfbuzz/harfbuzz/releases/download/12.3.2/harfbuzz-12.3.2.tar.xz"
2121
HARFBUZZ_ARGS="-Dfreetype=enabled -Dicu=disabled -Dtests=disabled -Dutilities=disabled" # TODO disable subset
22-
HARFBUZZ_DIR="harfbuzz-12.3.0"
22+
HARFBUZZ_DIR="harfbuzz-12.3.2"
2323

2424
PIXMAN_URL="https://cairographics.org/releases/pixman-0.46.4.tar.gz"
2525
PIXMAN_ARGS="-Dtests=disabled -Ddemos=disabled -Dlibpng=disabled"
2626
PIXMAN_DIR="pixman-0.46.4"
2727

28-
EXPAT_URL="https://github.com/libexpat/libexpat/releases/download/R_2_7_3/expat-2.7.3.tar.bz2"
28+
EXPAT_URL="https://github.com/libexpat/libexpat/releases/download/R_2_7_4/expat-2.7.4.tar.bz2"
2929
EXPAT_ARGS="-DEXPAT_BUILD_TOOLS=OFF -DEXPAT_BUILD_EXAMPLES=OFF \
3030
-DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_DOCS=OFF -DEXPAT_SHARED_LIBS=OFF"
31-
EXPAT_DIR="expat-2.7.3"
31+
EXPAT_DIR="expat-2.7.4"
3232

3333
LIBOGG_URL="https://downloads.xiph.org/releases/ogg/libogg-1.3.6.tar.xz"
3434
LIBOGG_DIR="libogg-1.3.6"
@@ -65,17 +65,17 @@ WILDMIDI_URL="https://github.com/Mindwerks/wildmidi/archive/wildmidi-0.4.6.tar.g
6565
WILDMIDI_DIR="wildmidi-wildmidi-0.4.6"
6666
WILDMIDI_ARGS="-DWANT_PLAYER=OFF -DWANT_STATIC=ON"
6767

68-
OPUS_URL="https://downloads.xiph.org/releases/opus/opus-1.6.tar.gz"
68+
OPUS_URL="https://downloads.xiph.org/releases/opus/opus-1.6.1.tar.gz"
6969
OPUS_ARGS="-DOPUS_DISABLE_INTRINSICS=ON"
70-
OPUS_DIR="opus-1.6"
70+
OPUS_DIR="opus-1.6.1"
7171

7272
OPUSFILE_URL="https://github.com/xiph/opusfile/releases/download/v0.12/opusfile-0.12.tar.gz"
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"

‎shared/zlib-only-static.patch‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎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)