Skip to content

Commit e176d9c

Browse files
authored
Merge branch 'PCSX2:master' into dev
2 parents a987bd8 + ba705c8 commit e176d9c

21 files changed

+1930
-1252
lines changed

.github/workflows/scripts/linux/build-dependencies-qt.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LIBWEBP=1.5.0
2121
LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
2222
SDL=SDL2-2.30.12
2323
QT=6.8.2
24-
ZSTD=1.5.6
24+
ZSTD=1.5.7
2525

2626
SHADERC=2024.1
2727
SHADERC_GLSLANG=142052fa30f9eca191aa9dcf65359fcaed09eeec
@@ -38,7 +38,7 @@ fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79 $LIBBACKTRACE.
3838
7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c libwebp-$LIBWEBP.tar.gz
3939
0728800155f3ed0a0c87e03addbd30ecbe374f7b080678bbca1506051d50dec3 $LZ4.tar.gz
4040
ac356ea55e8b9dd0b2d1fa27da40ef7e238267ccf9324704850d5d47375b48ea $SDL.tar.gz
41-
8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1 zstd-$ZSTD.tar.gz
41+
eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3 zstd-$ZSTD.tar.gz
4242
012043ce6d411e6e8a91fdc4e05e6bedcfa10fcb1347d3c33908f7fdd10dfe05 qtbase-everywhere-src-$QT.tar.xz
4343
d2a1bbb84707b8a0aec29227b170be00f04383fbf2361943596d09e7e443c8e1 qtimageformats-everywhere-src-$QT.tar.xz
4444
aa2579f21ca66d19cbcf31d87e9067e07932635d36869c8239d4decd0a9dc1fa qtsvg-everywhere-src-$QT.tar.xz

.github/workflows/scripts/macos/build-dependencies-universal.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fi
4141
FREETYPE=2.13.3
4242
HARFBUZZ=10.0.1
4343
SDL=SDL2-2.30.12
44-
ZSTD=1.5.6
44+
ZSTD=1.5.7
4545
LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
4646
LIBPNG=1.6.45
4747
LIBJPEG=9f
@@ -77,7 +77,7 @@ cat > SHASUMS <<EOF
7777
0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289 freetype-$FREETYPE.tar.xz
7878
e7358ea86fe10fb9261931af6f010d4358dac64f7074420ca9bc94aae2bdd542 harfbuzz-$HARFBUZZ.tar.gz
7979
ac356ea55e8b9dd0b2d1fa27da40ef7e238267ccf9324704850d5d47375b48ea $SDL.tar.gz
80-
8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1 zstd-$ZSTD.tar.gz
80+
eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3 zstd-$ZSTD.tar.gz
8181
0728800155f3ed0a0c87e03addbd30ecbe374f7b080678bbca1506051d50dec3 $LZ4.tar.gz
8282
926485350139ffb51ef69760db35f78846c805fef3d59bfdcb2fba704663f370 libpng-$LIBPNG.tar.xz
8383
7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c libwebp-$LIBWEBP.tar.gz

.github/workflows/scripts/macos/build-dependencies.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ fi
2323
FREETYPE=2.13.3
2424
HARFBUZZ=10.0.1
2525
SDL=SDL2-2.30.12
26-
ZSTD=1.5.6
26+
ZSTD=1.5.7
2727
LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
2828
LIBPNG=1.6.45
2929
LIBJPEG=9f
@@ -57,7 +57,7 @@ cat > SHASUMS <<EOF
5757
0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289 freetype-$FREETYPE.tar.xz
5858
e7358ea86fe10fb9261931af6f010d4358dac64f7074420ca9bc94aae2bdd542 harfbuzz-$HARFBUZZ.tar.gz
5959
ac356ea55e8b9dd0b2d1fa27da40ef7e238267ccf9324704850d5d47375b48ea $SDL.tar.gz
60-
8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1 zstd-$ZSTD.tar.gz
60+
eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3 zstd-$ZSTD.tar.gz
6161
0728800155f3ed0a0c87e03addbd30ecbe374f7b080678bbca1506051d50dec3 $LZ4.tar.gz
6262
926485350139ffb51ef69760db35f78846c805fef3d59bfdcb2fba704663f370 libpng-$LIBPNG.tar.xz
6363
7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c libwebp-$LIBWEBP.tar.gz

0 commit comments

Comments
 (0)