diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index ebc02ec..67f2361 100755 --- a/scripts.d/10-mingw.sh +++ b/scripts.d/10-mingw.sh @@ -1,7 +1,7 @@ #!/bin/bash MINGW_REPO="https://github.com/mirror/mingw-w64.git" -MINGW_COMMIT="ea40a87ad09703b4cc0a47b83a5c4ed2a8276482" +MINGW_COMMIT="c17efd05d019136a9b3527e2dd32234175c0a9f9" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/scripts.d/21-libxml2.sh b/scripts.d/21-libxml2.sh index 6798798..28d3b93 100755 --- a/scripts.d/21-libxml2.sh +++ b/scripts.d/21-libxml2.sh @@ -1,7 +1,7 @@ #!/bin/bash LIBXML2_REPO="https://gitlab.gnome.org/GNOME/libxml2.git" -LIBXML2_COMMIT="cbe1212db6e22fa92c33242c3ce089476585f872" +LIBXML2_COMMIT="fb08d9fe837ab64934e6ddc66d442e599c805ca4" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index 58fa52e..f3d49f0 100755 --- a/scripts.d/45-harfbuzz.sh +++ b/scripts.d/45-harfbuzz.sh @@ -1,7 +1,7 @@ #!/bin/bash HARFBUZZ_REPO="https://github.com/harfbuzz/harfbuzz.git" -HARFBUZZ_COMMIT="cf203936d7ba74dfb567a92378476c3125010023" +HARFBUZZ_COMMIT="596f4258d0b6464a8186263625a2da1b16014bdd" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh index 33fe9e2..74b541d 100755 --- a/scripts.d/45-libsamplerate.sh +++ b/scripts.d/45-libsamplerate.sh @@ -1,7 +1,7 @@ #!/bin/bash LIBSR_REPO="https://github.com/libsndfile/libsamplerate.git" -LIBSR_COMMIT="3fd1232ceb8a7cc44b16e0f01bcd75c9c7b4651a" +LIBSR_COMMIT="0278ebe9c3da2dfb960cfc62aea192c3cff06866" ffbuild_enabled() { # Dependency of GPL-Only librubberband diff --git a/scripts.d/45-lv2.sh b/scripts.d/45-lv2.sh index 03119c2..7855a2c 100755 --- a/scripts.d/45-lv2.sh +++ b/scripts.d/45-lv2.sh @@ -1,7 +1,7 @@ #!/bin/bash LV2_REPO="https://github.com/lv2/lv2.git" -LV2_COMMIT="611759daacc377a2dba97723097338fceffd6ef8" +LV2_COMMIT="6cefc7df1a6158c79d23029df183c09b10b88cad" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh index f7e0ed0..ab63ff0 100755 --- a/scripts.d/45-opencl.sh +++ b/scripts.d/45-opencl.sh @@ -1,10 +1,10 @@ #!/bin/bash HEADERS_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git" -HEADERS_COMMIT="d1b936b72b9610626ecab8a991cec18348fba047" +HEADERS_COMMIT="23710f1b99186065c1768fc3098ba681adc0f253" LOADER_REPO="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git" -LOADER_COMMIT="99df8d88f7509739be7849da03a9fb1fb8bcbfa4" +LOADER_COMMIT="9b5e3849b49a1448996c8b96ba086cd774d987db" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index f0bb8b7..5d2e4bf 100755 --- a/scripts.d/45-vmaf.sh +++ b/scripts.d/45-vmaf.sh @@ -1,7 +1,7 @@ #!/bin/bash VMAF_REPO="https://github.com/Netflix/vmaf.git" -VMAF_COMMIT="7138a0b8f9834ca33a7712c174cad68dc2b770f8" +VMAF_COMMIT="e23732666b24792fee70afbb830b2f1805db30d6" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-vulkan.sh b/scripts.d/45-vulkan.sh index 8009073..502b453 100755 --- a/scripts.d/45-vulkan.sh +++ b/scripts.d/45-vulkan.sh @@ -1,7 +1,7 @@ #!/bin/bash LOADER_REPO="https://github.com/BtbN/Vulkan-Loader.git" -LOADER_COMMIT="8697146b15fe9accbd38527687e2059eebbab495" +LOADER_COMMIT="b42b70be453766f56b9ac21c11190b1b5fd74179" ffbuild_enabled() { [[ $ADDINS_STR != *vulkan* ]] && return -1 diff --git a/scripts.d/49-libvorbis.sh b/scripts.d/49-libvorbis.sh index 202aeb2..5fc3852 100755 --- a/scripts.d/49-libvorbis.sh +++ b/scripts.d/49-libvorbis.sh @@ -1,7 +1,7 @@ #!/bin/bash VORBIS_REPO="https://github.com/xiph/vorbis.git" -VORBIS_COMMIT="83a82dd9296400d811b78c06e9ca429e24dd1e5c" +VORBIS_COMMIT="4e1155cc77a2c672f3dd18f9a32dbf1404693289" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index 3b2a81c..f31f82e 100755 --- a/scripts.d/50-aom.sh +++ b/scripts.d/50-aom.sh @@ -1,7 +1,7 @@ #!/bin/bash AOM_REPO="https://aomedia.googlesource.com/aom" -AOM_COMMIT="08eb1d45f2f8c5dbeb2b77ba211c33c32b0fbe53" +AOM_COMMIT="8c1aa3050e5ab883bc86e9c772be73b6d2b9d23c" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh index 37e092c..9eff261 100755 --- a/scripts.d/50-avisynth.sh +++ b/scripts.d/50-avisynth.sh @@ -1,7 +1,7 @@ #!/bin/bash AVISYNTH_REPO="https://github.com/AviSynth/AviSynthPlus.git" -AVISYNTH_COMMIT="ae2e995f3abc4fe88b30c666498086d7f20d7659" +AVISYNTH_COMMIT="927e7a3fdd4428c44c58df216df5bdffc095f8b0" ffbuild_enabled() { [[ $VARIANT == gpl* ]] || return -1 diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index 3f1f0ea..6cadc90 100755 --- a/scripts.d/50-dav1d.sh +++ b/scripts.d/50-dav1d.sh @@ -1,7 +1,7 @@ #!/bin/bash DAV1D_REPO="https://code.videolan.org/videolan/dav1d.git" -DAV1D_COMMIT="be5200c4f072265add3f578f0b6f1a4ebc117000" +DAV1D_COMMIT="6c6d25d355b78556d231b1a5633ded2ddb9e3774" ffbuild_enabled() { return 0 @@ -33,9 +33,9 @@ ffbuild_dockerbuild() { return -1 fi - meson "${myconf[@]}" .. || return -1 - ninja -j$(nproc) || return -1 - ninja install || return -1 + meson "${myconf[@]}" .. + ninja -j$(nproc) + ninja install cd ../.. rm -rf dav1d diff --git a/scripts.d/50-glslang.sh b/scripts.d/50-glslang.sh index 8ccfbe7..a88a107 100755 --- a/scripts.d/50-glslang.sh +++ b/scripts.d/50-glslang.sh @@ -1,7 +1,7 @@ #!/bin/bash GLSLANG_REPO="https://github.com/KhronosGroup/glslang.git" -GLSLANG_COMMIT="e56beaee736863ce48455955158f1839e6e4c1a1" +GLSLANG_COMMIT="5878bcb17e43bf22cecaf6095900a33ff7f53445" ffbuild_enabled() { [[ $ADDINS_STR != *vulkan* ]] && return -1 diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh index f58bb02..6e431e3 100755 --- a/scripts.d/50-gme.sh +++ b/scripts.d/50-gme.sh @@ -1,7 +1,7 @@ #!/bin/bash GME_REPO="https://bitbucket.org/mpyne/game-music-emu.git" -GME_COMMIT="013d4676c689dc49f363f99dcfb8b88f22278236" +GME_COMMIT="b3d158a30492181fd7c38ef795c8d4dcfd77eaa9" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh index 81d3738..ad6f919 100755 --- a/scripts.d/50-libass.sh +++ b/scripts.d/50-libass.sh @@ -1,7 +1,7 @@ #!/bin/bash ASS_REPO="https://github.com/libass/libass.git" -ASS_COMMIT="d0634f4a669c86063e2765891bfdec17719f40c2" +ASS_COMMIT="49f116ab1fa4386f6a5191f322ac29872279516e" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh index 603180f..e748271 100755 --- a/scripts.d/50-libbluray.sh +++ b/scripts.d/50-libbluray.sh @@ -1,7 +1,7 @@ #!/bin/bash LIBBLURAY_REPO="https://code.videolan.org/videolan/libbluray.git" -LIBBLURAY_COMMIT="79429a524a1f339f4c2e6c90bb14939ab767ab00" +LIBBLURAY_COMMIT="7aae20a6a1660e2ed2d13246ea511809489cc25c" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh index fd4c9cb..dc325b1 100755 --- a/scripts.d/50-libopus.sh +++ b/scripts.d/50-libopus.sh @@ -1,7 +1,7 @@ #!/bin/bash OPUS_REPO="https://github.com/xiph/opus.git" -OPUS_COMMIT="d633f523e36e3b6d01cc6d57386458d770d618be" +OPUS_COMMIT="7b05f44f4baadf34d8d1073f4ff69f1806d5cdb4" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index a51705a..d59996c 100755 --- a/scripts.d/50-libvpx.sh +++ b/scripts.d/50-libvpx.sh @@ -1,7 +1,7 @@ #!/bin/bash LIBVPX_REPO="https://chromium.googlesource.com/webm/libvpx" -LIBVPX_COMMIT="02392eecccde436a76aca6c86a6fdf643e98eb38" +LIBVPX_COMMIT="8b3e575a45792fe490b5bc08c3fe08f01553756b" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index bd5813c..5f7dd8b 100755 --- a/scripts.d/50-libwebp.sh +++ b/scripts.d/50-libwebp.sh @@ -1,7 +1,7 @@ #!/bin/bash WEBP_REPO="https://chromium.googlesource.com/webm/libwebp" -WEBP_COMMIT="fae416179e0ad59dcce962a1e92d8fa3feeff0e9" +WEBP_COMMIT="25ae67b3de2ba941ff19ee0e90655b591faf048e" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index 12344b6..472eec7 100755 --- a/scripts.d/50-rav1e.sh +++ b/scripts.d/50-rav1e.sh @@ -1,10 +1,9 @@ #!/bin/bash -RAV1E_SRC_PREFIX="https://github.com/xiph/rav1e/releases/download/p20210216" +RAV1E_URL="https://github.com/xiph/rav1e/releases/download/v0.4.1/rav1e-0.4.1-windows-gnu.zip" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 - [[ $VARIANT == *4.2* ]] && return -1 return 0 } @@ -17,7 +16,7 @@ ffbuild_dockerbuild() { mkdir rav1e && cd rav1e if [[ $TARGET == win64 ]]; then - wget -O rav1e.zip "${RAV1E_SRC_PREFIX}/rav1e-windows-gnu.zip" + wget -O rav1e.zip "${RAV1E_URL}" else echo "Unknown target" return -1 diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh index 0b14748..7aa14cd 100755 --- a/scripts.d/50-rubberband.sh +++ b/scripts.d/50-rubberband.sh @@ -1,7 +1,7 @@ #!/bin/bash # https://breakfastquay.com/rubberband/ -RUBBERBAND_SRC="https://breakfastquay.com/files/releases/rubberband-1.9.0.tar.bz2" +RUBBERBAND_SRC="https://breakfastquay.com/files/releases/rubberband-1.9.1.tar.bz2" ffbuild_enabled() { [[ $VARIANT == gpl* ]] || return -1 @@ -17,37 +17,38 @@ ffbuild_dockerbuild() { mkdir rubberband cd rubberband - wget "$RUBBERBAND_SRC" -O rubberband.tar.gz || return -1 - tar xaf rubberband.tar.gz || return -1 + wget "$RUBBERBAND_SRC" -O rubberband.tar.gz + tar xaf rubberband.tar.gz rm rubberband.tar.gz - cd rubberband* || return -1 + cd rubberband* + + # Fix broken cross compilation + sed -i 's/build_machine.system/host_machine.system/' meson.build + + mkdir build && cd build local myconf=( --prefix="$FFBUILD_PREFIX" - --disable-shared - --enable-static - --disable-ladspa - --disable-vamp - --disable-programs + -Dno_shared=true ) if [[ $TARGET == win* ]]; then myconf+=( - --host="$FFBUILD_TOOLCHAIN" + --cross-file=/cross.meson ) else echo "Unknown target" return -1 fi - ./configure "${myconf[@]}" || return -1 - make -j$(nproc) || return -1 - make install || return -1 + meson "${myconf[@]}" .. + ninja -j$(nproc) + ninja install # Fix static linking echo "Requires.private: fftw3 samplerate" >> "$FFBUILD_PREFIX"/lib/pkgconfig/rubberband.pc - cd ../.. + cd ../../.. rm -rf rubberband } diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index c216ffd..828833d 100755 --- a/scripts.d/50-srt.sh +++ b/scripts.d/50-srt.sh @@ -1,7 +1,7 @@ #!/bin/bash SRT_REPO="https://github.com/Haivision/srt.git" -SRT_COMMIT="030b0d4f791313229fbd80ff5d4199d87afe7d18" +SRT_COMMIT="60ae6e56014b5ee48c8e25eda4d7fcc2e28f79cc" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index 8873fd3..91eb2d6 100755 --- a/scripts.d/50-svtav1.sh +++ b/scripts.d/50-svtav1.sh @@ -1,7 +1,7 @@ #!/bin/bash SVTAV1_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git" -SVTAV1_COMMIT="6870e6cadc166235b8fb5aa286564e0fb5039e4f" +SVTAV1_COMMIT="0a253a1cec457d50a3a441cec4d553c817bb7231" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh index 3f46809..34052d5 100755 --- a/scripts.d/50-x265.sh +++ b/scripts.d/50-x265.sh @@ -1,7 +1,7 @@ #!/bin/bash X265_REPO="https://bitbucket.org/multicoreware/x265_git.git" -X265_COMMIT="b2445965714d4b94ac41da3a15b7a4bf63d1fe3a" +X265_COMMIT="bf91444e034831141e0ce02b1200e51996f8b6c6" ffbuild_enabled() { [[ $VARIANT == gpl* ]] || return -1