Update SDL2, json, tremor, freetype, harfbuzz, libmpg123, libsamplerate, fluidsynth and fluidlite

[fdelapena]

Untested. Assuming some patches, if any, could require some amendments.

[Ghabry]

did you mess up a rebase? We already have these commits.

[fdelapena]

did you mess up a rebase? We already have these commits.

Fixed, I forgot to rebase from local master properly

[Ghabry]

Could you make a buildtest of Player using these buildscripts, at least on Linux? Then you can see at least if the patches still apply

[carstene1ns]

Sorry, had no time to do the testing for the toolchains yet.

• [x] 3ds
• [x] switch
• [x] vita
• [ ] emscripten
• [ ] linux-static
• [ ] wii
• [x] android

[Ghabry]

Can you bump:

json 3.10.4 samplerate 0.2.2 FluidLite https://github.com/divideconcept/FluidLite/commit/57a0e74e708f699b13d7c85b28a4e1ff5b71887c

[Ghabry]

also git rm fluidsynth-emscripten.patch and libxmp-no-symver.patch

diff --git a/emscripten/2_build_toolchain.sh b/emscripten/2_build_toolchain.sh
index d5a3786..86d2f7a 100755
--- a/emscripten/2_build_toolchain.sh
+++ b/emscripten/2_build_toolchain.sh
@@ -37,11 +37,6 @@ if [ ! -f .patches-applied ]; then
        patch -Np1 < ../xmp-emscripten.patch
    )

-   # Fix fluidsynth
-   (cd $FLUIDSYNTH_DIR
-       patch -Np1 < ../fluidsynth-emscripten.patch
-   )
-
    cp -rup icu icu-native

    touch .patches-applied
diff --git a/shared/common.sh b/shared/common.sh
index 74b3abf..3b24d2d 100644
--- a/shared/common.sh
+++ b/shared/common.sh
@@ -254,8 +254,6 @@ function patches_common {
    if [ -d "$LIBXMP_LITE_DIR" ]; then
        # compile fix
        (cd $LIBXMP_LITE_DIR
-           patch -Np1 < $_SCRIPT_DIR/libxmp-no-symver.patch
-
            # Use custom CMakeLists.txt
            cp $_SCRIPT_DIR/CMakeLists_xmplite.txt ./CMakeLists.txt
        )
diff --git a/shared/packages.sh b/shared/packages.sh
index 1a6e8bf..ee73600 100644
--- a/shared/packages.sh
+++ b/shared/packages.sh
@@ -72,8 +72,8 @@ SPEEXDSP_DIR="$lib-$ver"
 SPEEXDSP_ARGS="--disable-sse --disable-neon"

 lib=libsamplerate
-ver=0.2.1
-LIBSAMPLERATE_URL="https://github.com/libsndfile/libsamplerate/releases/download/$ver/$lib-$ver.tar.bz2"
+ver=0.2.2
+LIBSAMPLERATE_URL="https://github.com/libsndfile/libsamplerate/releases/download/$ver/$lib-$ver.tar.xz"
 LIBSAMPLERATE_DIR="$lib-$ver"

 lib=wildmidi
@@ -100,13 +100,13 @@ FLUIDSYNTH_URL="https://github.com/FluidSynth/fluidsynth/archive/refs/tags/v$ver
 FLUIDSYNTH_DIR="$lib-$ver"

 lib=FluidLite
-ver=fdd05bad03cdb24d1f78b5fe3453842890c1b0e8
+ver=57a0e74e708f699b13d7c85b28a4e1ff5b71887c
 FLUIDLITE_URL="https://github.com/divideconcept/$lib/archive/$ver.zip"
 FLUIDLITE_DIR="$lib-$ver"
 FLUIDLITE_ARGS="-DFLUIDLITE_BUILD_STATIC=ON -DFLUIDLITE_BUILD_SHARED=OFF"

 lib=json
-ver=3.10.2
+ver=3.10.4
 NLOHMANNJSON_URL="https://github.com/nlohmann/$lib/archive/v$ver.tar.gz"
 NLOHMANNJSON_DIR=$lib-$ver
 NLOHMANNJSON_ARGS="-DJSON_BuildTests=OFF"
diff --git a/vita/1_download_library.sh b/vita/1_download_library.sh
index 2303a35..0b37b1e 100755
--- a/vita/1_download_library.sh
+++ b/vita/1_download_library.sh
@@ -18,7 +18,7 @@ function download_and_extract_shaders {
 msg " [1] Installing local Vita SDK"

 export VITASDK=$PWD/vitasdk
-export URL="https://github.com/vitasdk/autobuilds/releases/download/master-linux-v1498/vitasdk-x86_64-linux-gnu-2021-06-13_20-39-05.tar.bz2"
+export URL="https://github.com/vitasdk/autobuilds/releases/download/master-linux-v2.171/vitasdk-x86_64-linux-gnu-2021-09-30_23-13-51.tar.bz2"

 mkdir -p vitasdk
 curl -sSLR -o vitasdk-nightly.tar.bz2 "$URL"

[Ghabry]

Made a build test of Player and everything builds here. Just apply my patch and delete the unused files and we are good to go :+1:

[Ghabry]

for some reason CMake installs now in lib64 for linux-static, including the pkg-config files. o_O

Added a temporary workaround to ensure this still compiles but should be fixed properly