diff --git a/3ds/2_build_toolchain.sh b/3ds/2_build_toolchain.sh index 201b26e9..c0183a5c 100755 --- a/3ds/2_build_toolchain.sh +++ b/3ds/2_build_toolchain.sh @@ -34,6 +34,11 @@ if [ ! -f .patches-applied ]; then autoreconf -fi ) + # Fix opus (remove when next version is out) + (cd $OPUS_DIR + patch -Np1 < $SCRIPT_DIR/opus-fix-types.patch + ) + # Fix opusfile (cd $OPUSFILE_DIR patch -Np1 < $SCRIPT_DIR/../shared/extra/opusfile-devkit.patch @@ -99,7 +104,7 @@ install_lib $MPG123_DIR $MPG123_ARGS install_lib_cmake $LIBXMP_LITE_DIR $LIBXMP_LITE_ARGS install_lib $SPEEXDSP_DIR $SPEEXDSP_ARGS install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS -install_lib $OPUS_DIR $OPUS_ARGS +install_lib $OPUS_DIR $OPUS_ARGS --disable-asm install_lib $OPUSFILE_DIR $OPUSFILE_ARGS install_lib_cmake $FLUIDLITE_DIR $FLUIDLITE_ARGS install_lib_meson $INIH_DIR $INIH_ARGS diff --git a/3ds/opus-fix-types.patch b/3ds/opus-fix-types.patch new file mode 100644 index 00000000..fc325016 --- /dev/null +++ b/3ds/opus-fix-types.patch @@ -0,0 +1,12 @@ +diff '--color=auto' -Naur opus-1.5.1-orig/src/opus_private.h opus-1.5.1/src/opus_private.h +--- opus-1.5.1-orig/src/opus_private.h 2024-01-26 06:17:36.000000000 +0100 ++++ opus-1.5.1/src/opus_private.h 2024-03-29 12:35:28.073702694 +0100 +@@ -214,7 +214,7 @@ + + opus_int32 opus_packet_extensions_parse(const unsigned char *data, opus_int32 len, opus_extension_data *extensions, opus_int32 *nb_extensions); + +-opus_int32 opus_packet_extensions_generate(unsigned char *data, opus_int32 len, const opus_extension_data *extensions, int nb_extensions, int pad); ++opus_int32 opus_packet_extensions_generate(unsigned char *data, opus_int32 len, const opus_extension_data *extensions, opus_int32 nb_extensions, int pad); + + opus_int32 opus_packet_extensions_count(const unsigned char *data, opus_int32 len); + diff --git a/shared/fluidsynth-no-deps.patch b/shared/fluidsynth-no-deps.patch index 734c92ed..8e25072f 100644 --- a/shared/fluidsynth-no-deps.patch +++ b/shared/fluidsynth-no-deps.patch @@ -1,14 +1,14 @@ -From 9682aa045f1ae8265919770bf2a63a8337764eca Mon Sep 17 00:00:00 2001 +From d11f0149429f8fc5a2f9ad79c7d9040bf72af5cc Mon Sep 17 00:00:00 2001 From: Ghabry Date: Fri, 17 Mar 2023 14:02:43 +0100 -Subject: [PATCH 2/2] Disable most features +Subject: [PATCH] Disable most features --- CMakeLists.txt | 54 +++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index dd3a0c8..7dda03e 100644 +index 433197fe..df81f4c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,44 +76,44 @@ option ( enable-trap-on-fpe "enable SIGFPE trap on Floating Point Exceptions" of @@ -62,9 +62,8 @@ index dd3a0c8..7dda03e 100644 # Platform specific options if ( CMAKE_SYSTEM MATCHES "Linux|FreeBSD|DragonFly" ) -- option ( enable-lash "compile LASH support (if it is available)" on ) + option ( enable-lash "compile LASH support (if it is available)" off ) - option ( enable-alsa "compile ALSA support (if it is available)" on ) -+ option ( enable-lash "compile LASH support (if it is available)" off ) + option ( enable-alsa "compile ALSA support (if it is available)" off ) endif ( CMAKE_SYSTEM MATCHES "Linux|FreeBSD|DragonFly" ) @@ -84,5 +83,5 @@ index dd3a0c8..7dda03e 100644 if ( CMAKE_SYSTEM MATCHES "OS2" ) -- -2.40.0 +2.44.0 diff --git a/shared/packages.ini b/shared/packages.ini index 7419b8a2..37ac249a 100644 --- a/shared/packages.ini +++ b/shared/packages.ini @@ -18,7 +18,7 @@ arguments = "-DFT_DISABLE_BZIP2=ON -DFT_DISABLE_BROTLI=ON" anitya_id = 854 [harfbuzz] -version = 8.3.0 +version = 8.4.0 url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz" arguments = "-Dfreetype=enabled -Dtests=disabled -Dutilities=disabled" # TODO disable subset anitya_id = 1299 @@ -32,7 +32,7 @@ anitya_id = 3648 [expat] version_major = 2 version_minor = 6 -version_patch = 1 +version_patch = 2 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" @@ -93,7 +93,7 @@ arguments = "-DWANT_PLAYER=OFF -DWANT_STATIC=ON" anitya_id = 9179 [opus] -version = 1.4 +version = 1.5.1 url = "https://downloads.xiph.org/releases/opus/opus-${version}.tar.gz" arguments = "--disable-intrinsics --disable-extra-programs" anitya_id = 11081 @@ -105,7 +105,7 @@ arguments = "--disable-http --disable-examples" anitya_id = 10353 [fluidsynth] -version = 2.3.4 +version = 2.3.5 url = "https://github.com/FluidSynth/fluidsynth/archive/refs/tags/v${version}.tar.gz" arguments = "-DLIB_SUFFIX=''" anitya_id = 10437 @@ -158,7 +158,7 @@ url = https://ci.easyrpg.org/job/icudata/lastSuccessfulBuild/artifact/icudata.ta files = "icudt*.dat" [SDL2] -version = 2.28.5 +version = 2.30.1 url = "https://libsdl.org/release/SDL2-${version}.tar.gz" anitya_id = 4779 diff --git a/shared/packages.sh b/shared/packages.sh index 2b292e4e..a2e23b28 100644 --- a/shared/packages.sh +++ b/shared/packages.sh @@ -15,18 +15,18 @@ FREETYPE_URL="https://mirrors.sarata.com/non-gnu/freetype/freetype-2.13.2.tar.xz FREETYPE_ARGS="-DFT_DISABLE_BZIP2=ON -DFT_DISABLE_BROTLI=ON" FREETYPE_DIR="freetype-2.13.2" -HARFBUZZ_URL="https://github.com/harfbuzz/harfbuzz/releases/download/8.3.0/harfbuzz-8.3.0.tar.xz" +HARFBUZZ_URL="https://github.com/harfbuzz/harfbuzz/releases/download/8.4.0/harfbuzz-8.4.0.tar.xz" HARFBUZZ_ARGS="-Dfreetype=enabled -Dtests=disabled -Dutilities=disabled" # TODO disable subset -HARFBUZZ_DIR="harfbuzz-8.3.0" +HARFBUZZ_DIR="harfbuzz-8.4.0" PIXMAN_URL="https://cairographics.org/releases/pixman-0.43.4.tar.gz" PIXMAN_ARGS="-Dtests=disabled -Ddemos=disabled -Dlibpng=disabled" PIXMAN_DIR="pixman-0.43.4" -EXPAT_URL="https://github.com/libexpat/libexpat/releases/download/R_2_6_1/expat-2.6.1.tar.bz2" +EXPAT_URL="https://github.com/libexpat/libexpat/releases/download/R_2_6_2/expat-2.6.2.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.6.1" +EXPAT_DIR="expat-2.6.2" LIBOGG_URL="https://downloads.xiph.org/releases/ogg/libogg-1.3.5.tar.xz" LIBOGG_DIR="libogg-1.3.5" @@ -62,17 +62,17 @@ WILDMIDI_URL="https://github.com/Mindwerks/wildmidi/archive/wildmidi-0.4.5.tar.g WILDMIDI_DIR="wildmidi-wildmidi-0.4.5" WILDMIDI_ARGS="-DWANT_PLAYER=OFF -DWANT_STATIC=ON" -OPUS_URL="https://downloads.xiph.org/releases/opus/opus-1.4.tar.gz" +OPUS_URL="https://downloads.xiph.org/releases/opus/opus-1.5.1.tar.gz" OPUS_ARGS="--disable-intrinsics --disable-extra-programs" -OPUS_DIR="opus-1.4" +OPUS_DIR="opus-1.5.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.3.4.tar.gz" +FLUIDSYNTH_URL="https://github.com/FluidSynth/fluidsynth/archive/refs/tags/v2.3.5.tar.gz" FLUIDSYNTH_ARGS="-DLIB_SUFFIX=''" -FLUIDSYNTH_DIR="fluidsynth-2.3.4" +FLUIDSYNTH_DIR="fluidsynth-2.3.5" FLUIDLITE_URL="https://github.com/divideconcept/FluidLite/archive/57a0e74e708f699b13d7c85b28a4e1ff5b71887c.zip" FLUIDLITE_ARGS="-DFLUIDLITE_BUILD_STATIC=ON -DFLUIDLITE_BUILD_SHARED=OFF" @@ -101,8 +101,8 @@ ICU_ARGS="--enable-strict=no --disable-tests --disable-samples \ ICUDATA_URL=https://ci.easyrpg.org/job/icudata/lastSuccessfulBuild/artifact/icudata.tar.gz ICUDATA_FILES="icudt*.dat" -SDL2_URL="https://libsdl.org/release/SDL2-2.28.5.tar.gz" -SDL2_DIR="SDL2-2.28.5" +SDL2_URL="https://libsdl.org/release/SDL2-2.30.1.tar.gz" +SDL2_DIR="SDL2-2.30.1" # only needed for lmu2png tool SDL2_IMAGE_URL="https://libsdl.org/projects/SDL_image/release/SDL2_image-2.8.0.tar.gz"