From 787aa9ab3999dbbfc715927080a9e13e29133144 Mon Sep 17 00:00:00 2001
From: n00mkrad <login@nmkd.de>
Date: Wed, 13 Apr 2022 12:24:29 +0200
Subject: [PATCH 001/160] Update to rc2
Update SVT-AV1 to 1.0.0-rc1
---
scripts.d/50-svtav1.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index ffb3a83..c54113b 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="a9dcf001750ce894187c4bed216675ccc5e038e9"
+SVTAV1_COMMIT="a508cd5386ecf6de8cf2c47a27a3168bcce52907"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
From 0795443336ad66cc6f37ab68df754c6eeade4df6 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sat, 23 Apr 2022 21:49:20 +0200
Subject: [PATCH 002/160] Update dependencies
---
scripts.d/10-mingw-std-threads.sh | 2 +-
scripts.d/10-mingw.sh | 2 +-
scripts.d/20-libxml2.sh | 2 +-
scripts.d/25-freetype.sh | 2 +-
scripts.d/25-fribidi.sh | 2 +-
scripts.d/35-fontconfig.sh | 2 +-
scripts.d/45-harfbuzz.sh | 2 +-
scripts.d/45-pulseaudio.sh | 2 +-
scripts.d/45-vmaf.sh | 2 +-
scripts.d/45-x11/10-xproto.sh | 2 +-
scripts.d/45-x11/40-libx11.sh | 2 +-
scripts.d/45-x11/60-libglvnd.sh | 2 +-
scripts.d/45-x11/60-libxcursor.sh | 2 +-
scripts.d/50-amf.sh | 2 +-
scripts.d/50-aom.sh | 2 +-
scripts.d/50-avisynth.sh | 2 +-
scripts.d/50-dav1d.sh | 2 +-
scripts.d/50-frei0r.sh | 2 +-
scripts.d/50-libass.sh | 2 +-
scripts.d/50-libbluray.sh | 2 +-
scripts.d/50-libopus.sh | 2 +-
scripts.d/50-librist/50-librist.sh | 2 +-
scripts.d/50-libvpx.sh | 2 +-
scripts.d/50-libwebp.sh | 2 +-
scripts.d/50-openh264.sh | 2 +-
scripts.d/50-openmpt.sh | 2 +-
scripts.d/50-rav1e.sh | 2 +-
scripts.d/50-rubberband.sh | 2 +-
scripts.d/50-sdl.sh | 2 +-
scripts.d/50-srt.sh | 2 +-
scripts.d/50-svtav1.sh | 2 +-
scripts.d/50-uavs3d.sh | 2 +-
scripts.d/50-vaapi/30-libpciaccess.sh | 2 +-
scripts.d/50-vaapi/40-libdrm.sh | 2 +-
scripts.d/50-vaapi/50-libva.sh | 2 +-
scripts.d/50-vulkan/45-vulkan.sh | 2 +-
scripts.d/50-vulkan/55-spirv-cross.sh | 2 +-
scripts.d/50-vulkan/60-libplacebo.sh | 2 +-
scripts.d/50-x265.sh | 2 +-
scripts.d/50-zimg.sh | 2 +-
40 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/scripts.d/10-mingw-std-threads.sh b/scripts.d/10-mingw-std-threads.sh
index 1a2ad30..7727df4 100755
--- a/scripts.d/10-mingw-std-threads.sh
+++ b/scripts.d/10-mingw-std-threads.sh
@@ -1,7 +1,7 @@
#!/bin/bash
MINGW_STD_THREADS_REPO="https://github.com/meganz/mingw-std-threads.git"
-MINGW_STD_THREADS_COMMIT="7e2507915900f5589febf0d8972cd5c9c03191f2"
+MINGW_STD_THREADS_COMMIT="6c2061b7da41d6aa1b2162ff4383ec3ece864bc6"
ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index 3a4325b..c019444 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="99c95def1dcafdd7a2faa671942bdd17cc19864d"
+MINGW_COMMIT="f6b0870e4de11fd04155511606bb6e6564d38c71"
ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh
index 0456322..6914d3a 100755
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
LIBXML2_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-LIBXML2_COMMIT="48ed5a74bdf24c630b99b063fa79b1a79c2ae5f3"
+LIBXML2_COMMIT="145170125af959c814d33899bebb57f2da2f541b"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index fcba45d..91b9690 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# https://sourceforge.net/projects/freetype/files/freetype2/
-FREETYPE_SRC="https://sourceforge.net/projects/freetype/files/freetype2/2.11.1/freetype-2.11.1.tar.xz/download"
+FREETYPE_SRC="https://sourceforge.net/projects/freetype/files/freetype2/2.12.0/freetype-2.12.0.tar.xz/download"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-fribidi.sh b/scripts.d/25-fribidi.sh
index 873d044..52252d2 100755
--- a/scripts.d/25-fribidi.sh
+++ b/scripts.d/25-fribidi.sh
@@ -1,7 +1,7 @@
#!/bin/bash
FRIBIDI_REPO="https://github.com/fribidi/fribidi.git"
-FRIBIDI_COMMIT="cffa3047a0db9f4cd391d68bf98ce7b7425be245"
+FRIBIDI_COMMIT="6428d8469e536bcbb6e12c7b79ba6659371c435a"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh
index 6a2c0b9..483a757 100755
--- a/scripts.d/35-fontconfig.sh
+++ b/scripts.d/35-fontconfig.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-FONTCONFIG_SRC="https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.96.tar.xz"
+FONTCONFIG_SRC="https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.0.tar.xz"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index 5863d4f..1a04724 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="924dd71de3c8444125f532655a8647c713f0cdc0"
+HARFBUZZ_COMMIT="6695bf056065f2e2e56c0e00b9740e6685a8af28"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index b8d436e..2341940 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -1,7 +1,7 @@
#!/bin/bash
PULSEAUDIO_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-PULSEAUDIO_COMMIT="5af2afba85b8cc33b12189a8b0d40cfc4477ed89"
+PULSEAUDIO_COMMIT="852c15954ee2c02b8a82cf98f2996adedf6ca0b8"
ffbuild_enabled() {
[[ $TARGET == linux* ]] || return 1
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index 625f9e8..78dabaf 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="9e1fb0bbc218855dc695166d77aea0a14e6d3527"
+VMAF_COMMIT="e495579fc8f70f75a27961905a544d6dbd55dedf"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh
index 7296e92..ee2b6c3 100755
--- a/scripts.d/45-x11/10-xproto.sh
+++ b/scripts.d/45-x11/10-xproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
XPROTO_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
-XPROTO_COMMIT="914d8f5e0f469cd0416364dd008e9eea752bf703"
+XPROTO_COMMIT="8c8bbb903410e39140727867a26bbe501f77de8f"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index ffc7836..6e84e24 100755
--- a/scripts.d/45-x11/40-libx11.sh
+++ b/scripts.d/45-x11/40-libx11.sh
@@ -1,7 +1,7 @@
#!/bin/bash
LIBX11_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-LIBX11_COMMIT="4f9eb32709dca705f02ca771bbd47d6c08aba5e0"
+LIBX11_COMMIT="35d1513bc7fdd3ac6f5807feb601efc34ac19163"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh
index 35904c2..e43f202 100755
--- a/scripts.d/45-x11/60-libglvnd.sh
+++ b/scripts.d/45-x11/60-libglvnd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
GLVND_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-GLVND_COMMIT="c8ee0055dfad919e92e92631c5a4a0af68dca9eb"
+GLVND_COMMIT="5024e5796ea16baf6f9203b1414c870a30b20474"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libxcursor.sh b/scripts.d/45-x11/60-libxcursor.sh
index d79bdb5..4a11470 100755
--- a/scripts.d/45-x11/60-libxcursor.sh
+++ b/scripts.d/45-x11/60-libxcursor.sh
@@ -1,7 +1,7 @@
#!/bin/bash
LIBXCURSOR_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git"
-LIBXCURSOR_COMMIT="801925839d26e7c8d942c5e02c4897652ead26c8"
+LIBXCURSOR_COMMIT="27adb16027fa99d83818a0ed9f6623cb03f0c574"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh
index f58736d..cfc4689 100755
--- a/scripts.d/50-amf.sh
+++ b/scripts.d/50-amf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
AMF_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
-AMF_COMMIT="06b0e29a372b0c491f87ff285ca92be2844dc039"
+AMF_COMMIT="053040d662b4d88d9994dc706b948ee409292537"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index d10220c..4db70b3 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="493cf67c62441838a56c5ea6f8dfbf6777e3cee7"
+AOM_COMMIT="93e83ff473b20e983c6b9bf6ba8d208c70a31188"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh
index 8e287e4..cd3f317 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="c6d9cf4aa062a150995b8ef00eb8f46e7a2caec8"
+AVISYNTH_COMMIT="23f945532f22c75fa1c8e7b99c129b25b88f1cc8"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index 7621b29..dc636d7 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="887fa1d718df42aac1ac102580c14eb655979ac6"
+DAV1D_COMMIT="bfc1178f911543739fe50697998d9df69ad2f201"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh
index 9881cfb..a48e371 100755
--- a/scripts.d/50-frei0r.sh
+++ b/scripts.d/50-frei0r.sh
@@ -1,7 +1,7 @@
#!/bin/bash
FREI0R_REPO="https://github.com/dyne/frei0r.git"
-FREI0R_COMMIT="febd73874dab6be330398a3b55112451b36ee939"
+FREI0R_COMMIT="114a72f438fa04c5d12593e38dac148dbb9ce10c"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index 46bc994..363ffa1 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="ba6bcb3a9c2f06272ca1ff1a65f52dc5bc4528b0"
+ASS_COMMIT="0e0f9da2edc8eead93f9bf0ac4ef0336ad646ea7"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh
index eff4446..14f8d17 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="060d8f055f2ed1b4752340be5d16403bad5ccdc0"
+LIBBLURAY_COMMIT="0540b1c1c53f9813f99233208c5ccccd87004f98"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh
index d671fb8..a7274bb 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="37aba6e9b382f7dbdb7916adbc335704cf2992e8"
+OPUS_COMMIT="ccaaffa9a3ee427e9401c4dcf6462e378d9a4694"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh
index 2d0cc2c..df97141 100755
--- a/scripts.d/50-librist/50-librist.sh
+++ b/scripts.d/50-librist/50-librist.sh
@@ -1,7 +1,7 @@
#!/bin/bash
LIBRIST_REPO="https://code.videolan.org/rist/librist.git"
-LIBRIST_COMMIT="6356dde85e97398be8b60a44ee4341e847ce4d5f"
+LIBRIST_COMMIT="809390b3b75a259a704079d0fb4d8f1b5f7fa956"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index f1a3eb1..b83b64b 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="3b21aeac8b7d5a52b6360d878cb4df593e87113e"
+LIBVPX_COMMIT="618739f59f5d3505ff76a1a82eb198bed4ec989d"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index 39fae69..fa2604e 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="0fa0ea5488ab37f229b42c363c73c4bae3d90386"
+WEBP_COMMIT="dc3841e077c522be3a011a50d78c717d2656eab9"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh
index 1f731f2..317c970 100755
--- a/scripts.d/50-openh264.sh
+++ b/scripts.d/50-openh264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
OPENH264_REPO="https://github.com/cisco/openh264.git"
-OPENH264_COMMIT="cb2321f67c0347737353d53e7456001dca6f485b"
+OPENH264_COMMIT="0819f288dc5fc24fb34089113bc230aea65c8375"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index 17825a1..9357d4e 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
OPENMPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-OPENMPT_REV="17047"
+OPENMPT_REV="17268"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index d69b455..52ddb04 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
#!/bin/bash
RAV1E_REPO="https://github.com/xiph/rav1e.git"
-RAV1E_COMMIT="4c863c575420d900618b25cd75f2e52253cecf30"
+RAV1E_COMMIT="d2bc4d20db705b364f8bb7ed0da5cfabf8a985e2"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index 43f561b..d8d6c97 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -1,7 +1,7 @@
#!/bin/bash
RUBBERBAND_REPO="https://github.com/breakfastquay/rubberband.git"
-RUBBERBAND_COMMIT="30e63d33ace7c12e2f5feb6838a7c9d4c3a9392f"
+RUBBERBAND_COMMIT="95371b882b01af86132d17be739de82d2fadf6d7"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index a959bf9..00ed7e3 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SDL_REPO="https://github.com/libsdl-org/SDL.git"
-SDL_COMMIT="98353533e51e2ea90768c9c43f1d08296cd434f7"
+SDL_COMMIT="981e1e3c4489add5bf6d4df5415af3cf1ef2773d"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index 0e9a92f..31ddc53 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="7d77d417c24c3233340a94da1613512d19ba4194"
+SRT_COMMIT="c76f43df6887b414799211441b733fc2a94abdf5"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index c54113b..34e7041 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="a508cd5386ecf6de8cf2c47a27a3168bcce52907"
+SVTAV1_COMMIT="da60d7c6e27c08806da0b493d5d3fc0a08629102"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh
index 322d5ef..ba0adc4 100755
--- a/scripts.d/50-uavs3d.sh
+++ b/scripts.d/50-uavs3d.sh
@@ -1,7 +1,7 @@
#!/bin/bash
UAVS3D_REPO="https://github.com/uavs3/uavs3d.git"
-UAVS3D_COMMIT="e58e199ccc50163c20df114db7e3950295c3e2ed"
+UAVS3D_COMMIT="7b1dd734c926a23f8134b42dbfaac4d22cd6ba1d"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-vaapi/30-libpciaccess.sh b/scripts.d/50-vaapi/30-libpciaccess.sh
index 67d2520..cedd449 100755
--- a/scripts.d/50-vaapi/30-libpciaccess.sh
+++ b/scripts.d/50-vaapi/30-libpciaccess.sh
@@ -1,7 +1,7 @@
#!/bin/bash
LIBPCIACCESS_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git"
-LIBPCIACCESS_COMMIT="4ef1660667425c0f171949aacae9d07b10a40d7f"
+LIBPCIACCESS_COMMIT="22a93f8b9b4a79eefbdd0b2c412526f6141ac7a8"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index f587cd3..c6481c9 100755
--- a/scripts.d/50-vaapi/40-libdrm.sh
+++ b/scripts.d/50-vaapi/40-libdrm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
LIBDRM_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-LIBDRM_COMMIT="8376362245e5cc61e4fa4932ecbcc5cc1566e98f"
+LIBDRM_COMMIT="d95b12e7e3ed6a22f284afbc5d2356365b820ea8"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh
index 4cf6ace..fdc26f5 100755
--- a/scripts.d/50-vaapi/50-libva.sh
+++ b/scripts.d/50-vaapi/50-libva.sh
@@ -1,7 +1,7 @@
#!/bin/bash
LIBVA_REPO="https://github.com/intel/libva.git"
-LIBVA_COMMIT="9e4bdc5c4f7f8549187badb8a5111c1b07c3c41c"
+LIBVA_COMMIT="aeba58590726ab08b924e6a2ad0078d74c5dd01b"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index dc15561..a643733 100755
--- a/scripts.d/50-vulkan/45-vulkan.sh
+++ b/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
#!/bin/bash
HEADERS_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-HEADERS_VERSION="1.3.206"
+HEADERS_VERSION="1.3.212"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh
index 4216665..1da988d 100755
--- a/scripts.d/50-vulkan/55-spirv-cross.sh
+++ b/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SPIRV_CROSS_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SPIRV_CROSS_COMMIT="c08ee860c8ad4f020b19f9a372013e99cd4a00d9"
+SPIRV_CROSS_COMMIT="d7cae5e7cd326ca0ebfb2a7ac4e634a63ecfe19f"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index c028df8..bcb773a 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
#!/bin/bash
PLACEBO_REPO="https://code.videolan.org/videolan/libplacebo.git"
-PLACEBO_COMMIT="c71bbe1cc86bee7d679af05120b67b44947a6ea2"
+PLACEBO_COMMIT="f85c3c0791271089a3b1df2b5d6948cd1cb8c63e"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh
index d5c40bc..bc6b6c7 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="7a57090483c6d251e2a2515ead59d0bc002e2346"
+X265_COMMIT="9b59d45549f460e41a852cfd276f9b89eed2112a"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh
index 1b83ae7..9d8e369 100755
--- a/scripts.d/50-zimg.sh
+++ b/scripts.d/50-zimg.sh
@@ -1,7 +1,7 @@
#!/bin/bash
ZIMG_REPO="https://github.com/sekrit-twc/zimg.git"
-ZIMG_COMMIT="9a6f2f019df34f60a5464ca5724ea795c1189f95"
+ZIMG_COMMIT="b97c086a5b767423b678d922cb62c675df56290e"
ffbuild_enabled() {
return 0
From 07084d690931c8f4c5c457623fd2384c771ebe8a Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sat, 23 Apr 2022 23:47:55 +0200
Subject: [PATCH 003/160] Bump to new mbedtls major version
---
scripts.d/50-librist/40-mbedtls.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh
index bfb905f..01aa7b7 100755
--- a/scripts.d/50-librist/40-mbedtls.sh
+++ b/scripts.d/50-librist/40-mbedtls.sh
@@ -1,8 +1,7 @@
#!/bin/bash
MBEDTLS_REPO="https://github.com/ARMmbed/mbedtls.git"
-# HEAD of development_2.x
-MBEDTLS_COMMIT="4ed284440582a32bfdf3c223730271a7b2fcf13c"
+MBEDTLS_COMMIT="v3.1.0"
ffbuild_enabled() {
return 0
From aef227430cf9c553524f73477ede28dde6dd5ef5 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 24 Apr 2022 00:48:25 +0200
Subject: [PATCH 004/160] Revert "Bump to new mbedtls major version"
Seems like FFmpeg itself is not ready for it...
This reverts commit 07084d690931c8f4c5c457623fd2384c771ebe8a.
---
scripts.d/50-librist/40-mbedtls.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh
index 01aa7b7..bfb905f 100755
--- a/scripts.d/50-librist/40-mbedtls.sh
+++ b/scripts.d/50-librist/40-mbedtls.sh
@@ -1,7 +1,8 @@
#!/bin/bash
MBEDTLS_REPO="https://github.com/ARMmbed/mbedtls.git"
-MBEDTLS_COMMIT="v3.1.0"
+# HEAD of development_2.x
+MBEDTLS_COMMIT="4ed284440582a32bfdf3c223730271a7b2fcf13c"
ffbuild_enabled() {
return 0
From 71b37989a519080fb83dbe788089eb75dc30577a Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 24 Apr 2022 20:10:44 +0200
Subject: [PATCH 005/160] Add libjxl for JPEG-XL support
---
scripts.d/50-libjxl/45-brotli.sh | 34 ++++++++++++++++++++
scripts.d/50-libjxl/50-libjxl.sh | 55 ++++++++++++++++++++++++++++++++
2 files changed, 89 insertions(+)
create mode 100755 scripts.d/50-libjxl/45-brotli.sh
create mode 100755 scripts.d/50-libjxl/50-libjxl.sh
diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh
new file mode 100755
index 0000000..966fbcb
--- /dev/null
+++ b/scripts.d/50-libjxl/45-brotli.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+BROTLI_REPO="https://github.com/google/brotli.git"
+BROTLI_COMMIT="f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
+
+ffbuild_enabled() {
+ return 0
+}
+
+ffbuild_dockerbuild() {
+ git-mini-clone "$BROTLI_REPO" "$BROTLI_COMMIT" brotli
+ cd brotli
+
+ mkdir build && cd build
+
+ cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DCMAKE_POSITION_INDEPENDENT_CODE=ON ..
+ ninja -j$(nproc)
+ ninja install
+
+ # Build system is severely lacking in options, clean up after it
+ rm -r "${FFBUILD_PREFIX}"/bin
+ mv "${FFBUILD_PREFIX}"/lib/libbrotlienc{-static,}.a
+ mv "${FFBUILD_PREFIX}"/lib/libbrotlidec{-static,}.a
+ mv "${FFBUILD_PREFIX}"/lib/libbrotlicommon{-static,}.a
+
+ if [[ $TARGET == win* ]]; then
+ rm "${FFBUILD_PREFIX}"/lib/libbrotli*.dll.a
+ elif [[ $TARGET == linux* ]]; then
+ rm "${FFBUILD_PREFIX}"/lib/libbrotli*.so*
+ else
+ echo "Unknown target"
+ return -1
+ fi
+}
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
new file mode 100755
index 0000000..5187c43
--- /dev/null
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+JXL_REPO="https://github.com/libjxl/libjxl.git"
+JXL_COMMIT="638ca594d54c0f9eb16a8c236770418750e4cbec"
+
+ffbuild_enabled() {
+ [[ $ADDINS_STR == *4.4* ]] && return -1
+ [[ $ADDINS_STR == *5.0* ]] && return -1
+ return 0
+}
+
+ffbuild_dockerbuild() {
+ git-mini-clone "$JXL_REPO" "$JXL_COMMIT" jxl
+ cd jxl
+ git submodule update --init --recursive --depth 1 --recommend-shallow third_party/{highway,skcms}
+
+ mkdir build && cd build
+
+ if [[ $TARGET == linux* ]]; then
+ # our glibc is too old(<2.25), and their detection fails for some reason
+ export CXXFLAGS="$CXXFLAGS -DVQSORT_GETRANDOM=0 -DVQSORT_SECURE_SEED=0"
+ fi
+
+ cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+ -DBUILD_SHARED_LIBS=OFF -DJPEGXL_STATIC=OFF -DJPEGXL_ENABLE_TOOLS=OFF -DJPEGXL_ENABLE_VIEWERS=OFF -DJPEGXL_EMSCRIPTEN=OFF -DJPEGXL_ENABLE_DOXYGEN=OFF \
+ -DBUILD_TESTING=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_MANPAGES=OFF -DJPEGXL_ENABLE_JNI=OFF -DJPEGXL_ENABLE_PLUGINS=OFF \
+ -DJPEGXL_ENABLE_DEVTOOLS=OFF -DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_BUNDLE_LIBPNG=OFF -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_FORCE_SYSTEM_BROTLI=ON ..
+ ninja -j$(nproc)
+ ninja install
+
+ echo "Cflags.private: -DJXL_STATIC_DEFINE=1" >> "${FFBUILD_PREFIX}"/lib/pkgconfig/libjxl.pc
+ echo "Libs.private: -lstdc++" >> "${FFBUILD_PREFIX}"/lib/pkgconfig/libjxl.pc
+
+ echo "Cflags.private: -DJXL_STATIC_DEFINE=1" >> "${FFBUILD_PREFIX}"/lib/pkgconfig/libjxl_threads.pc
+ echo "Libs.private: -lstdc++" >> "${FFBUILD_PREFIX}"/lib/pkgconfig/libjxl_threads.pc
+
+ if [[ $TARGET == win* ]]; then
+ echo "Libs.private: -ladvapi32" >> "${FFBUILD_PREFIX}"/lib/pkgconfig/libjxl.pc
+ echo "Libs.private: -ladvapi32" >> "${FFBUILD_PREFIX}"/lib/pkgconfig/libjxl_threads.pc
+
+ mv "${FFBUILD_PREFIX}"/lib/libjxl{-static,}.a
+ mv "${FFBUILD_PREFIX}"/lib/libjxl_dec{-static,}.a
+ mv "${FFBUILD_PREFIX}"/lib/libjxl_threads{-static,}.a
+ fi
+}
+
+ffbuild_configure() {
+ echo --enable-libjxl
+}
+
+ffbuild_unconfigure() {
+ [[ $ADDINS_STR == *4.4* ]] && return 0
+ [[ $ADDINS_STR == *5.0* ]] && return 0
+ echo --disable-libjxl
+}
From e176c338611aef3483e76a1e264447c3ae344ce2 Mon Sep 17 00:00:00 2001
From: shirt <2660574+shirt-dev@users.noreply.github.com>
Date: Tue, 26 Apr 2022 01:54:22 +0200
Subject: [PATCH 006/160] Add aribb24 for ARIB caption support
Closes #152
---
patches/aribb24/12.patch | 31 ++++++
patches/aribb24/13.patch | 23 ++++
patches/aribb24/17.patch | 151 ++++++++++++++++++++++++++
scripts.d/50-aribb24/25-libpng.sh | 37 +++++++
scripts.d/50-aribb24/50-libaribb24.sh | 56 ++++++++++
5 files changed, 298 insertions(+)
create mode 100644 patches/aribb24/12.patch
create mode 100644 patches/aribb24/13.patch
create mode 100644 patches/aribb24/17.patch
create mode 100755 scripts.d/50-aribb24/25-libpng.sh
create mode 100755 scripts.d/50-aribb24/50-libaribb24.sh
diff --git a/patches/aribb24/12.patch b/patches/aribb24/12.patch
new file mode 100644
index 0000000..c55bf23
--- /dev/null
+++ b/patches/aribb24/12.patch
@@ -0,0 +1,31 @@
+From a5bcc6d17c20e18bdeec295089cc0cdfac9d35c8 Mon Sep 17 00:00:00 2001
+From: xtne6f <xt4ubq@gmail.com>
+Date: Thu, 7 Feb 2019 20:11:13 +0900
+Subject: [PATCH] Fix default macros
+
+---
+ src/decoder_macro.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/decoder_macro.h b/src/decoder_macro.h
+index 86edee4..513b81e 100644
+--- a/src/decoder_macro.h
++++ b/src/decoder_macro.h
+@@ -30,7 +30,7 @@ static const unsigned char decoder_default_macro_1[] = {
+ 0x1B,0x24,0x39,0x1B,0x29,0x31,0x1B,0x2A,0x30,0x1B,0x2B,0x20,0x70,0x0F,0x1B,0x7D
+ };
+ static const unsigned char decoder_default_macro_2[] = {
+- 0x1B,0x24,0x39,0x1B,0x29,0x20,0x40,0x1B,0x2A,0x30,0x1B,0x2B,0x20,0x70,0x0F,0x1B,0x7D
++ 0x1B,0x24,0x39,0x1B,0x29,0x20,0x41,0x1B,0x2A,0x30,0x1B,0x2B,0x20,0x70,0x0F,0x1B,0x7D
+ };
+ static const unsigned char decoder_default_macro_3[] = {
+ 0x1B,0x28,0x32,0x1B,0x29,0x34,0x1B,0x2A,0x35,0x1B,0x2B,0x20,0x70,0x0F,0x1B,0x7D
+@@ -39,7 +39,7 @@ static const unsigned char decoder_default_macro_4[] = {
+ 0x1B,0x28,0x32,0x1B,0x29,0x33,0x1B,0x2A,0x35,0x1B,0x2B,0x20,0x70,0x0F,0x1B,0x7D
+ };
+ static const unsigned char decoder_default_macro_5[] = {
+- 0x1B,0x28,0x32,0x1B,0x29,0x20,0x40,0x1B,0x2A,0x35,0x1B,0x2B,0x20,0x70,0x0F,0x1B,0x7D
++ 0x1B,0x28,0x32,0x1B,0x29,0x20,0x41,0x1B,0x2A,0x35,0x1B,0x2B,0x20,0x70,0x0F,0x1B,0x7D
+ };
+ static const unsigned char decoder_default_macro_6[] = {
+ 0x1B,0x28,0x20,0x41,0x1B,0x29,0x20,0x42,0x1B,0x2A,0x20,0x43,0x1B,0x2B,0x20,0x70,0x0F,0x1B,0x7D
diff --git a/patches/aribb24/13.patch b/patches/aribb24/13.patch
new file mode 100644
index 0000000..30d17ba
--- /dev/null
+++ b/patches/aribb24/13.patch
@@ -0,0 +1,23 @@
+From facc51923d43f26dec09a9391566de7cba29f8db Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= <jeebjp@gmail.com>
+Date: Sun, 17 Feb 2019 22:42:31 +0200
+Subject: [PATCH] decoder: reset control_time when finalizing decoder
+
+This way finalize_decoder() can properly be utilized as a flush
+function.
+---
+ src/decoder.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/decoder.c b/src/decoder.c
+index 2b77f38..24c0f06 100644
+--- a/src/decoder.c
++++ b/src/decoder.c
+@@ -1506,6 +1506,7 @@ void arib_finalize_decoder( arib_decoder_t* decoder )
+ free( p_region );
+ }
+ decoder->p_region = NULL;
++ decoder->i_control_time = 0;
+ }
+
+ size_t arib_decode_buffer( arib_decoder_t* decoder,
diff --git a/patches/aribb24/17.patch b/patches/aribb24/17.patch
new file mode 100644
index 0000000..5961b2e
--- /dev/null
+++ b/patches/aribb24/17.patch
@@ -0,0 +1,151 @@
+From 58a34b8fabf4d0e9e1984fb603a97f52fb934a09 Mon Sep 17 00:00:00 2001
+From: scimmia9286 <scimmia9286@yahoo.co.jp>
+Date: Thu, 22 Apr 2021 20:26:45 +0900
+Subject: [PATCH] Fixed DRCS parser bug
+
+---
+ src/decoder.c | 3 ++-
+ src/drcs.c | 12 ++++++++----
+ src/drcs.h | 2 +-
+ src/parser.c | 25 +++++++++++++++++++++----
+ 4 files changed, 32 insertions(+), 10 deletions(-)
+
+diff --git a/src/decoder.c b/src/decoder.c
+index 2b77f38..c9d6ac3 100644
+--- a/src/decoder.c
++++ b/src/decoder.c
+@@ -1139,9 +1139,10 @@ static int decoder_handle_time( arib_decoder_t *decoder )
+ return 1;
+ break;
+ default:
+- if( i_mode == 1 && c >= 0x40 && c <= 0x7F )
++ if( i_mode == 1 && c >= 0x40 && c <= 0x7F ) {
+ decoder->i_control_time += c & 0x3f;
+ return 1;
++ }
+ return 0;
+ }
+ if( i_mode == 0 )
+diff --git a/src/drcs.c b/src/drcs.c
+index 114d846..8ff8d4f 100644
+--- a/src/drcs.c
++++ b/src/drcs.c
+@@ -406,15 +406,19 @@ static void save_drcs_pattern_data_image(
+ void save_drcs_pattern(
+ arib_instance_t *p_instance,
+ int i_width, int i_height,
+- int i_depth, const int8_t* p_patternData )
++ int i_depth, const int8_t* p_patternData,
++ int16_t i_CharacterCode )
+ {
++// int i_drcsPage = (i_CharacterCode >> 16) & 0xff;
++ int i_code = (i_CharacterCode & 0xff) - 0x20;
+ char* psz_hash = get_drcs_pattern_data_hash( p_instance,
+ i_width, i_height, i_depth, p_patternData );
+
+- strncpy( p_instance->p->drcs_hash_table[p_instance->p->i_drcs_num], psz_hash, 32 );
+- p_instance->p->drcs_hash_table[p_instance->p->i_drcs_num][32] = '\0';
++ strncpy( p_instance->p->drcs_hash_table[i_code-1], psz_hash, 32 );
++ p_instance->p->drcs_hash_table[i_code-1][32] = '\0';
+
+- p_instance->p->i_drcs_num++;
++ p_instance->p->i_drcs_num = i_code > p_instance->p->i_drcs_num ?
++ i_code : p_instance->p->i_drcs_num;
+
+ save_drcs_pattern_data_image( p_instance, psz_hash,
+ i_width, i_height, i_depth, p_patternData );
+diff --git a/src/drcs.h b/src/drcs.h
+index 274ff44..9c1533e 100644
+--- a/src/drcs.h
++++ b/src/drcs.h
+@@ -77,6 +77,6 @@ typedef struct drcs_data_s
+
+ bool apply_drcs_conversion_table( arib_instance_t * );
+ bool load_drcs_conversion_table( arib_instance_t * );
+-void save_drcs_pattern( arib_instance_t *, int, int, int, const int8_t* );
++void save_drcs_pattern( arib_instance_t *, int, int, int, const int8_t*, int16_t );
+
+ #endif
+diff --git a/src/parser.c b/src/parser.c
+index 1403dd6..6db27ae 100644
+--- a/src/parser.c
++++ b/src/parser.c
+@@ -79,7 +79,6 @@ static void parse_data_unit_DRCS( arib_parser_t *p_parser, bs_t *p_bs,
+ uint8_t i_data_unit_parameter,
+ uint32_t i_data_unit_size )
+ {
+- p_parser->p_instance->p->i_drcs_num = 0;
+ #ifdef ARIBSUB_GEN_DRCS_DATA
+ if( p_parser->p_drcs_data != NULL )
+ {
+@@ -119,7 +118,7 @@ static void parse_data_unit_DRCS( arib_parser_t *p_parser, bs_t *p_bs,
+
+ for( int i = 0; i < i_NumberOfCode; i++ )
+ {
+- bs_skip( p_bs, 16 ); /* i_character_code */
++ int16_t i_CharacterCode = bs_read( p_bs, 16 ); /* i_character_code */
+ p_parser->i_data_unit_size += 2;
+ uint8_t i_NumberOfFont = bs_read( p_bs, 8 );
+ p_parser->i_data_unit_size += 1;
+@@ -139,7 +138,11 @@ static void parse_data_unit_DRCS( arib_parser_t *p_parser, bs_t *p_bs,
+
+ for( int j = 0; j < i_NumberOfFont; j++ )
+ {
++#ifdef ARIBSUB_GEN_DRCS_DATA
++ int8_t i_fontId = bs_read( p_bs, 4 ); /* i_fontID */
++#else
+ bs_skip( p_bs, 4 ); /* i_fontID */
++#endif //ARIBSUB_GEN_DRCS_DATA
+ uint8_t i_mode = bs_read( p_bs, 4 );
+ p_parser->i_data_unit_size += 1;
+
+@@ -206,18 +209,26 @@ static void parse_data_unit_DRCS( arib_parser_t *p_parser, bs_t *p_bs,
+
+ #ifdef ARIBSUB_GEN_DRCS_DATA
+ save_drcs_pattern( p_parser->p_instance, i_width, i_height, i_depth + 2,
+- p_drcs_pattern_data->p_patternData );
++ p_drcs_pattern_data->p_patternData, i_CharacterCode );
+ #else
+ save_drcs_pattern( p_parser->p_instance, i_width, i_height, i_depth + 2,
+- p_patternData );
++ p_patternData, i_CharacterCode);
+ free( p_patternData );
+ #endif //ARIBSUB_GEN_DRCS_DATA
+ }
+ else
+ {
++#ifdef ARIBSUB_GEN_DRCS_DATA
++ int8_t i_regionX = bs_read( p_bs, 8 ); /* i_regionX */
++#else
+ bs_skip( p_bs, 8 ); /* i_regionX */
++#endif //ARIBSUB_GEN_DRCS_DATA
+ p_parser->i_data_unit_size += 1;
++#ifdef ARIBSUB_GEN_DRCS_DATA
++ int8_t i_regionY = bs_read( p_bs, 8 ); /* i_regionY */
++#else
+ bs_skip( p_bs, 8 ); /* i_regionY */
++#endif //ARIBSUB_GEN_DRCS_DATA
+ p_parser->i_data_unit_size += 1;
+ uint16_t i_geometricData_length = bs_read( p_bs, 16 );
+ p_parser->i_data_unit_size += 2;
+@@ -245,7 +256,11 @@ static void parse_data_unit_DRCS( arib_parser_t *p_parser, bs_t *p_bs,
+
+ for( int k = 0; k < i_geometricData_length ; k++ )
+ {
++#ifdef ARIBSUB_GEN_DRCS_DATA
++ int8_t i_geometricData = bs_read( p_bs, 8 ); /* i_geometric_data */
++#else
+ bs_skip( p_bs, 8 ); /* i_geometric_data */
++#endif //ARIBSUB_GEN_DRCS_DATA
+ p_parser->i_data_unit_size += 1;
+
+ #ifdef ARIBSUB_GEN_DRCS_DATA
+@@ -344,6 +359,8 @@ static void parse_caption_management_data( arib_parser_t *p_parser, bs_t *p_bs )
+ p_parser->i_data_unit_size = 0;
+ p_parser->i_subtitle_data_size = 0;
+ p_parser->psz_subtitle_data = NULL;
++ p_parser->p_instance->p->i_drcs_num = 0;
++ memset(p_parser->p_instance->p->drcs_hash_table, 0, sizeof(p_parser->p_instance->p->drcs_hash_table));
+ if( i_data_unit_loop_length > 0 )
+ {
+ p_parser->psz_subtitle_data = (unsigned char*) calloc(
diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh
new file mode 100755
index 0000000..72e7b36
--- /dev/null
+++ b/scripts.d/50-aribb24/25-libpng.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+LIBPNG_REPO="https://github.com/glennrp/libpng.git"
+LIBPNG_COMMIT="a37d4836519517bdce6cb9d956092321eca3e73b"
+
+ffbuild_enabled() {
+ return 0
+}
+
+ffbuild_dockerbuild() {
+ git-mini-clone "$LIBPNG_REPO" "$LIBPNG_COMMIT" libpng
+ cd libpng
+
+ autoreconf -i
+
+ local myconf=(
+ --prefix="$FFBUILD_PREFIX"
+ --disable-shared
+ --enable-static
+ --with-pic
+ )
+
+ if [[ $TARGET == win* || $TARGET == linux* ]]; then
+ myconf+=(
+ --host="$FFBUILD_TOOLCHAIN"
+ )
+ else
+ echo "Unknown target"
+ return -1
+ fi
+
+ export CPPFLAGS="$CPPFLAGS -I$FFBUILD_PREFIX/include"
+
+ ./configure "${myconf[@]}"
+ make -j$(nproc)
+ make install
+}
diff --git a/scripts.d/50-aribb24/50-libaribb24.sh b/scripts.d/50-aribb24/50-libaribb24.sh
new file mode 100755
index 0000000..9131ac4
--- /dev/null
+++ b/scripts.d/50-aribb24/50-libaribb24.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+ARIBB24_REPO="https://github.com/nkoriyama/aribb24.git"
+ARIBB24_COMMIT="5e9be272f96e00f15a2f3c5f8ba7e124862aec38"
+
+ffbuild_enabled() {
+ return 0
+}
+
+ffbuild_dockerstage() {
+ to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=patches/aribb24,dst=/patches run_stage /stage.sh"
+}
+
+ffbuild_dockerbuild() {
+ git-mini-clone "$ARIBB24_REPO" "$ARIBB24_COMMIT" aribb24
+ cd aribb24
+
+ for patch in /patches/*.patch; do
+ echo "Applying $patch"
+ git am < "$patch"
+ done
+
+ # Library switched to LGPL on master, but didn't bump version since.
+ # FFmpeg checks for >1.0.3 to allow LGPL builds.
+ sed -i 's/1.0.3/1.0.4/' configure.ac
+
+ autoreconf -i
+
+ local myconf=(
+ --prefix="$FFBUILD_PREFIX"
+ --disable-shared
+ --enable-static
+ --with-pic
+ )
+
+ if [[ $TARGET == win* || $TARGET == linux* ]]; then
+ myconf+=(
+ --host="$FFBUILD_TOOLCHAIN"
+ )
+ else
+ echo "Unknown target"
+ return -1
+ fi
+
+ ./configure "${myconf[@]}"
+ make -j$(nproc)
+ make install
+}
+
+ffbuild_configure() {
+ echo --enable-libaribb24
+}
+
+ffbuild_unconfigure() {
+ echo --disable-libaribb24
+}
From 89c0e1b8254237d119d04b74566bce54aeae568c Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 27 Apr 2022 13:38:13 +0200
Subject: [PATCH 007/160] Update OpenCL-ICD-Loader
Should be fine to update now, ssee https://github.com/KhronosGroup/OpenCL-ICD-Loader/issues/170
---
scripts.d/45-opencl.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh
index 3021aeb..201db29 100755
--- a/scripts.d/45-opencl.sh
+++ b/scripts.d/45-opencl.sh
@@ -4,7 +4,7 @@ HEADERS_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
HEADERS_COMMIT="dcd5bede6859d26833cd85f0d6bbcee7382dc9b3"
LOADER_REPO="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
-LOADER_COMMIT="cd7d07cfa667d8d959b4272be45cf217a65c2948"
+LOADER_COMMIT="aec3952654832211636fc4af613710f80e203b0a"
ffbuild_enabled() {
return 0
From ee8ea9129e0d7265c3fd713fb51509ce0121a408 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 27 Apr 2022 19:06:16 +0200
Subject: [PATCH 008/160] Update mbedtls
---
scripts.d/50-librist/40-mbedtls.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh
index bfb905f..01aa7b7 100755
--- a/scripts.d/50-librist/40-mbedtls.sh
+++ b/scripts.d/50-librist/40-mbedtls.sh
@@ -1,8 +1,7 @@
#!/bin/bash
MBEDTLS_REPO="https://github.com/ARMmbed/mbedtls.git"
-# HEAD of development_2.x
-MBEDTLS_COMMIT="4ed284440582a32bfdf3c223730271a7b2fcf13c"
+MBEDTLS_COMMIT="v3.1.0"
ffbuild_enabled() {
return 0
From 6fdf7bf4fa571c6e7557cc6b5c30505eafbe0c9b Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 5 May 2022 16:16:34 +0200
Subject: [PATCH 009/160] Update libjxl
Attempt to fix the issue mentioned in https://github.com/BtbN/FFmpeg-Builds/issues/151
---
scripts.d/50-libjxl/50-libjxl.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index 5187c43..34a8516 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
JXL_REPO="https://github.com/libjxl/libjxl.git"
-JXL_COMMIT="638ca594d54c0f9eb16a8c236770418750e4cbec"
+JXL_COMMIT="bd48652dba3469244af489e48c645307191cc039"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
From ce9add44fbfd6d644c0c078648d9c0661be942a2 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Fri, 6 May 2022 18:04:02 +0200
Subject: [PATCH 010/160] Try updating all action versions
---
.github/workflows/build.yml | 34 +++++++++++++++++-----------------
.github/workflows/pr.yml | 6 +++---
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0073de6..8ab11f6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,13 +24,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Install buildx
- uses: docker/setup-buildx-action@v1
+ uses: docker/setup-buildx-action@v2
with:
config: .github/buildkit.toml
- name: Login to Docker
- uses: docker/login-action@v1
+ uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
@@ -41,7 +41,7 @@ jobs:
- name: Stop Commands
run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
- name: Build target base image
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v3
with:
context: images/base
pull: true
@@ -59,13 +59,13 @@ jobs:
target: [win64,linux64]
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Install buildx
- uses: docker/setup-buildx-action@v1
+ uses: docker/setup-buildx-action@v2
with:
config: .github/buildkit.toml
- name: Login to Docker
- uses: docker/login-action@v1
+ uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
@@ -76,7 +76,7 @@ jobs:
- name: Stop Commands
run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
- name: Build target base image
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v3
with:
context: images/base-${{ matrix.target }}
pull: true
@@ -95,13 +95,13 @@ jobs:
variant: [gpl,lgpl,gpl 4.4,gpl 5.0,lgpl 4.4,lgpl 5.0,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.0,lgpl-shared 4.4,lgpl-shared 5.0]
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Install buildx
- uses: docker/setup-buildx-action@v1
+ uses: docker/setup-buildx-action@v2
with:
config: .github/buildkit.toml
- name: Login to Docker
- uses: docker/login-action@v1
+ uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
@@ -116,7 +116,7 @@ jobs:
- name: Stop Commands
run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
- name: Build target base image
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v3
with:
context: .
pull: true
@@ -135,9 +135,9 @@ jobs:
variant: [gpl,lgpl,gpl 4.4,gpl 5.0,lgpl 4.4,lgpl 5.0,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.0,lgpl-shared 4.4,lgpl-shared 5.0]
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Login to Docker
- uses: docker/login-action@v1
+ uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
@@ -147,7 +147,7 @@ jobs:
T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
./build.sh ${{ matrix.target }} ${{ matrix.variant }}
- name: Upload artifacts
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
name: ffmpeg
path: artifacts/*
@@ -158,9 +158,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Download artifacts
- uses: actions/download-artifact@v2
+ uses: actions/download-artifact@v3
with:
name: ffmpeg
path: artifacts
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index f0f4ece..35c90f1 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -21,9 +21,9 @@ jobs:
variant: [gpl,lgpl,gpl 4.4,gpl 5.0,lgpl 4.4,lgpl 5.0,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.0,lgpl-shared 4.4,lgpl-shared 5.0]
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Install buildx
- uses: docker/setup-buildx-action@v1
+ uses: docker/setup-buildx-action@v2
with:
config: .github/buildkit.toml
driver: docker
@@ -32,7 +32,7 @@ jobs:
- name: Build ffmpeg
run: ./build.sh ${{ matrix.target }} ${{ matrix.variant }}
- name: Upload artifacts
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
name: ffmpeg
path: artifacts/*
From 22eebe8ea63df58eca455ea18a15c0a6f9fc26f7 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sat, 7 May 2022 21:42:25 +0200
Subject: [PATCH 011/160] Attempt to fix libjxl
---
scripts.d/50-libjxl/50-libjxl.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index 34a8516..87062de 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -21,6 +21,9 @@ ffbuild_dockerbuild() {
export CXXFLAGS="$CXXFLAGS -DVQSORT_GETRANDOM=0 -DVQSORT_SECURE_SEED=0"
fi
+ export CXXFLAGS="$CXXFLAGS -DHWY_COMPILE_ONLY_SCALAR"
+ export CFLAGS="$CFLAGS -DHWY_COMPILE_ONLY_SCALAR"
+
cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-DBUILD_SHARED_LIBS=OFF -DJPEGXL_STATIC=OFF -DJPEGXL_ENABLE_TOOLS=OFF -DJPEGXL_ENABLE_VIEWERS=OFF -DJPEGXL_EMSCRIPTEN=OFF -DJPEGXL_ENABLE_DOXYGEN=OFF \
-DBUILD_TESTING=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_MANPAGES=OFF -DJPEGXL_ENABLE_JNI=OFF -DJPEGXL_ENABLE_PLUGINS=OFF \
From 8573a684fbdb486d40a80e9e5365cc5f235276c2 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 12 May 2022 12:45:00 +0200
Subject: [PATCH 012/160] Bump OpenSSL
---
scripts.d/25-openssl.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh
index a3558da..cc376af 100755
--- a/scripts.d/25-openssl.sh
+++ b/scripts.d/25-openssl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
OPENSSL_REPO="https://github.com/openssl/openssl.git"
-OPENSSL_COMMIT="OpenSSL_1_1_1n"
+OPENSSL_COMMIT="OpenSSL_1_1_1o"
ffbuild_enabled() {
return 0
From 3be839badf08209a7e696e2edc6de43c08d7e79c Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 25 May 2022 18:10:17 +0200
Subject: [PATCH 013/160] Create (lib)mfx compat symlink
---
scripts.d/50-mfx.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts.d/50-mfx.sh b/scripts.d/50-mfx.sh
index 04cdf4d..b55fd20 100755
--- a/scripts.d/50-mfx.sh
+++ b/scripts.d/50-mfx.sh
@@ -32,6 +32,8 @@ ffbuild_dockerbuild() {
./configure "${myconf[@]}"
make -j$(nproc)
make install
+
+ ln -s libmfx.pc "$FFBUILD_PREFIX"/lib/pkgconfig/mfx.pc
}
ffbuild_configure() {
From 0d5fea8a18a843109da80c650cb399b175cde0b9 Mon Sep 17 00:00:00 2001
From: bitraid <bitraid@protonmail.ch>
Date: Wed, 25 May 2022 17:33:35 +0300
Subject: [PATCH 014/160] Update SVT-AV1 to 1.1.0
---
scripts.d/50-svtav1.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index 34e7041..3e67c08 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="da60d7c6e27c08806da0b493d5d3fc0a08629102"
+SVTAV1_COMMIT="98aba736053ba0cb00112db88a7f39f16bd64080"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
From 48f83820fb8c57d6a64579ad3efb9566a185f425 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Fri, 27 May 2022 20:49:17 +0200
Subject: [PATCH 015/160] Fix unaligned stack access by highway in libjxl
---
scripts.d/50-libjxl/50-libjxl.sh | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index 87062de..67b5fcb 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -19,11 +19,12 @@ ffbuild_dockerbuild() {
if [[ $TARGET == linux* ]]; then
# our glibc is too old(<2.25), and their detection fails for some reason
export CXXFLAGS="$CXXFLAGS -DVQSORT_GETRANDOM=0 -DVQSORT_SECURE_SEED=0"
+ elif [[ $TARGET == win* ]]; then
+ # Fix AVX2 related crash due to unaligned stack memory
+ export CXXFLAGS="$CXXFLAGS -Wa,-muse-unaligned-vector-move"
+ export CFLAGS="$CFLAGS -Wa,-muse-unaligned-vector-move"
fi
- export CXXFLAGS="$CXXFLAGS -DHWY_COMPILE_ONLY_SCALAR"
- export CFLAGS="$CFLAGS -DHWY_COMPILE_ONLY_SCALAR"
-
cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-DBUILD_SHARED_LIBS=OFF -DJPEGXL_STATIC=OFF -DJPEGXL_ENABLE_TOOLS=OFF -DJPEGXL_ENABLE_VIEWERS=OFF -DJPEGXL_EMSCRIPTEN=OFF -DJPEGXL_ENABLE_DOXYGEN=OFF \
-DBUILD_TESTING=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_MANPAGES=OFF -DJPEGXL_ENABLE_JNI=OFF -DJPEGXL_ENABLE_PLUGINS=OFF \
From 42174778e70eb31eee1592a297e93564523b4b2f Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 9 Jun 2022 22:21:18 +0200
Subject: [PATCH 016/160] Update dependencies
---
scripts.d/10-mingw.sh | 2 +-
scripts.d/20-libiconv.sh | 2 +-
scripts.d/20-libxml2.sh | 2 +-
scripts.d/25-freetype.sh | 2 +-
scripts.d/45-harfbuzz.sh | 2 +-
scripts.d/45-libsamplerate.sh | 2 +-
scripts.d/45-opencl.sh | 4 ++--
scripts.d/45-pulseaudio.sh | 2 +-
scripts.d/45-vmaf.sh | 2 +-
scripts.d/45-x11/10-xcbproto.sh | 2 +-
scripts.d/45-x11/10-xproto.sh | 2 +-
scripts.d/45-x11/10-xtrans.sh | 2 +-
scripts.d/45-x11/30-libxcb.sh | 2 +-
scripts.d/45-x11/40-libx11.sh | 2 +-
scripts.d/45-x11/60-libglvnd.sh | 2 +-
scripts.d/50-amf.sh | 2 +-
scripts.d/50-aom.sh | 2 +-
scripts.d/50-avisynth.sh | 2 +-
scripts.d/50-dav1d.sh | 2 +-
scripts.d/50-fdk-aac.sh | 2 +-
scripts.d/50-frei0r.sh | 2 +-
scripts.d/50-gme.sh | 2 +-
scripts.d/50-libass.sh | 2 +-
scripts.d/50-libbluray.sh | 2 +-
scripts.d/50-libjxl/45-brotli.sh | 2 +-
scripts.d/50-libjxl/50-libjxl.sh | 2 +-
scripts.d/50-libvpx.sh | 2 +-
scripts.d/50-libwebp.sh | 2 +-
scripts.d/50-lilv/96-lv2.sh | 2 +-
scripts.d/50-lilv/96-serd.sh | 2 +-
scripts.d/50-lilv/97-sord.sh | 2 +-
scripts.d/50-lilv/98-sratom.sh | 2 +-
scripts.d/50-lilv/99-lilv.sh | 2 +-
scripts.d/50-openh264.sh | 2 +-
scripts.d/50-openjpeg.sh | 2 +-
scripts.d/50-openmpt.sh | 2 +-
scripts.d/50-rav1e.sh | 2 +-
scripts.d/50-rubberband.sh | 2 +-
scripts.d/50-sdl.sh | 2 +-
scripts.d/50-srt.sh | 2 +-
scripts.d/50-svtav1.sh | 2 +-
scripts.d/50-vaapi/40-libdrm.sh | 2 +-
scripts.d/50-vaapi/50-libva.sh | 2 +-
scripts.d/50-vulkan/45-vulkan.sh | 2 +-
scripts.d/50-vulkan/50-shaderc.sh | 2 +-
scripts.d/50-vulkan/55-spirv-cross.sh | 2 +-
scripts.d/50-vulkan/60-libplacebo.sh | 2 +-
scripts.d/50-x264.sh | 2 +-
scripts.d/50-zimg.sh | 2 +-
49 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index c019444..99eee3a 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="f6b0870e4de11fd04155511606bb6e6564d38c71"
+MINGW_COMMIT="826706cbf2b01e799f495bf57d5e681da74dad37"
ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh
index 1263beb..467cb8a 100755
--- a/scripts.d/20-libiconv.sh
+++ b/scripts.d/20-libiconv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# https://ftp.gnu.org/gnu/libiconv/
-ICONV_SRC="https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz"
+ICONV_SRC="https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh
index 6914d3a..dfb78b7 100755
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
LIBXML2_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-LIBXML2_COMMIT="145170125af959c814d33899bebb57f2da2f541b"
+LIBXML2_COMMIT="a6df42e649acacb55be832222d1f3f50c66720ff"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index 91b9690..76822e4 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# https://sourceforge.net/projects/freetype/files/freetype2/
-FREETYPE_SRC="https://sourceforge.net/projects/freetype/files/freetype2/2.12.0/freetype-2.12.0.tar.xz/download"
+FREETYPE_SRC="https://sourceforge.net/projects/freetype/files/freetype2/2.12.1/freetype-2.12.1.tar.xz/download"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index 1a04724..833f5a0 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="6695bf056065f2e2e56c0e00b9740e6685a8af28"
+HARFBUZZ_COMMIT="17c80035adc61c52a9e9600664496e3e4b837e37"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh
index 4611ade..0fa2ecf 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="4909e679b3e268a1403608cbd860f3895549b0d5"
+LIBSR_COMMIT="9cccc50b0e850cb1d5fed6c36e9a3b6f07a13711"
ffbuild_enabled() {
# Dependency of GPL-Only librubberband
diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh
index 201db29..faaf98d 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="dcd5bede6859d26833cd85f0d6bbcee7382dc9b3"
+HEADERS_COMMIT="def8be9d35fda35492b72f54a94515f7df8d1e9f"
LOADER_REPO="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
-LOADER_COMMIT="aec3952654832211636fc4af613710f80e203b0a"
+LOADER_COMMIT="5b280f69e8312c41310a72c28c66cf24830ee85a"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index 2341940..2b4719e 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -1,7 +1,7 @@
#!/bin/bash
PULSEAUDIO_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-PULSEAUDIO_COMMIT="852c15954ee2c02b8a82cf98f2996adedf6ca0b8"
+PULSEAUDIO_COMMIT="05c06afa58e30b7958e96766d1e917099c8a4041"
ffbuild_enabled() {
[[ $TARGET == linux* ]] || return 1
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index 78dabaf..5d5a7c3 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="e495579fc8f70f75a27961905a544d6dbd55dedf"
+VMAF_COMMIT="ebc457e98fec3400af87382fcae2b963a9152d91"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh
index 70d2d01..b3c438c 100755
--- a/scripts.d/45-x11/10-xcbproto.sh
+++ b/scripts.d/45-x11/10-xcbproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
XCBPROTO_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-XCBPROTO_COMMIT="70ca65fa35c3760661b090bc4b2601daa7a099b8"
+XCBPROTO_COMMIT="b69b997c11d863d63ee053a0ff4d62957d8ab389"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh
index ee2b6c3..981014f 100755
--- a/scripts.d/45-x11/10-xproto.sh
+++ b/scripts.d/45-x11/10-xproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
XPROTO_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
-XPROTO_COMMIT="8c8bbb903410e39140727867a26bbe501f77de8f"
+XPROTO_COMMIT="74255ccfd895e70156c45a2c51174c852b64bc71"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/10-xtrans.sh b/scripts.d/45-x11/10-xtrans.sh
index bb72f3f..9d4c85a 100755
--- a/scripts.d/45-x11/10-xtrans.sh
+++ b/scripts.d/45-x11/10-xtrans.sh
@@ -1,7 +1,7 @@
#!/bin/bash
LIBXTRANS_REPO="https://gitlab.freedesktop.org/xorg/lib/libxtrans.git"
-LIBXTRANS_COMMIT="3b5df889f58a99980a35a7b4a18eb4e7d2abeac4"
+LIBXTRANS_COMMIT="3309c75906a56de86607f59481304b3a2812162f"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh
index 0adda53..264a8ce 100755
--- a/scripts.d/45-x11/30-libxcb.sh
+++ b/scripts.d/45-x11/30-libxcb.sh
@@ -1,7 +1,7 @@
#!/bin/bash
LIBXCB_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
-LIBXCB_COMMIT="ddafdba11f6919e6fcf977c09c78b06f94de47aa"
+LIBXCB_COMMIT="c2c4a2cd1947e559718acdba19ef6e7db731dbeb"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index 6e84e24..4b03c9d 100755
--- a/scripts.d/45-x11/40-libx11.sh
+++ b/scripts.d/45-x11/40-libx11.sh
@@ -1,7 +1,7 @@
#!/bin/bash
LIBX11_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-LIBX11_COMMIT="35d1513bc7fdd3ac6f5807feb601efc34ac19163"
+LIBX11_COMMIT="3a30ada60c5217ada37b143b541c8e6f6284c7fa"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh
index e43f202..dbf1e62 100755
--- a/scripts.d/45-x11/60-libglvnd.sh
+++ b/scripts.d/45-x11/60-libglvnd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
GLVND_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-GLVND_COMMIT="5024e5796ea16baf6f9203b1414c870a30b20474"
+GLVND_COMMIT="8e5f0f16467cc8ce870789d9a5b6a2c3f58921c9"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh
index cfc4689..2e248df 100755
--- a/scripts.d/50-amf.sh
+++ b/scripts.d/50-amf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
AMF_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
-AMF_COMMIT="053040d662b4d88d9994dc706b948ee409292537"
+AMF_COMMIT="9c36583841b01c23b3972005ff6db6fd4aaac1a0"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index 4db70b3..b0bad49 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="93e83ff473b20e983c6b9bf6ba8d208c70a31188"
+AOM_COMMIT="67c37914286ace423a9de7fbd9f6272871061db3"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh
index cd3f317..f200e27 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="23f945532f22c75fa1c8e7b99c129b25b88f1cc8"
+AVISYNTH_COMMIT="8ce63364a5105fbdf0eda6b564b67a5eb6a9cb9d"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index dc636d7..21436c1 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="bfc1178f911543739fe50697998d9df69ad2f201"
+DAV1D_COMMIT="7576cd572f3ab5f6543a70dcc606e131110dbcd8"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-fdk-aac.sh b/scripts.d/50-fdk-aac.sh
index f97fa87..3c42065 100755
--- a/scripts.d/50-fdk-aac.sh
+++ b/scripts.d/50-fdk-aac.sh
@@ -1,7 +1,7 @@
#!/bin/bash
FDK_REPO="https://github.com/mstorsjo/fdk-aac.git"
-FDK_COMMIT="072f2cdafdd2bb7ed2d630d09c2a5697a4aec53d"
+FDK_COMMIT="3f864cce9736cc8e9312835465fae18428d76295"
ffbuild_enabled() {
[[ $VARIANT == nonfree* ]] || return -1
diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh
index a48e371..ae7c341 100755
--- a/scripts.d/50-frei0r.sh
+++ b/scripts.d/50-frei0r.sh
@@ -1,7 +1,7 @@
#!/bin/bash
FREI0R_REPO="https://github.com/dyne/frei0r.git"
-FREI0R_COMMIT="114a72f438fa04c5d12593e38dac148dbb9ce10c"
+FREI0R_COMMIT="6a576f4538992bbbe88eba1e773d6144d22eb3ca"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh
index 5a7a0c7..72c2702 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="b3d158a30492181fd7c38ef795c8d4dcfd77eaa9"
+GME_COMMIT="d39b0bce47f66074c6aa85202b8cb4642fa77b78"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index 363ffa1..2356a48 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="0e0f9da2edc8eead93f9bf0ac4ef0336ad646ea7"
+ASS_COMMIT="a2b39cde4ecb74d5e6fccab4a5f7d8ad52b2b1a4"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh
index 14f8d17..23e0c9f 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="0540b1c1c53f9813f99233208c5ccccd87004f98"
+LIBBLURAY_COMMIT="8f26777b1ce124ff761f80ef52d6be10bcea323e"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh
index 966fbcb..e9234ad 100755
--- a/scripts.d/50-libjxl/45-brotli.sh
+++ b/scripts.d/50-libjxl/45-brotli.sh
@@ -1,7 +1,7 @@
#!/bin/bash
BROTLI_REPO="https://github.com/google/brotli.git"
-BROTLI_COMMIT="f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
+BROTLI_COMMIT="9801a2c5d6c67c467ffad676ac301379bb877fc3"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index 67b5fcb..c3663df 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
JXL_REPO="https://github.com/libjxl/libjxl.git"
-JXL_COMMIT="bd48652dba3469244af489e48c645307191cc039"
+JXL_COMMIT="ec093557b0e8f76a48b0a68356d786c664a65660"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index b83b64b..5ede9c9 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="618739f59f5d3505ff76a1a82eb198bed4ec989d"
+LIBVPX_COMMIT="7b1b9f7cd23e085d97c26ed026d2c817d78a14d6"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index fa2604e..6981bbe 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="dc3841e077c522be3a011a50d78c717d2656eab9"
+WEBP_COMMIT="5ecee06f7a11b5b06d846196b362fb9fd39b25b2"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh
index d8d43d7..e521c27 100755
--- a/scripts.d/50-lilv/96-lv2.sh
+++ b/scripts.d/50-lilv/96-lv2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
LV2_REPO="https://github.com/lv2/lv2.git"
-LV2_COMMIT="6cefc7df1a6158c79d23029df183c09b10b88cad"
+LV2_COMMIT="d97a1a4daff228bdd62c68859959d13077e47026"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh
index a84d358..718b6de 100755
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SERD_REPO="https://github.com/drobilla/serd.git"
-SERD_COMMIT="c05fdaa19be53ef618435d3629122a4ebdc7cb63"
+SERD_COMMIT="272d7081257dc6d50c06b1b62e8c4baa5bf3b4b2"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh
index 0930117..9e3573f 100755
--- a/scripts.d/50-lilv/97-sord.sh
+++ b/scripts.d/50-lilv/97-sord.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SORD_REPO="https://github.com/drobilla/sord.git"
-SORD_COMMIT="d2efdb2d026216449599350b55c2c85c0d3efb89"
+SORD_COMMIT="ee631481ba7cbe5f6afdf5dd00860eb9bbed57f4"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh
index b325e2f..a6746b1 100755
--- a/scripts.d/50-lilv/98-sratom.sh
+++ b/scripts.d/50-lilv/98-sratom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SRATOM_REPO="https://github.com/lv2/sratom.git"
-SRATOM_COMMIT="c46452c83d442de137fa6470ba544e3ba142e923"
+SRATOM_COMMIT="8cf09feee6895ba0760f8c24db6416dac9006dc3"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh
index 5a15b13..b2c0680 100755
--- a/scripts.d/50-lilv/99-lilv.sh
+++ b/scripts.d/50-lilv/99-lilv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
LILV_REPO="https://github.com/lv2/lilv.git"
-LILV_COMMIT="71a2ff5170caaa052814cce19b3de927d10d0e24"
+LILV_COMMIT="c36d3451278555134de850fc548d743b6da2179a"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh
index 317c970..d53b163 100755
--- a/scripts.d/50-openh264.sh
+++ b/scripts.d/50-openh264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
OPENH264_REPO="https://github.com/cisco/openh264.git"
-OPENH264_COMMIT="0819f288dc5fc24fb34089113bc230aea65c8375"
+OPENH264_COMMIT="8fe55e3f4accac7fd1af4262bcd6eff5d008396d"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh
index 87b14ef..2194b07 100755
--- a/scripts.d/50-openjpeg.sh
+++ b/scripts.d/50-openjpeg.sh
@@ -1,7 +1,7 @@
#!/bin/bash
OPENJPEG_REPO="https://github.com/uclouvain/openjpeg.git"
-OPENJPEG_COMMIT="6a29f5a9e3a1e2dbf1e3df22b7e449bc1db20b5c"
+OPENJPEG_COMMIT="0535bfc3b7d5cd6fc73a7d4a6749a338fc5d7703"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index 9357d4e..6a89783 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
OPENMPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-OPENMPT_REV="17268"
+OPENMPT_REV="17456"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index 52ddb04..7469ec6 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
#!/bin/bash
RAV1E_REPO="https://github.com/xiph/rav1e.git"
-RAV1E_COMMIT="d2bc4d20db705b364f8bb7ed0da5cfabf8a985e2"
+RAV1E_COMMIT="a8d1e46e0dba460345e70a519d3becd079bb3acd"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index d8d6c97..05519c1 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -1,7 +1,7 @@
#!/bin/bash
RUBBERBAND_REPO="https://github.com/breakfastquay/rubberband.git"
-RUBBERBAND_COMMIT="95371b882b01af86132d17be739de82d2fadf6d7"
+RUBBERBAND_COMMIT="4cff1741664918791474da9a9d41f48cc3119229"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index 00ed7e3..544ce71 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SDL_REPO="https://github.com/libsdl-org/SDL.git"
-SDL_COMMIT="981e1e3c4489add5bf6d4df5415af3cf1ef2773d"
+SDL_COMMIT="0a93ac129475ab3ce11af95969f767d60e98233a"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index 31ddc53..d687e92 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="c76f43df6887b414799211441b733fc2a94abdf5"
+SRT_COMMIT="fba72ac4d7d5ebf2cad5ddf10ee8fae8953af3f9"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index 3e67c08..d57e6cc 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="98aba736053ba0cb00112db88a7f39f16bd64080"
+SVTAV1_COMMIT="1a656a3dd30499f1c548d10b03b022e4983ee53e"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index c6481c9..6618b2c 100755
--- a/scripts.d/50-vaapi/40-libdrm.sh
+++ b/scripts.d/50-vaapi/40-libdrm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
LIBDRM_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-LIBDRM_COMMIT="d95b12e7e3ed6a22f284afbc5d2356365b820ea8"
+LIBDRM_COMMIT="f83ad09dc04c9f918ee8836bac9d88dac5de6745"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh
index fdc26f5..d8646f6 100755
--- a/scripts.d/50-vaapi/50-libva.sh
+++ b/scripts.d/50-vaapi/50-libva.sh
@@ -1,7 +1,7 @@
#!/bin/bash
LIBVA_REPO="https://github.com/intel/libva.git"
-LIBVA_COMMIT="aeba58590726ab08b924e6a2ad0078d74c5dd01b"
+LIBVA_COMMIT="395e502d162fe04ccec7700bd1a58dca40328605"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index a643733..dea8b6a 100755
--- a/scripts.d/50-vulkan/45-vulkan.sh
+++ b/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
#!/bin/bash
HEADERS_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-HEADERS_VERSION="1.3.212"
+HEADERS_VERSION="1.3.217"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh
index 9e96f80..ca38859 100755
--- a/scripts.d/50-vulkan/50-shaderc.sh
+++ b/scripts.d/50-vulkan/50-shaderc.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SHADERC_REPO="https://github.com/google/shaderc.git"
-SHADERC_COMMIT="96b1dd72a827304817470274a470c4d3b2293451"
+SHADERC_COMMIT="7e2cfcf2b75c245fa3ceaf2e276180cbf8f107ea"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh
index 1da988d..6e48771 100755
--- a/scripts.d/50-vulkan/55-spirv-cross.sh
+++ b/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SPIRV_CROSS_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SPIRV_CROSS_COMMIT="d7cae5e7cd326ca0ebfb2a7ac4e634a63ecfe19f"
+SPIRV_CROSS_COMMIT="a97bbc24c5bae15d3d2eaa2865c122e8d3be1b67"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index bcb773a..22bf4e8 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
#!/bin/bash
PLACEBO_REPO="https://code.videolan.org/videolan/libplacebo.git"
-PLACEBO_COMMIT="f85c3c0791271089a3b1df2b5d6948cd1cb8c63e"
+PLACEBO_COMMIT="93c54f9a45ba9b85eadd64d1ab58b12896138cd2"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh
index 6870132..aecea16 100755
--- a/scripts.d/50-x264.sh
+++ b/scripts.d/50-x264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
X264_REPO="https://github.com/mirror/x264.git"
-X264_COMMIT="bfc87b7a330f75f5c9a21e56081e4b20344f139e"
+X264_COMMIT="baee400fa9ced6f5481a728138fed6e867b0ff7f"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh
index 9d8e369..495efd3 100755
--- a/scripts.d/50-zimg.sh
+++ b/scripts.d/50-zimg.sh
@@ -1,7 +1,7 @@
#!/bin/bash
ZIMG_REPO="https://github.com/sekrit-twc/zimg.git"
-ZIMG_COMMIT="b97c086a5b767423b678d922cb62c675df56290e"
+ZIMG_COMMIT="51c3c7f750c2af61955377faad56e3ba1b03589f"
ffbuild_enabled() {
return 0
From d7a253b168bb6d224cda69f2b805cddb9e2fb1ba Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Fri, 10 Jun 2022 00:09:03 +0200
Subject: [PATCH 017/160] libjxl fixed static library names
---
scripts.d/50-libjxl/50-libjxl.sh | 4 ----
1 file changed, 4 deletions(-)
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index c3663df..2df7ccc 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -41,10 +41,6 @@ ffbuild_dockerbuild() {
if [[ $TARGET == win* ]]; then
echo "Libs.private: -ladvapi32" >> "${FFBUILD_PREFIX}"/lib/pkgconfig/libjxl.pc
echo "Libs.private: -ladvapi32" >> "${FFBUILD_PREFIX}"/lib/pkgconfig/libjxl_threads.pc
-
- mv "${FFBUILD_PREFIX}"/lib/libjxl{-static,}.a
- mv "${FFBUILD_PREFIX}"/lib/libjxl_dec{-static,}.a
- mv "${FFBUILD_PREFIX}"/lib/libjxl_threads{-static,}.a
fi
}
From c9635455a010d25d47db2666bec396145eeae990 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Fri, 10 Jun 2022 00:48:44 +0200
Subject: [PATCH 018/160] Bump libplacebo
---
scripts.d/50-vulkan/60-libplacebo.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index 22bf4e8..b472223 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
#!/bin/bash
PLACEBO_REPO="https://code.videolan.org/videolan/libplacebo.git"
-PLACEBO_COMMIT="93c54f9a45ba9b85eadd64d1ab58b12896138cd2"
+PLACEBO_COMMIT="db794a2fcc8214624c950752b04f6c23f8fc567d"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
From 8906c0968c84f4270f1ff5ccea807d6ebe4a9b7f Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Fri, 10 Jun 2022 01:00:16 +0200
Subject: [PATCH 019/160] Fix SDL2 .pc file some more
---
scripts.d/50-sdl.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index 544ce71..642abf3 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -49,6 +49,10 @@ ffbuild_dockerbuild() {
-e 's/ \-Dmain=SDL_main//g' \
"$FFBUILD_PREFIX"/lib/pkgconfig/sdl2.pc
fi
+
+ sed -ri -e 's/ -lSDL2//g' \
+ -e 's/Libs: /Libs: -lSDL2 /'\
+ "$FFBUILD_PREFIX"/lib/pkgconfig/sdl2.pc
}
ffbuild_configure() {
From c68820877b7044b35b6e87bbdd0314010a699835 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 12 Jun 2022 13:24:06 +0200
Subject: [PATCH 020/160] Update to Ubuntu 22.04
---
images/base/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/images/base/Dockerfile b/images/base/Dockerfile
index 54dedec..baf8b58 100644
--- a/images/base/Dockerfile
+++ b/images/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:21.10
+FROM ubuntu:22.04
ENV DEBIAN_FRONTEND noninteractive
RUN \
From dcbf2a77f3d7a4256feb8439dafe7784785790ff Mon Sep 17 00:00:00 2001
From: nihil-admirari <50202386+nihil-admirari@users.noreply.github.com>
Date: Sun, 12 Jun 2022 18:03:50 +0300
Subject: [PATCH 021/160] Fix Windows-only or Linux-only builds
---
.github/workflows/build.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8ab11f6..82553ba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -168,6 +168,7 @@ jobs:
id: create_release
run: |
set -xe
+ shopt -s nullglob
RELDATE="$(date +'%Y-%m-%d %H:%M')"
NAME="Auto-Build $RELDATE"
TAGNAME="autobuild-$(date +'%Y-%m-%d-%H-%M')"
@@ -179,6 +180,7 @@ jobs:
- name: Update Latest
run: |
set -xe
+ shopt -s nullglob
mkdir latest_artifacts
./util/repack_latest.sh latest_artifacts artifacts/*.{zip,tar.xz}
NAME="Latest Auto-Build (${{ steps.create_release.outputs.rel_date }})"
From 7f6eef0e5f76b27e4993b0c0767f1e8e3f1b2481 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 13 Jun 2022 00:25:51 +0200
Subject: [PATCH 022/160] Add option to trigger ffmpeg-only build
---
.github/workflows/build.yml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 82553ba..52d8135 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,6 +12,11 @@ on:
type: boolean
default: false
required: false
+ buildOnly:
+ description: 'Only build ffmpeg'
+ type: boolean
+ default: false
+ required: false
schedule:
- cron: '0 12 * * *'
@@ -21,6 +26,7 @@ env:
jobs:
build_base:
name: Build base image
+ if: ${{ github.event.inputs.buildOnly != 'true' }}
runs-on: ubuntu-latest
steps:
- name: Checkout
@@ -51,6 +57,7 @@ jobs:
cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache
build_target_bases:
name: Build target base image
+ if: ${{ github.event.inputs.buildOnly != 'true' }}
needs: build_base
runs-on: ubuntu-latest
strategy:
@@ -86,6 +93,7 @@ jobs:
cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache
build_targets:
name: Build target-variant image
+ if: ${{ github.event.inputs.buildOnly != 'true' }}
needs: build_target_bases
runs-on: ubuntu-latest
strategy:
From 76aacb4b85f20b433e67f3450f670b1a06045712 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 13 Jun 2022 00:32:46 +0200
Subject: [PATCH 023/160] Actually make build step run
---
.github/workflows/build.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 52d8135..9c7a96a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -134,6 +134,7 @@ jobs:
cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache
build_ffmpeg:
name: Build ffmpeg
+ if: ${{ github.event.inputs.buildOnly == 'true' || success() }}
needs: build_targets
runs-on: ubuntu-latest
strategy:
From e57447b1c876dc0f55881bfc5f7a3927bfe60b0a Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 13 Jun 2022 01:44:36 +0200
Subject: [PATCH 024/160] Fix publish release condition logic
---
.github/workflows/build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9c7a96a..1b8b776 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -162,7 +162,7 @@ jobs:
path: artifacts/*
publish_release:
name: Publish release
- if: ${{ github.event_name == 'schedule' || github.event.inputs.doRelease == 'true' }}
+ if: ${{ always() && ( github.event_name == 'schedule' || github.event.inputs.doRelease == 'true' ) && needs.build_ffmpeg.result == 'success' }}
needs: build_ffmpeg
runs-on: ubuntu-latest
steps:
From 84385814bd40a1c0657ad47bfd85f310fe672017 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 13 Jun 2022 12:24:41 +0200
Subject: [PATCH 025/160] Allow cancelling of manual jobs
---
.github/workflows/build.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1b8b776..57078d5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -134,7 +134,7 @@ jobs:
cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache
build_ffmpeg:
name: Build ffmpeg
- if: ${{ github.event.inputs.buildOnly == 'true' || success() }}
+ if: ${{ ( github.event.inputs.buildOnly == 'true' && !cancelled() ) || success() }}
needs: build_targets
runs-on: ubuntu-latest
strategy:
@@ -162,7 +162,7 @@ jobs:
path: artifacts/*
publish_release:
name: Publish release
- if: ${{ always() && ( github.event_name == 'schedule' || github.event.inputs.doRelease == 'true' ) && needs.build_ffmpeg.result == 'success' }}
+ if: ${{ !cancelled() && ( github.event_name == 'schedule' || github.event.inputs.doRelease == 'true' ) && needs.build_ffmpeg.result == 'success' }}
needs: build_ffmpeg
runs-on: ubuntu-latest
steps:
From a807ae4523cb46a18973685049411f5e5f4c0545 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 13 Jun 2022 18:55:53 +0200
Subject: [PATCH 026/160] PA: use library, not static_library
---
scripts.d/45-pulseaudio.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index 2b4719e..b796e3f 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -18,7 +18,7 @@ ffbuild_dockerbuild() {
echo > src/pulsecore/sndfile-util.c
echo > src/pulsecore/sndfile-util.h
sed -ri -e 's/(sndfile_dep = .*)\)/\1, required : false)/' meson.build
- sed -ri -e 's/shared_library/static_library/g' src/meson.build src/pulse/meson.build
+ sed -ri -e 's/shared_library/library/g' src/meson.build src/pulse/meson.build
mkdir build && cd build
From 1e5dc2ed5687df3502a36cc496f153f7c672714e Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 13 Jun 2022 21:15:38 +0200
Subject: [PATCH 027/160] Fix build of libdrm
---
scripts.d/50-vaapi/40-libdrm.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index 6618b2c..0c66f14 100755
--- a/scripts.d/50-vaapi/40-libdrm.sh
+++ b/scripts.d/50-vaapi/40-libdrm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
LIBDRM_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-LIBDRM_COMMIT="f83ad09dc04c9f918ee8836bac9d88dac5de6745"
+LIBDRM_COMMIT="f7828dc180ba3427b5e405fab25e9846c07322bc"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -17,7 +17,6 @@ ffbuild_dockerbuild() {
local myconf=(
--prefix="$FFBUILD_PREFIX"
-Ddefault_library=shared
- -Dlibkms=false
-Dudev=false
-Dcairo-tests=false
-Dvalgrind=false
From 03f047df3a7c8fc5f03641ac95a3ef14fbe84e17 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 13 Jun 2022 23:28:37 +0200
Subject: [PATCH 028/160] Fix srt.pc file
---
scripts.d/50-srt.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index d687e92..8a93092 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="fba72ac4d7d5ebf2cad5ddf10ee8fae8953af3f9"
+SRT_COMMIT="e8b713e954345291e8d6e2314d1e5094a6a14179"
ffbuild_enabled() {
return 0
@@ -14,9 +14,11 @@ ffbuild_dockerbuild() {
mkdir build && cd build
cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
- -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -DENABLE_ENCRYPTION=ON -DENABLE_APPS=OFF ..
+ -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -DENABLE_CXX_DEPS=ON -DUSE_STATIC_LIBSTDCXX=ON -DENABLE_ENCRYPTION=ON -DENABLE_APPS=OFF ..
make -j$(nproc)
make install
+
+ echo "Libs.private: -lstdc++" >> "$FFBUILD_PREFIX"/lib/pkgconfig/srt.pc
}
ffbuild_configure() {
From 7407f42884bbb143eeb7382d57662a800ceb3353 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 13 Jun 2022 23:57:40 +0200
Subject: [PATCH 029/160] Fix x265 .pc file
---
scripts.d/50-x265.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh
index bc6b6c7..525eca6 100755
--- a/scripts.d/50-x265.sh
+++ b/scripts.d/50-x265.sh
@@ -61,6 +61,8 @@ EOF
fi
make install
+
+ echo "Libs.private: -lstdc++" >> "$FFBUILD_PREFIX"/lib/pkgconfig/x265.pc
}
ffbuild_configure() {
From 26daa8f3809ce05baf63402cc88c781de306a54b Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 29 Jun 2022 15:58:02 +0200
Subject: [PATCH 030/160] Update OpenSSL
---
scripts.d/25-openssl.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh
index cc376af..f3886d8 100755
--- a/scripts.d/25-openssl.sh
+++ b/scripts.d/25-openssl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
OPENSSL_REPO="https://github.com/openssl/openssl.git"
-OPENSSL_COMMIT="OpenSSL_1_1_1o"
+OPENSSL_COMMIT="OpenSSL_1_1_1p"
ffbuild_enabled() {
return 0
From 7730280bd84c53e1d5a07fdab25ed1bdfaf247fb Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 6 Jul 2022 13:09:57 +0200
Subject: [PATCH 031/160] Update OpenSSL
---
scripts.d/25-openssl.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh
index f3886d8..c74a7ec 100755
--- a/scripts.d/25-openssl.sh
+++ b/scripts.d/25-openssl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
OPENSSL_REPO="https://github.com/openssl/openssl.git"
-OPENSSL_COMMIT="OpenSSL_1_1_1p"
+OPENSSL_COMMIT="OpenSSL_1_1_1q"
ffbuild_enabled() {
return 0
From cfd9fde44fb6e995645527489f97f5b67e7b1480 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 6 Jul 2022 13:25:52 +0200
Subject: [PATCH 032/160] Update ct-ng config, use gcc 12
---
images/base-linux64/ct-ng-config | 42 ++++++++++++++++++++++----------
images/base-win32/ct-ng-config | 23 +++++++++++------
images/base-win64/ct-ng-config | 23 +++++++++++------
3 files changed, 59 insertions(+), 29 deletions(-)
diff --git a/images/base-linux64/ct-ng-config b/images/base-linux64/ct-ng-config
index df995dc..3fdade0 100644
--- a/images/base-linux64/ct-ng-config
+++ b/images/base-linux64/ct-ng-config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.24.0.533_681aaef Configuration
+# crosstool-NG 1.25.0.55_3defb7b Configuration
#
CT_CONFIGURE_has_static_link=y
CT_CONFIGURE_has_cxx11=y
@@ -27,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
CT_CONFIGURE_has_sha256sum=y
CT_CONFIGURE_has_sha512sum=y
CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.24.0.533_681aaef"
+CT_VERSION="1.25.0.55_3defb7b"
CT_VCHECK=""
CT_CONFIG_VERSION_ENV="4"
CT_CONFIG_VERSION_CURRENT="4"
@@ -264,6 +264,9 @@ CT_LINUX_PATCH_GLOBAL=y
# CT_LINUX_PATCH_LOCAL_BUNDLED is not set
# CT_LINUX_PATCH_NONE is not set
CT_LINUX_PATCH_ORDER="global"
+# CT_LINUX_V_5_18 is not set
+# CT_LINUX_V_5_17 is not set
+# CT_LINUX_V_5_16 is not set
# CT_LINUX_V_5_15 is not set
# CT_LINUX_V_5_14 is not set
# CT_LINUX_V_5_13 is not set
@@ -301,7 +304,7 @@ CT_LINUX_V_4_4=y
# CT_LINUX_V_3_4 is not set
# CT_LINUX_V_3_2 is not set
# CT_LINUX_V_2_6_32 is not set
-CT_LINUX_VERSION="4.4.292"
+CT_LINUX_VERSION="4.4.302"
CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})"
CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -309,6 +312,8 @@ CT_LINUX_ARCHIVE_FORMATS=".tar.xz .tar.gz"
CT_LINUX_SIGNATURE_FORMAT="unpacked/.sign"
CT_LINUX_5_12_or_older=y
CT_LINUX_older_than_5_12=y
+CT_LINUX_5_5_or_older=y
+CT_LINUX_older_than_5_5=y
CT_LINUX_5_3_or_older=y
CT_LINUX_older_than_5_3=y
CT_LINUX_4_8_or_older=y
@@ -407,13 +412,11 @@ CT_ALL_BINUTILS_CHOICES="BINUTILS"
#
# C-library
#
-# CT_LIBC_BIONIC is not set
CT_LIBC_GLIBC=y
# CT_LIBC_MUSL is not set
# CT_LIBC_UCLIBC_NG is not set
CT_LIBC="glibc"
CT_LIBC_CHOICE_KSYM="GLIBC"
-CT_THREADS="nptl"
CT_LIBC_GLIBC_SHOW=y
#
@@ -450,15 +453,18 @@ CT_GLIBC_PATCH_ORDER="global"
CT_GLIBC_V_2_23=y
# CT_GLIBC_V_2_19 is not set
# CT_GLIBC_V_2_17 is not set
-# CT_GLIBC_V_2_12_1 is not set
CT_GLIBC_VERSION="2.23"
CT_GLIBC_MIRRORS="$(CT_Mirrors GNU glibc)"
CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
CT_GLIBC_SIGNATURE_FORMAT="packed/.sig"
+CT_GLIBC_2_34_or_older=y
+CT_GLIBC_older_than_2_34=y
CT_GLIBC_2_32_or_older=y
CT_GLIBC_older_than_2_32=y
+CT_GLIBC_2_31_or_older=y
+CT_GLIBC_older_than_2_31=y
CT_GLIBC_2_30_or_older=y
CT_GLIBC_older_than_2_30=y
CT_GLIBC_2_29_or_older=y
@@ -486,12 +492,14 @@ CT_GLIBC_DEP_BINUTILS=y
CT_GLIBC_DEP_GCC=y
CT_GLIBC_DEP_PYTHON=y
CT_GLIBC_SPARC_ALLOW_V7=y
+CT_THREADS="nptl"
CT_GLIBC_HAS_LIBIDN_ADDON=y
# CT_GLIBC_USE_LIBIDN_ADDON is not set
CT_GLIBC_NO_SPARC_V8=y
CT_GLIBC_HAS_OBSOLETE_RPC=y
CT_GLIBC_EXTRA_CONFIG_ARRAY="--with-pic"
CT_GLIBC_CONFIGPARMS=""
+# CT_GLIBC_ENABLE_DEBUG is not set
CT_GLIBC_EXTRA_CFLAGS="-fPIC -DPIC"
CT_GLIBC_ENABLE_OBSOLETE_RPC=y
# CT_GLIBC_ENABLE_FORTIFIED_BUILD is not set
@@ -502,9 +510,9 @@ CT_GLIBC_FORCE_UNWIND=y
# CT_GLIBC_KERNEL_VERSION_NONE is not set
CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_GLIBC_MIN_KERNEL="4.4.292"
+CT_GLIBC_MIN_KERNEL="4.4.302"
CT_GLIBC_ENABLE_COMMON_FLAG=y
-CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
+CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
CT_LIBC_SUPPORT_THREADS_ANY=y
CT_LIBC_SUPPORT_THREADS_NATIVE=y
@@ -523,6 +531,7 @@ CT_CC_CORE_NEEDED=y
CT_CC_SUPPORT_CXX=y
CT_CC_SUPPORT_FORTRAN=y
CT_CC_SUPPORT_ADA=y
+CT_CC_SUPPORT_D=y
CT_CC_SUPPORT_OBJC=y
CT_CC_SUPPORT_OBJCXX=y
CT_CC_SUPPORT_GOLANG=y
@@ -538,6 +547,7 @@ CT_CC_GCC_PKG_KSYM="GCC"
CT_GCC_DIR_NAME="gcc"
CT_GCC_USE_GNU=y
# CT_GCC_USE_LINARO is not set
+# CT_GCC_USE_ORACLE is not set
CT_GCC_USE="GCC"
CT_GCC_PKG_NAME="gcc"
CT_GCC_SRC_RELEASE=y
@@ -550,7 +560,8 @@ CT_GCC_PATCH_GLOBAL=y
# CT_GCC_PATCH_LOCAL_BUNDLED is not set
# CT_GCC_PATCH_NONE is not set
CT_GCC_PATCH_ORDER="global"
-CT_GCC_V_11=y
+CT_GCC_V_12=y
+# CT_GCC_V_11 is not set
# CT_GCC_V_10 is not set
# CT_GCC_V_9 is not set
# CT_GCC_V_8 is not set
@@ -558,12 +569,14 @@ CT_GCC_V_11=y
# CT_GCC_V_6 is not set
# CT_GCC_V_5 is not set
# CT_GCC_V_4_9 is not set
-CT_GCC_VERSION="11.2.0"
+CT_GCC_VERSION="12.1.0"
CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
CT_GCC_SIGNATURE_FORMAT=""
+CT_GCC_later_than_12=y
+CT_GCC_12_or_later=y
CT_GCC_later_than_11=y
CT_GCC_11_or_later=y
CT_GCC_later_than_10=y
@@ -634,6 +647,7 @@ CT_ALL_CC_CHOICES="GCC"
CT_CC_LANG_CXX=y
# CT_CC_LANG_FORTRAN is not set
# CT_CC_LANG_ADA is not set
+# CT_CC_LANG_D is not set
# CT_CC_LANG_OBJC is not set
# CT_CC_LANG_OBJCXX is not set
# CT_CC_LANG_GOLANG is not set
@@ -731,6 +745,7 @@ CT_ISL_PATCH_GLOBAL=y
# CT_ISL_PATCH_NONE is not set
CT_ISL_PATCH_ORDER="global"
CT_ISL_V_0_24=y
+# CT_ISL_V_0_23 is not set
# CT_ISL_V_0_22 is not set
# CT_ISL_V_0_21 is not set
# CT_ISL_V_0_20 is not set
@@ -739,6 +754,7 @@ CT_ISL_V_0_24=y
# CT_ISL_V_0_17 is not set
# CT_ISL_V_0_16 is not set
# CT_ISL_V_0_15 is not set
+# CT_ISL_V_0_11 is not set
CT_ISL_VERSION="0.24"
CT_ISL_MIRRORS="https://libisl.sourceforge.io"
CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
@@ -789,7 +805,7 @@ CT_MPC_PATCH_ORDER="global"
CT_MPC_V_1_2=y
# CT_MPC_V_1_1 is not set
# CT_MPC_V_1_0 is not set
-CT_MPC_VERSION="1.2.0"
+CT_MPC_VERSION="1.2.1"
CT_MPC_MIRRORS="http://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)"
CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -866,8 +882,8 @@ CT_ZLIB_PATCH_GLOBAL=y
# CT_ZLIB_PATCH_LOCAL_BUNDLED is not set
# CT_ZLIB_PATCH_NONE is not set
CT_ZLIB_PATCH_ORDER="global"
-CT_ZLIB_V_1_2_11=y
-CT_ZLIB_VERSION="1.2.11"
+CT_ZLIB_V_1_2_12=y
+CT_ZLIB_VERSION="1.2.12"
CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
diff --git a/images/base-win32/ct-ng-config b/images/base-win32/ct-ng-config
index 4801234..25f27f5 100644
--- a/images/base-win32/ct-ng-config
+++ b/images/base-win32/ct-ng-config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.24.0.533_681aaef Configuration
+# crosstool-NG 1.25.0.55_3defb7b Configuration
#
CT_CONFIGURE_has_static_link=y
CT_CONFIGURE_has_cxx11=y
@@ -27,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
CT_CONFIGURE_has_sha256sum=y
CT_CONFIGURE_has_sha512sum=y
CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.24.0.533_681aaef"
+CT_VERSION="1.25.0.55_3defb7b"
CT_VCHECK=""
CT_CONFIG_VERSION_ENV="4"
CT_CONFIG_VERSION_CURRENT="4"
@@ -374,7 +374,7 @@ CT_MINGW_DIRECTX=y
CT_MINGW_DDK=y
CT_MINGW_TOOLS=y
CT_MINGW_TOOL_LIST_ARRAY="gendef genidl genlib genpeimg widl"
-CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
+CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
CT_LIBC_SUPPORT_THREADS_ANY=y
CT_LIBC_SUPPORT_THREADS_NATIVE=y
CT_LIBC_SUPPORT_THREADS_POSIX=y
@@ -393,6 +393,7 @@ CT_CC_CORE_NEEDED=y
CT_CC_SUPPORT_CXX=y
CT_CC_SUPPORT_FORTRAN=y
CT_CC_SUPPORT_ADA=y
+CT_CC_SUPPORT_D=y
CT_CC_SUPPORT_OBJC=y
CT_CC_SUPPORT_OBJCXX=y
CT_CC_SUPPORT_GOLANG=y
@@ -408,6 +409,7 @@ CT_CC_GCC_PKG_KSYM="GCC"
CT_GCC_DIR_NAME="gcc"
CT_GCC_USE_GNU=y
# CT_GCC_USE_LINARO is not set
+# CT_GCC_USE_ORACLE is not set
CT_GCC_USE="GCC"
CT_GCC_PKG_NAME="gcc"
CT_GCC_SRC_RELEASE=y
@@ -420,7 +422,8 @@ CT_GCC_PATCH_GLOBAL=y
# CT_GCC_PATCH_LOCAL_BUNDLED is not set
# CT_GCC_PATCH_NONE is not set
CT_GCC_PATCH_ORDER="global"
-CT_GCC_V_11=y
+CT_GCC_V_12=y
+# CT_GCC_V_11 is not set
# CT_GCC_V_10 is not set
# CT_GCC_V_9 is not set
# CT_GCC_V_8 is not set
@@ -428,12 +431,14 @@ CT_GCC_V_11=y
# CT_GCC_V_6 is not set
# CT_GCC_V_5 is not set
# CT_GCC_V_4_9 is not set
-CT_GCC_VERSION="11.2.0"
+CT_GCC_VERSION="12.1.0"
CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
CT_GCC_SIGNATURE_FORMAT=""
+CT_GCC_later_than_12=y
+CT_GCC_12_or_later=y
CT_GCC_later_than_11=y
CT_GCC_11_or_later=y
CT_GCC_later_than_10=y
@@ -502,6 +507,7 @@ CT_ALL_CC_CHOICES="GCC"
CT_CC_LANG_CXX=y
# CT_CC_LANG_FORTRAN is not set
# CT_CC_LANG_ADA is not set
+# CT_CC_LANG_D is not set
# CT_CC_LANG_OBJC is not set
# CT_CC_LANG_OBJCXX is not set
# CT_CC_LANG_GOLANG is not set
@@ -599,6 +605,7 @@ CT_ISL_PATCH_GLOBAL=y
# CT_ISL_PATCH_NONE is not set
CT_ISL_PATCH_ORDER="global"
CT_ISL_V_0_24=y
+# CT_ISL_V_0_23 is not set
# CT_ISL_V_0_22 is not set
# CT_ISL_V_0_21 is not set
# CT_ISL_V_0_20 is not set
@@ -636,7 +643,7 @@ CT_MPC_PATCH_ORDER="global"
CT_MPC_V_1_2=y
# CT_MPC_V_1_1 is not set
# CT_MPC_V_1_0 is not set
-CT_MPC_VERSION="1.2.0"
+CT_MPC_VERSION="1.2.1"
CT_MPC_MIRRORS="http://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)"
CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -684,8 +691,8 @@ CT_ZLIB_PATCH_GLOBAL=y
# CT_ZLIB_PATCH_LOCAL_BUNDLED is not set
# CT_ZLIB_PATCH_NONE is not set
CT_ZLIB_PATCH_ORDER="global"
-CT_ZLIB_V_1_2_11=y
-CT_ZLIB_VERSION="1.2.11"
+CT_ZLIB_V_1_2_12=y
+CT_ZLIB_VERSION="1.2.12"
CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
diff --git a/images/base-win64/ct-ng-config b/images/base-win64/ct-ng-config
index 6687370..01d48d7 100644
--- a/images/base-win64/ct-ng-config
+++ b/images/base-win64/ct-ng-config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.24.0.533_681aaef Configuration
+# crosstool-NG 1.25.0.55_3defb7b Configuration
#
CT_CONFIGURE_has_static_link=y
CT_CONFIGURE_has_cxx11=y
@@ -27,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
CT_CONFIGURE_has_sha256sum=y
CT_CONFIGURE_has_sha512sum=y
CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.24.0.533_681aaef"
+CT_VERSION="1.25.0.55_3defb7b"
CT_VCHECK=""
CT_CONFIG_VERSION_ENV="4"
CT_CONFIG_VERSION_CURRENT="4"
@@ -374,7 +374,7 @@ CT_MINGW_DIRECTX=y
CT_MINGW_DDK=y
CT_MINGW_TOOLS=y
CT_MINGW_TOOL_LIST_ARRAY="gendef genidl genlib genpeimg widl"
-CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
+CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
CT_LIBC_SUPPORT_THREADS_ANY=y
CT_LIBC_SUPPORT_THREADS_NATIVE=y
CT_LIBC_SUPPORT_THREADS_POSIX=y
@@ -393,6 +393,7 @@ CT_CC_CORE_NEEDED=y
CT_CC_SUPPORT_CXX=y
CT_CC_SUPPORT_FORTRAN=y
CT_CC_SUPPORT_ADA=y
+CT_CC_SUPPORT_D=y
CT_CC_SUPPORT_OBJC=y
CT_CC_SUPPORT_OBJCXX=y
CT_CC_SUPPORT_GOLANG=y
@@ -408,6 +409,7 @@ CT_CC_GCC_PKG_KSYM="GCC"
CT_GCC_DIR_NAME="gcc"
CT_GCC_USE_GNU=y
# CT_GCC_USE_LINARO is not set
+# CT_GCC_USE_ORACLE is not set
CT_GCC_USE="GCC"
CT_GCC_PKG_NAME="gcc"
CT_GCC_SRC_RELEASE=y
@@ -420,7 +422,8 @@ CT_GCC_PATCH_GLOBAL=y
# CT_GCC_PATCH_LOCAL_BUNDLED is not set
# CT_GCC_PATCH_NONE is not set
CT_GCC_PATCH_ORDER="global"
-CT_GCC_V_11=y
+CT_GCC_V_12=y
+# CT_GCC_V_11 is not set
# CT_GCC_V_10 is not set
# CT_GCC_V_9 is not set
# CT_GCC_V_8 is not set
@@ -428,12 +431,14 @@ CT_GCC_V_11=y
# CT_GCC_V_6 is not set
# CT_GCC_V_5 is not set
# CT_GCC_V_4_9 is not set
-CT_GCC_VERSION="11.2.0"
+CT_GCC_VERSION="12.1.0"
CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
CT_GCC_SIGNATURE_FORMAT=""
+CT_GCC_later_than_12=y
+CT_GCC_12_or_later=y
CT_GCC_later_than_11=y
CT_GCC_11_or_later=y
CT_GCC_later_than_10=y
@@ -502,6 +507,7 @@ CT_ALL_CC_CHOICES="GCC"
CT_CC_LANG_CXX=y
# CT_CC_LANG_FORTRAN is not set
# CT_CC_LANG_ADA is not set
+# CT_CC_LANG_D is not set
# CT_CC_LANG_OBJC is not set
# CT_CC_LANG_OBJCXX is not set
# CT_CC_LANG_GOLANG is not set
@@ -599,6 +605,7 @@ CT_ISL_PATCH_GLOBAL=y
# CT_ISL_PATCH_NONE is not set
CT_ISL_PATCH_ORDER="global"
CT_ISL_V_0_24=y
+# CT_ISL_V_0_23 is not set
# CT_ISL_V_0_22 is not set
# CT_ISL_V_0_21 is not set
# CT_ISL_V_0_20 is not set
@@ -636,7 +643,7 @@ CT_MPC_PATCH_ORDER="global"
CT_MPC_V_1_2=y
# CT_MPC_V_1_1 is not set
# CT_MPC_V_1_0 is not set
-CT_MPC_VERSION="1.2.0"
+CT_MPC_VERSION="1.2.1"
CT_MPC_MIRRORS="http://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)"
CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -684,8 +691,8 @@ CT_ZLIB_PATCH_GLOBAL=y
# CT_ZLIB_PATCH_LOCAL_BUNDLED is not set
# CT_ZLIB_PATCH_NONE is not set
CT_ZLIB_PATCH_ORDER="global"
-CT_ZLIB_V_1_2_11=y
-CT_ZLIB_VERSION="1.2.11"
+CT_ZLIB_V_1_2_12=y
+CT_ZLIB_VERSION="1.2.12"
CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
From f29d3b5662f42be62044bcf6cb8310d108bb9a2f Mon Sep 17 00:00:00 2001
From: tsukumi <tsukumijima@users.noreply.github.com>
Date: Tue, 10 May 2022 07:15:31 +0900
Subject: [PATCH 033/160] Add support for Linux aarch64 builds
---
README.md | 18 +-
images/base-linuxarm64/Dockerfile | 57 ++
images/base-linuxarm64/cross.meson | 12 +
images/base-linuxarm64/ct-ng-config | 941 +++++++++++++++++++++++++
images/base-linuxarm64/gen-implib.sh | 17 +
images/base-linuxarm64/toolchain.cmake | 16 +
scripts.d/25-fftw3.sh | 11 +-
scripts.d/25-openssl.sh | 5 +
scripts.d/45-x11/40-libx11.sh | 1 +
scripts.d/45-x11/50-libxext.sh | 1 +
scripts.d/45-x11/50-libxfixes.sh | 1 +
scripts.d/45-x11/50-libxi.sh | 1 +
scripts.d/45-x11/50-libxinerama.sh | 1 +
scripts.d/45-x11/50-libxrender.sh | 1 +
scripts.d/45-x11/50-libxscrnsaver.sh | 1 +
scripts.d/45-x11/50-libxxf86vm.sh | 1 +
scripts.d/45-x11/60-libglvnd.sh | 1 +
scripts.d/45-x11/60-libxcursor.sh | 1 +
scripts.d/45-x11/60-libxrandr.sh | 1 +
scripts.d/45-x11/60-libxv.sh | 1 +
scripts.d/50-davs2.sh | 2 +
scripts.d/50-libvpx.sh | 7 +-
scripts.d/50-mfx.sh | 1 +
scripts.d/50-openh264.sh | 5 +
scripts.d/50-rav1e.sh | 6 +
scripts.d/50-sdl.sh | 1 +
scripts.d/50-vaapi/50-libva.sh | 1 +
scripts.d/50-vidstab.sh | 7 +-
scripts.d/50-xavs2.sh | 2 +
variants/linuxarm64-gpl-shared.sh | 3 +
variants/linuxarm64-gpl.sh | 3 +
variants/linuxarm64-lgpl-shared.sh | 3 +
variants/linuxarm64-lgpl.sh | 3 +
variants/linuxarm64-nonfree-shared.sh | 3 +
variants/linuxarm64-nonfree.sh | 4 +
35 files changed, 1133 insertions(+), 7 deletions(-)
create mode 100644 images/base-linuxarm64/Dockerfile
create mode 100644 images/base-linuxarm64/cross.meson
create mode 100644 images/base-linuxarm64/ct-ng-config
create mode 100755 images/base-linuxarm64/gen-implib.sh
create mode 100644 images/base-linuxarm64/toolchain.cmake
create mode 100644 variants/linuxarm64-gpl-shared.sh
create mode 100644 variants/linuxarm64-gpl.sh
create mode 100644 variants/linuxarm64-lgpl-shared.sh
create mode 100644 variants/linuxarm64-lgpl.sh
create mode 100644 variants/linuxarm64-nonfree-shared.sh
create mode 100644 variants/linuxarm64-nonfree.sh
diff --git a/README.md b/README.md
index f1f6666..5bc2ea5 100644
--- a/README.md
+++ b/README.md
@@ -4,13 +4,15 @@ Static Windows (x86_64) and Linux (x86_64) Builds of ffmpeg master and latest re
Windows builds are targetting Windows 7 and newer.
-Linux builds are targetting Ubuntu 16.04 (glibc-2.23 + linux-4.4) and anything more recent.
+Linux (x86_64) builds are targetting Ubuntu 16.04 (glibc-2.23 + linux-4.4) and anything more recent.
+
+Linux (arm64) builds are targetting Ubuntu 18.04 (glibc-2.27 + linux-4.15) and anything more recent.
## Auto-Builds
Builds run daily at 12:00 UTC (or GitHubs idea of that time) and are automatically released on success.
-**Auto-Builds run ONLY for win64 and linux64. There are no win32/x86 auto-builds, though you can produce win32 builds yourself following the instructions below.**
+**Auto-Builds run ONLY for win64 and linux64. There are no win32/x86 and linux-arm64/aarch64 auto-builds, though you can produce win32 and linux-arm64 builds yourself following the instructions below.**
### Release Retention Policy
@@ -46,13 +48,25 @@ Available targets:
* `win64` (x86_64 Windows)
* `win32` (x86 Windows)
* `linux64` (x86_64 Linux, glibc>=2.23, linux>=4.4)
+* `linuxarm64` (arm64 (aarch64) Linux, glibc>=2.27, linux>=4.15)
+
+The linuxarm64 target will not build some dependencies due to lack of arm64 (aarch64) architecture support or cross-compiling restrictions.
+
+* `libx11` and dependencies: libx11 and its dependencies don't seem to support cross-compiling.
+* `SDL`: Because it depends on libx11.
+* `davs2` and `xavs2`: aarch64 support is broken.
+* `libmfx` and `libva`: Library for Intel QSV, so there is no aarch64 support.
+* `ffplay` binary: Because it depends on libx11 and SDL.
Available:
* `gpl` Includes all dependencies, even those that require full GPL instead of just LGPL.
* `lgpl` Lacking libraries that are GPL-only. Most prominently libx264 and libx265.
+* `nonfree` Includes fdk-aac in addition to all the dependencies of the gpl variant.
* `gpl-shared` Same as gpl, but comes with the libav* family of shared libs instead of pure static executables.
* `lgpl-shared` Same again, but with the lgpl set of dependencies.
+* `nonfree-shared` Same again, but with the nonfree set of dependencies.
All of those can be optionally combined with any combination of addins.
* `4.4` to build from the 4.4 release branch instead of master.
+* `5.0` to build from the 5.0 release branch instead of master.
* `debug` to not strip debug symbols from the binaries. This increases the output size by about 250MB.
diff --git a/images/base-linuxarm64/Dockerfile b/images/base-linuxarm64/Dockerfile
new file mode 100644
index 0000000..bcc068b
--- /dev/null
+++ b/images/base-linuxarm64/Dockerfile
@@ -0,0 +1,57 @@
+ARG GH_REPO=btbn/ffmpeg-builds
+FROM ghcr.io/$GH_REPO/base:latest
+
+RUN --mount=src=ct-ng-config,dst=/.config \
+ git clone --filter=blob:none https://github.com/crosstool-ng/crosstool-ng.git /ct-ng && cd /ct-ng && \
+ ./bootstrap && \
+ ./configure --enable-local && \
+ make -j$(nproc) && \
+ cp /.config .config && \
+ ./ct-ng build && \
+ cd / && \
+ rm -rf ct-ng
+
+# Prepare cross environment to heavily favour static builds
+RUN \
+ find /opt/ct-ng -type l \
+ -and -name '*.so' \
+ -and -not -ipath '*plugin*' \
+ -and -not -name 'libdl.*' \
+ -and -not -name 'libc.*' \
+ -and -not -name 'libm.*' \
+ -and -not -name 'libmvec.*' \
+ -and -not -name 'librt.*' \
+ -and -not -name 'libpthread.*' \
+ -delete && \
+ find /opt/ct-ng \
+ -name 'libdl.a' \
+ -or -name 'libc.a' \
+ -or -name 'libm.a' \
+ -or -name 'libmvec.a' \
+ -or -name 'librt.a' \
+ -or -name 'libpthread.a' \
+ -delete && \
+ mkdir /opt/ffbuild
+
+RUN rustup target add aarch64-unknown-linux-gnu
+
+ADD toolchain.cmake /toolchain.cmake
+ADD cross.meson /cross.meson
+
+ADD gen-implib.sh /usr/bin/gen-implib
+RUN git clone --filter=blob:none --depth=1 https://github.com/yugr/Implib.so /opt/implib
+
+ENV PATH="/opt/ct-ng/bin:${PATH}" \
+ FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=aarch64-ffbuild-linux-gnu- --arch=aarch64 --target-os=linux" \
+ FFBUILD_TOOLCHAIN=aarch64-ffbuild-linux-gnu \
+ FFBUILD_CROSS_PREFIX="aarch64-ffbuild-linux-gnu-" \
+ FFBUILD_RUST_TARGET="aarch64-unknown-linux-gnu" \
+ FFBUILD_PREFIX=/opt/ffbuild \
+ FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \
+ PKG_CONFIG=pkg-config \
+ PKG_CONFIG_LIBDIR=/opt/ffbuild/lib/pkgconfig:/opt/ffbuild/share/pkgconfig \
+ CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \
+ CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \
+ LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -Wl,-z,relro,-z,now -pthread -lm" \
+ STAGE_CFLAGS="-fvisibility=hidden -fno-semantic-interposition" \
+ STAGE_CXXFLAGS="-fvisibility=hidden -fno-semantic-interposition"
diff --git a/images/base-linuxarm64/cross.meson b/images/base-linuxarm64/cross.meson
new file mode 100644
index 0000000..b40ba85
--- /dev/null
+++ b/images/base-linuxarm64/cross.meson
@@ -0,0 +1,12 @@
+[binaries]
+c = 'aarch64-ffbuild-linux-gnu-gcc'
+cpp = 'aarch64-ffbuild-linux-gnu-g++'
+ld = 'aarch64-ffbuild-linux-gnu-ld'
+ar = 'aarch64-ffbuild-linux-gnu-ar'
+strip = 'aarch64-ffbuild-linux-gnu-strip'
+
+[host_machine]
+system = 'linux'
+cpu_family = 'aarch64'
+cpu = 'aarch64'
+endian = 'little'
diff --git a/images/base-linuxarm64/ct-ng-config b/images/base-linuxarm64/ct-ng-config
new file mode 100644
index 0000000..2851302
--- /dev/null
+++ b/images/base-linuxarm64/ct-ng-config
@@ -0,0 +1,941 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# crosstool-NG 1.25.0.55_3defb7b Configuration
+#
+CT_CONFIGURE_has_static_link=y
+CT_CONFIGURE_has_cxx11=y
+CT_CONFIGURE_has_wget=y
+CT_CONFIGURE_has_curl=y
+CT_CONFIGURE_has_meson=y
+CT_CONFIGURE_has_ninja=y
+CT_CONFIGURE_has_rsync=y
+CT_CONFIGURE_has_make_3_81_or_newer=y
+CT_CONFIGURE_has_make_4_0_or_newer=y
+CT_CONFIGURE_has_libtool_2_4_or_newer=y
+CT_CONFIGURE_has_libtoolize_2_4_or_newer=y
+CT_CONFIGURE_has_autoconf_2_65_or_newer=y
+CT_CONFIGURE_has_autoreconf_2_65_or_newer=y
+CT_CONFIGURE_has_automake_1_15_or_newer=y
+CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
+CT_CONFIGURE_has_python_3_4_or_newer=y
+CT_CONFIGURE_has_bison_2_7_or_newer=y
+CT_CONFIGURE_has_python=y
+CT_CONFIGURE_has_svn=y
+CT_CONFIGURE_has_git=y
+CT_CONFIGURE_has_md5sum=y
+CT_CONFIGURE_has_sha1sum=y
+CT_CONFIGURE_has_sha256sum=y
+CT_CONFIGURE_has_sha512sum=y
+CT_CONFIGURE_has_install_with_strip_program=y
+CT_VERSION="1.25.0.55_3defb7b"
+CT_VCHECK=""
+CT_CONFIG_VERSION_ENV="4"
+CT_CONFIG_VERSION_CURRENT="4"
+CT_CONFIG_VERSION="4"
+CT_MODULES=y
+
+#
+# Paths and misc options
+#
+
+#
+# crosstool-NG behavior
+#
+CT_OBSOLETE=y
+CT_EXPERIMENTAL=y
+CT_ALLOW_BUILD_AS_ROOT=y
+CT_ALLOW_BUILD_AS_ROOT_SURE=y
+# CT_DEBUG_CT is not set
+
+#
+# Paths
+#
+CT_LOCAL_TARBALLS_DIR="${HOME}/src"
+# CT_SAVE_TARBALLS is not set
+# CT_TARBALLS_BUILDROOT_LAYOUT is not set
+CT_WORK_DIR="${CT_TOP_DIR}/build"
+CT_BUILD_TOP_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}"
+CT_BUILD_DIR="${CT_BUILD_TOP_DIR}/build"
+CT_PREFIX_DIR="/opt/ct-ng"
+CT_RM_RF_PREFIX_DIR=y
+CT_REMOVE_DOCS=y
+# CT_INSTALL_LICENSES is not set
+# CT_PREFIX_DIR_RO is not set
+CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y
+CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y
+
+#
+# Downloading
+#
+CT_DOWNLOAD_AGENT_WGET=y
+# CT_DOWNLOAD_AGENT_CURL is not set
+# CT_DOWNLOAD_AGENT_NONE is not set
+# CT_FORBID_DOWNLOAD is not set
+# CT_FORCE_DOWNLOAD is not set
+CT_CONNECT_TIMEOUT=10
+CT_DOWNLOAD_WGET_OPTIONS="--passive-ftp --tries=3 -nc --progress=dot:binary"
+# CT_ONLY_DOWNLOAD is not set
+# CT_USE_MIRROR is not set
+CT_VERIFY_DOWNLOAD_DIGEST=y
+CT_VERIFY_DOWNLOAD_DIGEST_SHA512=y
+# CT_VERIFY_DOWNLOAD_DIGEST_SHA256 is not set
+# CT_VERIFY_DOWNLOAD_DIGEST_SHA1 is not set
+# CT_VERIFY_DOWNLOAD_DIGEST_MD5 is not set
+CT_VERIFY_DOWNLOAD_DIGEST_ALG="sha512"
+# CT_VERIFY_DOWNLOAD_SIGNATURE is not set
+
+#
+# Extracting
+#
+# CT_FORCE_EXTRACT is not set
+CT_OVERRIDE_CONFIG_GUESS_SUB=y
+# CT_ONLY_EXTRACT is not set
+CT_PATCH_BUNDLED=y
+# CT_PATCH_LOCAL is not set
+# CT_PATCH_BUNDLED_LOCAL is not set
+# CT_PATCH_LOCAL_BUNDLED is not set
+# CT_PATCH_NONE is not set
+CT_PATCH_ORDER="bundled"
+
+#
+# Build behavior
+#
+CT_PARALLEL_JOBS=0
+CT_LOAD=""
+CT_USE_PIPES=y
+CT_EXTRA_CFLAGS_FOR_BUILD="-fPIC -DPIC"
+CT_EXTRA_CXXFLAGS_FOR_BUILD="-fPIC -DPIC"
+CT_EXTRA_LDFLAGS_FOR_BUILD=""
+CT_EXTRA_CFLAGS_FOR_HOST="-fPIC -DPIC"
+CT_EXTRA_LDFLAGS_FOR_HOST=""
+# CT_CONFIG_SHELL_SH is not set
+# CT_CONFIG_SHELL_ASH is not set
+CT_CONFIG_SHELL_BASH=y
+# CT_CONFIG_SHELL_CUSTOM is not set
+CT_CONFIG_SHELL="${bash}"
+
+#
+# Logging
+#
+# CT_LOG_ERROR is not set
+# CT_LOG_WARN is not set
+# CT_LOG_INFO is not set
+CT_LOG_EXTRA=y
+# CT_LOG_ALL is not set
+# CT_LOG_DEBUG is not set
+CT_LOG_LEVEL_MAX="EXTRA"
+# CT_LOG_SEE_TOOLS_WARN is not set
+# CT_LOG_PROGRESS_BAR is not set
+# CT_LOG_TO_FILE is not set
+# end of Paths and misc options
+
+#
+# Target options
+#
+# CT_ARCH_ALPHA is not set
+# CT_ARCH_ARC is not set
+CT_ARCH_ARM=y
+# CT_ARCH_AVR is not set
+# CT_ARCH_C6X is not set
+# CT_ARCH_M68K is not set
+# CT_ARCH_MICROBLAZE is not set
+# CT_ARCH_MIPS is not set
+# CT_ARCH_MOXIE is not set
+# CT_ARCH_MSP430 is not set
+# CT_ARCH_NIOS2 is not set
+# CT_ARCH_POWERPC is not set
+# CT_ARCH_PRU is not set
+# CT_ARCH_RISCV is not set
+# CT_ARCH_S390 is not set
+# CT_ARCH_SH is not set
+# CT_ARCH_SPARC is not set
+# CT_ARCH_X86 is not set
+# CT_ARCH_XTENSA is not set
+CT_ARCH="arm"
+CT_ARCH_CHOICE_KSYM="ARM"
+CT_ARCH_CPU=""
+CT_ARCH_TUNE=""
+CT_ARCH_ARM_SHOW=y
+
+#
+# Options for arm
+#
+CT_ARCH_ARM_PKG_KSYM=""
+CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
+CT_ARCH_SUFFIX=""
+# CT_OMIT_TARGET_VENDOR is not set
+
+#
+# Generic target options
+#
+# CT_MULTILIB is not set
+CT_DEMULTILIB=y
+CT_ARCH_SUPPORTS_BOTH_MMU=y
+CT_ARCH_DEFAULT_HAS_MMU=y
+CT_ARCH_USE_MMU=y
+CT_ARCH_SUPPORTS_FLAT_FORMAT=y
+CT_ARCH_SUPPORTS_EITHER_ENDIAN=y
+CT_ARCH_DEFAULT_LE=y
+# CT_ARCH_BE is not set
+CT_ARCH_LE=y
+CT_ARCH_ENDIAN="little"
+CT_ARCH_SUPPORTS_32=y
+CT_ARCH_SUPPORTS_64=y
+CT_ARCH_DEFAULT_32=y
+CT_ARCH_BITNESS=64
+# CT_ARCH_32 is not set
+CT_ARCH_64=y
+
+#
+# Target optimisations
+#
+CT_ARCH_SUPPORTS_WITH_ARCH=y
+CT_ARCH_SUPPORTS_WITH_CPU=y
+CT_ARCH_SUPPORTS_WITH_TUNE=y
+CT_ARCH_EXCLUSIVE_WITH_CPU=y
+CT_ARCH_ARCH=""
+CT_TARGET_CFLAGS="-fPIC -DPIC"
+CT_TARGET_LDFLAGS=""
+# end of Target options
+
+#
+# Toolchain options
+#
+
+#
+# General toolchain options
+#
+CT_USE_SYSROOT=y
+CT_SYSROOT_NAME="sysroot"
+CT_SYSROOT_DIR_PREFIX=""
+# CT_STATIC_TOOLCHAIN is not set
+CT_SHOW_CT_VERSION=y
+CT_TOOLCHAIN_PKGVERSION=""
+CT_TOOLCHAIN_BUGURL=""
+
+#
+# Tuple completion and aliasing
+#
+CT_TARGET_VENDOR="ffbuild"
+CT_TARGET_ALIAS_SED_EXPR=""
+CT_TARGET_ALIAS=""
+
+#
+# Toolchain type
+#
+# CT_NATIVE is not set
+CT_CROSS=y
+# CT_CROSS_NATIVE is not set
+# CT_CANADIAN is not set
+CT_TOOLCHAIN_TYPE="cross"
+
+#
+# Build system
+#
+CT_BUILD=""
+CT_BUILD_PREFIX=""
+CT_BUILD_SUFFIX=""
+
+#
+# Misc options
+#
+# CT_TOOLCHAIN_ENABLE_NLS is not set
+# end of Toolchain options
+
+#
+# Operating System
+#
+CT_KERNEL_SUPPORTS_SHARED_LIBS=y
+# CT_KERNEL_BARE_METAL is not set
+CT_KERNEL_LINUX=y
+CT_KERNEL="linux"
+CT_KERNEL_CHOICE_KSYM="LINUX"
+CT_KERNEL_LINUX_SHOW=y
+
+#
+# Options for linux
+#
+CT_KERNEL_LINUX_PKG_KSYM="LINUX"
+CT_LINUX_DIR_NAME="linux"
+CT_LINUX_USE_WWW_KERNEL_ORG=y
+# CT_LINUX_USE_ORACLE is not set
+CT_LINUX_USE="LINUX"
+CT_LINUX_PKG_NAME="linux"
+CT_LINUX_SRC_RELEASE=y
+# CT_LINUX_SRC_DEVEL is not set
+# CT_LINUX_SRC_CUSTOM is not set
+CT_LINUX_PATCH_GLOBAL=y
+# CT_LINUX_PATCH_BUNDLED is not set
+# CT_LINUX_PATCH_LOCAL is not set
+# CT_LINUX_PATCH_BUNDLED_LOCAL is not set
+# CT_LINUX_PATCH_LOCAL_BUNDLED is not set
+# CT_LINUX_PATCH_NONE is not set
+CT_LINUX_PATCH_ORDER="global"
+# CT_LINUX_V_5_18 is not set
+# CT_LINUX_V_5_17 is not set
+# CT_LINUX_V_5_16 is not set
+# CT_LINUX_V_5_15 is not set
+# CT_LINUX_V_5_14 is not set
+# CT_LINUX_V_5_13 is not set
+# CT_LINUX_V_5_12 is not set
+# CT_LINUX_V_5_11 is not set
+# CT_LINUX_V_5_10 is not set
+# CT_LINUX_V_5_9 is not set
+# CT_LINUX_V_5_8 is not set
+# CT_LINUX_V_5_7 is not set
+# CT_LINUX_V_5_5 is not set
+# CT_LINUX_V_5_4 is not set
+# CT_LINUX_V_5_3 is not set
+# CT_LINUX_V_5_2 is not set
+# CT_LINUX_V_5_1 is not set
+# CT_LINUX_V_5_0 is not set
+# CT_LINUX_V_4_20 is not set
+# CT_LINUX_V_4_19 is not set
+# CT_LINUX_V_4_18 is not set
+# CT_LINUX_V_4_17 is not set
+# CT_LINUX_V_4_16 is not set
+CT_LINUX_V_4_15=y
+# CT_LINUX_V_4_14 is not set
+# CT_LINUX_V_4_13 is not set
+# CT_LINUX_V_4_12 is not set
+# CT_LINUX_V_4_11 is not set
+# CT_LINUX_V_4_10 is not set
+# CT_LINUX_V_4_9 is not set
+# CT_LINUX_V_4_4 is not set
+# CT_LINUX_V_4_1 is not set
+# CT_LINUX_V_3_18 is not set
+# CT_LINUX_V_3_16 is not set
+# CT_LINUX_V_3_13 is not set
+# CT_LINUX_V_3_12 is not set
+# CT_LINUX_V_3_10 is not set
+CT_LINUX_VERSION="4.15.18"
+CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})"
+CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_LINUX_ARCHIVE_FORMATS=".tar.xz .tar.gz"
+CT_LINUX_SIGNATURE_FORMAT="unpacked/.sign"
+CT_LINUX_5_12_or_older=y
+CT_LINUX_older_than_5_12=y
+CT_LINUX_5_5_or_older=y
+CT_LINUX_older_than_5_5=y
+CT_LINUX_5_3_or_older=y
+CT_LINUX_older_than_5_3=y
+CT_LINUX_later_than_4_8=y
+CT_LINUX_4_8_or_later=y
+CT_LINUX_later_than_3_7=y
+CT_LINUX_3_7_or_later=y
+CT_LINUX_REQUIRE_3_7_or_later=y
+CT_LINUX_later_than_3_2=y
+CT_LINUX_3_2_or_later=y
+CT_LINUX_REQUIRE_3_2_or_later=y
+CT_KERNEL_DEP_RSYNC=y
+CT_KERNEL_LINUX_VERBOSITY_0=y
+# CT_KERNEL_LINUX_VERBOSITY_1 is not set
+# CT_KERNEL_LINUX_VERBOSITY_2 is not set
+CT_KERNEL_LINUX_VERBOSE_LEVEL=0
+# CT_KERNEL_LINUX_INSTALL_CHECK is not set
+CT_ALL_KERNEL_CHOICES="BARE_METAL LINUX WINDOWS"
+
+#
+# Common kernel options
+#
+CT_SHARED_LIBS=y
+# end of Operating System
+
+#
+# Binary utilities
+#
+CT_ARCH_BINFMT_ELF=y
+CT_BINUTILS_BINUTILS=y
+CT_BINUTILS="binutils"
+CT_BINUTILS_CHOICE_KSYM="BINUTILS"
+CT_BINUTILS_BINUTILS_SHOW=y
+
+#
+# Options for binutils
+#
+CT_BINUTILS_BINUTILS_PKG_KSYM="BINUTILS"
+CT_BINUTILS_DIR_NAME="binutils"
+CT_BINUTILS_USE_GNU=y
+# CT_BINUTILS_USE_LINARO is not set
+# CT_BINUTILS_USE_ORACLE is not set
+CT_BINUTILS_USE="BINUTILS"
+CT_BINUTILS_PKG_NAME="binutils"
+CT_BINUTILS_SRC_RELEASE=y
+# CT_BINUTILS_SRC_DEVEL is not set
+# CT_BINUTILS_SRC_CUSTOM is not set
+CT_BINUTILS_PATCH_GLOBAL=y
+# CT_BINUTILS_PATCH_BUNDLED is not set
+# CT_BINUTILS_PATCH_LOCAL is not set
+# CT_BINUTILS_PATCH_BUNDLED_LOCAL is not set
+# CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
+# CT_BINUTILS_PATCH_NONE is not set
+CT_BINUTILS_PATCH_ORDER="global"
+CT_BINUTILS_V_2_38=y
+# CT_BINUTILS_V_2_37 is not set
+# CT_BINUTILS_V_2_36 is not set
+# CT_BINUTILS_V_2_35 is not set
+# CT_BINUTILS_V_2_34 is not set
+# CT_BINUTILS_V_2_33 is not set
+# CT_BINUTILS_V_2_32 is not set
+# CT_BINUTILS_V_2_31 is not set
+# CT_BINUTILS_V_2_30 is not set
+# CT_BINUTILS_V_2_29 is not set
+# CT_BINUTILS_V_2_28 is not set
+# CT_BINUTILS_V_2_27 is not set
+# CT_BINUTILS_V_2_26 is not set
+CT_BINUTILS_VERSION="2.38"
+CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
+CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
+CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig"
+CT_BINUTILS_later_than_2_30=y
+CT_BINUTILS_2_30_or_later=y
+CT_BINUTILS_later_than_2_27=y
+CT_BINUTILS_2_27_or_later=y
+CT_BINUTILS_later_than_2_26=y
+CT_BINUTILS_2_26_or_later=y
+
+#
+# GNU binutils
+#
+CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
+CT_BINUTILS_GOLD_SUPPORT=y
+CT_BINUTILS_FORCE_LD_BFD_DEFAULT=y
+CT_BINUTILS_LINKER_LD=y
+# CT_BINUTILS_LINKER_LD_GOLD is not set
+CT_BINUTILS_LINKERS_LIST="ld"
+CT_BINUTILS_LINKER_DEFAULT="bfd"
+CT_BINUTILS_PLUGINS=y
+CT_BINUTILS_RELRO=m
+CT_BINUTILS_DETERMINISTIC_ARCHIVES=y
+CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
+# CT_BINUTILS_FOR_TARGET is not set
+CT_ALL_BINUTILS_CHOICES="BINUTILS"
+# end of Binary utilities
+
+#
+# C-library
+#
+CT_LIBC_GLIBC=y
+# CT_LIBC_MUSL is not set
+# CT_LIBC_UCLIBC_NG is not set
+CT_LIBC="glibc"
+CT_LIBC_CHOICE_KSYM="GLIBC"
+CT_LIBC_GLIBC_SHOW=y
+
+#
+# Options for glibc
+#
+CT_LIBC_GLIBC_PKG_KSYM="GLIBC"
+CT_GLIBC_DIR_NAME="glibc"
+CT_GLIBC_USE_GNU=y
+# CT_GLIBC_USE_ORACLE is not set
+CT_GLIBC_USE="GLIBC"
+CT_GLIBC_PKG_NAME="glibc"
+CT_GLIBC_SRC_RELEASE=y
+# CT_GLIBC_SRC_DEVEL is not set
+# CT_GLIBC_SRC_CUSTOM is not set
+CT_GLIBC_PATCH_GLOBAL=y
+# CT_GLIBC_PATCH_BUNDLED is not set
+# CT_GLIBC_PATCH_LOCAL is not set
+# CT_GLIBC_PATCH_BUNDLED_LOCAL is not set
+# CT_GLIBC_PATCH_LOCAL_BUNDLED is not set
+# CT_GLIBC_PATCH_NONE is not set
+CT_GLIBC_PATCH_ORDER="global"
+# CT_GLIBC_V_2_35 is not set
+# CT_GLIBC_V_2_34 is not set
+# CT_GLIBC_V_2_33 is not set
+# CT_GLIBC_V_2_32 is not set
+# CT_GLIBC_V_2_31 is not set
+# CT_GLIBC_V_2_30 is not set
+# CT_GLIBC_V_2_29 is not set
+# CT_GLIBC_V_2_28 is not set
+CT_GLIBC_V_2_27=y
+# CT_GLIBC_V_2_26 is not set
+# CT_GLIBC_V_2_25 is not set
+# CT_GLIBC_V_2_24 is not set
+# CT_GLIBC_V_2_23 is not set
+# CT_GLIBC_V_2_19 is not set
+# CT_GLIBC_V_2_17 is not set
+CT_GLIBC_VERSION="2.27"
+CT_GLIBC_MIRRORS="$(CT_Mirrors GNU glibc)"
+CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
+CT_GLIBC_SIGNATURE_FORMAT="packed/.sig"
+CT_GLIBC_2_34_or_older=y
+CT_GLIBC_older_than_2_34=y
+CT_GLIBC_2_32_or_older=y
+CT_GLIBC_older_than_2_32=y
+CT_GLIBC_2_31_or_older=y
+CT_GLIBC_older_than_2_31=y
+CT_GLIBC_2_30_or_older=y
+CT_GLIBC_older_than_2_30=y
+CT_GLIBC_2_29_or_older=y
+CT_GLIBC_older_than_2_29=y
+CT_GLIBC_2_28_or_older=y
+CT_GLIBC_older_than_2_28=y
+CT_GLIBC_2_27_or_later=y
+CT_GLIBC_2_27_or_older=y
+CT_GLIBC_later_than_2_26=y
+CT_GLIBC_2_26_or_later=y
+CT_GLIBC_later_than_2_25=y
+CT_GLIBC_2_25_or_later=y
+CT_GLIBC_later_than_2_24=y
+CT_GLIBC_2_24_or_later=y
+CT_GLIBC_later_than_2_23=y
+CT_GLIBC_2_23_or_later=y
+CT_GLIBC_later_than_2_20=y
+CT_GLIBC_2_20_or_later=y
+CT_GLIBC_later_than_2_17=y
+CT_GLIBC_2_17_or_later=y
+CT_GLIBC_later_than_2_14=y
+CT_GLIBC_2_14_or_later=y
+CT_GLIBC_DEP_KERNEL_HEADERS_VERSION=y
+CT_GLIBC_DEP_BINUTILS=y
+CT_GLIBC_DEP_GCC=y
+CT_GLIBC_DEP_PYTHON=y
+CT_GLIBC_SPARC_ALLOW_V7=y
+CT_THREADS="nptl"
+CT_GLIBC_BUILD_SSP=y
+CT_GLIBC_HAS_LIBIDN_ADDON=y
+# CT_GLIBC_USE_LIBIDN_ADDON is not set
+CT_GLIBC_NO_SPARC_V8=y
+CT_GLIBC_HAS_OBSOLETE_RPC=y
+CT_GLIBC_EXTRA_CONFIG_ARRAY="--with-pic"
+CT_GLIBC_CONFIGPARMS=""
+# CT_GLIBC_ENABLE_DEBUG is not set
+CT_GLIBC_EXTRA_CFLAGS="-fPIC -DPIC"
+CT_GLIBC_ENABLE_OBSOLETE_RPC=y
+# CT_GLIBC_ENABLE_FORTIFIED_BUILD is not set
+# CT_GLIBC_DISABLE_VERSIONING is not set
+CT_GLIBC_OLDEST_ABI=""
+CT_GLIBC_FORCE_UNWIND=y
+# CT_GLIBC_LOCALES is not set
+# CT_GLIBC_KERNEL_VERSION_NONE is not set
+CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
+# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
+CT_GLIBC_MIN_KERNEL="4.15.18"
+CT_GLIBC_SSP_DEFAULT=y
+# CT_GLIBC_SSP_NO is not set
+# CT_GLIBC_SSP_YES is not set
+# CT_GLIBC_SSP_ALL is not set
+# CT_GLIBC_SSP_STRONG is not set
+CT_GLIBC_ENABLE_COMMON_FLAG=y
+CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
+CT_LIBC_SUPPORT_THREADS_ANY=y
+CT_LIBC_SUPPORT_THREADS_NATIVE=y
+
+#
+# Common C library options
+#
+CT_THREADS_NATIVE=y
+# CT_CREATE_LDSO_CONF is not set
+CT_LIBC_XLDD=y
+# end of C-library
+
+#
+# C compiler
+#
+CT_CC_CORE_NEEDED=y
+CT_CC_SUPPORT_CXX=y
+CT_CC_SUPPORT_FORTRAN=y
+CT_CC_SUPPORT_ADA=y
+CT_CC_SUPPORT_D=y
+CT_CC_SUPPORT_OBJC=y
+CT_CC_SUPPORT_OBJCXX=y
+CT_CC_SUPPORT_GOLANG=y
+CT_CC_GCC=y
+CT_CC="gcc"
+CT_CC_CHOICE_KSYM="GCC"
+CT_CC_GCC_SHOW=y
+
+#
+# Options for gcc
+#
+CT_CC_GCC_PKG_KSYM="GCC"
+CT_GCC_DIR_NAME="gcc"
+CT_GCC_USE_GNU=y
+# CT_GCC_USE_LINARO is not set
+# CT_GCC_USE_ORACLE is not set
+CT_GCC_USE="GCC"
+CT_GCC_PKG_NAME="gcc"
+CT_GCC_SRC_RELEASE=y
+# CT_GCC_SRC_DEVEL is not set
+# CT_GCC_SRC_CUSTOM is not set
+CT_GCC_PATCH_GLOBAL=y
+# CT_GCC_PATCH_BUNDLED is not set
+# CT_GCC_PATCH_LOCAL is not set
+# CT_GCC_PATCH_BUNDLED_LOCAL is not set
+# CT_GCC_PATCH_LOCAL_BUNDLED is not set
+# CT_GCC_PATCH_NONE is not set
+CT_GCC_PATCH_ORDER="global"
+CT_GCC_V_12=y
+# CT_GCC_V_11 is not set
+# CT_GCC_V_10 is not set
+# CT_GCC_V_9 is not set
+# CT_GCC_V_8 is not set
+# CT_GCC_V_7 is not set
+# CT_GCC_V_6 is not set
+# CT_GCC_V_5 is not set
+# CT_GCC_V_4_9 is not set
+CT_GCC_VERSION="12.1.0"
+CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
+CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
+CT_GCC_SIGNATURE_FORMAT=""
+CT_GCC_later_than_12=y
+CT_GCC_12_or_later=y
+CT_GCC_later_than_11=y
+CT_GCC_11_or_later=y
+CT_GCC_later_than_10=y
+CT_GCC_10_or_later=y
+CT_GCC_later_than_9=y
+CT_GCC_9_or_later=y
+CT_GCC_later_than_8=y
+CT_GCC_8_or_later=y
+CT_GCC_later_than_7=y
+CT_GCC_7_or_later=y
+CT_GCC_later_than_6=y
+CT_GCC_6_or_later=y
+CT_GCC_later_than_5=y
+CT_GCC_5_or_later=y
+CT_GCC_later_than_4_9=y
+CT_GCC_4_9_or_later=y
+CT_GCC_REQUIRE_4_9_or_later=y
+CT_CC_GCC_ENABLE_PLUGINS=y
+CT_CC_GCC_HAS_LIBMPX=y
+CT_CC_GCC_ENABLE_CXX_FLAGS=""
+CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-host-shared --enable-default-ssp"
+CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-host-shared --enable-default-ssp"
+# CT_CC_GCC_STATIC_LIBSTDCXX is not set
+# CT_CC_GCC_SYSTEM_ZLIB is not set
+CT_CC_GCC_CONFIG_TLS=m
+
+#
+# Optimisation features
+#
+CT_CC_GCC_USE_GRAPHITE=y
+CT_CC_GCC_USE_LTO=y
+CT_CC_GCC_LTO_ZSTD=m
+
+#
+# Settings for libraries running on target
+#
+# CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
+# CT_CC_GCC_LIBMUDFLAP is not set
+CT_CC_GCC_LIBGOMP=y
+CT_CC_GCC_LIBSSP=m
+# CT_CC_GCC_LIBQUADMATH is not set
+# CT_CC_GCC_LIBSANITIZER is not set
+
+#
+# Misc. obscure options.
+#
+CT_CC_CXA_ATEXIT=y
+CT_CC_GCC_TM_CLONE_REGISTRY=m
+# CT_CC_GCC_DISABLE_PCH is not set
+CT_CC_GCC_SJLJ_EXCEPTIONS=m
+CT_CC_GCC_LDBL_128=m
+# CT_CC_GCC_BUILD_ID is not set
+CT_CC_GCC_LNK_HASH_STYLE_DEFAULT=y
+# CT_CC_GCC_LNK_HASH_STYLE_SYSV is not set
+# CT_CC_GCC_LNK_HASH_STYLE_GNU is not set
+# CT_CC_GCC_LNK_HASH_STYLE_BOTH is not set
+CT_CC_GCC_LNK_HASH_STYLE=""
+CT_CC_GCC_DEC_FLOATS_AUTO=y
+# CT_CC_GCC_DEC_FLOATS_BID is not set
+# CT_CC_GCC_DEC_FLOATS_DPD is not set
+# CT_CC_GCC_DEC_FLOATS_NO is not set
+CT_CC_GCC_DEC_FLOATS=""
+CT_ALL_CC_CHOICES="GCC"
+
+#
+# Additional supported languages:
+#
+CT_CC_LANG_CXX=y
+# CT_CC_LANG_FORTRAN is not set
+# CT_CC_LANG_ADA is not set
+# CT_CC_LANG_D is not set
+# CT_CC_LANG_OBJC is not set
+# CT_CC_LANG_OBJCXX is not set
+# CT_CC_LANG_GOLANG is not set
+CT_CC_LANG_OTHERS=""
+# end of C compiler
+
+#
+# Debug facilities
+#
+# CT_DEBUG_DUMA is not set
+# CT_DEBUG_GDB is not set
+# CT_DEBUG_LTRACE is not set
+# CT_DEBUG_STRACE is not set
+CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE"
+# end of Debug facilities
+
+#
+# Companion libraries
+#
+# CT_COMPLIBS_CHECK is not set
+# CT_COMP_LIBS_CLOOG is not set
+# CT_COMP_LIBS_EXPAT is not set
+CT_COMP_LIBS_GETTEXT=y
+CT_COMP_LIBS_GETTEXT_PKG_KSYM="GETTEXT"
+CT_GETTEXT_DIR_NAME="gettext"
+CT_GETTEXT_PKG_NAME="gettext"
+CT_GETTEXT_SRC_RELEASE=y
+# CT_GETTEXT_SRC_DEVEL is not set
+# CT_GETTEXT_SRC_CUSTOM is not set
+CT_GETTEXT_PATCH_GLOBAL=y
+# CT_GETTEXT_PATCH_BUNDLED is not set
+# CT_GETTEXT_PATCH_LOCAL is not set
+# CT_GETTEXT_PATCH_BUNDLED_LOCAL is not set
+# CT_GETTEXT_PATCH_LOCAL_BUNDLED is not set
+# CT_GETTEXT_PATCH_NONE is not set
+CT_GETTEXT_PATCH_ORDER="global"
+CT_GETTEXT_V_0_21=y
+# CT_GETTEXT_V_0_20_1 is not set
+# CT_GETTEXT_V_0_19_8_1 is not set
+CT_GETTEXT_VERSION="0.21"
+CT_GETTEXT_MIRRORS="$(CT_Mirrors GNU gettext)"
+CT_GETTEXT_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_GETTEXT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_GETTEXT_ARCHIVE_FORMATS=".tar.xz .tar.gz"
+CT_GETTEXT_SIGNATURE_FORMAT="packed/.sig"
+CT_GETTEXT_0_21_or_later=y
+CT_GETTEXT_0_21_or_older=y
+CT_GETTEXT_INCOMPATIBLE_WITH_UCLIBC_NG=y
+
+#
+# This version of gettext is not compatible with uClibc-NG. Select
+#
+
+#
+# a different version if uClibc-NG is used on the target or (in a
+#
+
+#
+# Canadian cross build) on the host.
+#
+CT_COMP_LIBS_GMP=y
+CT_COMP_LIBS_GMP_PKG_KSYM="GMP"
+CT_GMP_DIR_NAME="gmp"
+CT_GMP_PKG_NAME="gmp"
+CT_GMP_SRC_RELEASE=y
+# CT_GMP_SRC_DEVEL is not set
+# CT_GMP_SRC_CUSTOM is not set
+CT_GMP_PATCH_GLOBAL=y
+# CT_GMP_PATCH_BUNDLED is not set
+# CT_GMP_PATCH_LOCAL is not set
+# CT_GMP_PATCH_BUNDLED_LOCAL is not set
+# CT_GMP_PATCH_LOCAL_BUNDLED is not set
+# CT_GMP_PATCH_NONE is not set
+CT_GMP_PATCH_ORDER="global"
+CT_GMP_V_6_2=y
+# CT_GMP_V_6_1 is not set
+CT_GMP_VERSION="6.2.1"
+CT_GMP_MIRRORS="https://gmplib.org/download/gmp https://gmplib.org/download/gmp/archive $(CT_Mirrors GNU gmp)"
+CT_GMP_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_GMP_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_GMP_ARCHIVE_FORMATS=".tar.xz .tar.lz .tar.bz2"
+CT_GMP_SIGNATURE_FORMAT="packed/.sig"
+CT_COMP_LIBS_ISL=y
+CT_COMP_LIBS_ISL_PKG_KSYM="ISL"
+CT_ISL_DIR_NAME="isl"
+CT_ISL_PKG_NAME="isl"
+CT_ISL_SRC_RELEASE=y
+# CT_ISL_SRC_DEVEL is not set
+# CT_ISL_SRC_CUSTOM is not set
+CT_ISL_PATCH_GLOBAL=y
+# CT_ISL_PATCH_BUNDLED is not set
+# CT_ISL_PATCH_LOCAL is not set
+# CT_ISL_PATCH_BUNDLED_LOCAL is not set
+# CT_ISL_PATCH_LOCAL_BUNDLED is not set
+# CT_ISL_PATCH_NONE is not set
+CT_ISL_PATCH_ORDER="global"
+CT_ISL_V_0_24=y
+# CT_ISL_V_0_23 is not set
+# CT_ISL_V_0_22 is not set
+# CT_ISL_V_0_21 is not set
+# CT_ISL_V_0_20 is not set
+# CT_ISL_V_0_19 is not set
+# CT_ISL_V_0_18 is not set
+# CT_ISL_V_0_17 is not set
+# CT_ISL_V_0_16 is not set
+# CT_ISL_V_0_15 is not set
+# CT_ISL_V_0_11 is not set
+CT_ISL_VERSION="0.24"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
+CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
+CT_ISL_SIGNATURE_FORMAT=""
+CT_ISL_later_than_0_18=y
+CT_ISL_0_18_or_later=y
+CT_ISL_later_than_0_15=y
+CT_ISL_0_15_or_later=y
+# CT_COMP_LIBS_LIBELF is not set
+CT_COMP_LIBS_LIBICONV=y
+CT_COMP_LIBS_LIBICONV_PKG_KSYM="LIBICONV"
+CT_LIBICONV_DIR_NAME="libiconv"
+CT_LIBICONV_PKG_NAME="libiconv"
+CT_LIBICONV_SRC_RELEASE=y
+# CT_LIBICONV_SRC_DEVEL is not set
+# CT_LIBICONV_SRC_CUSTOM is not set
+CT_LIBICONV_PATCH_GLOBAL=y
+# CT_LIBICONV_PATCH_BUNDLED is not set
+# CT_LIBICONV_PATCH_LOCAL is not set
+# CT_LIBICONV_PATCH_BUNDLED_LOCAL is not set
+# CT_LIBICONV_PATCH_LOCAL_BUNDLED is not set
+# CT_LIBICONV_PATCH_NONE is not set
+CT_LIBICONV_PATCH_ORDER="global"
+CT_LIBICONV_V_1_16=y
+# CT_LIBICONV_V_1_15 is not set
+CT_LIBICONV_VERSION="1.16"
+CT_LIBICONV_MIRRORS="$(CT_Mirrors GNU libiconv)"
+CT_LIBICONV_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_LIBICONV_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_LIBICONV_ARCHIVE_FORMATS=".tar.gz"
+CT_LIBICONV_SIGNATURE_FORMAT="packed/.sig"
+CT_COMP_LIBS_MPC=y
+CT_COMP_LIBS_MPC_PKG_KSYM="MPC"
+CT_MPC_DIR_NAME="mpc"
+CT_MPC_PKG_NAME="mpc"
+CT_MPC_SRC_RELEASE=y
+# CT_MPC_SRC_DEVEL is not set
+# CT_MPC_SRC_CUSTOM is not set
+CT_MPC_PATCH_GLOBAL=y
+# CT_MPC_PATCH_BUNDLED is not set
+# CT_MPC_PATCH_LOCAL is not set
+# CT_MPC_PATCH_BUNDLED_LOCAL is not set
+# CT_MPC_PATCH_LOCAL_BUNDLED is not set
+# CT_MPC_PATCH_NONE is not set
+CT_MPC_PATCH_ORDER="global"
+CT_MPC_V_1_2=y
+# CT_MPC_V_1_1 is not set
+# CT_MPC_V_1_0 is not set
+CT_MPC_VERSION="1.2.1"
+CT_MPC_MIRRORS="http://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)"
+CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_MPC_ARCHIVE_FORMATS=".tar.gz"
+CT_MPC_SIGNATURE_FORMAT="packed/.sig"
+CT_MPC_later_than_1_1_0=y
+CT_MPC_1_1_0_or_later=y
+CT_COMP_LIBS_MPFR=y
+CT_COMP_LIBS_MPFR_PKG_KSYM="MPFR"
+CT_MPFR_DIR_NAME="mpfr"
+CT_MPFR_PKG_NAME="mpfr"
+CT_MPFR_SRC_RELEASE=y
+# CT_MPFR_SRC_DEVEL is not set
+# CT_MPFR_SRC_CUSTOM is not set
+CT_MPFR_PATCH_GLOBAL=y
+# CT_MPFR_PATCH_BUNDLED is not set
+# CT_MPFR_PATCH_LOCAL is not set
+# CT_MPFR_PATCH_BUNDLED_LOCAL is not set
+# CT_MPFR_PATCH_LOCAL_BUNDLED is not set
+# CT_MPFR_PATCH_NONE is not set
+CT_MPFR_PATCH_ORDER="global"
+CT_MPFR_V_4_1=y
+# CT_MPFR_V_4_0 is not set
+# CT_MPFR_V_3_1 is not set
+CT_MPFR_VERSION="4.1.0"
+CT_MPFR_MIRRORS="http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)"
+CT_MPFR_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_MPFR_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_MPFR_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz .zip"
+CT_MPFR_SIGNATURE_FORMAT="packed/.asc"
+CT_MPFR_later_than_4_0_0=y
+CT_MPFR_4_0_0_or_later=y
+CT_COMP_LIBS_NCURSES=y
+CT_COMP_LIBS_NCURSES_PKG_KSYM="NCURSES"
+CT_NCURSES_DIR_NAME="ncurses"
+CT_NCURSES_PKG_NAME="ncurses"
+CT_NCURSES_SRC_RELEASE=y
+# CT_NCURSES_SRC_DEVEL is not set
+# CT_NCURSES_SRC_CUSTOM is not set
+CT_NCURSES_PATCH_GLOBAL=y
+# CT_NCURSES_PATCH_BUNDLED is not set
+# CT_NCURSES_PATCH_LOCAL is not set
+# CT_NCURSES_PATCH_BUNDLED_LOCAL is not set
+# CT_NCURSES_PATCH_LOCAL_BUNDLED is not set
+# CT_NCURSES_PATCH_NONE is not set
+CT_NCURSES_PATCH_ORDER="global"
+CT_NCURSES_V_6_2=y
+# CT_NCURSES_V_6_1 is not set
+# CT_NCURSES_V_6_0 is not set
+CT_NCURSES_VERSION="6.2"
+CT_NCURSES_MIRRORS="https://invisible-mirror.net/archives/ncurses $(CT_Mirrors GNU ncurses)"
+CT_NCURSES_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_NCURSES_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_NCURSES_ARCHIVE_FORMATS=".tar.gz"
+CT_NCURSES_SIGNATURE_FORMAT="packed/.sig"
+# CT_NCURSES_NEW_ABI is not set
+CT_NCURSES_HOST_CONFIG_ARGS=""
+CT_NCURSES_HOST_DISABLE_DB=y
+CT_NCURSES_HOST_FALLBACKS="linux,xterm,xterm-color,xterm-256color,vt100"
+CT_NCURSES_TARGET_CONFIG_ARGS=""
+# CT_NCURSES_TARGET_DISABLE_DB is not set
+CT_NCURSES_TARGET_FALLBACKS=""
+CT_COMP_LIBS_ZLIB=y
+CT_COMP_LIBS_ZLIB_PKG_KSYM="ZLIB"
+CT_ZLIB_DIR_NAME="zlib"
+CT_ZLIB_PKG_NAME="zlib"
+CT_ZLIB_SRC_RELEASE=y
+# CT_ZLIB_SRC_DEVEL is not set
+# CT_ZLIB_SRC_CUSTOM is not set
+CT_ZLIB_PATCH_GLOBAL=y
+# CT_ZLIB_PATCH_BUNDLED is not set
+# CT_ZLIB_PATCH_LOCAL is not set
+# CT_ZLIB_PATCH_BUNDLED_LOCAL is not set
+# CT_ZLIB_PATCH_LOCAL_BUNDLED is not set
+# CT_ZLIB_PATCH_NONE is not set
+CT_ZLIB_PATCH_ORDER="global"
+CT_ZLIB_V_1_2_12=y
+CT_ZLIB_VERSION="1.2.12"
+CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
+CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
+CT_ZLIB_SIGNATURE_FORMAT="packed/.asc"
+CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB"
+CT_LIBICONV_NEEDED=y
+CT_GETTEXT_NEEDED=y
+CT_GMP_NEEDED=y
+CT_MPFR_NEEDED=y
+CT_ISL_NEEDED=y
+CT_MPC_NEEDED=y
+CT_NCURSES_NEEDED=y
+CT_ZLIB_NEEDED=y
+CT_LIBICONV=y
+CT_GETTEXT=y
+CT_GMP=y
+CT_MPFR=y
+CT_ISL=y
+CT_MPC=y
+CT_NCURSES=y
+CT_ZLIB=y
+# end of Companion libraries
+
+#
+# Companion tools
+#
+# CT_COMP_TOOLS_FOR_HOST is not set
+# CT_COMP_TOOLS_AUTOCONF is not set
+# CT_COMP_TOOLS_AUTOMAKE is not set
+# CT_COMP_TOOLS_BISON is not set
+# CT_COMP_TOOLS_DTC is not set
+# CT_COMP_TOOLS_LIBTOOL is not set
+# CT_COMP_TOOLS_M4 is not set
+# CT_COMP_TOOLS_MAKE is not set
+CT_ALL_COMP_TOOLS_CHOICES="AUTOCONF AUTOMAKE BISON DTC LIBTOOL M4 MAKE"
+# end of Companion tools
+
+#
+# Test suite
+#
+# CT_TEST_SUITE_GCC is not set
+# end of Test suite
diff --git a/images/base-linuxarm64/gen-implib.sh b/images/base-linuxarm64/gen-implib.sh
new file mode 100755
index 0000000..71d6d46
--- /dev/null
+++ b/images/base-linuxarm64/gen-implib.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+if [[ $# != 2 ]]; then
+ echo "Invalid arguments"
+ exit 1
+fi
+IN="$1"
+OUT="$2"
+
+TMPDIR="$(mktemp -d)"
+trap "rm -rf '$TMPDIR'" EXIT
+cd "$TMPDIR"
+
+set -x
+python3 /opt/implib/implib-gen.py --target aarch64-linux-gnu --dlopen --lazy-load --verbose "$IN"
+${FFBUILD_CROSS_PREFIX}gcc $CFLAGS $STAGE_CFLAGS -DIMPLIB_HIDDEN_SHIMS -c *.tramp.S *.init.c
+${FFBUILD_CROSS_PREFIX}ar -rcs "$OUT" *.tramp.o *.init.o
diff --git a/images/base-linuxarm64/toolchain.cmake b/images/base-linuxarm64/toolchain.cmake
new file mode 100644
index 0000000..38fe7c6
--- /dev/null
+++ b/images/base-linuxarm64/toolchain.cmake
@@ -0,0 +1,16 @@
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
+
+set(triple aarch64-ffbuild-linux-gnu)
+
+set(CMAKE_C_COMPILER ${triple}-gcc)
+set(CMAKE_CXX_COMPILER ${triple}-g++)
+set(CMAKE_RANLIB ${triple}-ranlib)
+set(CMAKE_AR ${triple}-ar)
+
+set(CMAKE_SYSROOT /opt/ct-ng/${triple}/sysroot)
+set(CMAKE_FIND_ROOT_PATH /opt/ct-ng /opt/ct-ng/${triple}/sysroot /opt/ffbuild)
+
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh
index 662b05e..8173824 100755
--- a/scripts.d/25-fftw3.sh
+++ b/scripts.d/25-fftw3.sh
@@ -29,11 +29,16 @@ ffbuild_dockerbuild() {
--enable-threads
--with-combined-threads
--with-incoming-stack-boundary=2
- --enable-sse2
- --enable-avx
- --enable-avx2
)
+ if [[ $TARGET != *arm64 ]]; then
+ myconf+=(
+ --enable-sse2
+ --enable-avx
+ --enable-avx2
+ )
+ fi
+
if [[ $TARGET == win* || $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"
diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh
index c74a7ec..ff189e4 100755
--- a/scripts.d/25-openssl.sh
+++ b/scripts.d/25-openssl.sh
@@ -36,6 +36,11 @@ ffbuild_dockerbuild() {
--cross-compile-prefix="$FFBUILD_CROSS_PREFIX"
linux-x86_64
)
+ elif [[ $TARGET == linuxarm64 ]]; then
+ myconf+=(
+ --cross-compile-prefix="$FFBUILD_CROSS_PREFIX"
+ linux-aarch64
+ )
else
echo "Unknown target"
return -1
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index 4b03c9d..2de5c4b 100755
--- a/scripts.d/45-x11/40-libx11.sh
+++ b/scripts.d/45-x11/40-libx11.sh
@@ -5,6 +5,7 @@ LIBX11_COMMIT="3a30ada60c5217ada37b143b541c8e6f6284c7fa"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
+ [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/45-x11/50-libxext.sh b/scripts.d/45-x11/50-libxext.sh
index 77d5bad..3d7006a 100755
--- a/scripts.d/45-x11/50-libxext.sh
+++ b/scripts.d/45-x11/50-libxext.sh
@@ -5,6 +5,7 @@ LIBXEXT_COMMIT="47904063048fa6ef6e8e16219ddef4d14d5d9a4b"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
+ [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/45-x11/50-libxfixes.sh b/scripts.d/45-x11/50-libxfixes.sh
index 693f3dd..7c5f6d3 100755
--- a/scripts.d/45-x11/50-libxfixes.sh
+++ b/scripts.d/45-x11/50-libxfixes.sh
@@ -5,6 +5,7 @@ LIBXFIXES_COMMIT="6fe3bd64dd82f704ed91478acb4c99ab5c00be16"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
+ [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/45-x11/50-libxi.sh b/scripts.d/45-x11/50-libxi.sh
index 4ba520a..8d12604 100755
--- a/scripts.d/45-x11/50-libxi.sh
+++ b/scripts.d/45-x11/50-libxi.sh
@@ -5,6 +5,7 @@ LIBXI_COMMIT="f24d7f43ab4d97203e60677a3d42e11dbc80c8b4"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
+ [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/45-x11/50-libxinerama.sh b/scripts.d/45-x11/50-libxinerama.sh
index 9483165..bd94cb8 100755
--- a/scripts.d/45-x11/50-libxinerama.sh
+++ b/scripts.d/45-x11/50-libxinerama.sh
@@ -5,6 +5,7 @@ LIBXINERAMA_COMMIT="c5187f076d16601c15c59c5a2f05c0513d9f042b"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
+ [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/45-x11/50-libxrender.sh b/scripts.d/45-x11/50-libxrender.sh
index e4ac8af..8d2c475 100755
--- a/scripts.d/45-x11/50-libxrender.sh
+++ b/scripts.d/45-x11/50-libxrender.sh
@@ -5,6 +5,7 @@ LIBXRENDER_COMMIT="bce0618839fc33f44edd8b5498b8e33d167806ff"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
+ [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/45-x11/50-libxscrnsaver.sh b/scripts.d/45-x11/50-libxscrnsaver.sh
index 5b37c50..c227c4d 100755
--- a/scripts.d/45-x11/50-libxscrnsaver.sh
+++ b/scripts.d/45-x11/50-libxscrnsaver.sh
@@ -5,6 +5,7 @@ LIBXSCRNSAVER_COMMIT="aa9fd5061d0a8832480ad0c1acc9d2e864e807f4"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
+ [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/45-x11/50-libxxf86vm.sh b/scripts.d/45-x11/50-libxxf86vm.sh
index 147573f..bb13de9 100755
--- a/scripts.d/45-x11/50-libxxf86vm.sh
+++ b/scripts.d/45-x11/50-libxxf86vm.sh
@@ -5,6 +5,7 @@ LIBXXF86VM_COMMIT="7f43cd2a905e7b93b83c9ce81dabb768f6fa2bc7"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
+ [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh
index dbf1e62..c112b95 100755
--- a/scripts.d/45-x11/60-libglvnd.sh
+++ b/scripts.d/45-x11/60-libglvnd.sh
@@ -5,6 +5,7 @@ GLVND_COMMIT="8e5f0f16467cc8ce870789d9a5b6a2c3f58921c9"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
+ [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/45-x11/60-libxcursor.sh b/scripts.d/45-x11/60-libxcursor.sh
index 4a11470..7718117 100755
--- a/scripts.d/45-x11/60-libxcursor.sh
+++ b/scripts.d/45-x11/60-libxcursor.sh
@@ -5,6 +5,7 @@ LIBXCURSOR_COMMIT="27adb16027fa99d83818a0ed9f6623cb03f0c574"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
+ [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/45-x11/60-libxrandr.sh b/scripts.d/45-x11/60-libxrandr.sh
index bc159c1..463d327 100755
--- a/scripts.d/45-x11/60-libxrandr.sh
+++ b/scripts.d/45-x11/60-libxrandr.sh
@@ -5,6 +5,7 @@ LIBXRANDR_COMMIT="55dcda4518eda8ae03ef25ea29d3c994ad71eb0a"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
+ [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/45-x11/60-libxv.sh b/scripts.d/45-x11/60-libxv.sh
index 1648a2e..3eb0107 100755
--- a/scripts.d/45-x11/60-libxv.sh
+++ b/scripts.d/45-x11/60-libxv.sh
@@ -5,6 +5,7 @@ LIBXV_COMMIT="03a6f599d060591a9a7cd8558bd2143a1c7c70d7"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
+ [[ $TARGET == linuxarm64 ]] && return -1
[[ $ADDINS_STR == *4.4* ]] && return -1
return 0
}
diff --git a/scripts.d/50-davs2.sh b/scripts.d/50-davs2.sh
index 64b84a3..a95a370 100755
--- a/scripts.d/50-davs2.sh
+++ b/scripts.d/50-davs2.sh
@@ -6,6 +6,8 @@ DAVS2_COMMIT="b06d7585620f4e90a6d19a2926bb4e59793b8942"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
[[ $TARGET == win32 ]] && return -1
+ # davs2 aarch64 support is broken
+ [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index 5ede9c9..e47d41c 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -32,11 +32,16 @@ ffbuild_dockerbuild() {
--target=x86-win32-gcc
)
export CROSS="$FFBUILD_CROSS_PREFIX"
- elif [[ $TARGET == linux* ]]; then
+ elif [[ $TARGET == linux64 ]]; then
myconf+=(
--target=x86_64-linux-gcc
)
export CROSS="$FFBUILD_CROSS_PREFIX"
+ elif [[ $TARGET == linuxarm64 ]]; then
+ myconf+=(
+ --target=arm64-linux-gcc
+ )
+ export CROSS="$FFBUILD_CROSS_PREFIX"
else
echo "Unknown target"
return -1
diff --git a/scripts.d/50-mfx.sh b/scripts.d/50-mfx.sh
index b55fd20..18554aa 100755
--- a/scripts.d/50-mfx.sh
+++ b/scripts.d/50-mfx.sh
@@ -4,6 +4,7 @@ MFX_REPO="https://github.com/lu-zero/mfx_dispatch.git"
MFX_COMMIT="7e4d221c36c630c1250b23a5dfa15657bc04c10c"
ffbuild_enabled() {
+ [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh
index d53b163..f207138 100755
--- a/scripts.d/50-openh264.sh
+++ b/scripts.d/50-openh264.sh
@@ -37,6 +37,11 @@ ffbuild_dockerbuild() {
OS=linux
ARCH=x86_64
)
+ elif [[ $TARGET == linuxarm64 ]]; then
+ myconf+=(
+ OS=linux
+ ARCH=aarch64
+ )
else
echo "Unknown target"
return -1
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index 7469ec6..dc44132 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -25,6 +25,12 @@ ffbuild_dockerbuild() {
)
fi
+ # For some reason, RUSTFLAGS, CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER,
+ # and .cargo/config.toml can't work, so have to put a symbolic link
+ if [[ $TARGET == linuxarm64 ]]; then
+ ln -s /opt/ct-ng/bin/aarch64-ffbuild-linux-gnu-gcc /opt/ct-ng/bin/aarch64-linux-gnu-gcc
+ fi
+
cargo cinstall "${myconf[@]}"
}
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index 642abf3..da02c12 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -4,6 +4,7 @@ SDL_REPO="https://github.com/libsdl-org/SDL.git"
SDL_COMMIT="0a93ac129475ab3ce11af95969f767d60e98233a"
ffbuild_enabled() {
+ [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh
index d8646f6..367e114 100755
--- a/scripts.d/50-vaapi/50-libva.sh
+++ b/scripts.d/50-vaapi/50-libva.sh
@@ -5,6 +5,7 @@ LIBVA_COMMIT="395e502d162fe04ccec7700bd1a58dca40328605"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
+ [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/50-vidstab.sh b/scripts.d/50-vidstab.sh
index a52794c..e9326e4 100755
--- a/scripts.d/50-vidstab.sh
+++ b/scripts.d/50-vidstab.sh
@@ -15,7 +15,12 @@ ffbuild_dockerbuild() {
mkdir build && cd build
- cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DUSE_OMP=ON ..
+ local disable_sse2=""
+ if [[ $TARGET == *arm64 ]]; then
+ disable_sse2=-DSSE2_FOUND=FALSE
+ fi
+
+ cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DUSE_OMP=ON $disable_sse2 ..
make -j$(nproc)
make install
diff --git a/scripts.d/50-xavs2.sh b/scripts.d/50-xavs2.sh
index 309edd9..3c37a8c 100755
--- a/scripts.d/50-xavs2.sh
+++ b/scripts.d/50-xavs2.sh
@@ -6,6 +6,8 @@ XAVS2_COMMIT="eae1e8b9d12468059bdd7dee893508e470fa83d8"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
[[ $TARGET == win32 ]] && return -1
+ # xavs2 aarch64 support is broken
+ [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/variants/linuxarm64-gpl-shared.sh b/variants/linuxarm64-gpl-shared.sh
new file mode 100644
index 0000000..ca8fbb2
--- /dev/null
+++ b/variants/linuxarm64-gpl-shared.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+source "$(dirname "$BASH_SOURCE")"/linux-install-shared.sh
+source "$(dirname "$BASH_SOURCE")"/defaults-gpl-shared.sh
diff --git a/variants/linuxarm64-gpl.sh b/variants/linuxarm64-gpl.sh
new file mode 100644
index 0000000..b3003a4
--- /dev/null
+++ b/variants/linuxarm64-gpl.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+source "$(dirname "$BASH_SOURCE")"/default-install.sh
+source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh
diff --git a/variants/linuxarm64-lgpl-shared.sh b/variants/linuxarm64-lgpl-shared.sh
new file mode 100644
index 0000000..33244aa
--- /dev/null
+++ b/variants/linuxarm64-lgpl-shared.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+source "$(dirname "$BASH_SOURCE")"/linux-install-shared.sh
+source "$(dirname "$BASH_SOURCE")"/defaults-lgpl-shared.sh
diff --git a/variants/linuxarm64-lgpl.sh b/variants/linuxarm64-lgpl.sh
new file mode 100644
index 0000000..f000a33
--- /dev/null
+++ b/variants/linuxarm64-lgpl.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+source "$(dirname "$BASH_SOURCE")"/default-install.sh
+source "$(dirname "$BASH_SOURCE")"/defaults-lgpl.sh
diff --git a/variants/linuxarm64-nonfree-shared.sh b/variants/linuxarm64-nonfree-shared.sh
new file mode 100644
index 0000000..ec9e7f4
--- /dev/null
+++ b/variants/linuxarm64-nonfree-shared.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+source "$(dirname "$BASH_SOURCE")"/linuxarm64-gpl-shared.sh
+FF_CONFIGURE="--enable-nonfree $FF_CONFIGURE"
diff --git a/variants/linuxarm64-nonfree.sh b/variants/linuxarm64-nonfree.sh
new file mode 100644
index 0000000..d6bd88b
--- /dev/null
+++ b/variants/linuxarm64-nonfree.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+source "$(dirname "$BASH_SOURCE")"/linuxarm64-gpl.sh
+FF_CONFIGURE="--enable-nonfree $FF_CONFIGURE"
+LICENSE_FILE=""
From 9c766b0b3384da8c12b8efbdf0a112f64bebc1ea Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 6 Jul 2022 14:55:26 +0200
Subject: [PATCH 034/160] Fix X11 and rust build on arm64
---
README.md | 3 ---
scripts.d/45-x11/40-libx11.sh | 7 ++++++-
scripts.d/45-x11/50-libxext.sh | 7 ++++++-
scripts.d/45-x11/50-libxfixes.sh | 1 -
scripts.d/45-x11/50-libxi.sh | 7 ++++++-
scripts.d/45-x11/50-libxinerama.sh | 7 ++++++-
scripts.d/45-x11/50-libxrender.sh | 7 ++++++-
scripts.d/45-x11/50-libxscrnsaver.sh | 7 ++++++-
scripts.d/45-x11/50-libxxf86vm.sh | 7 ++++++-
scripts.d/45-x11/60-libglvnd.sh | 1 -
scripts.d/45-x11/60-libxcursor.sh | 1 -
scripts.d/45-x11/60-libxrandr.sh | 7 ++++++-
scripts.d/45-x11/60-libxv.sh | 7 ++++++-
scripts.d/50-rav1e.sh | 6 +-----
scripts.d/50-sdl.sh | 1 -
scripts.d/50-vidstab.sh | 12 +++++++++---
16 files changed, 64 insertions(+), 24 deletions(-)
diff --git a/README.md b/README.md
index 5bc2ea5..19930c2 100644
--- a/README.md
+++ b/README.md
@@ -52,11 +52,8 @@ Available targets:
The linuxarm64 target will not build some dependencies due to lack of arm64 (aarch64) architecture support or cross-compiling restrictions.
-* `libx11` and dependencies: libx11 and its dependencies don't seem to support cross-compiling.
-* `SDL`: Because it depends on libx11.
* `davs2` and `xavs2`: aarch64 support is broken.
* `libmfx` and `libva`: Library for Intel QSV, so there is no aarch64 support.
-* `ffplay` binary: Because it depends on libx11 and SDL.
Available:
* `gpl` Includes all dependencies, even those that require full GPL instead of just LGPL.
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index 2de5c4b..23016dc 100755
--- a/scripts.d/45-x11/40-libx11.sh
+++ b/scripts.d/45-x11/40-libx11.sh
@@ -5,7 +5,6 @@ LIBX11_COMMIT="3a30ada60c5217ada37b143b541c8e6f6284c7fa"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
- [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
@@ -28,6 +27,12 @@ ffbuild_dockerbuild() {
--enable-ipv6
)
+ if [[ $TARGET == linuxarm64 ]]; then
+ myconf+=(
+ --disable-malloc0returnsnull
+ )
+ fi
+
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"
diff --git a/scripts.d/45-x11/50-libxext.sh b/scripts.d/45-x11/50-libxext.sh
index 3d7006a..721c255 100755
--- a/scripts.d/45-x11/50-libxext.sh
+++ b/scripts.d/45-x11/50-libxext.sh
@@ -5,7 +5,6 @@ LIBXEXT_COMMIT="47904063048fa6ef6e8e16219ddef4d14d5d9a4b"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
- [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
@@ -26,6 +25,12 @@ ffbuild_dockerbuild() {
--without-lint
)
+ if [[ $TARGET == linuxarm64 ]]; then
+ myconf+=(
+ --disable-malloc0returnsnull
+ )
+ fi
+
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"
diff --git a/scripts.d/45-x11/50-libxfixes.sh b/scripts.d/45-x11/50-libxfixes.sh
index 7c5f6d3..693f3dd 100755
--- a/scripts.d/45-x11/50-libxfixes.sh
+++ b/scripts.d/45-x11/50-libxfixes.sh
@@ -5,7 +5,6 @@ LIBXFIXES_COMMIT="6fe3bd64dd82f704ed91478acb4c99ab5c00be16"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
- [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/45-x11/50-libxi.sh b/scripts.d/45-x11/50-libxi.sh
index 8d12604..d4a205c 100755
--- a/scripts.d/45-x11/50-libxi.sh
+++ b/scripts.d/45-x11/50-libxi.sh
@@ -5,7 +5,6 @@ LIBXI_COMMIT="f24d7f43ab4d97203e60677a3d42e11dbc80c8b4"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
- [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
@@ -22,6 +21,12 @@ ffbuild_dockerbuild() {
--with-pic
)
+ if [[ $TARGET == linuxarm64 ]]; then
+ myconf+=(
+ --disable-malloc0returnsnull
+ )
+ fi
+
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"
diff --git a/scripts.d/45-x11/50-libxinerama.sh b/scripts.d/45-x11/50-libxinerama.sh
index bd94cb8..50b72fd 100755
--- a/scripts.d/45-x11/50-libxinerama.sh
+++ b/scripts.d/45-x11/50-libxinerama.sh
@@ -5,7 +5,6 @@ LIBXINERAMA_COMMIT="c5187f076d16601c15c59c5a2f05c0513d9f042b"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
- [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
@@ -22,6 +21,12 @@ ffbuild_dockerbuild() {
--with-pic
)
+ if [[ $TARGET == linuxarm64 ]]; then
+ myconf+=(
+ --disable-malloc0returnsnull
+ )
+ fi
+
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"
diff --git a/scripts.d/45-x11/50-libxrender.sh b/scripts.d/45-x11/50-libxrender.sh
index 8d2c475..7e3f6bf 100755
--- a/scripts.d/45-x11/50-libxrender.sh
+++ b/scripts.d/45-x11/50-libxrender.sh
@@ -5,7 +5,6 @@ LIBXRENDER_COMMIT="bce0618839fc33f44edd8b5498b8e33d167806ff"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
- [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
@@ -22,6 +21,12 @@ ffbuild_dockerbuild() {
--with-pic
)
+ if [[ $TARGET == linuxarm64 ]]; then
+ myconf+=(
+ --disable-malloc0returnsnull
+ )
+ fi
+
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"
diff --git a/scripts.d/45-x11/50-libxscrnsaver.sh b/scripts.d/45-x11/50-libxscrnsaver.sh
index c227c4d..e07aa3f 100755
--- a/scripts.d/45-x11/50-libxscrnsaver.sh
+++ b/scripts.d/45-x11/50-libxscrnsaver.sh
@@ -5,7 +5,6 @@ LIBXSCRNSAVER_COMMIT="aa9fd5061d0a8832480ad0c1acc9d2e864e807f4"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
- [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
@@ -22,6 +21,12 @@ ffbuild_dockerbuild() {
--with-pic
)
+ if [[ $TARGET == linuxarm64 ]]; then
+ myconf+=(
+ --disable-malloc0returnsnull
+ )
+ fi
+
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"
diff --git a/scripts.d/45-x11/50-libxxf86vm.sh b/scripts.d/45-x11/50-libxxf86vm.sh
index bb13de9..b03ac76 100755
--- a/scripts.d/45-x11/50-libxxf86vm.sh
+++ b/scripts.d/45-x11/50-libxxf86vm.sh
@@ -5,7 +5,6 @@ LIBXXF86VM_COMMIT="7f43cd2a905e7b93b83c9ce81dabb768f6fa2bc7"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
- [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
@@ -22,6 +21,12 @@ ffbuild_dockerbuild() {
--with-pic
)
+ if [[ $TARGET == linuxarm64 ]]; then
+ myconf+=(
+ --disable-malloc0returnsnull
+ )
+ fi
+
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"
diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh
index c112b95..dbf1e62 100755
--- a/scripts.d/45-x11/60-libglvnd.sh
+++ b/scripts.d/45-x11/60-libglvnd.sh
@@ -5,7 +5,6 @@ GLVND_COMMIT="8e5f0f16467cc8ce870789d9a5b6a2c3f58921c9"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
- [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/45-x11/60-libxcursor.sh b/scripts.d/45-x11/60-libxcursor.sh
index 7718117..4a11470 100755
--- a/scripts.d/45-x11/60-libxcursor.sh
+++ b/scripts.d/45-x11/60-libxcursor.sh
@@ -5,7 +5,6 @@ LIBXCURSOR_COMMIT="27adb16027fa99d83818a0ed9f6623cb03f0c574"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
- [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/45-x11/60-libxrandr.sh b/scripts.d/45-x11/60-libxrandr.sh
index 463d327..43b727f 100755
--- a/scripts.d/45-x11/60-libxrandr.sh
+++ b/scripts.d/45-x11/60-libxrandr.sh
@@ -5,7 +5,6 @@ LIBXRANDR_COMMIT="55dcda4518eda8ae03ef25ea29d3c994ad71eb0a"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
- [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
@@ -22,6 +21,12 @@ ffbuild_dockerbuild() {
--with-pic
)
+ if [[ $TARGET == linuxarm64 ]]; then
+ myconf+=(
+ --disable-malloc0returnsnull
+ )
+ fi
+
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"
diff --git a/scripts.d/45-x11/60-libxv.sh b/scripts.d/45-x11/60-libxv.sh
index 3eb0107..8b9b00f 100755
--- a/scripts.d/45-x11/60-libxv.sh
+++ b/scripts.d/45-x11/60-libxv.sh
@@ -5,7 +5,6 @@ LIBXV_COMMIT="03a6f599d060591a9a7cd8558bd2143a1c7c70d7"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
- [[ $TARGET == linuxarm64 ]] && return -1
[[ $ADDINS_STR == *4.4* ]] && return -1
return 0
}
@@ -24,6 +23,12 @@ ffbuild_dockerbuild() {
--without-lint
)
+ if [[ $TARGET == linuxarm64 ]]; then
+ myconf+=(
+ --disable-malloc0returnsnull
+ )
+ fi
+
if [[ $TARGET == linux* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index dc44132..d0a604f 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -25,11 +25,7 @@ ffbuild_dockerbuild() {
)
fi
- # For some reason, RUSTFLAGS, CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER,
- # and .cargo/config.toml can't work, so have to put a symbolic link
- if [[ $TARGET == linuxarm64 ]]; then
- ln -s /opt/ct-ng/bin/aarch64-ffbuild-linux-gnu-gcc /opt/ct-ng/bin/aarch64-linux-gnu-gcc
- fi
+ export CC="${FFBUILD_CROSS_PREFIX}gcc"
cargo cinstall "${myconf[@]}"
}
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index da02c12..642abf3 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -4,7 +4,6 @@ SDL_REPO="https://github.com/libsdl-org/SDL.git"
SDL_COMMIT="0a93ac129475ab3ce11af95969f767d60e98233a"
ffbuild_enabled() {
- [[ $TARGET == linuxarm64 ]] && return -1
return 0
}
diff --git a/scripts.d/50-vidstab.sh b/scripts.d/50-vidstab.sh
index e9326e4..27e4955 100755
--- a/scripts.d/50-vidstab.sh
+++ b/scripts.d/50-vidstab.sh
@@ -15,12 +15,18 @@ ffbuild_dockerbuild() {
mkdir build && cd build
- local disable_sse2=""
+ local mycmake=(
+ -DBUILD_SHARED_LIBS=OFF
+ -DUSE_OMP=ON
+ )
+
if [[ $TARGET == *arm64 ]]; then
- disable_sse2=-DSSE2_FOUND=FALSE
+ mycmake+=(
+ -DSSE2_FOUND=FALSE
+ )
fi
- cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DUSE_OMP=ON $disable_sse2 ..
+ cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" "${mycmake[@]}" ..
make -j$(nproc)
make install
From 8a44955e4c1eae4df4dc5cf042a5297dd0064509 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 6 Jul 2022 17:00:37 +0200
Subject: [PATCH 035/160] Enable linuxarm64 for autobuilds
---
.github/workflows/build.yml | 6 +++---
.github/workflows/pr.yml | 2 +-
README.md | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 57078d5..59f0d16 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,7 +63,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- target: [win64,linux64]
+ target: [win64,linux64,linuxarm64]
steps:
- name: Checkout
uses: actions/checkout@v3
@@ -99,7 +99,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- target: [win64,linux64]
+ target: [win64,linux64,linuxarm64]
variant: [gpl,lgpl,gpl 4.4,gpl 5.0,lgpl 4.4,lgpl 5.0,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.0,lgpl-shared 4.4,lgpl-shared 5.0]
steps:
- name: Checkout
@@ -140,7 +140,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- target: [win64,linux64]
+ target: [win64,linux64,linuxarm64]
variant: [gpl,lgpl,gpl 4.4,gpl 5.0,lgpl 4.4,lgpl 5.0,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.0,lgpl-shared 4.4,lgpl-shared 5.0]
steps:
- name: Checkout
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 35c90f1..62394a3 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- target: [win64,linux64]
+ target: [win64,linux64,linuxarm64]
variant: [gpl,lgpl,gpl 4.4,gpl 5.0,lgpl 4.4,lgpl 5.0,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.0,lgpl-shared 4.4,lgpl-shared 5.0]
steps:
- name: Checkout
diff --git a/README.md b/README.md
index 19930c2..e4a98cb 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Linux (arm64) builds are targetting Ubuntu 18.04 (glibc-2.27 + linux-4.15) and a
Builds run daily at 12:00 UTC (or GitHubs idea of that time) and are automatically released on success.
-**Auto-Builds run ONLY for win64 and linux64. There are no win32/x86 and linux-arm64/aarch64 auto-builds, though you can produce win32 and linux-arm64 builds yourself following the instructions below.**
+**Auto-Builds run ONLY for win64 and linux(arm)64. There are no win32/x86 auto-builds, though you can produce win32 builds yourself following the instructions below.**
### Release Retention Policy
From ad7773b276ed7be759080269efcc4c1a0ada5b4e Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 11 Jul 2022 21:20:20 +0200
Subject: [PATCH 036/160] Bump mbedtls
---
scripts.d/50-librist/40-mbedtls.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh
index 01aa7b7..4a4f2d6 100755
--- a/scripts.d/50-librist/40-mbedtls.sh
+++ b/scripts.d/50-librist/40-mbedtls.sh
@@ -1,7 +1,7 @@
#!/bin/bash
MBEDTLS_REPO="https://github.com/ARMmbed/mbedtls.git"
-MBEDTLS_COMMIT="v3.1.0"
+MBEDTLS_COMMIT="v3.2.0"
ffbuild_enabled() {
return 0
From f7882ac23028ae8dba0dc21c68a0d5d704f3a572 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 11 Jul 2022 21:36:32 +0200
Subject: [PATCH 037/160] Add new required mbedtls build options
---
scripts.d/50-librist/40-mbedtls.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh
index 4a4f2d6..02846ae 100755
--- a/scripts.d/50-librist/40-mbedtls.sh
+++ b/scripts.d/50-librist/40-mbedtls.sh
@@ -14,7 +14,7 @@ ffbuild_dockerbuild() {
mkdir build && cd build
cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
- -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF \
+ -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DGEN_FILES=ON \
-DUSE_STATIC_MBEDTLS_LIBRARY=ON -DUSE_SHARED_MBEDTLS_LIBRARY=OFF -DINSTALL_MBEDTLS_HEADERS=ON \
..
make -j$(nproc)
From a4c1851a86d84459dbd692d3ae2f351074da4f3c Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 11 Jul 2022 21:43:48 +0200
Subject: [PATCH 038/160] Add missing python dep
---
images/base/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/images/base/Dockerfile b/images/base/Dockerfile
index baf8b58..3f184e9 100644
--- a/images/base/Dockerfile
+++ b/images/base/Dockerfile
@@ -4,7 +4,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN \
apt-get -y update && \
apt-get -y dist-upgrade && \
- apt-get -y install build-essential yasm nasm xxd pkgconf git curl wget unzip subversion autoconf automake libtool libtool-bin autopoint cmake clang texinfo texi2html help2man flex bison gperf gettext itstool ragel libc6-dev libssl-dev gtk-doc-tools gobject-introspection gawk meson ninja-build p7zip-full python3-distutils python3-apt python-is-python3 && \
+ apt-get -y install build-essential yasm nasm xxd pkgconf git curl wget unzip subversion autoconf automake libtool libtool-bin autopoint cmake clang texinfo texi2html help2man flex bison gperf gettext itstool ragel libc6-dev libssl-dev gtk-doc-tools gobject-introspection gawk meson ninja-build p7zip-full python3-distutils python3-jinja2 python3-apt python-is-python3 && \
apt-get -y clean && \
git config --global user.email "builder@localhost" && \
git config --global user.name "Builder" && \
From b9a3f7ffce68d1ac4224e036c58c10120f86eb48 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Tue, 12 Jul 2022 17:31:33 +0200
Subject: [PATCH 039/160] Bump mbedtls again.
Not strictly neccesary, since the generated files are now being
generated anyway, but this makes version check happy.
---
scripts.d/50-librist/40-mbedtls.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh
index 02846ae..2468361 100755
--- a/scripts.d/50-librist/40-mbedtls.sh
+++ b/scripts.d/50-librist/40-mbedtls.sh
@@ -1,7 +1,7 @@
#!/bin/bash
MBEDTLS_REPO="https://github.com/ARMmbed/mbedtls.git"
-MBEDTLS_COMMIT="v3.2.0"
+MBEDTLS_COMMIT="v3.2.1"
ffbuild_enabled() {
return 0
From 38fccdcd44a09bc683d43c83bf325a2279f48ff4 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Tue, 12 Jul 2022 17:54:12 +0200
Subject: [PATCH 040/160] Unify repo/commit/rev variable names
---
scripts.d/10-mingw-std-threads.sh | 6 +++---
scripts.d/10-mingw.sh | 6 +++---
scripts.d/10-xorg-macros.sh | 6 +++---
scripts.d/20-libxml2.sh | 6 +++---
scripts.d/25-fribidi.sh | 6 +++---
scripts.d/25-libogg.sh | 6 +++---
scripts.d/25-openssl.sh | 6 +++---
scripts.d/45-harfbuzz.sh | 6 +++---
scripts.d/45-libsamplerate.sh | 6 +++---
scripts.d/45-libudfread.sh | 6 +++---
scripts.d/45-libvorbis.sh | 6 +++---
scripts.d/45-opencl.sh | 12 ++++++------
scripts.d/45-pulseaudio.sh | 8 ++++----
scripts.d/45-vmaf.sh | 6 +++---
scripts.d/45-x11/10-xcbproto.sh | 6 +++---
scripts.d/45-x11/10-xproto.sh | 6 +++---
scripts.d/45-x11/10-xtrans.sh | 6 +++---
scripts.d/45-x11/20-libxau.sh | 6 +++---
scripts.d/45-x11/30-libxcb.sh | 6 +++---
scripts.d/45-x11/40-libx11.sh | 6 +++---
scripts.d/45-x11/50-libxext.sh | 6 +++---
scripts.d/45-x11/50-libxfixes.sh | 6 +++---
scripts.d/45-x11/50-libxi.sh | 6 +++---
scripts.d/45-x11/50-libxinerama.sh | 6 +++---
scripts.d/45-x11/50-libxrender.sh | 6 +++---
scripts.d/45-x11/50-libxscrnsaver.sh | 6 +++---
scripts.d/45-x11/50-libxxf86vm.sh | 6 +++---
scripts.d/45-x11/60-libglvnd.sh | 6 +++---
scripts.d/45-x11/60-libxcursor.sh | 6 +++---
scripts.d/45-x11/60-libxrandr.sh | 6 +++---
scripts.d/45-x11/60-libxv.sh | 6 +++---
scripts.d/50-amf.sh | 6 +++---
scripts.d/50-aom.sh | 6 +++---
scripts.d/50-aribb24/25-libpng.sh | 6 +++---
scripts.d/50-aribb24/50-libaribb24.sh | 6 +++---
scripts.d/50-avisynth.sh | 6 +++---
scripts.d/50-dav1d.sh | 6 +++---
scripts.d/50-davs2.sh | 8 ++++----
scripts.d/50-fdk-aac.sh | 6 +++---
scripts.d/50-ffnvcodec.sh | 6 +++---
scripts.d/50-frei0r.sh | 6 +++---
scripts.d/50-gme.sh | 8 ++++----
scripts.d/50-libass.sh | 6 +++---
scripts.d/50-libbluray.sh | 6 +++---
scripts.d/50-libjxl/45-brotli.sh | 6 +++---
scripts.d/50-libjxl/50-libjxl.sh | 6 +++---
scripts.d/50-libopus.sh | 6 +++---
scripts.d/50-librist/40-mbedtls.sh | 6 +++---
scripts.d/50-librist/50-librist.sh | 6 +++---
scripts.d/50-libtheora.sh | 6 +++---
scripts.d/50-libvpx.sh | 6 +++---
scripts.d/50-libwebp.sh | 6 +++---
scripts.d/50-lilv/96-lv2.sh | 6 +++---
scripts.d/50-lilv/96-serd.sh | 6 +++---
scripts.d/50-lilv/97-sord.sh | 6 +++---
scripts.d/50-lilv/98-sratom.sh | 6 +++---
scripts.d/50-lilv/99-lilv.sh | 6 +++---
scripts.d/50-mfx.sh | 6 +++---
scripts.d/50-openh264.sh | 6 +++---
scripts.d/50-openjpeg.sh | 6 +++---
scripts.d/50-openmpt.sh | 6 +++---
scripts.d/50-rav1e.sh | 6 +++---
scripts.d/50-rubberband.sh | 6 +++---
scripts.d/50-sdl.sh | 6 +++---
scripts.d/50-soxr.sh | 6 +++---
scripts.d/50-srt.sh | 6 +++---
scripts.d/50-svtav1.sh | 8 ++++----
scripts.d/50-uavs3d.sh | 8 ++++----
scripts.d/50-vaapi/30-libpciaccess.sh | 6 +++---
scripts.d/50-vaapi/40-libdrm.sh | 6 +++---
scripts.d/50-vaapi/50-libva.sh | 6 +++---
scripts.d/50-vidstab.sh | 6 +++---
scripts.d/50-vulkan/45-vulkan.sh | 8 ++++----
scripts.d/50-vulkan/50-shaderc.sh | 6 +++---
scripts.d/50-vulkan/55-spirv-cross.sh | 6 +++---
scripts.d/50-vulkan/60-libplacebo.sh | 6 +++---
scripts.d/50-x264.sh | 6 +++---
scripts.d/50-x265.sh | 8 ++++----
scripts.d/50-xavs2.sh | 8 ++++----
scripts.d/50-zimg.sh | 6 +++---
scripts.d/50-zvbi.sh | 6 +++---
81 files changed, 254 insertions(+), 254 deletions(-)
diff --git a/scripts.d/10-mingw-std-threads.sh b/scripts.d/10-mingw-std-threads.sh
index 7727df4..ad55011 100755
--- a/scripts.d/10-mingw-std-threads.sh
+++ b/scripts.d/10-mingw-std-threads.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-MINGW_STD_THREADS_REPO="https://github.com/meganz/mingw-std-threads.git"
-MINGW_STD_THREADS_COMMIT="6c2061b7da41d6aa1b2162ff4383ec3ece864bc6"
+SCRIPT_REPO="https://github.com/meganz/mingw-std-threads.git"
+SCRIPT_COMMIT="6c2061b7da41d6aa1b2162ff4383ec3ece864bc6"
ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$MINGW_STD_THREADS_REPO" "$MINGW_STD_THREADS_COMMIT" mingw-std-threads
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mingw-std-threads
cd mingw-std-threads
mkdir -p "$FFBUILD_PREFIX"/include
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index 99eee3a..7651b5f 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="826706cbf2b01e799f495bf57d5e681da74dad37"
+SCRIPT_REPO="https://github.com/mirror/mingw-w64.git"
+SCRIPT_COMMIT="826706cbf2b01e799f495bf57d5e681da74dad37"
ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
@@ -18,7 +18,7 @@ ffbuild_dockerfinal() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$MINGW_REPO" "$MINGW_COMMIT" mingw
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mingw
cd mingw
cd mingw-w64-headers
diff --git a/scripts.d/10-xorg-macros.sh b/scripts.d/10-xorg-macros.sh
index e378e3b..0de4dd6 100755
--- a/scripts.d/10-xorg-macros.sh
+++ b/scripts.d/10-xorg-macros.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-XORGMACROS_REPO="https://gitlab.freedesktop.org/xorg/util/macros.git"
-XORGMACROS_COMMIT="0326ba3c4caa34116c0e7e4af98661858cf25d1c"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/util/macros.git"
+SCRIPT_COMMIT="0326ba3c4caa34116c0e7e4af98661858cf25d1c"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -14,7 +14,7 @@ ffbuild_dockerlayer() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$XORGMACROS_REPO" "$XORGMACROS_COMMIT" xorg-macros
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xorg-macros
cd xorg-macros
autoreconf -i
diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh
index dfb78b7..d175e78 100755
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-LIBXML2_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-LIBXML2_COMMIT="a6df42e649acacb55be832222d1f3f50c66720ff"
+SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
+SCRIPT_COMMIT="a6df42e649acacb55be832222d1f3f50c66720ff"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBXML2_REPO" "$LIBXML2_COMMIT" libxml2
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxml2
cd libxml2
local myconf=(
diff --git a/scripts.d/25-fribidi.sh b/scripts.d/25-fribidi.sh
index 52252d2..bfc1375 100755
--- a/scripts.d/25-fribidi.sh
+++ b/scripts.d/25-fribidi.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-FRIBIDI_REPO="https://github.com/fribidi/fribidi.git"
-FRIBIDI_COMMIT="6428d8469e536bcbb6e12c7b79ba6659371c435a"
+SCRIPT_REPO="https://github.com/fribidi/fribidi.git"
+SCRIPT_COMMIT="6428d8469e536bcbb6e12c7b79ba6659371c435a"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$FRIBIDI_REPO" "$FRIBIDI_COMMIT" fribidi
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fribidi
cd fribidi
mkdir build && cd build
diff --git a/scripts.d/25-libogg.sh b/scripts.d/25-libogg.sh
index aee3dfc..aeeb914 100755
--- a/scripts.d/25-libogg.sh
+++ b/scripts.d/25-libogg.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-OGG_REPO="https://github.com/xiph/ogg.git"
-OGG_COMMIT="3069cc2bb44160982cdb21b2b8f0660c76b17572"
+SCRIPT_REPO="https://github.com/xiph/ogg.git"
+SCRIPT_COMMIT="3069cc2bb44160982cdb21b2b8f0660c76b17572"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$OGG_REPO" "$OGG_COMMIT" ogg
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ogg
cd ogg
./autogen.sh
diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh
index ff189e4..5303b93 100755
--- a/scripts.d/25-openssl.sh
+++ b/scripts.d/25-openssl.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-OPENSSL_REPO="https://github.com/openssl/openssl.git"
-OPENSSL_COMMIT="OpenSSL_1_1_1q"
+SCRIPT_REPO="https://github.com/openssl/openssl.git"
+SCRIPT_COMMIT="OpenSSL_1_1_1q"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$OPENSSL_REPO" "$OPENSSL_COMMIT" openssl
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openssl
cd openssl
local myconf=(
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index 833f5a0..eadb997 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-HARFBUZZ_REPO="https://github.com/harfbuzz/harfbuzz.git"
-HARFBUZZ_COMMIT="17c80035adc61c52a9e9600664496e3e4b837e37"
+SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
+SCRIPT_COMMIT="17c80035adc61c52a9e9600664496e3e4b837e37"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$HARFBUZZ_REPO" "$HARFBUZZ_COMMIT" harfbuzz
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" harfbuzz
cd harfbuzz
local myconf=(
diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh
index 0fa2ecf..e0858e0 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="9cccc50b0e850cb1d5fed6c36e9a3b6f07a13711"
+SCRIPT_REPO="https://github.com/libsndfile/libsamplerate.git"
+SCRIPT_COMMIT="9cccc50b0e850cb1d5fed6c36e9a3b6f07a13711"
ffbuild_enabled() {
# Dependency of GPL-Only librubberband
@@ -10,7 +10,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBSR_REPO" "$LIBSR_COMMIT" libsr
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libsr
cd libsr
mkdir build
diff --git a/scripts.d/45-libudfread.sh b/scripts.d/45-libudfread.sh
index 346a4b0..e46ea84 100755
--- a/scripts.d/45-libudfread.sh
+++ b/scripts.d/45-libudfread.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-LIBUDFREAD_REPO="https://code.videolan.org/videolan/libudfread.git"
-LIBUDFREAD_COMMIT="b3e6936a23f8af30a0be63d88f4695bdc0ea26e1"
+SCRIPT_REPO="https://code.videolan.org/videolan/libudfread.git"
+SCRIPT_COMMIT="b3e6936a23f8af30a0be63d88f4695bdc0ea26e1"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBUDFREAD_REPO" "$LIBUDFREAD_COMMIT" libudfread
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libudfread
cd libudfread
./bootstrap
diff --git a/scripts.d/45-libvorbis.sh b/scripts.d/45-libvorbis.sh
index d40b622..1499431 100755
--- a/scripts.d/45-libvorbis.sh
+++ b/scripts.d/45-libvorbis.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-VORBIS_REPO="https://github.com/xiph/vorbis.git"
-VORBIS_COMMIT="84c023699cdf023a32fa4ded32019f194afcdad0"
+SCRIPT_REPO="https://github.com/xiph/vorbis.git"
+SCRIPT_COMMIT="84c023699cdf023a32fa4ded32019f194afcdad0"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$VORBIS_REPO" "$VORBIS_COMMIT" vorbis
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vorbis
cd vorbis
./autogen.sh
diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh
index faaf98d..7bc5ea3 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="def8be9d35fda35492b72f54a94515f7df8d1e9f"
+SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
+SCRIPT_COMMIT="def8be9d35fda35492b72f54a94515f7df8d1e9f"
-LOADER_REPO="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
-LOADER_COMMIT="5b280f69e8312c41310a72c28c66cf24830ee85a"
+SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
+SCRIPT_COMMIT2="5b280f69e8312c41310a72c28c66cf24830ee85a"
ffbuild_enabled() {
return 0
@@ -13,11 +13,11 @@ ffbuild_enabled() {
ffbuild_dockerbuild() {
mkdir opencl && cd opencl
- git-mini-clone "$HEADERS_REPO" "$HEADERS_COMMIT" headers
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" headers
mkdir -p "$FFBUILD_PREFIX"/include/CL
cp -r headers/CL/* "$FFBUILD_PREFIX"/include/CL/.
- git-mini-clone "$LOADER_REPO" "$LOADER_COMMIT" loader
+ git-mini-clone "$SCRIPT_REPO2" "$SCRIPT_COMMIT2" loader
cd loader
mkdir build && cd build
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index b796e3f..9728a6d 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-PULSEAUDIO_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-PULSEAUDIO_COMMIT="05c06afa58e30b7958e96766d1e917099c8a4041"
+SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
+SCRIPT_COMMIT="05c06afa58e30b7958e96766d1e917099c8a4041"
ffbuild_enabled() {
[[ $TARGET == linux* ]] || return 1
@@ -9,9 +9,9 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git clone --filter=blob:none "$PULSEAUDIO_REPO" pa
+ git clone --filter=blob:none "$SCRIPT_REPO" pa
cd pa
- git checkout "$PULSEAUDIO_COMMIT"
+ git checkout "$SCRIPT_COMMIT"
# Kill build of utils and their sndfile dep
echo > src/utils/meson.build
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index 5d5a7c3..8a3c51c 100755
--- a/scripts.d/45-vmaf.sh
+++ b/scripts.d/45-vmaf.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-VMAF_REPO="https://github.com/Netflix/vmaf.git"
-VMAF_COMMIT="ebc457e98fec3400af87382fcae2b963a9152d91"
+SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
+SCRIPT_COMMIT="ebc457e98fec3400af87382fcae2b963a9152d91"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$VMAF_REPO" "$VMAF_COMMIT" vmaf
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vmaf
cd vmaf
# Kill build of unused and broken tools
diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh
index b3c438c..5ac34d1 100755
--- a/scripts.d/45-x11/10-xcbproto.sh
+++ b/scripts.d/45-x11/10-xcbproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-XCBPROTO_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-XCBPROTO_COMMIT="b69b997c11d863d63ee053a0ff4d62957d8ab389"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
+SCRIPT_COMMIT="b69b997c11d863d63ee053a0ff4d62957d8ab389"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$XCBPROTO_REPO" "$XCBPROTO_COMMIT" xcbproto
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xcbproto
cd xcbproto
autoreconf -i
diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh
index 981014f..a70fb6d 100755
--- a/scripts.d/45-x11/10-xproto.sh
+++ b/scripts.d/45-x11/10-xproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-XPROTO_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
-XPROTO_COMMIT="74255ccfd895e70156c45a2c51174c852b64bc71"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
+SCRIPT_COMMIT="74255ccfd895e70156c45a2c51174c852b64bc71"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$XPROTO_REPO" "$XPROTO_COMMIT" xproto
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xproto
cd xproto
autoreconf -i
diff --git a/scripts.d/45-x11/10-xtrans.sh b/scripts.d/45-x11/10-xtrans.sh
index 9d4c85a..9351bbc 100755
--- a/scripts.d/45-x11/10-xtrans.sh
+++ b/scripts.d/45-x11/10-xtrans.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LIBXTRANS_REPO="https://gitlab.freedesktop.org/xorg/lib/libxtrans.git"
-LIBXTRANS_COMMIT="3309c75906a56de86607f59481304b3a2812162f"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxtrans.git"
+SCRIPT_COMMIT="3309c75906a56de86607f59481304b3a2812162f"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBXTRANS_REPO" "$LIBXTRANS_COMMIT" libxtrans
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxtrans
cd libxtrans
autoreconf -i
diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh
index 17c2acc..6268f81 100755
--- a/scripts.d/45-x11/20-libxau.sh
+++ b/scripts.d/45-x11/20-libxau.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LIBXAU_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git"
-LIBXAU_COMMIT="d9443b2c57b512cfb250b35707378654d86c7dea"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git"
+SCRIPT_COMMIT="d9443b2c57b512cfb250b35707378654d86c7dea"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBXAU_REPO" "$LIBXAU_COMMIT" libxau
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxau
cd libxau
autoreconf -i
diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh
index 264a8ce..9fabe30 100755
--- a/scripts.d/45-x11/30-libxcb.sh
+++ b/scripts.d/45-x11/30-libxcb.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LIBXCB_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
-LIBXCB_COMMIT="c2c4a2cd1947e559718acdba19ef6e7db731dbeb"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
+SCRIPT_COMMIT="c2c4a2cd1947e559718acdba19ef6e7db731dbeb"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBXCB_REPO" "$LIBXCB_COMMIT" libxcb
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxcb
cd libxcb
autoreconf -i
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index 23016dc..82765bf 100755
--- a/scripts.d/45-x11/40-libx11.sh
+++ b/scripts.d/45-x11/40-libx11.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LIBX11_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-LIBX11_COMMIT="3a30ada60c5217ada37b143b541c8e6f6284c7fa"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
+SCRIPT_COMMIT="3a30ada60c5217ada37b143b541c8e6f6284c7fa"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBX11_REPO" "$LIBX11_COMMIT" libx11
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libx11
cd libx11
autoreconf -i
diff --git a/scripts.d/45-x11/50-libxext.sh b/scripts.d/45-x11/50-libxext.sh
index 721c255..b41eba0 100755
--- a/scripts.d/45-x11/50-libxext.sh
+++ b/scripts.d/45-x11/50-libxext.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LIBXEXT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxext.git"
-LIBXEXT_COMMIT="47904063048fa6ef6e8e16219ddef4d14d5d9a4b"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxext.git"
+SCRIPT_COMMIT="47904063048fa6ef6e8e16219ddef4d14d5d9a4b"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBXEXT_REPO" "$LIBXEXT_COMMIT" libxext
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxext
cd libxext
autoreconf -i
diff --git a/scripts.d/45-x11/50-libxfixes.sh b/scripts.d/45-x11/50-libxfixes.sh
index 693f3dd..4afe973 100755
--- a/scripts.d/45-x11/50-libxfixes.sh
+++ b/scripts.d/45-x11/50-libxfixes.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LIBXFIXES_REPO="https://gitlab.freedesktop.org/xorg/lib/libxfixes.git"
-LIBXFIXES_COMMIT="6fe3bd64dd82f704ed91478acb4c99ab5c00be16"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxfixes.git"
+SCRIPT_COMMIT="6fe3bd64dd82f704ed91478acb4c99ab5c00be16"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBXFIXES_REPO" "$LIBXFIXES_COMMIT" libxfixes
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxfixes
cd libxfixes
autoreconf -i
diff --git a/scripts.d/45-x11/50-libxi.sh b/scripts.d/45-x11/50-libxi.sh
index d4a205c..1ce92f1 100755
--- a/scripts.d/45-x11/50-libxi.sh
+++ b/scripts.d/45-x11/50-libxi.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LIBXI_REPO="https://gitlab.freedesktop.org/xorg/lib/libxi.git"
-LIBXI_COMMIT="f24d7f43ab4d97203e60677a3d42e11dbc80c8b4"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxi.git"
+SCRIPT_COMMIT="f24d7f43ab4d97203e60677a3d42e11dbc80c8b4"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBXI_REPO" "$LIBXI_COMMIT" libxi
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxi
cd libxi
autoreconf -i
diff --git a/scripts.d/45-x11/50-libxinerama.sh b/scripts.d/45-x11/50-libxinerama.sh
index 50b72fd..8c70f1c 100755
--- a/scripts.d/45-x11/50-libxinerama.sh
+++ b/scripts.d/45-x11/50-libxinerama.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LIBXINERAMA_REPO="https://gitlab.freedesktop.org/xorg/lib/libxinerama.git"
-LIBXINERAMA_COMMIT="c5187f076d16601c15c59c5a2f05c0513d9f042b"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxinerama.git"
+SCRIPT_COMMIT="c5187f076d16601c15c59c5a2f05c0513d9f042b"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBXINERAMA_REPO" "$LIBXINERAMA_COMMIT" libxinerama
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxinerama
cd libxinerama
autoreconf -i
diff --git a/scripts.d/45-x11/50-libxrender.sh b/scripts.d/45-x11/50-libxrender.sh
index 7e3f6bf..108e819 100755
--- a/scripts.d/45-x11/50-libxrender.sh
+++ b/scripts.d/45-x11/50-libxrender.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LIBXRENDER_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrender.git"
-LIBXRENDER_COMMIT="bce0618839fc33f44edd8b5498b8e33d167806ff"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrender.git"
+SCRIPT_COMMIT="bce0618839fc33f44edd8b5498b8e33d167806ff"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBXRENDER_REPO" "$LIBXRENDER_COMMIT" libxrender
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxrender
cd libxrender
autoreconf -i
diff --git a/scripts.d/45-x11/50-libxscrnsaver.sh b/scripts.d/45-x11/50-libxscrnsaver.sh
index e07aa3f..c12be3a 100755
--- a/scripts.d/45-x11/50-libxscrnsaver.sh
+++ b/scripts.d/45-x11/50-libxscrnsaver.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LIBXSCRNSAVER_REPO="https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver.git"
-LIBXSCRNSAVER_COMMIT="aa9fd5061d0a8832480ad0c1acc9d2e864e807f4"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver.git"
+SCRIPT_COMMIT="aa9fd5061d0a8832480ad0c1acc9d2e864e807f4"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBXSCRNSAVER_REPO" "$LIBXSCRNSAVER_COMMIT" libxscrnsaver
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxscrnsaver
cd libxscrnsaver
autoreconf -i
diff --git a/scripts.d/45-x11/50-libxxf86vm.sh b/scripts.d/45-x11/50-libxxf86vm.sh
index b03ac76..f5faca8 100755
--- a/scripts.d/45-x11/50-libxxf86vm.sh
+++ b/scripts.d/45-x11/50-libxxf86vm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LIBXXF86VM_REPO="https://gitlab.freedesktop.org/xorg/lib/libxxf86vm.git"
-LIBXXF86VM_COMMIT="7f43cd2a905e7b93b83c9ce81dabb768f6fa2bc7"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxxf86vm.git"
+SCRIPT_COMMIT="7f43cd2a905e7b93b83c9ce81dabb768f6fa2bc7"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBXXF86VM_REPO" "$LIBXXF86VM_COMMIT" libxxf86vm
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxxf86vm
cd libxxf86vm
autoreconf -i
diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh
index dbf1e62..1560869 100755
--- a/scripts.d/45-x11/60-libglvnd.sh
+++ b/scripts.d/45-x11/60-libglvnd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-GLVND_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-GLVND_COMMIT="8e5f0f16467cc8ce870789d9a5b6a2c3f58921c9"
+SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
+SCRIPT_COMMIT="8e5f0f16467cc8ce870789d9a5b6a2c3f58921c9"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$GLVND_REPO" "$GLVND_COMMIT" glvnd
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" glvnd
cd glvnd
mkdir build && cd build
diff --git a/scripts.d/45-x11/60-libxcursor.sh b/scripts.d/45-x11/60-libxcursor.sh
index 4a11470..1cbaa1d 100755
--- a/scripts.d/45-x11/60-libxcursor.sh
+++ b/scripts.d/45-x11/60-libxcursor.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LIBXCURSOR_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git"
-LIBXCURSOR_COMMIT="27adb16027fa99d83818a0ed9f6623cb03f0c574"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git"
+SCRIPT_COMMIT="27adb16027fa99d83818a0ed9f6623cb03f0c574"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBXCURSOR_REPO" "$LIBXCURSOR_COMMIT" libxcursor
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxcursor
cd libxcursor
autoreconf -i
diff --git a/scripts.d/45-x11/60-libxrandr.sh b/scripts.d/45-x11/60-libxrandr.sh
index 43b727f..5708416 100755
--- a/scripts.d/45-x11/60-libxrandr.sh
+++ b/scripts.d/45-x11/60-libxrandr.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LIBXRANDR_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrandr.git"
-LIBXRANDR_COMMIT="55dcda4518eda8ae03ef25ea29d3c994ad71eb0a"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrandr.git"
+SCRIPT_COMMIT="55dcda4518eda8ae03ef25ea29d3c994ad71eb0a"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBXRANDR_REPO" "$LIBXRANDR_COMMIT" libxrandr
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxrandr
cd libxrandr
autoreconf -i
diff --git a/scripts.d/45-x11/60-libxv.sh b/scripts.d/45-x11/60-libxv.sh
index 8b9b00f..c83add9 100755
--- a/scripts.d/45-x11/60-libxv.sh
+++ b/scripts.d/45-x11/60-libxv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LIBXV_REPO="https://gitlab.freedesktop.org/xorg/lib/libxv.git"
-LIBXV_COMMIT="03a6f599d060591a9a7cd8558bd2143a1c7c70d7"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxv.git"
+SCRIPT_COMMIT="03a6f599d060591a9a7cd8558bd2143a1c7c70d7"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -10,7 +10,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBXV_REPO" "$LIBXV_COMMIT" libxv
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxv
cd libxv
autoreconf -i
diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh
index 2e248df..ed20f08 100755
--- a/scripts.d/50-amf.sh
+++ b/scripts.d/50-amf.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-AMF_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
-AMF_COMMIT="9c36583841b01c23b3972005ff6db6fd4aaac1a0"
+SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
+SCRIPT_COMMIT="9c36583841b01c23b3972005ff6db6fd4aaac1a0"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$AMF_REPO" "$AMF_COMMIT" amf
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" amf
cd amf
mkdir -p "$FFBUILD_PREFIX"/include
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index b0bad49..86d5cf5 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="67c37914286ace423a9de7fbd9f6272871061db3"
+SCRIPT_REPO="https://aomedia.googlesource.com/aom"
+SCRIPT_COMMIT="67c37914286ace423a9de7fbd9f6272871061db3"
ffbuild_enabled() {
return 0
@@ -12,7 +12,7 @@ ffbuild_dockerstage() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$AOM_REPO" "$AOM_COMMIT" aom
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" aom
cd aom
for patch in /patches/*.patch; do
diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh
index 72e7b36..ce3d386 100755
--- a/scripts.d/50-aribb24/25-libpng.sh
+++ b/scripts.d/50-aribb24/25-libpng.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-LIBPNG_REPO="https://github.com/glennrp/libpng.git"
-LIBPNG_COMMIT="a37d4836519517bdce6cb9d956092321eca3e73b"
+SCRIPT_REPO="https://github.com/glennrp/libpng.git"
+SCRIPT_COMMIT="a37d4836519517bdce6cb9d956092321eca3e73b"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBPNG_REPO" "$LIBPNG_COMMIT" libpng
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libpng
cd libpng
autoreconf -i
diff --git a/scripts.d/50-aribb24/50-libaribb24.sh b/scripts.d/50-aribb24/50-libaribb24.sh
index 9131ac4..30a7c05 100755
--- a/scripts.d/50-aribb24/50-libaribb24.sh
+++ b/scripts.d/50-aribb24/50-libaribb24.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-ARIBB24_REPO="https://github.com/nkoriyama/aribb24.git"
-ARIBB24_COMMIT="5e9be272f96e00f15a2f3c5f8ba7e124862aec38"
+SCRIPT_REPO="https://github.com/nkoriyama/aribb24.git"
+SCRIPT_COMMIT="5e9be272f96e00f15a2f3c5f8ba7e124862aec38"
ffbuild_enabled() {
return 0
@@ -12,7 +12,7 @@ ffbuild_dockerstage() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$ARIBB24_REPO" "$ARIBB24_COMMIT" aribb24
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" aribb24
cd aribb24
for patch in /patches/*.patch; do
diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh
index f200e27..5d44680 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="8ce63364a5105fbdf0eda6b564b67a5eb6a9cb9d"
+SCRIPT_REPO="https://github.com/AviSynth/AviSynthPlus.git"
+SCRIPT_COMMIT="8ce63364a5105fbdf0eda6b564b67a5eb6a9cb9d"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$AVISYNTH_REPO" "$AVISYNTH_COMMIT" avisynth
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" avisynth
cd avisynth
mkdir build && cd build
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index 21436c1..3fb8414 100755
--- a/scripts.d/50-dav1d.sh
+++ b/scripts.d/50-dav1d.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-DAV1D_REPO="https://code.videolan.org/videolan/dav1d.git"
-DAV1D_COMMIT="7576cd572f3ab5f6543a70dcc606e131110dbcd8"
+SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
+SCRIPT_COMMIT="7576cd572f3ab5f6543a70dcc606e131110dbcd8"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$DAV1D_REPO" "$DAV1D_COMMIT" dav1d
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" dav1d
cd dav1d
mkdir build && cd build
diff --git a/scripts.d/50-davs2.sh b/scripts.d/50-davs2.sh
index a95a370..47377db 100755
--- a/scripts.d/50-davs2.sh
+++ b/scripts.d/50-davs2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-DAVS2_REPO="https://github.com/pkuvcl/davs2.git"
-DAVS2_COMMIT="b06d7585620f4e90a6d19a2926bb4e59793b8942"
+SCRIPT_REPO="https://github.com/pkuvcl/davs2.git"
+SCRIPT_COMMIT="b06d7585620f4e90a6d19a2926bb4e59793b8942"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
@@ -12,9 +12,9 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git clone "$DAVS2_REPO" davs2
+ git clone "$SCRIPT_REPO" davs2
cd davs2
- git checkout "$DAVS2_COMMIT"
+ git checkout "$SCRIPT_COMMIT"
cd build/linux
local myconf=(
diff --git a/scripts.d/50-fdk-aac.sh b/scripts.d/50-fdk-aac.sh
index 3c42065..9e6c9c3 100755
--- a/scripts.d/50-fdk-aac.sh
+++ b/scripts.d/50-fdk-aac.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-FDK_REPO="https://github.com/mstorsjo/fdk-aac.git"
-FDK_COMMIT="3f864cce9736cc8e9312835465fae18428d76295"
+SCRIPT_REPO="https://github.com/mstorsjo/fdk-aac.git"
+SCRIPT_COMMIT="3f864cce9736cc8e9312835465fae18428d76295"
ffbuild_enabled() {
[[ $VARIANT == nonfree* ]] || return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$FDK_REPO" "$FDK_COMMIT" fdk
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fdk
cd fdk
./autogen.sh
diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh
index dc037fc..999902f 100755
--- a/scripts.d/50-ffnvcodec.sh
+++ b/scripts.d/50-ffnvcodec.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-FFNVCODEC_REPO="https://github.com/FFmpeg/nv-codec-headers.git"
-FFNVCODEC_COMMIT="84483da70d903239d4536763fde8c7e6c4e80784"
+SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git"
+SCRIPT_COMMIT="84483da70d903239d4536763fde8c7e6c4e80784"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$FFNVCODEC_REPO" "$FFNVCODEC_COMMIT" ffnvcodec
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ffnvcodec
cd ffnvcodec
make PREFIX="$FFBUILD_PREFIX" install
diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh
index ae7c341..79d376b 100755
--- a/scripts.d/50-frei0r.sh
+++ b/scripts.d/50-frei0r.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-FREI0R_REPO="https://github.com/dyne/frei0r.git"
-FREI0R_COMMIT="6a576f4538992bbbe88eba1e773d6144d22eb3ca"
+SCRIPT_REPO="https://github.com/dyne/frei0r.git"
+SCRIPT_COMMIT="6a576f4538992bbbe88eba1e773d6144d22eb3ca"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
@@ -10,7 +10,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$FREI0R_REPO" "$FREI0R_COMMIT" frei0r
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" frei0r
cd frei0r
./autogen.sh
diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh
index 72c2702..871b080 100755
--- a/scripts.d/50-gme.sh
+++ b/scripts.d/50-gme.sh
@@ -1,16 +1,16 @@
#!/bin/bash
-GME_REPO="https://bitbucket.org/mpyne/game-music-emu.git"
-GME_COMMIT="d39b0bce47f66074c6aa85202b8cb4642fa77b78"
+SCRIPT_REPO="https://bitbucket.org/mpyne/game-music-emu.git"
+SCRIPT_COMMIT="d39b0bce47f66074c6aa85202b8cb4642fa77b78"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git clone "$GME_REPO" gme
+ git clone "$SCRIPT_REPO" gme
cd gme
- git checkout "$GME_COMMIT"
+ git checkout "$SCRIPT_COMMIT"
mkdir build && cd build
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index 2356a48..db6f643 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-ASS_REPO="https://github.com/libass/libass.git"
-ASS_COMMIT="a2b39cde4ecb74d5e6fccab4a5f7d8ad52b2b1a4"
+SCRIPT_REPO="https://github.com/libass/libass.git"
+SCRIPT_COMMIT="a2b39cde4ecb74d5e6fccab4a5f7d8ad52b2b1a4"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$ASS_REPO" "$ASS_COMMIT" ass
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ass
cd ass
./autogen.sh
diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh
index 23e0c9f..60b3f66 100755
--- a/scripts.d/50-libbluray.sh
+++ b/scripts.d/50-libbluray.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-LIBBLURAY_REPO="https://code.videolan.org/videolan/libbluray.git"
-LIBBLURAY_COMMIT="8f26777b1ce124ff761f80ef52d6be10bcea323e"
+SCRIPT_REPO="https://code.videolan.org/videolan/libbluray.git"
+SCRIPT_COMMIT="8f26777b1ce124ff761f80ef52d6be10bcea323e"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBBLURAY_REPO" "$LIBBLURAY_COMMIT" libbluray
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libbluray
cd libbluray
./bootstrap
diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh
index e9234ad..58a4602 100755
--- a/scripts.d/50-libjxl/45-brotli.sh
+++ b/scripts.d/50-libjxl/45-brotli.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-BROTLI_REPO="https://github.com/google/brotli.git"
-BROTLI_COMMIT="9801a2c5d6c67c467ffad676ac301379bb877fc3"
+SCRIPT_REPO="https://github.com/google/brotli.git"
+SCRIPT_COMMIT="9801a2c5d6c67c467ffad676ac301379bb877fc3"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$BROTLI_REPO" "$BROTLI_COMMIT" brotli
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" brotli
cd brotli
mkdir build && cd build
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index 2df7ccc..44fec6c 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-JXL_REPO="https://github.com/libjxl/libjxl.git"
-JXL_COMMIT="ec093557b0e8f76a48b0a68356d786c664a65660"
+SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
+SCRIPT_COMMIT="ec093557b0e8f76a48b0a68356d786c664a65660"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
@@ -10,7 +10,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$JXL_REPO" "$JXL_COMMIT" jxl
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" jxl
cd jxl
git submodule update --init --recursive --depth 1 --recommend-shallow third_party/{highway,skcms}
diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh
index a7274bb..2d5c553 100755
--- a/scripts.d/50-libopus.sh
+++ b/scripts.d/50-libopus.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-OPUS_REPO="https://github.com/xiph/opus.git"
-OPUS_COMMIT="ccaaffa9a3ee427e9401c4dcf6462e378d9a4694"
+SCRIPT_REPO="https://github.com/xiph/opus.git"
+SCRIPT_COMMIT="ccaaffa9a3ee427e9401c4dcf6462e378d9a4694"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$OPUS_REPO" "$OPUS_COMMIT" opus
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" opus
cd opus
./autogen.sh
diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh
index 2468361..7be215b 100755
--- a/scripts.d/50-librist/40-mbedtls.sh
+++ b/scripts.d/50-librist/40-mbedtls.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-MBEDTLS_REPO="https://github.com/ARMmbed/mbedtls.git"
-MBEDTLS_COMMIT="v3.2.1"
+SCRIPT_REPO="https://github.com/ARMmbed/mbedtls.git"
+SCRIPT_COMMIT="v3.2.1"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$MBEDTLS_REPO" "$MBEDTLS_COMMIT" mbedtls
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mbedtls
cd mbedtls
mkdir build && cd build
diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh
index df97141..a5ec29d 100755
--- a/scripts.d/50-librist/50-librist.sh
+++ b/scripts.d/50-librist/50-librist.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-LIBRIST_REPO="https://code.videolan.org/rist/librist.git"
-LIBRIST_COMMIT="809390b3b75a259a704079d0fb4d8f1b5f7fa956"
+SCRIPT_REPO="https://code.videolan.org/rist/librist.git"
+SCRIPT_COMMIT="809390b3b75a259a704079d0fb4d8f1b5f7fa956"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBRIST_REPO" "$LIBRIST_COMMIT" librist
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" librist
cd librist
mkdir build && cd build
diff --git a/scripts.d/50-libtheora.sh b/scripts.d/50-libtheora.sh
index d922288..11f5ac1 100755
--- a/scripts.d/50-libtheora.sh
+++ b/scripts.d/50-libtheora.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-THEORA_REPO="https://github.com/xiph/theora.git"
-THEORA_COMMIT="7180717276af1ebc7da15c83162d6c5d6203aabf"
+SCRIPT_REPO="https://github.com/xiph/theora.git"
+SCRIPT_COMMIT="7180717276af1ebc7da15c83162d6c5d6203aabf"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$THEORA_REPO" "$THEORA_COMMIT" theora
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" theora
cd theora
./autogen.sh
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index e47d41c..f317c8a 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-LIBVPX_REPO="https://chromium.googlesource.com/webm/libvpx"
-LIBVPX_COMMIT="7b1b9f7cd23e085d97c26ed026d2c817d78a14d6"
+SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
+SCRIPT_COMMIT="7b1b9f7cd23e085d97c26ed026d2c817d78a14d6"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBVPX_REPO" "$LIBVPX_COMMIT" libvpx
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libvpx
cd libvpx
local myconf=(
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index 6981bbe..81d534f 100755
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-WEBP_REPO="https://chromium.googlesource.com/webm/libwebp"
-WEBP_COMMIT="5ecee06f7a11b5b06d846196b362fb9fd39b25b2"
+SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
+SCRIPT_COMMIT="5ecee06f7a11b5b06d846196b362fb9fd39b25b2"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$WEBP_REPO" "$WEBP_COMMIT" webp
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" webp
cd webp
./autogen.sh
diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh
index e521c27..b22775f 100755
--- a/scripts.d/50-lilv/96-lv2.sh
+++ b/scripts.d/50-lilv/96-lv2.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-LV2_REPO="https://github.com/lv2/lv2.git"
-LV2_COMMIT="d97a1a4daff228bdd62c68859959d13077e47026"
+SCRIPT_REPO="https://github.com/lv2/lv2.git"
+SCRIPT_COMMIT="d97a1a4daff228bdd62c68859959d13077e47026"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$LV2_REPO" "$LV2_COMMIT" lv2
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" lv2
cd lv2
git submodule update --init --recursive --depth 1
diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh
index 718b6de..db15d2c 100755
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-SERD_REPO="https://github.com/drobilla/serd.git"
-SERD_COMMIT="272d7081257dc6d50c06b1b62e8c4baa5bf3b4b2"
+SCRIPT_REPO="https://github.com/drobilla/serd.git"
+SCRIPT_COMMIT="272d7081257dc6d50c06b1b62e8c4baa5bf3b4b2"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$SERD_REPO" "$SERD_COMMIT" serd
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" serd
cd serd
git submodule update --init --recursive --depth 1
diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh
index 9e3573f..4ceb3e5 100755
--- a/scripts.d/50-lilv/97-sord.sh
+++ b/scripts.d/50-lilv/97-sord.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-SORD_REPO="https://github.com/drobilla/sord.git"
-SORD_COMMIT="ee631481ba7cbe5f6afdf5dd00860eb9bbed57f4"
+SCRIPT_REPO="https://github.com/drobilla/sord.git"
+SCRIPT_COMMIT="ee631481ba7cbe5f6afdf5dd00860eb9bbed57f4"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$SORD_REPO" "$SORD_COMMIT" sord
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sord
cd sord
git submodule update --init --recursive --depth 1
diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh
index a6746b1..c8936e9 100755
--- a/scripts.d/50-lilv/98-sratom.sh
+++ b/scripts.d/50-lilv/98-sratom.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-SRATOM_REPO="https://github.com/lv2/sratom.git"
-SRATOM_COMMIT="8cf09feee6895ba0760f8c24db6416dac9006dc3"
+SCRIPT_REPO="https://github.com/lv2/sratom.git"
+SCRIPT_COMMIT="8cf09feee6895ba0760f8c24db6416dac9006dc3"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$SRATOM_REPO" "$SRATOM_COMMIT" sratom
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sratom
cd sratom
git submodule update --init --recursive --depth 1
diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh
index b2c0680..e7f08a8 100755
--- a/scripts.d/50-lilv/99-lilv.sh
+++ b/scripts.d/50-lilv/99-lilv.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-LILV_REPO="https://github.com/lv2/lilv.git"
-LILV_COMMIT="c36d3451278555134de850fc548d743b6da2179a"
+SCRIPT_REPO="https://github.com/lv2/lilv.git"
+SCRIPT_COMMIT="c36d3451278555134de850fc548d743b6da2179a"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$LILV_REPO" "$LILV_COMMIT" lilv
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" lilv
cd lilv
git submodule update --init --recursive --depth 1
diff --git a/scripts.d/50-mfx.sh b/scripts.d/50-mfx.sh
index 18554aa..6ec2b96 100755
--- a/scripts.d/50-mfx.sh
+++ b/scripts.d/50-mfx.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-MFX_REPO="https://github.com/lu-zero/mfx_dispatch.git"
-MFX_COMMIT="7e4d221c36c630c1250b23a5dfa15657bc04c10c"
+SCRIPT_REPO="https://github.com/lu-zero/mfx_dispatch.git"
+SCRIPT_COMMIT="7e4d221c36c630c1250b23a5dfa15657bc04c10c"
ffbuild_enabled() {
[[ $TARGET == linuxarm64 ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$MFX_REPO" "$MFX_COMMIT" mfx
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mfx
cd mfx
autoreconf -i
diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh
index f207138..dc976ba 100755
--- a/scripts.d/50-openh264.sh
+++ b/scripts.d/50-openh264.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-OPENH264_REPO="https://github.com/cisco/openh264.git"
-OPENH264_COMMIT="8fe55e3f4accac7fd1af4262bcd6eff5d008396d"
+SCRIPT_REPO="https://github.com/cisco/openh264.git"
+SCRIPT_COMMIT="8fe55e3f4accac7fd1af4262bcd6eff5d008396d"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$OPENH264_REPO" "$OPENH264_COMMIT" openh264
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openh264
cd openh264
local myconf=(
diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh
index 2194b07..772b893 100755
--- a/scripts.d/50-openjpeg.sh
+++ b/scripts.d/50-openjpeg.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-OPENJPEG_REPO="https://github.com/uclouvain/openjpeg.git"
-OPENJPEG_COMMIT="0535bfc3b7d5cd6fc73a7d4a6749a338fc5d7703"
+SCRIPT_REPO="https://github.com/uclouvain/openjpeg.git"
+SCRIPT_COMMIT="0535bfc3b7d5cd6fc73a7d4a6749a338fc5d7703"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$OPENJPEG_REPO" "$OPENJPEG_COMMIT" openjpeg
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openjpeg
cd openjpeg
mkdir build && cd build
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index 6a89783..d06442c 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-OPENMPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-OPENMPT_REV="17456"
+SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
+SCRIPT_REV="17456"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- svn checkout "${OPENMPT_REPO}@${OPENMPT_REV}" openmpt
+ svn checkout "${SCRIPT_REPO}@${SCRIPT}" openmpt
cd openmpt
local myconf=(
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index d0a604f..7bdbb32 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-RAV1E_REPO="https://github.com/xiph/rav1e.git"
-RAV1E_COMMIT="a8d1e46e0dba460345e70a519d3becd079bb3acd"
+SCRIPT_REPO="https://github.com/xiph/rav1e.git"
+SCRIPT_COMMIT="a8d1e46e0dba460345e70a519d3becd079bb3acd"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$RAV1E_REPO" "$RAV1E_COMMIT" rav1e
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" rav1e
cd rav1e
local myconf=(
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index 05519c1..3dbea5a 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-RUBBERBAND_REPO="https://github.com/breakfastquay/rubberband.git"
-RUBBERBAND_COMMIT="4cff1741664918791474da9a9d41f48cc3119229"
+SCRIPT_REPO="https://github.com/breakfastquay/rubberband.git"
+SCRIPT_COMMIT="4cff1741664918791474da9a9d41f48cc3119229"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$RUBBERBAND_REPO" "$RUBBERBAND_COMMIT" rubberband
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" rubberband
cd rubberband
mkdir build && cd build
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index 642abf3..ef455db 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-SDL_REPO="https://github.com/libsdl-org/SDL.git"
-SDL_COMMIT="0a93ac129475ab3ce11af95969f767d60e98233a"
+SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
+SCRIPT_COMMIT="0a93ac129475ab3ce11af95969f767d60e98233a"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$SDL_REPO" "$SDL_COMMIT" sdl
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sdl
cd sdl
mkdir build && cd build
diff --git a/scripts.d/50-soxr.sh b/scripts.d/50-soxr.sh
index 5df1fea..1fb2cac 100755
--- a/scripts.d/50-soxr.sh
+++ b/scripts.d/50-soxr.sh
@@ -1,15 +1,15 @@
#!/bin/bash
# https://sourceforge.net/p/soxr/code/ci/master/tree/
-SOXR_REPO="https://git.code.sf.net/p/soxr/code"
-SOXR_COMMIT="945b592b70470e29f917f4de89b4281fbbd540c0"
+SCRIPT_REPO="https://git.code.sf.net/p/soxr/code"
+SCRIPT_COMMIT="945b592b70470e29f917f4de89b4281fbbd540c0"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$SOXR_REPO" "$SOXR_COMMIT" soxr
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" soxr
cd soxr
mkdir build && cd build
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index 8a93092..f4a2f88 100755
--- a/scripts.d/50-srt.sh
+++ b/scripts.d/50-srt.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-SRT_REPO="https://github.com/Haivision/srt.git"
-SRT_COMMIT="e8b713e954345291e8d6e2314d1e5094a6a14179"
+SCRIPT_REPO="https://github.com/Haivision/srt.git"
+SCRIPT_COMMIT="e8b713e954345291e8d6e2314d1e5094a6a14179"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$SRT_REPO" "$SRT_COMMIT" srt
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" srt
cd srt
mkdir build && cd build
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index d57e6cc..bb30bd8 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="1a656a3dd30499f1c548d10b03b022e4983ee53e"
+SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
+SCRIPT_COMMIT="1a656a3dd30499f1c548d10b03b022e4983ee53e"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
@@ -9,9 +9,9 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git clone "$SVTAV1_REPO" svtav1
+ git clone "$SCRIPT_REPO" svtav1
cd svtav1
- git checkout "$SVTAV1_COMMIT"
+ git checkout "$SCRIPT_COMMIT"
mkdir build && cd build
diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh
index ba0adc4..2ac1728 100755
--- a/scripts.d/50-uavs3d.sh
+++ b/scripts.d/50-uavs3d.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-UAVS3D_REPO="https://github.com/uavs3/uavs3d.git"
-UAVS3D_COMMIT="7b1dd734c926a23f8134b42dbfaac4d22cd6ba1d"
+SCRIPT_REPO="https://github.com/uavs3/uavs3d.git"
+SCRIPT_COMMIT="7b1dd734c926a23f8134b42dbfaac4d22cd6ba1d"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
@@ -9,9 +9,9 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git clone "$UAVS3D_REPO" uavs3d
+ git clone "$SCRIPT_REPO" uavs3d
cd uavs3d
- git checkout "$UAVS3D_COMMIT"
+ git checkout "$SCRIPT_COMMIT"
mkdir build/linux
cd build/linux
diff --git a/scripts.d/50-vaapi/30-libpciaccess.sh b/scripts.d/50-vaapi/30-libpciaccess.sh
index cedd449..684754d 100755
--- a/scripts.d/50-vaapi/30-libpciaccess.sh
+++ b/scripts.d/50-vaapi/30-libpciaccess.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LIBPCIACCESS_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git"
-LIBPCIACCESS_COMMIT="22a93f8b9b4a79eefbdd0b2c412526f6141ac7a8"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git"
+SCRIPT_COMMIT="22a93f8b9b4a79eefbdd0b2c412526f6141ac7a8"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBPCIACCESS_REPO" "$LIBPCIACCESS_COMMIT" libpciaccess
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libpciaccess
cd libpciaccess
autoreconf -fi
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index 0c66f14..87c5e74 100755
--- a/scripts.d/50-vaapi/40-libdrm.sh
+++ b/scripts.d/50-vaapi/40-libdrm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LIBDRM_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-LIBDRM_COMMIT="f7828dc180ba3427b5e405fab25e9846c07322bc"
+SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
+SCRIPT_COMMIT="f7828dc180ba3427b5e405fab25e9846c07322bc"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBDRM_REPO" "$LIBDRM_COMMIT" libdrm
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libdrm
cd libdrm
mkdir build && cd build
diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh
index 367e114..14c3c7c 100755
--- a/scripts.d/50-vaapi/50-libva.sh
+++ b/scripts.d/50-vaapi/50-libva.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LIBVA_REPO="https://github.com/intel/libva.git"
-LIBVA_COMMIT="395e502d162fe04ccec7700bd1a58dca40328605"
+SCRIPT_REPO="https://github.com/intel/libva.git"
+SCRIPT_COMMIT="395e502d162fe04ccec7700bd1a58dca40328605"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
@@ -10,7 +10,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$LIBVA_REPO" "$LIBVA_COMMIT" libva
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libva
cd libva
autoreconf -i
diff --git a/scripts.d/50-vidstab.sh b/scripts.d/50-vidstab.sh
index 27e4955..0763fc8 100755
--- a/scripts.d/50-vidstab.sh
+++ b/scripts.d/50-vidstab.sh
@@ -1,8 +1,8 @@
#!/bin/bash
-VIDSTAB_REPO="https://github.com/georgmartius/vid.stab.git"
+SCRIPT_REPO="https://github.com/georgmartius/vid.stab.git"
# TODO: clamp to e7715fc until georgmartius/vid.stab#104 get fixed
-VIDSTAB_COMMIT="e7715fcf329573cdcff5c57d0e4a25f4c3a0cb7f"
+SCRIPT_COMMIT="e7715fcf329573cdcff5c57d0e4a25f4c3a0cb7f"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
@@ -10,7 +10,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$VIDSTAB_REPO" "$VIDSTAB_COMMIT" vidstab
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vidstab
cd vidstab
mkdir build && cd build
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index dea8b6a..757753f 100755
--- a/scripts.d/50-vulkan/45-vulkan.sh
+++ b/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-HEADERS_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-HEADERS_VERSION="1.3.217"
+SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
+SCRIPT_COMMIT="v1.3.217"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$HEADERS_REPO" "v$HEADERS_VERSION" vkheaders
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vkheaders
cd vkheaders
mkdir build && cd build
@@ -23,7 +23,7 @@ prefix=$FFBUILD_PREFIX
includedir=\${prefix}/include
Name: vulkan
-Version: $HEADERS_VERSION
+Version: ${SCRIPT_COMMIT:1}
Description: Vulkan (Headers Only)
Cflags: -I\${includedir}
EOF
diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh
index ca38859..4e7001e 100755
--- a/scripts.d/50-vulkan/50-shaderc.sh
+++ b/scripts.d/50-vulkan/50-shaderc.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-SHADERC_REPO="https://github.com/google/shaderc.git"
-SHADERC_COMMIT="7e2cfcf2b75c245fa3ceaf2e276180cbf8f107ea"
+SCRIPT_REPO="https://github.com/google/shaderc.git"
+SCRIPT_COMMIT="7e2cfcf2b75c245fa3ceaf2e276180cbf8f107ea"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$SHADERC_REPO" "$SHADERC_COMMIT" shaderc
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" shaderc
cd shaderc
./utils/git-sync-deps
diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh
index 6e48771..8578b10 100755
--- a/scripts.d/50-vulkan/55-spirv-cross.sh
+++ b/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-SPIRV_CROSS_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SPIRV_CROSS_COMMIT="a97bbc24c5bae15d3d2eaa2865c122e8d3be1b67"
+SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
+SCRIPT_COMMIT="a97bbc24c5bae15d3d2eaa2865c122e8d3be1b67"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$SPIRV_CROSS_REPO" "$SPIRV_CROSS_COMMIT" spirv-cross
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" spirv-cross
cd spirv-cross
VER_MAJ="$(grep 'set(spirv-cross-abi-major' CMakeLists.txt | sed -re 's/.* ([0-9]+)\)/\1/')"
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index b472223..ada1af4 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-PLACEBO_REPO="https://code.videolan.org/videolan/libplacebo.git"
-PLACEBO_COMMIT="db794a2fcc8214624c950752b04f6c23f8fc567d"
+SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git"
+SCRIPT_COMMIT="db794a2fcc8214624c950752b04f6c23f8fc567d"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$PLACEBO_REPO" "$PLACEBO_COMMIT" placebo
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" placebo
cd placebo
mkdir build && cd build
diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh
index aecea16..7a08518 100755
--- a/scripts.d/50-x264.sh
+++ b/scripts.d/50-x264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-X264_REPO="https://github.com/mirror/x264.git"
-X264_COMMIT="baee400fa9ced6f5481a728138fed6e867b0ff7f"
+SCRIPT_REPO="https://github.com/mirror/x264.git"
+SCRIPT_COMMIT="baee400fa9ced6f5481a728138fed6e867b0ff7f"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$X264_REPO" "$X264_COMMIT" x264
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" x264
cd x264
local myconf=(
diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh
index 525eca6..c6031a9 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="9b59d45549f460e41a852cfd276f9b89eed2112a"
+SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git"
+SCRIPT_COMMIT="9b59d45549f460e41a852cfd276f9b89eed2112a"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
@@ -9,9 +9,9 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git clone "$X265_REPO" x265
+ git clone "$SCRIPT_REPO" x265
cd x265
- git checkout "$X265_COMMIT"
+ git checkout "$SCRIPT_COMMIT"
local common_config=(
-DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX"
diff --git a/scripts.d/50-xavs2.sh b/scripts.d/50-xavs2.sh
index 3c37a8c..108693c 100755
--- a/scripts.d/50-xavs2.sh
+++ b/scripts.d/50-xavs2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-XAVS2_REPO="https://github.com/pkuvcl/xavs2.git"
-XAVS2_COMMIT="eae1e8b9d12468059bdd7dee893508e470fa83d8"
+SCRIPT_REPO="https://github.com/pkuvcl/xavs2.git"
+SCRIPT_COMMIT="eae1e8b9d12468059bdd7dee893508e470fa83d8"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
@@ -12,9 +12,9 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git clone "$XAVS2_REPO" xavs2
+ git clone "$SCRIPT_REPO" xavs2
cd xavs2
- git checkout "$XAVS2_COMMIT"
+ git checkout "$SCRIPT_COMMIT"
cd build/linux
local myconf=(
diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh
index 495efd3..83b55af 100755
--- a/scripts.d/50-zimg.sh
+++ b/scripts.d/50-zimg.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-ZIMG_REPO="https://github.com/sekrit-twc/zimg.git"
-ZIMG_COMMIT="51c3c7f750c2af61955377faad56e3ba1b03589f"
+SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git"
+SCRIPT_COMMIT="51c3c7f750c2af61955377faad56e3ba1b03589f"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- git-mini-clone "$ZIMG_REPO" "$ZIMG_COMMIT" zimg
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" zimg
cd zimg
./autogen.sh
diff --git a/scripts.d/50-zvbi.sh b/scripts.d/50-zvbi.sh
index f3670ce..20f3586 100755
--- a/scripts.d/50-zvbi.sh
+++ b/scripts.d/50-zvbi.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-ZVBI_REPO="https://svn.code.sf.net/p/zapping/svn/trunk/vbi"
-ZVBI_REV="4270"
+SCRIPT_REPO="https://svn.code.sf.net/p/zapping/svn/trunk/vbi"
+SCRIPT_REV="4270"
ffbuild_enabled() {
return 0
@@ -12,7 +12,7 @@ ffbuild_dockerstage() {
}
ffbuild_dockerbuild() {
- svn checkout "${ZVBI_REPO}@${ZVBI_REV}" zvbi
+ svn checkout "${SCRIPT_REPO}@${SCRIPT_REV}" zvbi
cd zvbi
for patch in /patches/*.patch; do
From 42202d95bc5a0dad64bbae80db984b40eafce5ac Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Tue, 12 Jul 2022 19:55:52 +0200
Subject: [PATCH 041/160] Add auto update script and needed script metadata
---
scripts.d/25-openssl.sh | 1 +
scripts.d/45-x11/99-finalize.sh | 2 +
scripts.d/50-librist/40-mbedtls.sh | 1 +
scripts.d/50-schannel.sh | 2 +
scripts.d/50-vaapi/99-finalize.sh | 2 +
scripts.d/50-vidstab.sh | 4 +-
scripts.d/50-vulkan/45-vulkan.sh | 1 +
scripts.d/99-rpath.sh | 2 +
util/update_scripts.sh | 75 ++++++++++++++++++++++++++++++
9 files changed, 88 insertions(+), 2 deletions(-)
create mode 100755 util/update_scripts.sh
diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh
index 5303b93..28216a7 100755
--- a/scripts.d/25-openssl.sh
+++ b/scripts.d/25-openssl.sh
@@ -2,6 +2,7 @@
SCRIPT_REPO="https://github.com/openssl/openssl.git"
SCRIPT_COMMIT="OpenSSL_1_1_1q"
+SCRIPT_TAGFILTER="OpenSSL_1_1_1*"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-x11/99-finalize.sh b/scripts.d/45-x11/99-finalize.sh
index 4cf3f77..1714e39 100755
--- a/scripts.d/45-x11/99-finalize.sh
+++ b/scripts.d/45-x11/99-finalize.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+SCRIPT_SKIP="1"
+
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
return 0
diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh
index 7be215b..3ffcfa8 100755
--- a/scripts.d/50-librist/40-mbedtls.sh
+++ b/scripts.d/50-librist/40-mbedtls.sh
@@ -2,6 +2,7 @@
SCRIPT_REPO="https://github.com/ARMmbed/mbedtls.git"
SCRIPT_COMMIT="v3.2.1"
+SCRIPT_TAGFILTER="v3.*"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-schannel.sh b/scripts.d/50-schannel.sh
index 873b2f9..4546e2b 100755
--- a/scripts.d/50-schannel.sh
+++ b/scripts.d/50-schannel.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+SCRIPT_SKIP="1"
+
ffbuild_enabled() {
[[ $TARGET == win* ]]
}
diff --git a/scripts.d/50-vaapi/99-finalize.sh b/scripts.d/50-vaapi/99-finalize.sh
index f11547e..5435582 100755
--- a/scripts.d/50-vaapi/99-finalize.sh
+++ b/scripts.d/50-vaapi/99-finalize.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+SCRIPT_SKIP="1"
+
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
return 0
diff --git a/scripts.d/50-vidstab.sh b/scripts.d/50-vidstab.sh
index 0763fc8..f3730dc 100755
--- a/scripts.d/50-vidstab.sh
+++ b/scripts.d/50-vidstab.sh
@@ -2,7 +2,7 @@
SCRIPT_REPO="https://github.com/georgmartius/vid.stab.git"
# TODO: clamp to e7715fc until georgmartius/vid.stab#104 get fixed
-SCRIPT_COMMIT="e7715fcf329573cdcff5c57d0e4a25f4c3a0cb7f"
+SCRIPT_COMMIT_PINNED="e7715fcf329573cdcff5c57d0e4a25f4c3a0cb7f"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
@@ -10,7 +10,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vidstab
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT_PINNED" vidstab
cd vidstab
mkdir build && cd build
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index 757753f..5edd9e4 100755
--- a/scripts.d/50-vulkan/45-vulkan.sh
+++ b/scripts.d/50-vulkan/45-vulkan.sh
@@ -2,6 +2,7 @@
SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
SCRIPT_COMMIT="v1.3.217"
+SCRIPT_TAGFILTER="v?.*.*"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/99-rpath.sh b/scripts.d/99-rpath.sh
index 09b543c..c5d3256 100755
--- a/scripts.d/99-rpath.sh
+++ b/scripts.d/99-rpath.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+SCRIPT_SKIP="1"
+
ffbuild_enabled() {
[[ $TARGET == linux* ]]
}
diff --git a/util/update_scripts.sh b/util/update_scripts.sh
new file mode 100755
index 0000000..be5afee
--- /dev/null
+++ b/util/update_scripts.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+set -eo pipefail
+shopt -s globstar
+export LC_ALL=C
+
+cd "$(dirname "$0")"/..
+
+for scr in scripts.d/**/*.sh; do
+echo "Processing ${scr}"
+(
+ source "$scr"
+
+ if [[ -n "$SCRIPT_SKIP" ]]; then
+ exit 0
+ fi
+
+ for i in "" $(seq 2 9); do
+ REPO_VAR="SCRIPT_REPO$i"
+ COMMIT_VAR="SCRIPT_COMMIT$i"
+ REV_VAR="SCRIPT_REV$i"
+ BRANCH_VAR="SCRIPT_BRANCH$i"
+ TAGFILTER_VAR="SCRIPT_TAGFILTER$i"
+
+ CUR_REPO="${!REPO_VAR}"
+ CUR_COMMIT="${!COMMIT_VAR}"
+ CUR_REV="${!REV_VAR}"
+ CUR_BRANCH="${!BRANCH_VAR}"
+ CUR_TAGFILTER="${!TAGFILTER_VAR}"
+
+ if [[ -z "${CUR_REPO}" ]]; then
+ if [[ -z "$i" ]]; then
+ # Mark scripts without repo source for manual check
+ echo "xxx_CHECKME_xxx" >> "$scr"
+ echo "Needs manual check."
+ fi
+ break
+ fi
+
+ if [[ -n "${CUR_REV}" ]]; then # SVN
+ echo "Checking svn rev for ${CUR_REPO}..."
+ NEW_REV="$(svn info --password="" "${CUR_REPO}" | grep ^Revision: | cut -d" " -f2 | xargs)"
+ echo "Got ${NEW_REV} (current: ${CUR_REV})"
+
+ if [[ "${NEW_REV}" != "${CUR_REV}" ]]; then
+ echo "Updating ${scr}"
+ sed -i "s/^${REV_VAR}=.*/${REV_VAR}=\"${NEW_REV}\"/" "${scr}"
+ fi
+ elif [[ -n "${CUR_COMMIT}" ]]; then # GIT
+ if [[ -n "${CUR_TAGFILTER}" ]]; then
+ NEW_COMMIT="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --tags --refs --sort "v:refname" "${CUR_REPO}" "refs/tags/${CUR_TAGFILTER}" | tail -n1 | cut -d/ -f3- | xargs)"
+ else
+ if [[ -z "${CUR_BRANCH}" ]]; then
+ # Fetch default branch name
+ CUR_BRANCH="$(git remote show "${CUR_REPO}" | grep "HEAD branch:" | cut -d":" -f2 | xargs)"
+ echo "Found default branch ${CUR_BRANCH}"
+ fi
+ NEW_COMMIT="$(git ls-remote --exit-code --heads --refs "${CUR_REPO}" refs/heads/"${CUR_BRANCH}" | cut -f1)"
+ fi
+
+ echo "Got ${NEW_COMMIT} (current: ${CUR_COMMIT})"
+
+ if [[ "${NEW_COMMIT}" != "${CUR_COMMIT}" ]]; then
+ echo "Updating ${scr}"
+ sed -i "s/^${COMMIT_VAR}=.*/${COMMIT_VAR}=\"${NEW_COMMIT}\"/" "${scr}"
+ fi
+ else
+ # Mark scripts with unknown layout for manual check
+ echo "xxx_CHECKME_UNKNOWN_xxx" >> "$scr"
+ echo "Unknown layout. Needs manual check."
+ break
+ fi
+ done
+)
+echo
+done
From a74783a375a875e1475c00e58da034630e4b0730 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Tue, 12 Jul 2022 21:40:55 +0200
Subject: [PATCH 042/160] Add missing build dependencies to base Dockerfile
---
images/base/Dockerfile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/images/base/Dockerfile b/images/base/Dockerfile
index 3f184e9..237502d 100644
--- a/images/base/Dockerfile
+++ b/images/base/Dockerfile
@@ -4,7 +4,14 @@ ENV DEBIAN_FRONTEND noninteractive
RUN \
apt-get -y update && \
apt-get -y dist-upgrade && \
- apt-get -y install build-essential yasm nasm xxd pkgconf git curl wget unzip subversion autoconf automake libtool libtool-bin autopoint cmake clang texinfo texi2html help2man flex bison gperf gettext itstool ragel libc6-dev libssl-dev gtk-doc-tools gobject-introspection gawk meson ninja-build p7zip-full python3-distutils python3-jinja2 python3-apt python-is-python3 && \
+ apt-get -y install build-essential yasm nasm \
+ xxd pkgconf curl wget unzip git subversion mercurial \
+ autoconf automake libtool libtool-bin autopoint gettext cmake clang meson ninja-build \
+ texinfo texi2html help2man flex bison groff \
+ gperf itstool ragel libc6-dev libssl-dev \
+ gtk-doc-tools gobject-introspection gawk \
+ ocaml ocamlbuild libnum-ocaml-dev indent p7zip-full \
+ python3-distutils python3-jinja2 python3-apt python-is-python3 && \
apt-get -y clean && \
git config --global user.email "builder@localhost" && \
git config --global user.name "Builder" && \
From 5339e22d26e9323094047a6c9c3fa4ec396dd1ac Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Tue, 12 Jul 2022 20:28:45 +0200
Subject: [PATCH 043/160] Migrate more scripts to git
---
scripts.d/20-libiconv.sh | 13 +++++++------
scripts.d/20-zlib.sh | 10 +++-------
scripts.d/25-freetype.sh | 14 ++++++--------
scripts.d/25-xz.sh | 10 ++++------
scripts.d/35-fontconfig.sh | 10 ++++------
scripts.d/50-libmp3lame.sh | 12 ++++++------
scripts.d/50-opencore-amr.sh | 9 +++------
scripts.d/50-soxr.sh | 1 -
scripts.d/50-twolame.sh | 12 ++++++------
scripts.d/50-vulkan/50-shaderc.sh | 2 +-
scripts.d/50-xvid.sh | 9 +++------
11 files changed, 43 insertions(+), 59 deletions(-)
diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh
index 467cb8a..6e3a15d 100755
--- a/scripts.d/20-libiconv.sh
+++ b/scripts.d/20-libiconv.sh
@@ -1,17 +1,18 @@
#!/bin/bash
-# https://ftp.gnu.org/gnu/libiconv/
-ICONV_SRC="https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz"
+SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git"
+SCRIPT_COMMIT="4b9c27bec873392533dd3ef309cd62962a644e18"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- wget -O iconv.tar.gz "$ICONV_SRC"
- tar xaf iconv.tar.gz
- rm iconv.tar.gz
- cd libiconv*
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" iconv
+ cd iconv
+
+ ./gitsub.sh pull
+ ./autogen.sh
local myconf=(
--prefix="$FFBUILD_PREFIX"
diff --git a/scripts.d/20-zlib.sh b/scripts.d/20-zlib.sh
index 816d666..4f3da7b 100755
--- a/scripts.d/20-zlib.sh
+++ b/scripts.d/20-zlib.sh
@@ -1,20 +1,16 @@
#!/bin/bash
-ZLIB_SRC="https://zlib.net/zlib-1.2.12.tar.gz"
+SCRIPT_REPO="https://github.com/madler/zlib.git"
+SCRIPT_COMMIT="21767c654d31d2dccdde4330529775c6c5fd5389"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- mkdir zlib
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" zlib
cd zlib
- wget "$ZLIB_SRC" -O zlib.tar.gz
- tar xaf zlib.tar.gz
- rm zlib.tar.gz
- cd zlib*
-
local myconf=(
--prefix="$FFBUILD_PREFIX"
--static
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index 76822e4..36b7a16 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -1,19 +1,17 @@
#!/bin/bash
-# https://sourceforge.net/projects/freetype/files/freetype2/
-FREETYPE_SRC="https://sourceforge.net/projects/freetype/files/freetype2/2.12.1/freetype-2.12.1.tar.xz/download"
+SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
+SCRIPT_COMMIT="275b116b40c9d183d42242099ea9ff276985855b"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- mkdir ft
- cd ft
- wget -O ft.tar.gz "$FREETYPE_SRC"
- tar xaf ft.tar.gz
- rm ft.tar.gz
- cd freetype*
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" freetype
+ cd freetype
+
+ ./autogen.sh
local myconf=(
--prefix="$FFBUILD_PREFIX"
diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh
index 62c13f2..0576bac 100755
--- a/scripts.d/25-xz.sh
+++ b/scripts.d/25-xz.sh
@@ -1,19 +1,17 @@
#!/bin/bash
-XZ_SRC="https://sourceforge.net/projects/lzmautils/files/xz-5.2.5.tar.xz/download"
+SCRIPT_REPO="https://github.com/xz-mirror/xz.git"
+SCRIPT_COMMIT="4773608554d1b684a05ff9c1d879cf5c42266d33"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- mkdir xz
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xz
cd xz
- wget "$XZ_SRC" -O xz.tar.xz
- tar xaf xz.tar.xz
- rm xz.tar.xz
- cd xz*
+ ./autogen.sh --no-po4a
local myconf=(
--prefix="$FFBUILD_PREFIX"
diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh
index 483a757..20144cd 100755
--- a/scripts.d/35-fontconfig.sh
+++ b/scripts.d/35-fontconfig.sh
@@ -1,19 +1,17 @@
#!/bin/bash
-FONTCONFIG_SRC="https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.0.tar.xz"
+SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
+SCRIPT_COMMIT="fd0753af88f746fd3d729bf6e1df08eefeeaa3ac"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- mkdir fc
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fc
cd fc
- wget "$FONTCONFIG_SRC" -O fc.tar.gz
- tar xaf fc.tar.gz
- rm fc.tar.gz
- cd fontconfig*
+ ./autogen.sh --noconf
local myconf=(
--prefix="$FFBUILD_PREFIX"
diff --git a/scripts.d/50-libmp3lame.sh b/scripts.d/50-libmp3lame.sh
index eb6a4b7..2daf818 100755
--- a/scripts.d/50-libmp3lame.sh
+++ b/scripts.d/50-libmp3lame.sh
@@ -1,18 +1,17 @@
#!/bin/bash
-LAME_SRC="https://sourceforge.net/projects/lame/files/lame/3.100/lame-3.100.tar.gz/download"
+SCRIPT_REPO="https://svn.code.sf.net/p/lame/svn/trunk/lame"
+SCRIPT_REV="6507"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- mkdir lame
+ svn checkout "${SCRIPT_REPO}@${SCRIPT_REV}" lame
cd lame
- wget -O lame.tar.gz "$LAME_SRC"
- tar xaf lame.tar.gz
- rm lame.tar.gz
- cd lame*
+
+ autoreconf -i
local myconf=(
--prefix="$FFBUILD_PREFIX"
@@ -22,6 +21,7 @@ ffbuild_dockerbuild() {
--disable-gtktest
--disable-cpml
--disable-frontend
+ --disable-decoder
)
if [[ $TARGET == win* || $TARGET == linux* ]]; then
diff --git a/scripts.d/50-opencore-amr.sh b/scripts.d/50-opencore-amr.sh
index b55bd22..da698f1 100755
--- a/scripts.d/50-opencore-amr.sh
+++ b/scripts.d/50-opencore-amr.sh
@@ -1,18 +1,15 @@
#!/bin/bash
-OAMR_SRC="https://sourceforge.net/projects/opencore-amr/files/opencore-amr/opencore-amr-0.1.5.tar.gz/download"
+SCRIPT_REPO="https://git.code.sf.net/p/opencore-amr/code"
+SCRIPT_COMMIT="7ba9df63d310355f86cb594018fba999965c1388"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- mkdir opencore
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" opencore
cd opencore
- wget -O opencore.tar.gz "$OAMR_SRC"
- tar xaf opencore.tar.gz
- rm opencore.tar.gz
- cd opencore*
autoreconf -i
diff --git a/scripts.d/50-soxr.sh b/scripts.d/50-soxr.sh
index 1fb2cac..f351fa6 100755
--- a/scripts.d/50-soxr.sh
+++ b/scripts.d/50-soxr.sh
@@ -1,6 +1,5 @@
#!/bin/bash
-# https://sourceforge.net/p/soxr/code/ci/master/tree/
SCRIPT_REPO="https://git.code.sf.net/p/soxr/code"
SCRIPT_COMMIT="945b592b70470e29f917f4de89b4281fbbd540c0"
diff --git a/scripts.d/50-twolame.sh b/scripts.d/50-twolame.sh
index 6464678..2dac91d 100755
--- a/scripts.d/50-twolame.sh
+++ b/scripts.d/50-twolame.sh
@@ -1,18 +1,18 @@
#!/bin/bash
-TWOLAME_SRC="https://sourceforge.net/projects/twolame/files/twolame/0.4.0/twolame-0.4.0.tar.gz/download"
+SCRIPT_REPO="https://github.com/njh/twolame.git"
+SCRIPT_COMMIT="90b694b6125dbe23a346bd5607a7fb63ad2785dc"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- mkdir twolame
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" twolame
cd twolame
- wget -O twolame.tar.gz "$TWOLAME_SRC"
- tar xaf twolame.tar.gz
- rm twolame.tar.gz
- cd twolame*
+
+ NOCONFIGURE=1 ./autogen.sh
+ touch doc/twolame.1
local myconf=(
--prefix="$FFBUILD_PREFIX"
diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh
index 4e7001e..225889f 100755
--- a/scripts.d/50-vulkan/50-shaderc.sh
+++ b/scripts.d/50-vulkan/50-shaderc.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/google/shaderc.git"
-SCRIPT_COMMIT="7e2cfcf2b75c245fa3ceaf2e276180cbf8f107ea"
+SCRIPT_COMMIT="a0a247d09229669d19b268eb8051eeda880449c1"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-xvid.sh b/scripts.d/50-xvid.sh
index f6ec11a..73f74a0 100755
--- a/scripts.d/50-xvid.sh
+++ b/scripts.d/50-xvid.sh
@@ -1,6 +1,7 @@
#!/bin/bash
-XVID_SRC="https://downloads.xvid.com/downloads/xvidcore-1.3.7.tar.gz"
+SCRIPT_REPO="http://svn.xvid.org/trunk/xvidcore"
+SCRIPT_REV="2197"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
@@ -8,12 +9,8 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- mkdir xvid
+ svn checkout --username "anonymous" --password "" "${SCRIPT_REPO}@${SCRIPT_REV}" xvid
cd xvid
- wget -O xvid.tar.gz "$XVID_SRC"
- tar xaf xvid.tar.gz
- rm xvid.tar.gz
- cd xvid*
cd build/generic
From d726824cf597337a579da7c11d11c07f47fbd7d1 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 13 Jul 2022 00:23:51 +0200
Subject: [PATCH 044/160] Build fftw3 from git version
---
scripts.d/25-fftw3.sh | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh
index 8173824..755858a 100755
--- a/scripts.d/25-fftw3.sh
+++ b/scripts.d/25-fftw3.sh
@@ -1,8 +1,7 @@
#!/bin/bash
-# https://fftw.org/download.html
-FFTW3_SRC="https://fftw.org/fftw-3.3.10.tar.gz"
-FFTW3_SHA512="2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40"
+SCRIPT_REPO="https://github.com/FFTW/fftw3.git"
+SCRIPT_COMMIT="619564efbf84199f87e1a3047da00b600208fca2"
ffbuild_enabled() {
# Dependency of GPL-Only librubberband
@@ -11,16 +10,12 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- mkdir fftw3
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT_PINNED" fftw3
cd fftw3
- check-wget fftw3.tar.gz "$FFTW3_SRC" "$FFTW3_SHA512"
- tar xaf fftw3.tar.gz
- rm fftw3.tar.gz
- cd fftw*
-
local myconf=(
--prefix="$FFBUILD_PREFIX"
+ --enable-maintainer-mode
--disable-shared
--enable-static
--disable-fortran
@@ -48,7 +43,7 @@ ffbuild_dockerbuild() {
return -1
fi
- ./configure "${myconf[@]}"
+ ./bootstrap.sh "${myconf[@]}"
make -j$(nproc)
make install
}
From b7ca4432e1d833b6631c03437ff962ab2807f1bb Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 13 Jul 2022 01:24:40 +0200
Subject: [PATCH 045/160] Use explicit buildx builder with limited parallelism
---
.gitignore | 1 +
makeimage.sh | 31 ++++++++++++++++++++++++++++---
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index bc80281..1c27a7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/Dockerfile
/ffbuild/
/artifacts/
+/.cache/
diff --git a/makeimage.sh b/makeimage.sh
index 1e7761c..c6c18af 100755
--- a/makeimage.sh
+++ b/makeimage.sh
@@ -3,14 +3,39 @@ set -xe
cd "$(dirname "$0")"
source util/vars.sh
+TMPCFG="$(mktemp --suffix=.toml)"
+cat <<EOF >"$TMPCFG"
+[worker.oci]
+ max-parallelism = 4
+EOF
+trap "rm -f '$TMPCFG'" EXIT
+
+docker buildx inspect ffbuilder &>/dev/null || docker buildx create \
+ --bootstrap \
+ --name ffbuilder \
+ --config "$TMPCFG" \
+ --driver-opt env.BUILDKIT_STEP_LOG_MAX_SIZE=-1 \
+ --driver-opt env.BUILDKIT_STEP_LOG_MAX_SPEED=-1
+
if [[ -z "$QUICKBUILD" ]]; then
if grep "FROM.*base.*" "images/base-${TARGET}/Dockerfile" >/dev/null 2>&1; then
- docker buildx --builder default build --load --tag "$BASE_IMAGE" images/base
+ docker buildx --builder ffbuilder build \
+ --cache-from=type=local,src=.cache/"${BASE_IMAGE/:/_}" \
+ --cache-to=type=local,mode=max,dest=.cache/"${BASE_IMAGE/:/_}" \
+ --load --tag "$BASE_IMAGE" images/base
fi
- docker buildx --builder default build --load --build-arg GH_REPO="$REPO" --tag "$TARGET_IMAGE" "images/base-${TARGET}"
+ docker buildx --builder ffbuilder build \
+ --cache-from=type=local,src=.cache/"${TARGET_IMAGE/:/_}" \
+ --cache-to=type=local,mode=max,dest=.cache/"${TARGET_IMAGE/:/_}" \
+ --load --build-arg GH_REPO="$REPO" --tag "$TARGET_IMAGE" "images/base-${TARGET}"
fi
./generate.sh "$TARGET" "$VARIANT" "${ADDINS[@]}"
-docker buildx --builder default build --load --tag "$IMAGE" .
+docker buildx --builder ffbuilder build \
+ --cache-from=type=local,src=.cache/"${IMAGE/:/_}" \
+ --cache-to=type=local,mode=max,dest=.cache/"${IMAGE/:/_}" \
+ --load --tag "$IMAGE" .
+
+docker buildx rm -f ffbuilder
From d1dd644b809bc0c8fc934d67f26807d352bb3e99 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 13 Jul 2022 01:46:13 +0200
Subject: [PATCH 046/160] Make retry tool generic
---
images/base/git-mini-clone.sh | 12 +-----------
images/base/retry-tool.sh | 14 ++++++++++++++
scripts.d/50-libmp3lame.sh | 2 +-
scripts.d/50-openmpt.sh | 2 +-
scripts.d/50-xvid.sh | 2 +-
scripts.d/50-zvbi.sh | 2 +-
6 files changed, 19 insertions(+), 15 deletions(-)
create mode 100755 images/base/retry-tool.sh
diff --git a/images/base/git-mini-clone.sh b/images/base/git-mini-clone.sh
index b924ada..e483802 100755
--- a/images/base/git-mini-clone.sh
+++ b/images/base/git-mini-clone.sh
@@ -6,17 +6,7 @@ DEST="$3"
git init "$DEST"
git -C "$DEST" remote add origin "$REPO"
-RETRY_COUNTER=0
-MAX_RETRY=15
-while [[ $RETRY_COUNTER -lt $MAX_RETRY ]]; do
- timeout 120 git -C "$DEST" fetch --depth=1 origin "$REF" && break || sleep 10
- RETRY_COUNTER=$(( $RETRY_COUNTER + 1 ))
- echo "Retry $RETRY_COUNTER..."
-done
-if [[ $RETRY_COUNTER -ge $MAX_RETRY ]]; then
- echo "Max retry count exceeded."
- exit 1
-fi
+retry-tool git -C "$DEST" fetch --depth=1 origin "$REF"
git -C "$DEST" config advice.detachedHead false
git -C "$DEST" checkout FETCH_HEAD
diff --git a/images/base/retry-tool.sh b/images/base/retry-tool.sh
new file mode 100755
index 0000000..548e2e4
--- /dev/null
+++ b/images/base/retry-tool.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -xe
+
+RETRY_COUNTER=0
+MAX_RETRY=15
+while [[ $RETRY_COUNTER -lt $MAX_RETRY ]]; do
+ timeout 120 "$@" && break || sleep 10
+ RETRY_COUNTER=$(( $RETRY_COUNTER + 1 ))
+ echo "Retry $RETRY_COUNTER..."
+done
+if [[ $RETRY_COUNTER -ge $MAX_RETRY ]]; then
+ echo "Max retry count exceeded."
+ exit 1
+fi
diff --git a/scripts.d/50-libmp3lame.sh b/scripts.d/50-libmp3lame.sh
index 2daf818..c9ed783 100755
--- a/scripts.d/50-libmp3lame.sh
+++ b/scripts.d/50-libmp3lame.sh
@@ -8,7 +8,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- svn checkout "${SCRIPT_REPO}@${SCRIPT_REV}" lame
+ retry-tool sh -c "rm -rf lame && svn checkout '${SCRIPT_REPO}@${SCRIPT_REV}' lame"
cd lame
autoreconf -i
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index d06442c..1f0481b 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -8,7 +8,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- svn checkout "${SCRIPT_REPO}@${SCRIPT}" openmpt
+ retry-tool sh -c "rm -rf openmpt && svn checkout '${SCRIPT_REPO}@${SCRIPT}' openmpt"
cd openmpt
local myconf=(
diff --git a/scripts.d/50-xvid.sh b/scripts.d/50-xvid.sh
index 73f74a0..25ab076 100755
--- a/scripts.d/50-xvid.sh
+++ b/scripts.d/50-xvid.sh
@@ -9,7 +9,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- svn checkout --username "anonymous" --password "" "${SCRIPT_REPO}@${SCRIPT_REV}" xvid
+ retry-tool sh -c "rm -rf xvid && svn checkout --username 'anonymous' --password '' '${SCRIPT_REPO}@${SCRIPT_REV}' xvid"
cd xvid
cd build/generic
diff --git a/scripts.d/50-zvbi.sh b/scripts.d/50-zvbi.sh
index 20f3586..d0c8031 100755
--- a/scripts.d/50-zvbi.sh
+++ b/scripts.d/50-zvbi.sh
@@ -12,7 +12,7 @@ ffbuild_dockerstage() {
}
ffbuild_dockerbuild() {
- svn checkout "${SCRIPT_REPO}@${SCRIPT_REV}" zvbi
+ retry-tool sh -c "rm -rf zvbi && svn checkout '${SCRIPT_REPO}@${SCRIPT_REV}' zvbi"
cd zvbi
for patch in /patches/*.patch; do
From 3ad7540a028289c291db39c5c2eaedce55e75d71 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 13 Jul 2022 12:51:27 +0200
Subject: [PATCH 047/160] xvidcore appears to have fixed the lib name on
Windows
---
scripts.d/50-xvid.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/scripts.d/50-xvid.sh b/scripts.d/50-xvid.sh
index 25ab076..c16af3a 100755
--- a/scripts.d/50-xvid.sh
+++ b/scripts.d/50-xvid.sh
@@ -40,8 +40,7 @@ ffbuild_dockerbuild() {
make install
if [[ $TARGET == win* ]]; then
- rm "$FFBUILD_PREFIX"/{bin/xvidcore.dll,lib/xvidcore.dll.a}
- mv "$FFBUILD_PREFIX"/lib/{,lib}xvidcore.a
+ rm "$FFBUILD_PREFIX"/{bin/libxvidcore.dll,lib/libxvidcore.dll.a}
elif [[ $TARGET == linux* ]]; then
rm "$FFBUILD_PREFIX"/lib/libxvidcore.so*
fi
From 20ef083828ba61aec0c4b135baaa0da65f4b4d59 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 13 Jul 2022 14:19:14 +0200
Subject: [PATCH 048/160] Build GMP from hg
---
scripts.d/25-gmp.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh
index 422d267..564adbf 100755
--- a/scripts.d/25-gmp.sh
+++ b/scripts.d/25-gmp.sh
@@ -1,21 +1,21 @@
#!/bin/bash
-GMP_SRC="https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz"
+SCRIPT_REPO="https://gmplib.org/repo/gmp/"
+SCRIPT_HGREV="cc75cab76738"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
- wget "$GMP_SRC" -O gmp.tar.xz
- tar xaf gmp.tar.xz
- rm gmp.tar.xz
- cd gmp*
+ hg clone -r "$SCRIPT_HGREV" -u "$SCRIPT_HGREV" "$SCRIPT_REPO" gmp
+ cd gmp
- autoreconf -i
+ ./.bootstrap
local myconf=(
--prefix="$FFBUILD_PREFIX"
+ --enable-maintainer-mode
--disable-shared
--enable-static
--with-pic
From 801aa94c0ecf4f3042bf49c34aad9e2ee11a0a1b Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 13 Jul 2022 14:45:44 +0200
Subject: [PATCH 049/160] Add mercurial auto update support
---
util/update_scripts.sh | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/util/update_scripts.sh b/util/update_scripts.sh
index be5afee..73c9daf 100755
--- a/util/update_scripts.sh
+++ b/util/update_scripts.sh
@@ -18,12 +18,14 @@ echo "Processing ${scr}"
REPO_VAR="SCRIPT_REPO$i"
COMMIT_VAR="SCRIPT_COMMIT$i"
REV_VAR="SCRIPT_REV$i"
+ HGREV_VAR="SCRIPT_HGREV$i"
BRANCH_VAR="SCRIPT_BRANCH$i"
TAGFILTER_VAR="SCRIPT_TAGFILTER$i"
CUR_REPO="${!REPO_VAR}"
CUR_COMMIT="${!COMMIT_VAR}"
CUR_REV="${!REV_VAR}"
+ CUR_HGREV="${!HGREV_VAR}"
CUR_BRANCH="${!BRANCH_VAR}"
CUR_TAGFILTER="${!TAGFILTER_VAR}"
@@ -45,6 +47,20 @@ echo "Processing ${scr}"
echo "Updating ${scr}"
sed -i "s/^${REV_VAR}=.*/${REV_VAR}=\"${NEW_REV}\"/" "${scr}"
fi
+ elif [[ -n "${CUR_HGREV}" ]]; then # HG
+ hg init tmphgrepo
+ trap "rm -rf tmphgrepo" EXIT
+ cd tmphgrepo
+ NEW_HGREV="$(hg in -f -n -l 1 "${CUR_REPO}" | grep changeset | cut -d: -f3 | xargs)"
+ cd ..
+ rm -rf tmphgrepo
+
+ echo "Got ${NEW_HGREV} (current: ${CUR_HGREV})"
+
+ if [[ "${NEW_HGREV}" != "${CUR_HGREV}" ]]; then
+ echo "Updating ${scr}"
+ sed -i "s/^${HGREV_VAR}=.*/${HGREV_VAR}=\"${NEW_HGREV}\"/" "${scr}"
+ fi
elif [[ -n "${CUR_COMMIT}" ]]; then # GIT
if [[ -n "${CUR_TAGFILTER}" ]]; then
NEW_COMMIT="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --tags --refs --sort "v:refname" "${CUR_REPO}" "refs/tags/${CUR_TAGFILTER}" | tail -n1 | cut -d/ -f3- | xargs)"
From c065001c7101c2ac95591f08f85cd2755893ef52 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 13 Jul 2022 17:07:25 +0200
Subject: [PATCH 050/160] Serd switched build system
---
scripts.d/50-lilv/96-serd.sh | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh
index db15d2c..f4d1e19 100755
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/serd.git"
-SCRIPT_COMMIT="272d7081257dc6d50c06b1b62e8c4baa5bf3b4b2"
+SCRIPT_COMMIT="2465c3f2779617658cf85d3cbc0ca7b786a4ddca"
ffbuild_enabled() {
return 0
@@ -10,20 +10,30 @@ ffbuild_enabled() {
ffbuild_dockerbuild() {
git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" serd
cd serd
- git submodule update --init --recursive --depth 1
- local mywaf=(
+ mkdir build && cd build
+
+ local myconf=(
--prefix="$FFBUILD_PREFIX"
- --no-utils
- --static
- --no-shared
- --largefile
- --stack-check
+ --buildtype=release
+ --default-library=static
+ -Ddocs=disabled
+ -Dtools=disabled
+ -Dtests=disabled
)
- CC="${FFBUILD_CROSS_PREFIX}gcc" CXX="${FFBUILD_CROSS_PREFIX}g++" ./waf configure "${mywaf[@]}"
- ./waf -j$(nproc)
- ./waf install
+ if [[ $TARGET == win* || $TARGET == linux* ]]; then
+ myconf+=(
+ --cross-file=/cross.meson
+ )
+ else
+ echo "Unknown target"
+ return -1
+ fi
+
+ meson "${myconf[@]}" ..
+ ninja -j"$(nproc)"
+ ninja install
sed -i 's/Cflags:/Cflags: -DSERD_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/serd-0.pc
}
From f8f6de13dbe7031cf177c1a4224ccc23d4567899 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 13 Jul 2022 17:08:04 +0200
Subject: [PATCH 051/160] zimg depends on submodules now
---
scripts.d/50-zimg.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh
index 83b55af..05501bd 100755
--- a/scripts.d/50-zimg.sh
+++ b/scripts.d/50-zimg.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git"
-SCRIPT_COMMIT="51c3c7f750c2af61955377faad56e3ba1b03589f"
+SCRIPT_COMMIT="598610059037bd815eedfec4f5b3683e8066446c"
ffbuild_enabled() {
return 0
@@ -10,6 +10,7 @@ ffbuild_enabled() {
ffbuild_dockerbuild() {
git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" zimg
cd zimg
+ git submodule update --init --recursive --depth=1
./autogen.sh
From ce66686c5a5c1e64e29fb76e48434489308b29c7 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 13 Jul 2022 17:08:17 +0200
Subject: [PATCH 052/160] Update dependencies
---
scripts.d/10-mingw.sh | 2 +-
scripts.d/20-libxml2.sh | 2 +-
scripts.d/45-harfbuzz.sh | 2 +-
scripts.d/45-libsamplerate.sh | 2 +-
scripts.d/45-opencl.sh | 4 ++--
scripts.d/45-pulseaudio.sh | 2 +-
scripts.d/45-vmaf.sh | 2 +-
scripts.d/45-x11/10-xcbproto.sh | 2 +-
scripts.d/45-x11/10-xproto.sh | 2 +-
scripts.d/45-x11/20-libxau.sh | 2 +-
scripts.d/45-x11/30-libxcb.sh | 2 +-
scripts.d/45-x11/40-libx11.sh | 2 +-
scripts.d/45-x11/50-libxext.sh | 2 +-
scripts.d/45-x11/60-libglvnd.sh | 2 +-
scripts.d/50-amf.sh | 2 +-
scripts.d/50-aom.sh | 2 +-
scripts.d/50-avisynth.sh | 2 +-
scripts.d/50-dav1d.sh | 2 +-
scripts.d/50-frei0r.sh | 2 +-
scripts.d/50-gme.sh | 2 +-
scripts.d/50-libass.sh | 2 +-
scripts.d/50-libjxl/50-libjxl.sh | 2 +-
scripts.d/50-libopus.sh | 2 +-
scripts.d/50-libvpx.sh | 2 +-
scripts.d/50-libwebp.sh | 2 +-
scripts.d/50-openh264.sh | 2 +-
scripts.d/50-openjpeg.sh | 2 +-
scripts.d/50-openmpt.sh | 2 +-
scripts.d/50-rav1e.sh | 2 +-
scripts.d/50-rubberband.sh | 2 +-
scripts.d/50-sdl.sh | 2 +-
scripts.d/50-srt.sh | 2 +-
scripts.d/50-svtav1.sh | 2 +-
scripts.d/50-uavs3d.sh | 2 +-
scripts.d/50-vaapi/30-libpciaccess.sh | 2 +-
scripts.d/50-vaapi/40-libdrm.sh | 2 +-
scripts.d/50-vaapi/50-libva.sh | 2 +-
scripts.d/50-vulkan/45-vulkan.sh | 2 +-
scripts.d/50-vulkan/55-spirv-cross.sh | 2 +-
scripts.d/50-vulkan/60-libplacebo.sh | 2 +-
scripts.d/50-x265.sh | 2 +-
scripts.d/50-xvid.sh | 2 +-
42 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index 7651b5f..ecc83ff 100755
--- a/scripts.d/10-mingw.sh
+++ b/scripts.d/10-mingw.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/mirror/mingw-w64.git"
-SCRIPT_COMMIT="826706cbf2b01e799f495bf57d5e681da74dad37"
+SCRIPT_COMMIT="b4116e310dbd1c28868972fd909568f1d9459230"
ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh
index d175e78..951e40b 100755
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-SCRIPT_COMMIT="a6df42e649acacb55be832222d1f3f50c66720ff"
+SCRIPT_COMMIT="c9925454fd384a17c8c03d358c6778a552e9287b"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index eadb997..19041f4 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="17c80035adc61c52a9e9600664496e3e4b837e37"
+SCRIPT_COMMIT="d8f9d517801c5c361f329764329731bc0bde950f"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh
index e0858e0..a33bdce 100755
--- a/scripts.d/45-libsamplerate.sh
+++ b/scripts.d/45-libsamplerate.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsndfile/libsamplerate.git"
-SCRIPT_COMMIT="9cccc50b0e850cb1d5fed6c36e9a3b6f07a13711"
+SCRIPT_COMMIT="aee38d0bc797d0d1a3774ef574af1d5d248d2398"
ffbuild_enabled() {
# Dependency of GPL-Only librubberband
diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh
index 7bc5ea3..343bbd0 100755
--- a/scripts.d/45-opencl.sh
+++ b/scripts.d/45-opencl.sh
@@ -1,10 +1,10 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
-SCRIPT_COMMIT="def8be9d35fda35492b72f54a94515f7df8d1e9f"
+SCRIPT_COMMIT="7f216e8aa5317a71d91bed7edc83f3620dff763d"
SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
-SCRIPT_COMMIT2="5b280f69e8312c41310a72c28c66cf24830ee85a"
+SCRIPT_COMMIT2="7072cf2ae9d9acb6be8f4fc956f1cdbf0675695b"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index 9728a6d..a5c414a 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-SCRIPT_COMMIT="05c06afa58e30b7958e96766d1e917099c8a4041"
+SCRIPT_COMMIT="eb870fcba9f1d3d9e4d0823012ff04ac2bea00ca"
ffbuild_enabled() {
[[ $TARGET == linux* ]] || return 1
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index 8a3c51c..4d8906d 100755
--- a/scripts.d/45-vmaf.sh
+++ b/scripts.d/45-vmaf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
-SCRIPT_COMMIT="ebc457e98fec3400af87382fcae2b963a9152d91"
+SCRIPT_COMMIT="8a95060b0d65fe7158d8c0ccab333ca658b0f7b5"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh
index 5ac34d1..fc7b997 100755
--- a/scripts.d/45-x11/10-xcbproto.sh
+++ b/scripts.d/45-x11/10-xcbproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-SCRIPT_COMMIT="b69b997c11d863d63ee053a0ff4d62957d8ab389"
+SCRIPT_COMMIT="0fc6197034c49d9fdf5607cae201f1ac3270e7de"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh
index a70fb6d..2943aa8 100755
--- a/scripts.d/45-x11/10-xproto.sh
+++ b/scripts.d/45-x11/10-xproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
-SCRIPT_COMMIT="74255ccfd895e70156c45a2c51174c852b64bc71"
+SCRIPT_COMMIT="912e050d8df0fc3d034c8b03d8afe37b9ce15402"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh
index 6268f81..d7d2f5c 100755
--- a/scripts.d/45-x11/20-libxau.sh
+++ b/scripts.d/45-x11/20-libxau.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git"
-SCRIPT_COMMIT="d9443b2c57b512cfb250b35707378654d86c7dea"
+SCRIPT_COMMIT="3db78d0fa60e07a4ffda61a19849ad30623f70cf"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh
index 9fabe30..0bb9528 100755
--- a/scripts.d/45-x11/30-libxcb.sh
+++ b/scripts.d/45-x11/30-libxcb.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
-SCRIPT_COMMIT="c2c4a2cd1947e559718acdba19ef6e7db731dbeb"
+SCRIPT_COMMIT="3123dfe723648c5abeab429e7cb4bd194ceeb8f6"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index 82765bf..67bd43e 100755
--- a/scripts.d/45-x11/40-libx11.sh
+++ b/scripts.d/45-x11/40-libx11.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-SCRIPT_COMMIT="3a30ada60c5217ada37b143b541c8e6f6284c7fa"
+SCRIPT_COMMIT="9702b836862da6838d725f555e7a1d83faf51740"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxext.sh b/scripts.d/45-x11/50-libxext.sh
index b41eba0..21dd006 100755
--- a/scripts.d/45-x11/50-libxext.sh
+++ b/scripts.d/45-x11/50-libxext.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxext.git"
-SCRIPT_COMMIT="47904063048fa6ef6e8e16219ddef4d14d5d9a4b"
+SCRIPT_COMMIT="178b95c486a1abcf2395157600dc1a2da7e67441"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh
index 1560869..e583247 100755
--- a/scripts.d/45-x11/60-libglvnd.sh
+++ b/scripts.d/45-x11/60-libglvnd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-SCRIPT_COMMIT="8e5f0f16467cc8ce870789d9a5b6a2c3f58921c9"
+SCRIPT_COMMIT="5e289fbceca18bf2145c121814a690b1a1fa276c"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh
index ed20f08..9d6be95 100755
--- a/scripts.d/50-amf.sh
+++ b/scripts.d/50-amf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
-SCRIPT_COMMIT="9c36583841b01c23b3972005ff6db6fd4aaac1a0"
+SCRIPT_COMMIT="9c7189ebb0a78e7e9287547b7898995abf268af8"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index 86d5cf5..2eb2c33 100755
--- a/scripts.d/50-aom.sh
+++ b/scripts.d/50-aom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://aomedia.googlesource.com/aom"
-SCRIPT_COMMIT="67c37914286ace423a9de7fbd9f6272871061db3"
+SCRIPT_COMMIT="5cbe762ad67590d3d4c49d1979a06e063b444bd5"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh
index 5d44680..f8ba4f2 100755
--- a/scripts.d/50-avisynth.sh
+++ b/scripts.d/50-avisynth.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/AviSynth/AviSynthPlus.git"
-SCRIPT_COMMIT="8ce63364a5105fbdf0eda6b564b67a5eb6a9cb9d"
+SCRIPT_COMMIT="f6d16bbd3e26c7f84e6b3d47c551f9c2ee705b11"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index 3fb8414..e9ba287 100755
--- a/scripts.d/50-dav1d.sh
+++ b/scripts.d/50-dav1d.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="7576cd572f3ab5f6543a70dcc606e131110dbcd8"
+SCRIPT_COMMIT="79bc755d19d61644360bef4402fcce69f280ea52"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh
index 79d376b..90a714d 100755
--- a/scripts.d/50-frei0r.sh
+++ b/scripts.d/50-frei0r.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/dyne/frei0r.git"
-SCRIPT_COMMIT="6a576f4538992bbbe88eba1e773d6144d22eb3ca"
+SCRIPT_COMMIT="a9d15ff07e130baf3408da6e1f1b22f82e7c62b6"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh
index 871b080..8411df2 100755
--- a/scripts.d/50-gme.sh
+++ b/scripts.d/50-gme.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://bitbucket.org/mpyne/game-music-emu.git"
-SCRIPT_COMMIT="d39b0bce47f66074c6aa85202b8cb4642fa77b78"
+SCRIPT_COMMIT="6cd4bdb69be304f58c9253fb08b8362f541b3b4b"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index db6f643..ace3032 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libass/libass.git"
-SCRIPT_COMMIT="a2b39cde4ecb74d5e6fccab4a5f7d8ad52b2b1a4"
+SCRIPT_COMMIT="7bc0c45dd58de6afa1800f8e8a94285e7535d68d"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index 44fec6c..2a9d942 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
-SCRIPT_COMMIT="ec093557b0e8f76a48b0a68356d786c664a65660"
+SCRIPT_COMMIT="70278597ccdc396fea1b5bdd8a9dd4b68a60552f"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh
index 2d5c553..f98a8c3 100755
--- a/scripts.d/50-libopus.sh
+++ b/scripts.d/50-libopus.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/opus.git"
-SCRIPT_COMMIT="ccaaffa9a3ee427e9401c4dcf6462e378d9a4694"
+SCRIPT_COMMIT="e4a74ddeb9788eab84d10660e958fe706619892f"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index f317c8a..4317ed5 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="7b1b9f7cd23e085d97c26ed026d2c817d78a14d6"
+SCRIPT_COMMIT="68c68ae959bcd13a0be036ea8eb81319f96faf07"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index 81d534f..4f2357c 100755
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="5ecee06f7a11b5b06d846196b362fb9fd39b25b2"
+SCRIPT_COMMIT="5a2d929cd8a627d7a342e78ce4603167022b76af"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh
index dc976ba..4028864 100755
--- a/scripts.d/50-openh264.sh
+++ b/scripts.d/50-openh264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/cisco/openh264.git"
-SCRIPT_COMMIT="8fe55e3f4accac7fd1af4262bcd6eff5d008396d"
+SCRIPT_COMMIT="2e637867315ffeda3cd8970825ec86acc3fc4a30"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh
index 772b893..80be0f4 100755
--- a/scripts.d/50-openjpeg.sh
+++ b/scripts.d/50-openjpeg.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/uclouvain/openjpeg.git"
-SCRIPT_COMMIT="0535bfc3b7d5cd6fc73a7d4a6749a338fc5d7703"
+SCRIPT_COMMIT="e3f07dcc07c651321ec3b5f540ef698bbe6f1906"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index 1f0481b..a44e3e4 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-SCRIPT_REV="17456"
+SCRIPT_REV="17665"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index 7bdbb32..b898756 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/rav1e.git"
-SCRIPT_COMMIT="a8d1e46e0dba460345e70a519d3becd079bb3acd"
+SCRIPT_COMMIT="182bbff8c4398af56123977ac91f1f3f589fbd85"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index 3dbea5a..846d386 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/breakfastquay/rubberband.git"
-SCRIPT_COMMIT="4cff1741664918791474da9a9d41f48cc3119229"
+SCRIPT_COMMIT="766cb4b061e468cd5676bcff56b61f7805cc798b"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index ef455db..c3ddf2b 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
-SCRIPT_COMMIT="0a93ac129475ab3ce11af95969f767d60e98233a"
+SCRIPT_COMMIT="06c7d22653b7fe5d0aeb9739bcb9666f9f327192"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index f4a2f88..2502127 100755
--- a/scripts.d/50-srt.sh
+++ b/scripts.d/50-srt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Haivision/srt.git"
-SCRIPT_COMMIT="e8b713e954345291e8d6e2314d1e5094a6a14179"
+SCRIPT_COMMIT="ced76c7b778c4a91d2bd9ad735ca9089dbcd3128"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index bb30bd8..af4a610 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="1a656a3dd30499f1c548d10b03b022e4983ee53e"
+SCRIPT_COMMIT="b2a5ee45ada90c8883e4de0b1a0fb47913f0ce45"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh
index 2ac1728..62f823a 100755
--- a/scripts.d/50-uavs3d.sh
+++ b/scripts.d/50-uavs3d.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/uavs3/uavs3d.git"
-SCRIPT_COMMIT="7b1dd734c926a23f8134b42dbfaac4d22cd6ba1d"
+SCRIPT_COMMIT="818a0cb719c0cd012f21ad0b9c5d83669e36f861"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-vaapi/30-libpciaccess.sh b/scripts.d/50-vaapi/30-libpciaccess.sh
index 684754d..d610d23 100755
--- a/scripts.d/50-vaapi/30-libpciaccess.sh
+++ b/scripts.d/50-vaapi/30-libpciaccess.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git"
-SCRIPT_COMMIT="22a93f8b9b4a79eefbdd0b2c412526f6141ac7a8"
+SCRIPT_COMMIT="1fa5d4bdfcc6fea44f9abf353d25f3a5d013f5d7"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index 87c5e74..70dc6da 100755
--- a/scripts.d/50-vaapi/40-libdrm.sh
+++ b/scripts.d/50-vaapi/40-libdrm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-SCRIPT_COMMIT="f7828dc180ba3427b5e405fab25e9846c07322bc"
+SCRIPT_COMMIT="60cf6bcef1390473419df14e3214da149dbd8f99"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh
index 14c3c7c..1886e27 100755
--- a/scripts.d/50-vaapi/50-libva.sh
+++ b/scripts.d/50-vaapi/50-libva.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/intel/libva.git"
-SCRIPT_COMMIT="395e502d162fe04ccec7700bd1a58dca40328605"
+SCRIPT_COMMIT="82e400e3b1615cf589568ac19689f2610ebcf244"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index 5edd9e4..d6dbd3b 100755
--- a/scripts.d/50-vulkan/45-vulkan.sh
+++ b/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-SCRIPT_COMMIT="v1.3.217"
+SCRIPT_COMMIT="v1.3.220"
SCRIPT_TAGFILTER="v?.*.*"
ffbuild_enabled() {
diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh
index 8578b10..6e2d48c 100755
--- a/scripts.d/50-vulkan/55-spirv-cross.sh
+++ b/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SCRIPT_COMMIT="a97bbc24c5bae15d3d2eaa2865c122e8d3be1b67"
+SCRIPT_COMMIT="d8d051381f65b9606fb8016c79b7c3bab872eec3"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index ada1af4..c1a35cf 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git"
-SCRIPT_COMMIT="db794a2fcc8214624c950752b04f6c23f8fc567d"
+SCRIPT_COMMIT="32837eb1028f7d4197b02cebca9b6e0857a1dbf8"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh
index c6031a9..a99205a 100755
--- a/scripts.d/50-x265.sh
+++ b/scripts.d/50-x265.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git"
-SCRIPT_COMMIT="9b59d45549f460e41a852cfd276f9b89eed2112a"
+SCRIPT_COMMIT="20255e6f0ead5b2ef65a520f202cedd5965f8541"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-xvid.sh b/scripts.d/50-xvid.sh
index c16af3a..0db384d 100755
--- a/scripts.d/50-xvid.sh
+++ b/scripts.d/50-xvid.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="http://svn.xvid.org/trunk/xvidcore"
-SCRIPT_REV="2197"
+SCRIPT_REV="2198"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
From 2c027573777551517a5ad6ae152df01f973a91bb Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 13 Jul 2022 20:25:29 +0200
Subject: [PATCH 053/160] Fix build of xext on aarch64
---
scripts.d/45-x11/50-libxext.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/45-x11/50-libxext.sh b/scripts.d/45-x11/50-libxext.sh
index 21dd006..82f836a 100755
--- a/scripts.d/45-x11/50-libxext.sh
+++ b/scripts.d/45-x11/50-libxext.sh
@@ -40,7 +40,7 @@ ffbuild_dockerbuild() {
return -1
fi
- export CFLAGS="$RAW_CFLAGS"
+ export CFLAGS="$RAW_CFLAGS -D_GNU_SOURCE"
export LDFLAFS="$RAW_LDFLAGS"
./configure "${myconf[@]}"
From 13f25e0993e2fc40917f333c749d301b52801b45 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 13 Jul 2022 21:40:17 +0200
Subject: [PATCH 054/160] Revert libjxl update
---
scripts.d/50-libjxl/50-libjxl.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index 2a9d942..44fec6c 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
-SCRIPT_COMMIT="70278597ccdc396fea1b5bdd8a9dd4b68a60552f"
+SCRIPT_COMMIT="ec093557b0e8f76a48b0a68356d786c664a65660"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
From 975fd8d3fd4d521e9c69bfffd20689c8987772a6 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 14 Jul 2022 00:16:48 +0200
Subject: [PATCH 055/160] Add new sdl2 dependency to its .pc file
---
scripts.d/50-sdl.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index c3ddf2b..b3460f8 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -53,6 +53,8 @@ ffbuild_dockerbuild() {
sed -ri -e 's/ -lSDL2//g' \
-e 's/Libs: /Libs: -lSDL2 /'\
"$FFBUILD_PREFIX"/lib/pkgconfig/sdl2.pc
+
+ echo 'Requires: samplerate' >> "$FFBUILD_PREFIX"/lib/pkgconfig/sdl2.pc
}
ffbuild_configure() {
From 64cc9bb50dff5d72599a889d31686bc2ef1abf1e Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 14 Jul 2022 00:52:00 +0200
Subject: [PATCH 056/160] More stuff is using libsamplerate now
---
scripts.d/45-libsamplerate.sh | 2 --
1 file changed, 2 deletions(-)
diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh
index a33bdce..213fb8c 100755
--- a/scripts.d/45-libsamplerate.sh
+++ b/scripts.d/45-libsamplerate.sh
@@ -4,8 +4,6 @@ SCRIPT_REPO="https://github.com/libsndfile/libsamplerate.git"
SCRIPT_COMMIT="aee38d0bc797d0d1a3774ef574af1d5d248d2398"
ffbuild_enabled() {
- # Dependency of GPL-Only librubberband
- [[ $VARIANT == lgpl* ]] && return -1
return 0
}
From dfdfc2931193c9e21e5b410e91c69e4d1a825b23 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 24 Jul 2022 16:43:09 +0200
Subject: [PATCH 057/160] Bump release from 5.0 to 5.1.
5.1 and 5.0 share the same ABI, so instead of cluttering the list even more, just bump to 5.1 entirely.
---
.github/workflows/build.yml | 4 ++--
.github/workflows/pr.yml | 2 +-
addins/5.1.sh | 2 ++
3 files changed, 5 insertions(+), 3 deletions(-)
create mode 100644 addins/5.1.sh
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 59f0d16..fcb0804 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -100,7 +100,7 @@ jobs:
fail-fast: false
matrix:
target: [win64,linux64,linuxarm64]
- variant: [gpl,lgpl,gpl 4.4,gpl 5.0,lgpl 4.4,lgpl 5.0,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.0,lgpl-shared 4.4,lgpl-shared 5.0]
+ variant: [gpl,lgpl,gpl 4.4,gpl 5.1,lgpl 4.4,lgpl 5.1,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.1,lgpl-shared 4.4,lgpl-shared 5.1]
steps:
- name: Checkout
uses: actions/checkout@v3
@@ -141,7 +141,7 @@ jobs:
fail-fast: false
matrix:
target: [win64,linux64,linuxarm64]
- variant: [gpl,lgpl,gpl 4.4,gpl 5.0,lgpl 4.4,lgpl 5.0,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.0,lgpl-shared 4.4,lgpl-shared 5.0]
+ variant: [gpl,lgpl,gpl 4.4,gpl 5.1,lgpl 4.4,lgpl 5.1,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.1,lgpl-shared 4.4,lgpl-shared 5.1]
steps:
- name: Checkout
uses: actions/checkout@v3
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 62394a3..3843ee9 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
target: [win64,linux64,linuxarm64]
- variant: [gpl,lgpl,gpl 4.4,gpl 5.0,lgpl 4.4,lgpl 5.0,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.0,lgpl-shared 4.4,lgpl-shared 5.0]
+ variant: [gpl,lgpl,gpl 4.4,gpl 5.1,lgpl 4.4,lgpl 5.1,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.1,lgpl-shared 4.4,lgpl-shared 5.1]
steps:
- name: Checkout
uses: actions/checkout@v3
diff --git a/addins/5.1.sh b/addins/5.1.sh
new file mode 100644
index 0000000..a58b318
--- /dev/null
+++ b/addins/5.1.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+GIT_BRANCH="release/5.1"
From ab020724b40c768b332cfb0ca260d36c4d4b40dd Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Tue, 2 Aug 2022 20:10:01 +0200
Subject: [PATCH 058/160] Bump opencore-amr to fix build
---
scripts.d/50-opencore-amr.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-opencore-amr.sh b/scripts.d/50-opencore-amr.sh
index da698f1..b72d70d 100755
--- a/scripts.d/50-opencore-amr.sh
+++ b/scripts.d/50-opencore-amr.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://git.code.sf.net/p/opencore-amr/code"
-SCRIPT_COMMIT="7ba9df63d310355f86cb594018fba999965c1388"
+SCRIPT_COMMIT="7dba8c32238418ce0b316a852b2224df586ca896"
ffbuild_enabled() {
return 0
From fcc7e6d9fbd01a5572761e39e50e4629156a1dc7 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Tue, 2 Aug 2022 20:37:17 +0200
Subject: [PATCH 059/160] Make local build script spin up a temporary registry
---
.github/workflows/build.yml | 3 +++
images/base-linux64/Dockerfile | 4 ++--
images/base-linuxarm64/Dockerfile | 4 ++--
images/base-win32/Dockerfile | 4 ++--
images/base-win64/Dockerfile | 4 ++--
makeimage.sh | 14 ++++++++++++--
util/vars.sh | 2 +-
7 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fcb0804..241f0bf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -121,6 +121,7 @@ jobs:
run: |
IMG="ghcr.io/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}"
echo "::set-output name=name::${IMG/ /-}"
+ echo "::set-output name=gh_repo::${GITHUB_REPOSITORY,,}"
- name: Stop Commands
run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
- name: Build target base image
@@ -132,6 +133,8 @@ jobs:
tags: ${{ steps.imagename.outputs.name }}:latest
cache-to: type=registry,mode=max,ref=${{ steps.imagename.outputs.name }}:cache
cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache
+ build-args: |
+ GH_REPO=ghcr.io/${{ steps.imagename.outputs.gh_repo }}
build_ffmpeg:
name: Build ffmpeg
if: ${{ ( github.event.inputs.buildOnly == 'true' && !cancelled() ) || success() }}
diff --git a/images/base-linux64/Dockerfile b/images/base-linux64/Dockerfile
index f8c39c7..a99ac97 100644
--- a/images/base-linux64/Dockerfile
+++ b/images/base-linux64/Dockerfile
@@ -1,5 +1,5 @@
-ARG GH_REPO=btbn/ffmpeg-builds
-FROM ghcr.io/$GH_REPO/base:latest
+ARG GH_REPO=ghcr.io/btbn/ffmpeg-builds
+FROM $GH_REPO/base:latest
RUN --mount=src=ct-ng-config,dst=/.config \
git clone --filter=blob:none https://github.com/crosstool-ng/crosstool-ng.git /ct-ng && cd /ct-ng && \
diff --git a/images/base-linuxarm64/Dockerfile b/images/base-linuxarm64/Dockerfile
index bcc068b..eb39ec5 100644
--- a/images/base-linuxarm64/Dockerfile
+++ b/images/base-linuxarm64/Dockerfile
@@ -1,5 +1,5 @@
-ARG GH_REPO=btbn/ffmpeg-builds
-FROM ghcr.io/$GH_REPO/base:latest
+ARG GH_REPO=ghcr.io/btbn/ffmpeg-builds
+FROM $GH_REPO/base:latest
RUN --mount=src=ct-ng-config,dst=/.config \
git clone --filter=blob:none https://github.com/crosstool-ng/crosstool-ng.git /ct-ng && cd /ct-ng && \
diff --git a/images/base-win32/Dockerfile b/images/base-win32/Dockerfile
index d62ac18..4a01efd 100644
--- a/images/base-win32/Dockerfile
+++ b/images/base-win32/Dockerfile
@@ -1,5 +1,5 @@
-ARG GH_REPO=btbn/ffmpeg-builds
-FROM ghcr.io/$GH_REPO/base:latest
+ARG GH_REPO=ghcr.io/btbn/ffmpeg-builds
+FROM $GH_REPO/base:latest
RUN --mount=src=ct-ng-config,dst=/.config \
git clone --filter=blob:none https://github.com/crosstool-ng/crosstool-ng.git /ct-ng && cd /ct-ng && \
diff --git a/images/base-win64/Dockerfile b/images/base-win64/Dockerfile
index 87f5d0f..120ce8c 100644
--- a/images/base-win64/Dockerfile
+++ b/images/base-win64/Dockerfile
@@ -1,5 +1,5 @@
-ARG GH_REPO=btbn/ffmpeg-builds
-FROM ghcr.io/$GH_REPO/base:latest
+ARG GH_REPO=ghcr.io/btbn/ffmpeg-builds
+FROM $GH_REPO/base:latest
RUN --mount=src=ct-ng-config,dst=/.config \
git clone --filter=blob:none https://github.com/crosstool-ng/crosstool-ng.git /ct-ng && cd /ct-ng && \
diff --git a/makeimage.sh b/makeimage.sh
index c6c18af..bbbd4cd 100755
--- a/makeimage.sh
+++ b/makeimage.sh
@@ -14,21 +14,31 @@ docker buildx inspect ffbuilder &>/dev/null || docker buildx create \
--bootstrap \
--name ffbuilder \
--config "$TMPCFG" \
+ --driver-opt network=host \
--driver-opt env.BUILDKIT_STEP_LOG_MAX_SIZE=-1 \
--driver-opt env.BUILDKIT_STEP_LOG_MAX_SPEED=-1
if [[ -z "$QUICKBUILD" ]]; then
+ docker container inspect ffbuildreg &>/dev/null || \
+ docker run --rm -d -p 127.0.0.1:0:5000 --name ffbuildreg registry:2
+ LOCAL_REG_PORT="$(docker container inspect --format='{{range $p, $conf := .NetworkSettings.Ports}}{{(index $conf 0).HostPort}}{{end}}' ffbuildreg)"
+ LOCAL_ROOT="127.0.0.1:${LOCAL_REG_PORT}/local"
+ trap "rm -f '$TMPCFG'; docker container stop ffbuildreg" EXIT
+
if grep "FROM.*base.*" "images/base-${TARGET}/Dockerfile" >/dev/null 2>&1; then
docker buildx --builder ffbuilder build \
--cache-from=type=local,src=.cache/"${BASE_IMAGE/:/_}" \
--cache-to=type=local,mode=max,dest=.cache/"${BASE_IMAGE/:/_}" \
- --load --tag "$BASE_IMAGE" images/base
+ --push --tag "${LOCAL_ROOT}/base:latest" images/base
fi
docker buildx --builder ffbuilder build \
--cache-from=type=local,src=.cache/"${TARGET_IMAGE/:/_}" \
--cache-to=type=local,mode=max,dest=.cache/"${TARGET_IMAGE/:/_}" \
- --load --build-arg GH_REPO="$REPO" --tag "$TARGET_IMAGE" "images/base-${TARGET}"
+ --push --tag "${LOCAL_ROOT}/base-${TARGET}:latest" \
+ --build-arg GH_REPO="$LOCAL_ROOT" "images/base-${TARGET}"
+
+ export REGISTRY_OVERRIDE="127.0.0.1:${LOCAL_REG_PORT}" GITHUB_REPOSITORY="local"
fi
./generate.sh "$TARGET" "$VARIANT" "${ADDINS[@]}"
diff --git a/util/vars.sh b/util/vars.sh
index f3002a2..656ac06 100644
--- a/util/vars.sh
+++ b/util/vars.sh
@@ -32,7 +32,7 @@ done
REPO="${GITHUB_REPOSITORY:-btbn/ffmpeg-builds}"
REPO="${REPO,,}"
-REGISTRY="ghcr.io"
+REGISTRY="${REGISTRY_OVERRIDE:-ghcr.io}"
BASE_IMAGE="${REGISTRY}/${REPO}/base:latest"
TARGET_IMAGE="${REGISTRY}/${REPO}/base-${TARGET}:latest"
IMAGE="${REGISTRY}/${REPO}/${TARGET}-${VARIANT}${ADDINS_STR:+-}${ADDINS_STR}:latest"
From d1b90729b6b9c5c3719186ba03445b6550c4186f Mon Sep 17 00:00:00 2001
From: n00mkrad <login@nmkd.de>
Date: Wed, 3 Aug 2022 15:39:15 +0200
Subject: [PATCH 060/160] Update SVT-AV1 to 1.2
---
scripts.d/50-svtav1.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index af4a610..28474e1 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="b2a5ee45ada90c8883e4de0b1a0fb47913f0ce45"
+SCRIPT_COMMIT="14c38dca41e352a89643c4a89bc5417b7e5c1ae8"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
From c7a73215c6e1d6bfdee48b58bbc45a0227e7a416 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 4 Aug 2022 19:25:20 +0200
Subject: [PATCH 061/160] Update dependencies
---
scripts.d/10-mingw.sh | 2 +-
scripts.d/20-libiconv.sh | 2 +-
scripts.d/20-libxml2.sh | 2 +-
scripts.d/25-freetype.sh | 2 +-
scripts.d/45-harfbuzz.sh | 2 +-
scripts.d/45-pulseaudio.sh | 2 +-
scripts.d/45-vmaf.sh | 2 +-
scripts.d/45-x11/10-xcbproto.sh | 2 +-
scripts.d/45-x11/10-xproto.sh | 2 +-
scripts.d/45-x11/20-libxau.sh | 2 +-
scripts.d/45-x11/30-libxcb.sh | 2 +-
scripts.d/45-x11/40-libx11.sh | 2 +-
scripts.d/45-x11/50-libxext.sh | 2 +-
scripts.d/45-x11/50-libxfixes.sh | 2 +-
scripts.d/45-x11/50-libxi.sh | 2 +-
scripts.d/45-x11/50-libxinerama.sh | 2 +-
scripts.d/45-x11/50-libxrender.sh | 2 +-
scripts.d/45-x11/50-libxscrnsaver.sh | 2 +-
scripts.d/45-x11/50-libxxf86vm.sh | 2 +-
scripts.d/45-x11/60-libxrandr.sh | 2 +-
scripts.d/45-x11/60-libxv.sh | 2 +-
scripts.d/50-amf.sh | 2 +-
scripts.d/50-aom.sh | 2 +-
scripts.d/50-avisynth.sh | 2 +-
scripts.d/50-dav1d.sh | 2 +-
scripts.d/50-libass.sh | 2 +-
scripts.d/50-libbluray.sh | 2 +-
scripts.d/50-libjxl/50-libjxl.sh | 2 +-
scripts.d/50-libopus.sh | 2 +-
scripts.d/50-libvpx.sh | 2 +-
scripts.d/50-libwebp.sh | 2 +-
scripts.d/50-lilv/96-lv2.sh | 2 +-
scripts.d/50-lilv/96-serd.sh | 2 +-
scripts.d/50-lilv/97-sord.sh | 2 +-
scripts.d/50-lilv/98-sratom.sh | 2 +-
scripts.d/50-lilv/99-lilv.sh | 2 +-
scripts.d/50-openmpt.sh | 2 +-
scripts.d/50-rav1e.sh | 2 +-
scripts.d/50-sdl.sh | 2 +-
scripts.d/50-srt.sh | 2 +-
scripts.d/50-vaapi/30-libpciaccess.sh | 2 +-
scripts.d/50-vaapi/40-libdrm.sh | 2 +-
scripts.d/50-vaapi/50-libva.sh | 2 +-
scripts.d/50-vulkan/45-vulkan.sh | 2 +-
scripts.d/50-vulkan/55-spirv-cross.sh | 2 +-
scripts.d/50-vulkan/60-libplacebo.sh | 2 +-
scripts.d/50-zimg.sh | 2 +-
47 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index ecc83ff..1c3ffcb 100755
--- a/scripts.d/10-mingw.sh
+++ b/scripts.d/10-mingw.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/mirror/mingw-w64.git"
-SCRIPT_COMMIT="b4116e310dbd1c28868972fd909568f1d9459230"
+SCRIPT_COMMIT="aacb650beeeaddaf399b4a05449c18c3b018da3e"
ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh
index 6e3a15d..99ceda8 100755
--- a/scripts.d/20-libiconv.sh
+++ b/scripts.d/20-libiconv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git"
-SCRIPT_COMMIT="4b9c27bec873392533dd3ef309cd62962a644e18"
+SCRIPT_COMMIT="2582e7bb06f1638877713400e2d11db547798a49"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh
index 951e40b..ac54e3e 100755
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-SCRIPT_COMMIT="c9925454fd384a17c8c03d358c6778a552e9287b"
+SCRIPT_COMMIT="e986d09cf531e77a9ab46af2d1a219072f310190"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index 36b7a16..a754927 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
-SCRIPT_COMMIT="275b116b40c9d183d42242099ea9ff276985855b"
+SCRIPT_COMMIT="90e1e39f50f9431e41fc3fb21b8d8f75fd5b4b9c"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index 19041f4..7d76cff 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="d8f9d517801c5c361f329764329731bc0bde950f"
+SCRIPT_COMMIT="b78546b1d2af284ae1cb9d98732016a149322680"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index a5c414a..e5bc90b 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-SCRIPT_COMMIT="eb870fcba9f1d3d9e4d0823012ff04ac2bea00ca"
+SCRIPT_COMMIT="1b031ecee69142c4b0ff6ea9767c0cabb61af144"
ffbuild_enabled() {
[[ $TARGET == linux* ]] || return 1
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index 4d8906d..5b095dc 100755
--- a/scripts.d/45-vmaf.sh
+++ b/scripts.d/45-vmaf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
-SCRIPT_COMMIT="8a95060b0d65fe7158d8c0ccab333ca658b0f7b5"
+SCRIPT_COMMIT="764d69d48ec163c1545373ca45164b37370140a6"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh
index fc7b997..9588597 100755
--- a/scripts.d/45-x11/10-xcbproto.sh
+++ b/scripts.d/45-x11/10-xcbproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-SCRIPT_COMMIT="0fc6197034c49d9fdf5607cae201f1ac3270e7de"
+SCRIPT_COMMIT="23865049477f44a6b2fdc9580ee6e857a7f99854"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh
index 2943aa8..ed7dfb8 100755
--- a/scripts.d/45-x11/10-xproto.sh
+++ b/scripts.d/45-x11/10-xproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
-SCRIPT_COMMIT="912e050d8df0fc3d034c8b03d8afe37b9ce15402"
+SCRIPT_COMMIT="a3f847b75025a57b64967d08a299bc752c488aee"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh
index d7d2f5c..4d25542 100755
--- a/scripts.d/45-x11/20-libxau.sh
+++ b/scripts.d/45-x11/20-libxau.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git"
-SCRIPT_COMMIT="3db78d0fa60e07a4ffda61a19849ad30623f70cf"
+SCRIPT_COMMIT="83f33926d43f6ae4cf9734e3aedbef23fb0d6b74"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh
index 0bb9528..bebf5cc 100755
--- a/scripts.d/45-x11/30-libxcb.sh
+++ b/scripts.d/45-x11/30-libxcb.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
-SCRIPT_COMMIT="3123dfe723648c5abeab429e7cb4bd194ceeb8f6"
+SCRIPT_COMMIT="9dcb08170898d3bd5ddb3bc26c514a6bfccf3fae"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index 67bd43e..c0aece2 100755
--- a/scripts.d/45-x11/40-libx11.sh
+++ b/scripts.d/45-x11/40-libx11.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-SCRIPT_COMMIT="9702b836862da6838d725f555e7a1d83faf51740"
+SCRIPT_COMMIT="38033b073f393564acf6a04501927002b2b4aa86"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxext.sh b/scripts.d/45-x11/50-libxext.sh
index 82f836a..e7340a6 100755
--- a/scripts.d/45-x11/50-libxext.sh
+++ b/scripts.d/45-x11/50-libxext.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxext.git"
-SCRIPT_COMMIT="178b95c486a1abcf2395157600dc1a2da7e67441"
+SCRIPT_COMMIT="c6eded76e212419518bd955cad58c96b8653840e"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxfixes.sh b/scripts.d/45-x11/50-libxfixes.sh
index 4afe973..4b042ae 100755
--- a/scripts.d/45-x11/50-libxfixes.sh
+++ b/scripts.d/45-x11/50-libxfixes.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxfixes.git"
-SCRIPT_COMMIT="6fe3bd64dd82f704ed91478acb4c99ab5c00be16"
+SCRIPT_COMMIT="d10ec36c81a6b488d1f700a28c5bff4714287b78"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxi.sh b/scripts.d/45-x11/50-libxi.sh
index 1ce92f1..eec87ab 100755
--- a/scripts.d/45-x11/50-libxi.sh
+++ b/scripts.d/45-x11/50-libxi.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxi.git"
-SCRIPT_COMMIT="f24d7f43ab4d97203e60677a3d42e11dbc80c8b4"
+SCRIPT_COMMIT="bca3474a8622fde5815260461784282f78a4efb5"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxinerama.sh b/scripts.d/45-x11/50-libxinerama.sh
index 8c70f1c..64482c4 100755
--- a/scripts.d/45-x11/50-libxinerama.sh
+++ b/scripts.d/45-x11/50-libxinerama.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxinerama.git"
-SCRIPT_COMMIT="c5187f076d16601c15c59c5a2f05c0513d9f042b"
+SCRIPT_COMMIT="f7c9b2cdd92cfcc1fcf0eb94c7fc5daaed2786f4"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxrender.sh b/scripts.d/45-x11/50-libxrender.sh
index 108e819..81c30a2 100755
--- a/scripts.d/45-x11/50-libxrender.sh
+++ b/scripts.d/45-x11/50-libxrender.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrender.git"
-SCRIPT_COMMIT="bce0618839fc33f44edd8b5498b8e33d167806ff"
+SCRIPT_COMMIT="e314946813bcb96e8baedc1a290c48a2aa6ef162"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxscrnsaver.sh b/scripts.d/45-x11/50-libxscrnsaver.sh
index c12be3a..ed251c5 100755
--- a/scripts.d/45-x11/50-libxscrnsaver.sh
+++ b/scripts.d/45-x11/50-libxscrnsaver.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver.git"
-SCRIPT_COMMIT="aa9fd5061d0a8832480ad0c1acc9d2e864e807f4"
+SCRIPT_COMMIT="d39f92be6b513c28546ebb0baf335f32ab154a89"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxxf86vm.sh b/scripts.d/45-x11/50-libxxf86vm.sh
index f5faca8..2bc6f9e 100755
--- a/scripts.d/45-x11/50-libxxf86vm.sh
+++ b/scripts.d/45-x11/50-libxxf86vm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxxf86vm.git"
-SCRIPT_COMMIT="7f43cd2a905e7b93b83c9ce81dabb768f6fa2bc7"
+SCRIPT_COMMIT="2e27589966d6653e63b56e29b0bea83f722c4c33"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libxrandr.sh b/scripts.d/45-x11/60-libxrandr.sh
index 5708416..9c0e3f8 100755
--- a/scripts.d/45-x11/60-libxrandr.sh
+++ b/scripts.d/45-x11/60-libxrandr.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrandr.git"
-SCRIPT_COMMIT="55dcda4518eda8ae03ef25ea29d3c994ad71eb0a"
+SCRIPT_COMMIT="d66693441f688867e6fd4a5d4a4bdade9a338755"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libxv.sh b/scripts.d/45-x11/60-libxv.sh
index c83add9..7efdfa3 100755
--- a/scripts.d/45-x11/60-libxv.sh
+++ b/scripts.d/45-x11/60-libxv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxv.git"
-SCRIPT_COMMIT="03a6f599d060591a9a7cd8558bd2143a1c7c70d7"
+SCRIPT_COMMIT="ee48980aca0bc9deb61458fdb5ebda3928d944a0"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh
index 9d6be95..19594ba 100755
--- a/scripts.d/50-amf.sh
+++ b/scripts.d/50-amf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
-SCRIPT_COMMIT="9c7189ebb0a78e7e9287547b7898995abf268af8"
+SCRIPT_COMMIT="5c78f194a396938ff0e72128712252151238e372"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index 2eb2c33..8353775 100755
--- a/scripts.d/50-aom.sh
+++ b/scripts.d/50-aom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://aomedia.googlesource.com/aom"
-SCRIPT_COMMIT="5cbe762ad67590d3d4c49d1979a06e063b444bd5"
+SCRIPT_COMMIT="496ae0b2c2fc73a4f09dfa5acf87c5ab2ee360a1"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh
index f8ba4f2..ad03e1e 100755
--- a/scripts.d/50-avisynth.sh
+++ b/scripts.d/50-avisynth.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/AviSynth/AviSynthPlus.git"
-SCRIPT_COMMIT="f6d16bbd3e26c7f84e6b3d47c551f9c2ee705b11"
+SCRIPT_COMMIT="a96f3c6dec89ef969800bcb3603a29aebcc8089d"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index e9ba287..4c6b5a9 100755
--- a/scripts.d/50-dav1d.sh
+++ b/scripts.d/50-dav1d.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="79bc755d19d61644360bef4402fcce69f280ea52"
+SCRIPT_COMMIT="a029d6892c5c39f4cda629d4a3b676ef2e8288f6"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index ace3032..781d178 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libass/libass.git"
-SCRIPT_COMMIT="7bc0c45dd58de6afa1800f8e8a94285e7535d68d"
+SCRIPT_COMMIT="1472ccf73bc8ba8d4bdd37364b52771c4bfa8a8f"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh
index 60b3f66..3f83caf 100755
--- a/scripts.d/50-libbluray.sh
+++ b/scripts.d/50-libbluray.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libbluray.git"
-SCRIPT_COMMIT="8f26777b1ce124ff761f80ef52d6be10bcea323e"
+SCRIPT_COMMIT="3187c3080096e107f0a27eed1843232b58342577"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index 44fec6c..9d0d4a1 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
-SCRIPT_COMMIT="ec093557b0e8f76a48b0a68356d786c664a65660"
+SCRIPT_COMMIT="88507d12340bee9c51d5ec3c6a6a883b72b62281"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh
index f98a8c3..66e3d21 100755
--- a/scripts.d/50-libopus.sh
+++ b/scripts.d/50-libopus.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/opus.git"
-SCRIPT_COMMIT="e4a74ddeb9788eab84d10660e958fe706619892f"
+SCRIPT_COMMIT="ab04fbb1b7d0b727636d28fc2cadb5df9febe515"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index 4317ed5..5139d50 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="68c68ae959bcd13a0be036ea8eb81319f96faf07"
+SCRIPT_COMMIT="2e61a623d4d5408c59f58e7bec713d789b27c3ef"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index 4f2357c..9441d3f 100755
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="5a2d929cd8a627d7a342e78ce4603167022b76af"
+SCRIPT_COMMIT="8a4576ce26bde4b90e073dfb0ae9045b337082c4"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh
index b22775f..7e45c79 100755
--- a/scripts.d/50-lilv/96-lv2.sh
+++ b/scripts.d/50-lilv/96-lv2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lv2.git"
-SCRIPT_COMMIT="d97a1a4daff228bdd62c68859959d13077e47026"
+SCRIPT_COMMIT="03cab09433d7bc5b5e0c1508351053494653a340"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh
index f4d1e19..2969f6e 100755
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/serd.git"
-SCRIPT_COMMIT="2465c3f2779617658cf85d3cbc0ca7b786a4ddca"
+SCRIPT_COMMIT="14f422f6355aaa109d030b81203eb090ad7d2663"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh
index 4ceb3e5..fc83d68 100755
--- a/scripts.d/50-lilv/97-sord.sh
+++ b/scripts.d/50-lilv/97-sord.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/sord.git"
-SCRIPT_COMMIT="ee631481ba7cbe5f6afdf5dd00860eb9bbed57f4"
+SCRIPT_COMMIT="c1cda16cede3998f0f590db932944bce39550820"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh
index c8936e9..77d984c 100755
--- a/scripts.d/50-lilv/98-sratom.sh
+++ b/scripts.d/50-lilv/98-sratom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/sratom.git"
-SCRIPT_COMMIT="8cf09feee6895ba0760f8c24db6416dac9006dc3"
+SCRIPT_COMMIT="bde09a6b5b6597365ad77a2093ff1e5e7110a5df"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh
index e7f08a8..c3cff24 100755
--- a/scripts.d/50-lilv/99-lilv.sh
+++ b/scripts.d/50-lilv/99-lilv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lilv.git"
-SCRIPT_COMMIT="c36d3451278555134de850fc548d743b6da2179a"
+SCRIPT_COMMIT="a15b01e4f211d3fae909c7c7b9bd02045a801ef1"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index a44e3e4..90c35da 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-SCRIPT_REV="17665"
+SCRIPT_REV="17698"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index b898756..4498a3e 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/rav1e.git"
-SCRIPT_COMMIT="182bbff8c4398af56123977ac91f1f3f589fbd85"
+SCRIPT_COMMIT="5518c5940564bb4f3c6012bc1542a75ef4857f2e"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index b3460f8..87f6736 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
-SCRIPT_COMMIT="06c7d22653b7fe5d0aeb9739bcb9666f9f327192"
+SCRIPT_COMMIT="16e699a76155b8babb51e14d03b1c65eb6c589bb"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index 2502127..d10991a 100755
--- a/scripts.d/50-srt.sh
+++ b/scripts.d/50-srt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Haivision/srt.git"
-SCRIPT_COMMIT="ced76c7b778c4a91d2bd9ad735ca9089dbcd3128"
+SCRIPT_COMMIT="e48f43d546457f3386702d032d7d7e08cd0a5b19"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-vaapi/30-libpciaccess.sh b/scripts.d/50-vaapi/30-libpciaccess.sh
index d610d23..484cb46 100755
--- a/scripts.d/50-vaapi/30-libpciaccess.sh
+++ b/scripts.d/50-vaapi/30-libpciaccess.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git"
-SCRIPT_COMMIT="1fa5d4bdfcc6fea44f9abf353d25f3a5d013f5d7"
+SCRIPT_COMMIT="a8abf913ad6b60492ef7b6ae512c4f879604a6a7"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index 70dc6da..54c9ded 100755
--- a/scripts.d/50-vaapi/40-libdrm.sh
+++ b/scripts.d/50-vaapi/40-libdrm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-SCRIPT_COMMIT="60cf6bcef1390473419df14e3214da149dbd8f99"
+SCRIPT_COMMIT="98794e2a0d537f3376970918bf955361191720c7"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh
index 1886e27..a12d645 100755
--- a/scripts.d/50-vaapi/50-libva.sh
+++ b/scripts.d/50-vaapi/50-libva.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/intel/libva.git"
-SCRIPT_COMMIT="82e400e3b1615cf589568ac19689f2610ebcf244"
+SCRIPT_COMMIT="0a989c9f0af69dcb15253945228c53780f019b79"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index d6dbd3b..a34b77a 100755
--- a/scripts.d/50-vulkan/45-vulkan.sh
+++ b/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-SCRIPT_COMMIT="v1.3.220"
+SCRIPT_COMMIT="v1.3.224"
SCRIPT_TAGFILTER="v?.*.*"
ffbuild_enabled() {
diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh
index 6e2d48c..37d9b71 100755
--- a/scripts.d/50-vulkan/55-spirv-cross.sh
+++ b/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SCRIPT_COMMIT="d8d051381f65b9606fb8016c79b7c3bab872eec3"
+SCRIPT_COMMIT="0cccd0a65a67f33922f8d0742b5930fd15353fa7"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index c1a35cf..56afd57 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git"
-SCRIPT_COMMIT="32837eb1028f7d4197b02cebca9b6e0857a1dbf8"
+SCRIPT_COMMIT="eeab271b4871c1639c961243c19d6761835463c2"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh
index 05501bd..aff943a 100755
--- a/scripts.d/50-zimg.sh
+++ b/scripts.d/50-zimg.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git"
-SCRIPT_COMMIT="598610059037bd815eedfec4f5b3683e8066446c"
+SCRIPT_COMMIT="afae03a94937cc6c84da93f7de815ec0a9e52089"
ffbuild_enabled() {
return 0
From 21f5e861bb873bae936e6e64997c834accd7d707 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 4 Aug 2022 20:25:22 +0200
Subject: [PATCH 062/160] Adjust build scripts after updates
---
scripts.d/50-lilv/96-lv2.sh | 28 ++++++++++++++++++-------
scripts.d/50-lilv/96-serd.sh | 2 --
scripts.d/50-lilv/97-sord.sh | 28 +++++++++++++++++--------
scripts.d/50-lilv/98-sratom.sh | 26 ++++++++++++++++-------
scripts.d/50-lilv/99-lilv.sh | 31 ++++++++++++++++++----------
scripts.d/50-vulkan/60-libplacebo.sh | 1 +
6 files changed, 79 insertions(+), 37 deletions(-)
diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh
index 7e45c79..7ecc6ce 100755
--- a/scripts.d/50-lilv/96-lv2.sh
+++ b/scripts.d/50-lilv/96-lv2.sh
@@ -10,15 +10,29 @@ ffbuild_enabled() {
ffbuild_dockerbuild() {
git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" lv2
cd lv2
- git submodule update --init --recursive --depth 1
- local mywaf=(
+ mkdir build && cd build
+
+ local myconf=(
--prefix="$FFBUILD_PREFIX"
- --no-plugins
- --no-coverage
+ --buildtype=release
+ --default-library=static
+ -Ddocs=disabled
+ -Dplugins=disabled
+ -Dtests=disabled
+ -Donline_docs=false
)
- CC="${FFBUILD_CROSS_PREFIX}gcc" CXX="${FFBUILD_CROSS_PREFIX}g++" ./waf configure "${mywaf[@]}"
- ./waf -j$(nproc)
- ./waf install
+ if [[ $TARGET == win* || $TARGET == linux* ]]; then
+ myconf+=(
+ --cross-file=/cross.meson
+ )
+ else
+ echo "Unknown target"
+ return -1
+ fi
+
+ meson "${myconf[@]}" ..
+ ninja -j"$(nproc)"
+ ninja install
}
diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh
index 2969f6e..478ee38 100755
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@@ -34,6 +34,4 @@ ffbuild_dockerbuild() {
meson "${myconf[@]}" ..
ninja -j"$(nproc)"
ninja install
-
- sed -i 's/Cflags:/Cflags: -DSERD_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/serd-0.pc
}
diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh
index fc83d68..39c5530 100755
--- a/scripts.d/50-lilv/97-sord.sh
+++ b/scripts.d/50-lilv/97-sord.sh
@@ -10,18 +10,28 @@ ffbuild_enabled() {
ffbuild_dockerbuild() {
git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sord
cd sord
- git submodule update --init --recursive --depth 1
- local mywaf=(
+ mkdir build && cd build
+
+ local myconf=(
--prefix="$FFBUILD_PREFIX"
- --no-utils
- --static
- --no-shared
+ --buildtype=release
+ --default-library=static
+ -Ddocs=disabled
+ -Dtools=disabled
+ -Dtests=disabled
)
- CC="${FFBUILD_CROSS_PREFIX}gcc" CXX="${FFBUILD_CROSS_PREFIX}g++" ./waf configure "${mywaf[@]}"
- ./waf -j$(nproc)
- ./waf install
+ if [[ $TARGET == win* || $TARGET == linux* ]]; then
+ myconf+=(
+ --cross-file=/cross.meson
+ )
+ else
+ echo "Unknown target"
+ return -1
+ fi
- sed -i 's/Cflags:/Cflags: -DSORD_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/sord-0.pc
+ meson "${myconf[@]}" ..
+ ninja -j"$(nproc)"
+ ninja install
}
diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh
index 77d984c..a4aeaa0 100755
--- a/scripts.d/50-lilv/98-sratom.sh
+++ b/scripts.d/50-lilv/98-sratom.sh
@@ -10,17 +10,27 @@ ffbuild_enabled() {
ffbuild_dockerbuild() {
git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sratom
cd sratom
- git submodule update --init --recursive --depth 1
- local mywaf=(
+ mkdir build && cd build
+
+ local myconf=(
--prefix="$FFBUILD_PREFIX"
- --static
- --no-shared
+ --buildtype=release
+ --default-library=static
+ -Ddocs=disabled
+ -Dtests=disabled
)
- CC="${FFBUILD_CROSS_PREFIX}gcc" CXX="${FFBUILD_CROSS_PREFIX}g++" ./waf configure "${mywaf[@]}"
- ./waf -j$(nproc)
- ./waf install
+ if [[ $TARGET == win* || $TARGET == linux* ]]; then
+ myconf+=(
+ --cross-file=/cross.meson
+ )
+ else
+ echo "Unknown target"
+ return -1
+ fi
- sed -i 's/Cflags:/Cflags: -DSRATOM_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/sratom-0.pc
+ meson "${myconf[@]}" ..
+ ninja -j"$(nproc)"
+ ninja install
}
diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh
index c3cff24..e6dbade 100755
--- a/scripts.d/50-lilv/99-lilv.sh
+++ b/scripts.d/50-lilv/99-lilv.sh
@@ -10,22 +10,31 @@ ffbuild_enabled() {
ffbuild_dockerbuild() {
git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" lilv
cd lilv
- git submodule update --init --recursive --depth 1
- local mywaf=(
+ mkdir build && cd build
+
+ local myconf=(
--prefix="$FFBUILD_PREFIX"
- --static
- --no-shared
- --no-bindings
- --no-utils
- --no-bash-completion
+ --buildtype=release
+ --default-library=static
+ -Ddocs=disabled
+ -Dtools=disabled
+ -Dtests=disabled
+ -Dbindings_py=disabled
)
- CC="${FFBUILD_CROSS_PREFIX}gcc" CXX="${FFBUILD_CROSS_PREFIX}g++" ./waf configure "${mywaf[@]}"
- ./waf -j$(nproc)
- ./waf install
+ if [[ $TARGET == win* || $TARGET == linux* ]]; then
+ myconf+=(
+ --cross-file=/cross.meson
+ )
+ else
+ echo "Unknown target"
+ return -1
+ fi
- sed -i 's/Cflags:/Cflags: -DLILV_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/lilv-0.pc
+ meson "${myconf[@]}" ..
+ ninja -j"$(nproc)"
+ ninja install
}
ffbuild_configure() {
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index 56afd57..27ade7d 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -11,6 +11,7 @@ ffbuild_enabled() {
ffbuild_dockerbuild() {
git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" placebo
cd placebo
+ git submodule update --init --recursive
mkdir build && cd build
From 11741adccbb79d23ebff43972cca91a14ec0f935 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Fri, 5 Aug 2022 12:32:16 +0200
Subject: [PATCH 063/160] Retry flakey hg clone
---
scripts.d/25-gmp.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh
index 564adbf..39b3088 100755
--- a/scripts.d/25-gmp.sh
+++ b/scripts.d/25-gmp.sh
@@ -8,7 +8,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- hg clone -r "$SCRIPT_HGREV" -u "$SCRIPT_HGREV" "$SCRIPT_REPO" gmp
+ retry-tool sh -c "rm -rf gmp && hg clone -r '$SCRIPT_HGREV' -u '$SCRIPT_HGREV' '$SCRIPT_REPO' gmp"
cd gmp
./.bootstrap
From 3ccb2f20b43fd21b244ca62d35132d0431dbcf72 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Fri, 12 Aug 2022 14:29:44 +0200
Subject: [PATCH 064/160] Add preliminary libvpl support
---
addins/onevpl.sh | 1 +
scripts.d/50-mfx.sh | 2 +-
scripts.d/50-onevpl.sh | 43 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 addins/onevpl.sh
create mode 100755 scripts.d/50-onevpl.sh
diff --git a/addins/onevpl.sh b/addins/onevpl.sh
new file mode 100644
index 0000000..a9bf588
--- /dev/null
+++ b/addins/onevpl.sh
@@ -0,0 +1 @@
+#!/bin/bash
diff --git a/scripts.d/50-mfx.sh b/scripts.d/50-mfx.sh
index 6ec2b96..85e15eb 100755
--- a/scripts.d/50-mfx.sh
+++ b/scripts.d/50-mfx.sh
@@ -38,7 +38,7 @@ ffbuild_dockerbuild() {
}
ffbuild_configure() {
- echo --enable-libmfx
+ [[ $ADDINS_STR == *onevpl* ]] || echo --enable-libmfx
}
ffbuild_unconfigure() {
diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh
new file mode 100755
index 0000000..6393d96
--- /dev/null
+++ b/scripts.d/50-onevpl.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+SCRIPT_REPO="https://github.com/oneapi-src/oneVPL.git"
+SCRIPT_COMMIT="2232af4cdb13c0018d965c3b040466ad89b1922b"
+
+ffbuild_enabled() {
+ [[ $TARGET == *arm64 ]] && return -1
+ [[ $ADDINS_STR == *4.4* ]] && return -1
+ [[ $ADDINS_STR == *5.0* ]] && return -1
+ [[ $ADDINS_STR == *5.1* ]] && return -1
+ return 0
+}
+
+ffbuild_dockerbuild() {
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" onevpl
+ cd onevpl
+
+ mkdir build && cd build
+
+ cmake -GNinja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
+ -DBUILD_DISPATCHER=ON -DBUILD_DEV=ON \
+ -DBUILD_PREVIEW=OFF -DBUILD_TOOLS=OFF -DBUILD_TOOLS_ONEVPL_EXPERIMENTAL=OFF -DINSTALL_EXAMPLE_CODE=OFF \
+ -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF ..
+
+ ninja -j$(nproc)
+ ninja install
+
+ rm -rf "$FFBUILD_PREFIX"/{etc,share}
+
+ cat /opt/ffbuild/lib/pkgconfig/vpl.pc
+}
+
+ffbuild_configure() {
+ [[ $ADDINS_STR == *onevpl* ]] && echo --enable-libvpl
+}
+
+ffbuild_unconfigure() {
+ [[ $ADDINS_STR == *4.4* ]] && return 0
+ [[ $ADDINS_STR == *5.0* ]] && return 0
+ [[ $ADDINS_STR == *5.1* ]] && return 0
+
+ echo --disable-libvpl
+}
From 8c1fe93e892d1e0ac506a45e6b40d1cd71709330 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Tue, 16 Aug 2022 12:44:22 +0200
Subject: [PATCH 065/160] Update dependencies
---
scripts.d/10-mingw.sh | 2 +-
scripts.d/20-libxml2.sh | 2 +-
scripts.d/25-freetype.sh | 2 +-
scripts.d/25-gmp.sh | 2 +-
scripts.d/45-harfbuzz.sh | 2 +-
scripts.d/45-pulseaudio.sh | 2 +-
scripts.d/45-vmaf.sh | 2 +-
scripts.d/45-x11/10-xproto.sh | 2 +-
scripts.d/45-x11/40-libx11.sh | 2 +-
scripts.d/50-aom.sh | 2 +-
scripts.d/50-avisynth.sh | 2 +-
scripts.d/50-ffnvcodec.sh | 2 +-
scripts.d/50-libass.sh | 2 +-
scripts.d/50-libbluray.sh | 2 +-
scripts.d/50-libjxl/50-libjxl.sh | 2 +-
scripts.d/50-libopus.sh | 2 +-
scripts.d/50-libvpx.sh | 2 +-
scripts.d/50-libwebp.sh | 2 +-
scripts.d/50-lilv/96-lv2.sh | 2 +-
scripts.d/50-lilv/96-serd.sh | 2 +-
scripts.d/50-lilv/97-sord.sh | 2 +-
scripts.d/50-lilv/98-sratom.sh | 2 +-
scripts.d/50-lilv/99-lilv.sh | 2 +-
scripts.d/50-openjpeg.sh | 2 +-
scripts.d/50-openmpt.sh | 2 +-
scripts.d/50-rav1e.sh | 2 +-
scripts.d/50-rubberband.sh | 2 +-
scripts.d/50-sdl.sh | 2 +-
scripts.d/50-srt.sh | 2 +-
scripts.d/50-svtav1.sh | 2 +-
scripts.d/50-vaapi/30-libpciaccess.sh | 2 +-
scripts.d/50-vaapi/50-libva.sh | 2 +-
scripts.d/50-vulkan/50-shaderc.sh | 2 +-
scripts.d/50-vulkan/55-spirv-cross.sh | 2 +-
scripts.d/50-vulkan/60-libplacebo.sh | 2 +-
35 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index 1c3ffcb..57f5b40 100755
--- a/scripts.d/10-mingw.sh
+++ b/scripts.d/10-mingw.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/mirror/mingw-w64.git"
-SCRIPT_COMMIT="aacb650beeeaddaf399b4a05449c18c3b018da3e"
+SCRIPT_COMMIT="fcbc39cf846c12c898998b82fe8126601884b4e2"
ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh
index ac54e3e..d86785a 100755
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-SCRIPT_COMMIT="e986d09cf531e77a9ab46af2d1a219072f310190"
+SCRIPT_COMMIT="a09c89545d3ed5b56701abcc5d638faa01c5c903"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index a754927..158a778 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
-SCRIPT_COMMIT="90e1e39f50f9431e41fc3fb21b8d8f75fd5b4b9c"
+SCRIPT_COMMIT="7cd3f19f21cc9d600e3b765ef2058474d20233e2"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh
index 39b3088..801dbd1 100755
--- a/scripts.d/25-gmp.sh
+++ b/scripts.d/25-gmp.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gmplib.org/repo/gmp/"
-SCRIPT_HGREV="cc75cab76738"
+SCRIPT_HGREV="d337756619a0"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index 7d76cff..4f1bbbc 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="b78546b1d2af284ae1cb9d98732016a149322680"
+SCRIPT_COMMIT="4ab7e579cb8f4fd4f5ee2e1c0404e58edf8eb8e6"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index e5bc90b..41fb6b2 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-SCRIPT_COMMIT="1b031ecee69142c4b0ff6ea9767c0cabb61af144"
+SCRIPT_COMMIT="8188b49bed7be08e23abcf92b098f62c1fc5c2ec"
ffbuild_enabled() {
[[ $TARGET == linux* ]] || return 1
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index 5b095dc..dbaa2b0 100755
--- a/scripts.d/45-vmaf.sh
+++ b/scripts.d/45-vmaf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
-SCRIPT_COMMIT="764d69d48ec163c1545373ca45164b37370140a6"
+SCRIPT_COMMIT="905b07fccd1243f70eff2a264cc21493591c77bf"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh
index ed7dfb8..315e51f 100755
--- a/scripts.d/45-x11/10-xproto.sh
+++ b/scripts.d/45-x11/10-xproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
-SCRIPT_COMMIT="a3f847b75025a57b64967d08a299bc752c488aee"
+SCRIPT_COMMIT="824001c947cb1962209c6a8f2c63c2637877220d"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index c0aece2..b1ffe24 100755
--- a/scripts.d/45-x11/40-libx11.sh
+++ b/scripts.d/45-x11/40-libx11.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-SCRIPT_COMMIT="38033b073f393564acf6a04501927002b2b4aa86"
+SCRIPT_COMMIT="1272879074ad9612314858a75cf844783c1963b2"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index 8353775..96920d9 100755
--- a/scripts.d/50-aom.sh
+++ b/scripts.d/50-aom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://aomedia.googlesource.com/aom"
-SCRIPT_COMMIT="496ae0b2c2fc73a4f09dfa5acf87c5ab2ee360a1"
+SCRIPT_COMMIT="b86730bfae5c9d3f09cd709d8a852da31641b2fa"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh
index ad03e1e..33956b6 100755
--- a/scripts.d/50-avisynth.sh
+++ b/scripts.d/50-avisynth.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/AviSynth/AviSynthPlus.git"
-SCRIPT_COMMIT="a96f3c6dec89ef969800bcb3603a29aebcc8089d"
+SCRIPT_COMMIT="9b55e9cd7e0f2b251b6a3d6930af08d31cd90d6e"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh
index 999902f..f20e6b0 100755
--- a/scripts.d/50-ffnvcodec.sh
+++ b/scripts.d/50-ffnvcodec.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git"
-SCRIPT_COMMIT="84483da70d903239d4536763fde8c7e6c4e80784"
+SCRIPT_COMMIT="3ed7c9a0a2c0b698b83088e13008f3ec983219b2"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index 781d178..47c5e12 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libass/libass.git"
-SCRIPT_COMMIT="1472ccf73bc8ba8d4bdd37364b52771c4bfa8a8f"
+SCRIPT_COMMIT="b890df23eb8931728acdf240fd5d29e53401b4f2"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh
index 3f83caf..cbc34c3 100755
--- a/scripts.d/50-libbluray.sh
+++ b/scripts.d/50-libbluray.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libbluray.git"
-SCRIPT_COMMIT="3187c3080096e107f0a27eed1843232b58342577"
+SCRIPT_COMMIT="e99df3adeb07420b72690ac09a147c8f34876eb8"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index 9d0d4a1..61169c1 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
-SCRIPT_COMMIT="88507d12340bee9c51d5ec3c6a6a883b72b62281"
+SCRIPT_COMMIT="ee80799d9e79511cb1597d6e94d69a4baddb8acc"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh
index 66e3d21..03d0e56 100755
--- a/scripts.d/50-libopus.sh
+++ b/scripts.d/50-libopus.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/opus.git"
-SCRIPT_COMMIT="ab04fbb1b7d0b727636d28fc2cadb5df9febe515"
+SCRIPT_COMMIT="997fdf54e781ae1c04dee42018f35388a04fe483"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index 5139d50..3cfadd1 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="2e61a623d4d5408c59f58e7bec713d789b27c3ef"
+SCRIPT_COMMIT="2f2ede692e8af4f9b59183d6bd8e7fefe8d8cffc"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index 9441d3f..3280d56 100755
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="8a4576ce26bde4b90e073dfb0ae9045b337082c4"
+SCRIPT_COMMIT="9b902cbacedd0fb19de5ce4475d7a8345d7fe9cf"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh
index 7ecc6ce..66340c3 100755
--- a/scripts.d/50-lilv/96-lv2.sh
+++ b/scripts.d/50-lilv/96-lv2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lv2.git"
-SCRIPT_COMMIT="03cab09433d7bc5b5e0c1508351053494653a340"
+SCRIPT_COMMIT="c8fb4d21901a4de2c822df537202b6a313e89edd"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh
index 478ee38..a08117d 100755
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/serd.git"
-SCRIPT_COMMIT="14f422f6355aaa109d030b81203eb090ad7d2663"
+SCRIPT_COMMIT="f4f9c9ec4c1031fc42af80642760a9138c3eaabc"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh
index 39c5530..2d5264b 100755
--- a/scripts.d/50-lilv/97-sord.sh
+++ b/scripts.d/50-lilv/97-sord.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/sord.git"
-SCRIPT_COMMIT="c1cda16cede3998f0f590db932944bce39550820"
+SCRIPT_COMMIT="9960380c5581b02e927e39c51cb1c38d020a30b6"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh
index a4aeaa0..a3f8723 100755
--- a/scripts.d/50-lilv/98-sratom.sh
+++ b/scripts.d/50-lilv/98-sratom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/sratom.git"
-SCRIPT_COMMIT="bde09a6b5b6597365ad77a2093ff1e5e7110a5df"
+SCRIPT_COMMIT="0713ba20a26c3eb6ae2574b2a23be87ff496f552"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh
index e6dbade..02df06f 100755
--- a/scripts.d/50-lilv/99-lilv.sh
+++ b/scripts.d/50-lilv/99-lilv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lilv.git"
-SCRIPT_COMMIT="a15b01e4f211d3fae909c7c7b9bd02045a801ef1"
+SCRIPT_COMMIT="96d897c5981d60ac52c33a9f9ac66753998fa4ed"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh
index 80be0f4..96d78b2 100755
--- a/scripts.d/50-openjpeg.sh
+++ b/scripts.d/50-openjpeg.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/uclouvain/openjpeg.git"
-SCRIPT_COMMIT="e3f07dcc07c651321ec3b5f540ef698bbe6f1906"
+SCRIPT_COMMIT="be95561917aa9b1d8ea4614820a534917cfa6bbe"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index 90c35da..ad9ae1b 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-SCRIPT_REV="17698"
+SCRIPT_REV="17745"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index 4498a3e..f79dae4 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/rav1e.git"
-SCRIPT_COMMIT="5518c5940564bb4f3c6012bc1542a75ef4857f2e"
+SCRIPT_COMMIT="537b1b91b861210062b1cf105a5bd0243bab0b90"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index 846d386..aa0fcf1 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/breakfastquay/rubberband.git"
-SCRIPT_COMMIT="766cb4b061e468cd5676bcff56b61f7805cc798b"
+SCRIPT_COMMIT="e3ae576fcd0083f0b5c8cf5ecaa011a0bb46b35e"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index 87f6736..c18b6dd 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
-SCRIPT_COMMIT="16e699a76155b8babb51e14d03b1c65eb6c589bb"
+SCRIPT_COMMIT="9670d2bb9ed19e3720c58378fe3eadab1ea0c40e"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index d10991a..64ea742 100755
--- a/scripts.d/50-srt.sh
+++ b/scripts.d/50-srt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Haivision/srt.git"
-SCRIPT_COMMIT="e48f43d546457f3386702d032d7d7e08cd0a5b19"
+SCRIPT_COMMIT="666ee63bc8fdc6e32922e82a4bfb60623652994f"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index 28474e1..76a6aee 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="14c38dca41e352a89643c4a89bc5417b7e5c1ae8"
+SCRIPT_COMMIT="6e24fb7f5f7438bb04061dc1a159f0c5b882d847"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-vaapi/30-libpciaccess.sh b/scripts.d/50-vaapi/30-libpciaccess.sh
index 484cb46..3e9a9db 100755
--- a/scripts.d/50-vaapi/30-libpciaccess.sh
+++ b/scripts.d/50-vaapi/30-libpciaccess.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git"
-SCRIPT_COMMIT="a8abf913ad6b60492ef7b6ae512c4f879604a6a7"
+SCRIPT_COMMIT="361356b08003f5e3c606e16eeb6a17fe02ff2726"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh
index a12d645..e961c26 100755
--- a/scripts.d/50-vaapi/50-libva.sh
+++ b/scripts.d/50-vaapi/50-libva.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/intel/libva.git"
-SCRIPT_COMMIT="0a989c9f0af69dcb15253945228c53780f019b79"
+SCRIPT_COMMIT="e4603ed481aa305002ba133b0108d210d308f45c"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh
index 225889f..15d1e1c 100755
--- a/scripts.d/50-vulkan/50-shaderc.sh
+++ b/scripts.d/50-vulkan/50-shaderc.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/google/shaderc.git"
-SCRIPT_COMMIT="a0a247d09229669d19b268eb8051eeda880449c1"
+SCRIPT_COMMIT="31bddbb37ef1e974da7bce859ab59bcfc5ad9ee7"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh
index 37d9b71..be3f400 100755
--- a/scripts.d/50-vulkan/55-spirv-cross.sh
+++ b/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SCRIPT_COMMIT="0cccd0a65a67f33922f8d0742b5930fd15353fa7"
+SCRIPT_COMMIT="61c603f3baa5270e04bcfb6acf83c654e3c57679"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index 27ade7d..903c8b4 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git"
-SCRIPT_COMMIT="eeab271b4871c1639c961243c19d6761835463c2"
+SCRIPT_COMMIT="0f0e3b36824ab3ebde6844040f3a4399a4628592"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
From 5be16c76720556edeeb2dee4a4406fa3cbce5a06 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Tue, 16 Aug 2022 17:10:37 +0200
Subject: [PATCH 066/160] Downgrade rav1e to last working version
---
scripts.d/50-rav1e.sh | 30 +++++++++++++++++++++++++-----
1 file changed, 25 insertions(+), 5 deletions(-)
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index f79dae4..f291f85 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/rav1e.git"
-SCRIPT_COMMIT="537b1b91b861210062b1cf105a5bd0243bab0b90"
+SCRIPT_COMMIT="db7a71ae53a31a60bf31bd0635f46e15bdcc444c"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
@@ -16,18 +16,38 @@ ffbuild_dockerbuild() {
--prefix="$FFBUILD_PREFIX" \
--library-type=staticlib \
--crt-static \
- --release
)
+ if [[ $TARGET == win_not_yet ]]; then
+ # CHECKME: back to release once lto is fixed
+ myconf+=(
+ --profile release-no-lto
+ )
+ else
+ myconf+=(
+ --release
+ )
+ fi
+
+ export CC="${FFBUILD_CROSS_PREFIX}gcc"
+ export CXX="${FFBUILD_CROSS_PREFIX}g++"
+ export LD="${FFBUILD_CROSS_PREFIX}gcc"
+ export AR="${FFBUILD_CROSS_PREFIX}ar"
+
if [[ -n "$FFBUILD_RUST_TARGET" ]]; then
myconf+=(
--target="$FFBUILD_RUST_TARGET"
)
+ cat <<EOF >$CARGO_HOME/config.toml
+[build]
+target = "$FFBUILD_RUST_TARGET"
+[target.$FFBUILD_RUST_TARGET]
+linker = "$LD"
+ar = "$AR"
+EOF
fi
- export CC="${FFBUILD_CROSS_PREFIX}gcc"
-
- cargo cinstall "${myconf[@]}"
+ cargo cinstall -v "${myconf[@]}"
}
ffbuild_configure() {
From 512e0fe9b4851983ceaffb588960cea715e9cad8 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 17 Aug 2022 20:50:30 +0200
Subject: [PATCH 067/160] Work around weird library install overrides by
onevpls build system
---
scripts.d/50-onevpl.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh
index 6393d96..e26cb1d 100755
--- a/scripts.d/50-onevpl.sh
+++ b/scripts.d/50-onevpl.sh
@@ -18,6 +18,7 @@ ffbuild_dockerbuild() {
mkdir build && cd build
cmake -GNinja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
+ -DCMAKE_INSTALL_BINDIR="$FFBUILD_PREFIX"/bin -DCMAKE_INSTALL_LIBDIR="$FFBUILD_PREFIX"/lib \
-DBUILD_DISPATCHER=ON -DBUILD_DEV=ON \
-DBUILD_PREVIEW=OFF -DBUILD_TOOLS=OFF -DBUILD_TOOLS_ONEVPL_EXPERIMENTAL=OFF -DINSTALL_EXAMPLE_CODE=OFF \
-DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF ..
From d4de0513b5b937644c9938e517798d04bcd9b8e7 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 18 Aug 2022 10:23:25 +0200
Subject: [PATCH 068/160] Only do one full build per target on PR builds
---
.github/workflows/pr.yml | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 3843ee9..9c7fbb3 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -18,7 +18,18 @@ jobs:
fail-fast: false
matrix:
target: [win64,linux64,linuxarm64]
- variant: [gpl,lgpl,gpl 4.4,gpl 5.1,lgpl 4.4,lgpl 5.1,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.1,lgpl-shared 4.4,lgpl-shared 5.1]
+ variant: [lgpl,gpl 4.4,gpl 5.1,lgpl 4.4,lgpl 5.1,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.1,lgpl-shared 4.4,lgpl-shared 5.1]
+ quickbuild: [1]
+ include:
+ - target: win64
+ variant: gpl
+ quickbuild: ''
+ - target: linux64
+ variant: gpl
+ quickbuild: ''
+ - target: linuxarm64
+ variant: gpl
+ quickbuild: ''
steps:
- name: Checkout
uses: actions/checkout@v3
@@ -29,6 +40,8 @@ jobs:
driver: docker
- name: Build Image
run: ./makeimage.sh ${{ matrix.target }} ${{ matrix.variant }}
+ env:
+ QUICKBUILD: ${{ matrix.quickbuild }}
- name: Build ffmpeg
run: ./build.sh ${{ matrix.target }} ${{ matrix.variant }}
- name: Upload artifacts
From c406209c93271a00f52297ba240d32bae2f449c2 Mon Sep 17 00:00:00 2001
From: nanake <nanake@users.noreply.github.com>
Date: Thu, 18 Aug 2022 16:59:15 +0900
Subject: [PATCH 069/160] Add kvazaar
Closes #173
Signed-off-by: nanake <nanake@users.noreply.github.com>
---
scripts.d/50-kvazaar.sh | 45 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
create mode 100755 scripts.d/50-kvazaar.sh
diff --git a/scripts.d/50-kvazaar.sh b/scripts.d/50-kvazaar.sh
new file mode 100755
index 0000000..cd34ebe
--- /dev/null
+++ b/scripts.d/50-kvazaar.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+SCRIPT_REPO="https://github.com/ultravideo/kvazaar.git"
+SCRIPT_COMMIT="76ce0c7716f593b5f4614aa864603684dd4fae3d"
+
+ffbuild_enabled() {
+ return 0
+}
+
+ffbuild_dockerbuild() {
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" kvazaar
+ cd kvazaar
+
+ ./autogen.sh
+
+ local myconf=(
+ --prefix="$FFBUILD_PREFIX"
+ --disable-shared
+ --enable-static
+ --with-pic
+ )
+
+ if [[ $TARGET == win* || $TARGET == linux* ]]; then
+ myconf+=(
+ --host="$FFBUILD_TOOLCHAIN"
+ )
+ else
+ echo "Unknown target"
+ return -1
+ fi
+
+ ./configure "${myconf[@]}"
+ make -j$(nproc)
+ make install
+
+ echo "Cflags.private: -DKVZ_STATIC_LIB" >> "$FFBUILD_PREFIX"/lib/pkgconfig/kvazaar.pc
+}
+
+ffbuild_configure() {
+ echo --enable-libkvazaar
+}
+
+ffbuild_unconfigure() {
+ echo --disable-libkvazaar
+}
From 843642ae9b5c12dc710b78db771bbd69de076ba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AA=E3=81=AA=E3=81=91?=
<467392+nanake@users.noreply.github.com>
Date: Sun, 21 Aug 2022 23:56:41 +0700
Subject: [PATCH 070/160] Add libssh (#186)
Closes #158
Signed-off-by: nanake <nanake@users.noreply.github.com>
---
scripts.d/50-libssh.sh | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100755 scripts.d/50-libssh.sh
diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh
new file mode 100755
index 0000000..51dbf75
--- /dev/null
+++ b/scripts.d/50-libssh.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+SCRIPT_REPO="https://git.libssh.org/projects/libssh.git"
+SCRIPT_COMMIT="ac6d2fad4a8bf07277127736367e90387646363f"
+
+ffbuild_enabled() {
+ return 0
+}
+
+ffbuild_dockerbuild() {
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libssh
+ cd libssh
+
+ mkdir build && cd build
+
+ if [[ $TARGET == win* ]]; then
+ export CFLAGS="$CFLAGS -Dgettimeofday=ssh_gettimeofday"
+ export CXXFLAGS="$CFLAGS -Dgettimeofday=ssh_gettimeofday"
+ fi
+
+ cmake -GNinja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
+ -DBUILD_SHARED_LIBS=OFF \
+ -DWITH_EXAMPLES=OFF -DWITH_SERVER=OFF \
+ -DWITH_SFTP=ON -DWITH_ZLIB=ON ..
+
+ ninja -j$(nproc)
+ ninja install
+
+ {
+ echo "Requires.private: libssl libcrypto zlib"
+ echo "Cflags.private: -DLIBSSH_STATIC"
+ } >> "$FFBUILD_PREFIX"/lib/pkgconfig/libssh.pc
+}
+
+ffbuild_configure() {
+ echo --enable-libssh
+}
+
+ffbuild_unconfigure() {
+ echo --disable-libssh
+}
From c9a6797b95d9e8da3217e1a6101d527f93dbdf9d Mon Sep 17 00:00:00 2001
From: ZaquL <104958042+ZaquL@users.noreply.github.com>
Date: Wed, 31 Aug 2022 21:11:10 +0300
Subject: [PATCH 071/160] Bump uavs3d version
Old commit has been removed from history
---
scripts.d/50-uavs3d.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh
index 62f823a..b396f94 100755
--- a/scripts.d/50-uavs3d.sh
+++ b/scripts.d/50-uavs3d.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/uavs3/uavs3d.git"
-SCRIPT_COMMIT="818a0cb719c0cd012f21ad0b9c5d83669e36f861"
+SCRIPT_COMMIT="6a6b98a91f221fb0d4d9febe9a045ed287c588bb"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
From d7fe57032622fc9a5443864caccff70660935173 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 1 Sep 2022 15:49:07 +0200
Subject: [PATCH 072/160] Update dependencies
---
scripts.d/10-mingw.sh | 2 +-
scripts.d/20-libxml2.sh | 2 +-
scripts.d/25-freetype.sh | 2 +-
scripts.d/25-gmp.sh | 2 +-
scripts.d/45-harfbuzz.sh | 2 +-
scripts.d/45-opencl.sh | 2 +-
scripts.d/45-pulseaudio.sh | 2 +-
scripts.d/45-vmaf.sh | 2 +-
scripts.d/45-x11/10-xproto.sh | 2 +-
scripts.d/45-x11/10-xtrans.sh | 2 +-
scripts.d/45-x11/20-libxau.sh | 2 +-
scripts.d/45-x11/50-libxi.sh | 2 +-
scripts.d/45-x11/50-libxxf86vm.sh | 2 +-
scripts.d/45-x11/60-libglvnd.sh | 2 +-
scripts.d/50-amf.sh | 2 +-
scripts.d/50-aom.sh | 2 +-
scripts.d/50-dav1d.sh | 2 +-
scripts.d/50-kvazaar.sh | 2 +-
scripts.d/50-libass.sh | 2 +-
scripts.d/50-libbluray.sh | 2 +-
scripts.d/50-libjxl/50-libjxl.sh | 2 +-
scripts.d/50-libssh.sh | 2 +-
scripts.d/50-libvpx.sh | 2 +-
scripts.d/50-libwebp.sh | 2 +-
scripts.d/50-lilv/96-lv2.sh | 2 +-
scripts.d/50-lilv/96-serd.sh | 2 +-
scripts.d/50-lilv/97-sord.sh | 2 +-
scripts.d/50-lilv/98-sratom.sh | 2 +-
scripts.d/50-lilv/99-lilv.sh | 2 +-
scripts.d/50-onevpl.sh | 2 +-
scripts.d/50-openh264.sh | 2 +-
scripts.d/50-openmpt.sh | 2 +-
scripts.d/50-rav1e.sh | 2 +-
scripts.d/50-rubberband.sh | 2 +-
scripts.d/50-sdl.sh | 2 +-
scripts.d/50-srt.sh | 2 +-
scripts.d/50-svtav1.sh | 2 +-
scripts.d/50-vaapi/30-libpciaccess.sh | 2 +-
scripts.d/50-vaapi/40-libdrm.sh | 2 +-
scripts.d/50-vulkan/45-vulkan.sh | 2 +-
scripts.d/50-vulkan/55-spirv-cross.sh | 2 +-
scripts.d/50-vulkan/60-libplacebo.sh | 2 +-
scripts.d/50-x264.sh | 2 +-
43 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index 57f5b40..66a39f9 100755
--- a/scripts.d/10-mingw.sh
+++ b/scripts.d/10-mingw.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/mirror/mingw-w64.git"
-SCRIPT_COMMIT="fcbc39cf846c12c898998b82fe8126601884b4e2"
+SCRIPT_COMMIT="d4a0c84d908243a45255a06dc293d3d7c06db98c"
ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh
index d86785a..f7393c5 100755
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-SCRIPT_COMMIT="a09c89545d3ed5b56701abcc5d638faa01c5c903"
+SCRIPT_COMMIT="ad338ca737c4df5a4d1c28f8ee18b878572f2964"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index 158a778..ad34c24 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
-SCRIPT_COMMIT="7cd3f19f21cc9d600e3b765ef2058474d20233e2"
+SCRIPT_COMMIT="dd91f6e7f5a051818070c49715125fb72074023e"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh
index 801dbd1..cb0ecab 100755
--- a/scripts.d/25-gmp.sh
+++ b/scripts.d/25-gmp.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gmplib.org/repo/gmp/"
-SCRIPT_HGREV="d337756619a0"
+SCRIPT_HGREV="b0d6b9f5807e"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index 4f1bbbc..febc106 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="4ab7e579cb8f4fd4f5ee2e1c0404e58edf8eb8e6"
+SCRIPT_COMMIT="29d5c7f67adc673391bcb8ab1ffeb8f4d4524eb8"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh
index 343bbd0..fe2cafa 100755
--- a/scripts.d/45-opencl.sh
+++ b/scripts.d/45-opencl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
-SCRIPT_COMMIT="7f216e8aa5317a71d91bed7edc83f3620dff763d"
+SCRIPT_COMMIT="3c4c95c2cd1b1ba1f13dabe827d047db30f68257"
SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
SCRIPT_COMMIT2="7072cf2ae9d9acb6be8f4fc956f1cdbf0675695b"
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index 41fb6b2..ac773a1 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-SCRIPT_COMMIT="8188b49bed7be08e23abcf92b098f62c1fc5c2ec"
+SCRIPT_COMMIT="8fe50bbc31e11abf2f30864f1e2dbdaa16d0e1c3"
ffbuild_enabled() {
[[ $TARGET == linux* ]] || return 1
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index dbaa2b0..09e3faa 100755
--- a/scripts.d/45-vmaf.sh
+++ b/scripts.d/45-vmaf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
-SCRIPT_COMMIT="905b07fccd1243f70eff2a264cc21493591c77bf"
+SCRIPT_COMMIT="23d3bb6d4d6f33cdc057bc5660c12ea896908741"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh
index 315e51f..23a6b58 100755
--- a/scripts.d/45-x11/10-xproto.sh
+++ b/scripts.d/45-x11/10-xproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
-SCRIPT_COMMIT="824001c947cb1962209c6a8f2c63c2637877220d"
+SCRIPT_COMMIT="aa1543ef9d156ff5f41e31777310cb2f8bc92a92"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/10-xtrans.sh b/scripts.d/45-x11/10-xtrans.sh
index 9351bbc..44b02e0 100755
--- a/scripts.d/45-x11/10-xtrans.sh
+++ b/scripts.d/45-x11/10-xtrans.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxtrans.git"
-SCRIPT_COMMIT="3309c75906a56de86607f59481304b3a2812162f"
+SCRIPT_COMMIT="c761c6505d49e8381a3eae94f2e5e118cbdf6487"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh
index 4d25542..fd4efaa 100755
--- a/scripts.d/45-x11/20-libxau.sh
+++ b/scripts.d/45-x11/20-libxau.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git"
-SCRIPT_COMMIT="83f33926d43f6ae4cf9734e3aedbef23fb0d6b74"
+SCRIPT_COMMIT="4fbefa02d6c842401ff79065d364edd7087a12a6"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxi.sh b/scripts.d/45-x11/50-libxi.sh
index eec87ab..6dfa355 100755
--- a/scripts.d/45-x11/50-libxi.sh
+++ b/scripts.d/45-x11/50-libxi.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxi.git"
-SCRIPT_COMMIT="bca3474a8622fde5815260461784282f78a4efb5"
+SCRIPT_COMMIT="08431d0684f9a1edf199f6c6060d2bef1ac78399"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxxf86vm.sh b/scripts.d/45-x11/50-libxxf86vm.sh
index 2bc6f9e..b319453 100755
--- a/scripts.d/45-x11/50-libxxf86vm.sh
+++ b/scripts.d/45-x11/50-libxxf86vm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxxf86vm.git"
-SCRIPT_COMMIT="2e27589966d6653e63b56e29b0bea83f722c4c33"
+SCRIPT_COMMIT="8cb2b07b8f83bc6385c41c7cdd6051a66dced0ff"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh
index e583247..2cd164f 100755
--- a/scripts.d/45-x11/60-libglvnd.sh
+++ b/scripts.d/45-x11/60-libglvnd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-SCRIPT_COMMIT="5e289fbceca18bf2145c121814a690b1a1fa276c"
+SCRIPT_COMMIT="1d270ce502bd5510754422377139a2028e7f477f"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh
index 19594ba..a48d5b5 100755
--- a/scripts.d/50-amf.sh
+++ b/scripts.d/50-amf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
-SCRIPT_COMMIT="5c78f194a396938ff0e72128712252151238e372"
+SCRIPT_COMMIT="9f558757af85029541110139586c35f8d4c6b2ad"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index 96920d9..2469909 100755
--- a/scripts.d/50-aom.sh
+++ b/scripts.d/50-aom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://aomedia.googlesource.com/aom"
-SCRIPT_COMMIT="b86730bfae5c9d3f09cd709d8a852da31641b2fa"
+SCRIPT_COMMIT="ff3923f48404c91ae3000cf66399f6a18f396ab0"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index 4c6b5a9..389e797 100755
--- a/scripts.d/50-dav1d.sh
+++ b/scripts.d/50-dav1d.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="a029d6892c5c39f4cda629d4a3b676ef2e8288f6"
+SCRIPT_COMMIT="a3a55b18494f5dd1e34f289298f78ffa4f32a25d"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-kvazaar.sh b/scripts.d/50-kvazaar.sh
index cd34ebe..7ed2345 100755
--- a/scripts.d/50-kvazaar.sh
+++ b/scripts.d/50-kvazaar.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/ultravideo/kvazaar.git"
-SCRIPT_COMMIT="76ce0c7716f593b5f4614aa864603684dd4fae3d"
+SCRIPT_COMMIT="d6032feab140a294cb72da708ea19c05a27d77d0"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index 47c5e12..712a909 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libass/libass.git"
-SCRIPT_COMMIT="b890df23eb8931728acdf240fd5d29e53401b4f2"
+SCRIPT_COMMIT="a48c98c274df25cc8d60cac1402948387d49840c"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh
index cbc34c3..91e0df3 100755
--- a/scripts.d/50-libbluray.sh
+++ b/scripts.d/50-libbluray.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libbluray.git"
-SCRIPT_COMMIT="e99df3adeb07420b72690ac09a147c8f34876eb8"
+SCRIPT_COMMIT="9a2d23d049760ef9cc9661ff90011a84d90368f1"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index 61169c1..b390606 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
-SCRIPT_COMMIT="ee80799d9e79511cb1597d6e94d69a4baddb8acc"
+SCRIPT_COMMIT="0103e5a901b776c46b55081fd6b647fbdd618472"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh
index 51dbf75..31ea81c 100755
--- a/scripts.d/50-libssh.sh
+++ b/scripts.d/50-libssh.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://git.libssh.org/projects/libssh.git"
-SCRIPT_COMMIT="ac6d2fad4a8bf07277127736367e90387646363f"
+SCRIPT_COMMIT="e5af9524e325eb534528df4964e84037ed2f8b2d"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index 3cfadd1..2afbc67 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="2f2ede692e8af4f9b59183d6bd8e7fefe8d8cffc"
+SCRIPT_COMMIT="028fc1b50f196cab1ec93816654fbefe64f20cf3"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index 3280d56..a689dcb 100755
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="9b902cbacedd0fb19de5ce4475d7a8345d7fe9cf"
+SCRIPT_COMMIT="e8f83de2867456a75b13aa1e876b22e2d1e1c077"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh
index 66340c3..eb4cfa6 100755
--- a/scripts.d/50-lilv/96-lv2.sh
+++ b/scripts.d/50-lilv/96-lv2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lv2.git"
-SCRIPT_COMMIT="c8fb4d21901a4de2c822df537202b6a313e89edd"
+SCRIPT_COMMIT="6594c7c90901bb027b288363b8830d724581fbc3"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh
index a08117d..381dc83 100755
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/serd.git"
-SCRIPT_COMMIT="f4f9c9ec4c1031fc42af80642760a9138c3eaabc"
+SCRIPT_COMMIT="26579820a960fcb02576a92d6adb26e87ff271ad"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh
index 2d5264b..9449f0a 100755
--- a/scripts.d/50-lilv/97-sord.sh
+++ b/scripts.d/50-lilv/97-sord.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/sord.git"
-SCRIPT_COMMIT="9960380c5581b02e927e39c51cb1c38d020a30b6"
+SCRIPT_COMMIT="53f071a571899faf27dd730ea24838c16887836c"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh
index a3f8723..5ac74cd 100755
--- a/scripts.d/50-lilv/98-sratom.sh
+++ b/scripts.d/50-lilv/98-sratom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/sratom.git"
-SCRIPT_COMMIT="0713ba20a26c3eb6ae2574b2a23be87ff496f552"
+SCRIPT_COMMIT="145ed2fe9756f707d9fd5f03ada5327d04e1b972"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh
index 02df06f..f5ac07e 100755
--- a/scripts.d/50-lilv/99-lilv.sh
+++ b/scripts.d/50-lilv/99-lilv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lilv.git"
-SCRIPT_COMMIT="96d897c5981d60ac52c33a9f9ac66753998fa4ed"
+SCRIPT_COMMIT="8cbf2a3dfce848c099536cf0f5e59c4fa8e04d87"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh
index e26cb1d..3dbd138 100755
--- a/scripts.d/50-onevpl.sh
+++ b/scripts.d/50-onevpl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/oneapi-src/oneVPL.git"
-SCRIPT_COMMIT="2232af4cdb13c0018d965c3b040466ad89b1922b"
+SCRIPT_COMMIT="15b79165c30fc4a7bf6efdf261a39b128b63b896"
ffbuild_enabled() {
[[ $TARGET == *arm64 ]] && return -1
diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh
index 4028864..712da5d 100755
--- a/scripts.d/50-openh264.sh
+++ b/scripts.d/50-openh264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/cisco/openh264.git"
-SCRIPT_COMMIT="2e637867315ffeda3cd8970825ec86acc3fc4a30"
+SCRIPT_COMMIT="ef270363115315a592685967901ebf462ea74dea"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index ad9ae1b..78d070a 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-SCRIPT_REV="17745"
+SCRIPT_REV="17803"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index f291f85..eb9eaec 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/rav1e.git"
-SCRIPT_COMMIT="db7a71ae53a31a60bf31bd0635f46e15bdcc444c"
+SCRIPT_COMMIT="59b21f9cd4dfb4c0911cd7329cb0f21d54cff52f"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index aa0fcf1..c6d4f27 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/breakfastquay/rubberband.git"
-SCRIPT_COMMIT="e3ae576fcd0083f0b5c8cf5ecaa011a0bb46b35e"
+SCRIPT_COMMIT="20d22f76d6ee7d58e23516659ec93bbc58962cd2"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index c18b6dd..c35837b 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
-SCRIPT_COMMIT="9670d2bb9ed19e3720c58378fe3eadab1ea0c40e"
+SCRIPT_COMMIT="6c2c01e0d1f7bc8c161dda26d983bd270ce0d176"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index 64ea742..99fec49 100755
--- a/scripts.d/50-srt.sh
+++ b/scripts.d/50-srt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Haivision/srt.git"
-SCRIPT_COMMIT="666ee63bc8fdc6e32922e82a4bfb60623652994f"
+SCRIPT_COMMIT="daf838e459d51fa2015bc6758379867ecf56b774"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index 76a6aee..841698f 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="6e24fb7f5f7438bb04061dc1a159f0c5b882d847"
+SCRIPT_COMMIT="8ff99c90359330d2e807757c9425560bbc452ff3"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-vaapi/30-libpciaccess.sh b/scripts.d/50-vaapi/30-libpciaccess.sh
index 3e9a9db..3da7c2c 100755
--- a/scripts.d/50-vaapi/30-libpciaccess.sh
+++ b/scripts.d/50-vaapi/30-libpciaccess.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git"
-SCRIPT_COMMIT="361356b08003f5e3c606e16eeb6a17fe02ff2726"
+SCRIPT_COMMIT="d193fa690415333420b435edb5782789a6f3ea57"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index 54c9ded..95fd449 100755
--- a/scripts.d/50-vaapi/40-libdrm.sh
+++ b/scripts.d/50-vaapi/40-libdrm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-SCRIPT_COMMIT="98794e2a0d537f3376970918bf955361191720c7"
+SCRIPT_COMMIT="fb5c0c301aa9b6d984ffee522775ca19ea7c7be6"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index a34b77a..e47a7ee 100755
--- a/scripts.d/50-vulkan/45-vulkan.sh
+++ b/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-SCRIPT_COMMIT="v1.3.224"
+SCRIPT_COMMIT="v1.3.226"
SCRIPT_TAGFILTER="v?.*.*"
ffbuild_enabled() {
diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh
index be3f400..c5854ab 100755
--- a/scripts.d/50-vulkan/55-spirv-cross.sh
+++ b/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SCRIPT_COMMIT="61c603f3baa5270e04bcfb6acf83c654e3c57679"
+SCRIPT_COMMIT="c93ee9261ed38be0b37b7cc40e2c5c47eaf5615d"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index 903c8b4..ad41151 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git"
-SCRIPT_COMMIT="0f0e3b36824ab3ebde6844040f3a4399a4628592"
+SCRIPT_COMMIT="0ce3fa4f28f41b20928476e6d7e09f5e611e7005"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh
index 7a08518..415f110 100755
--- a/scripts.d/50-x264.sh
+++ b/scripts.d/50-x264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/mirror/x264.git"
-SCRIPT_COMMIT="baee400fa9ced6f5481a728138fed6e867b0ff7f"
+SCRIPT_COMMIT="f7074e12d90de71f22aebd5040b8c6d31ca8f926"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
From 0c02e8fe66d8def2ff34de52f244789609f78d9a Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 1 Sep 2022 16:04:48 +0200
Subject: [PATCH 073/160] Rav1e still broken, revert update
---
scripts.d/50-rav1e.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index eb9eaec..f291f85 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/rav1e.git"
-SCRIPT_COMMIT="59b21f9cd4dfb4c0911cd7329cb0f21d54cff52f"
+SCRIPT_COMMIT="db7a71ae53a31a60bf31bd0635f46e15bdcc444c"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
From be519d8dc59f72f2ee6b40375cf1146e86bb53bc Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 1 Sep 2022 19:22:44 +0200
Subject: [PATCH 074/160] Update libdrm meson options
---
scripts.d/50-vaapi/40-libdrm.sh | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index 95fd449..0048d3b 100755
--- a/scripts.d/50-vaapi/40-libdrm.sh
+++ b/scripts.d/50-vaapi/40-libdrm.sh
@@ -18,16 +18,16 @@ ffbuild_dockerbuild() {
--prefix="$FFBUILD_PREFIX"
-Ddefault_library=shared
-Dudev=false
- -Dcairo-tests=false
- -Dvalgrind=false
- -Dexynos=false
- -Dfreedreno=false
- -Domap=false
- -Detnaviv=false
- -Dintel=true
- -Dnouveau=true
- -Dradeon=true
- -Damdgpu=true
+ -Dcairo-tests=disabled
+ -Dvalgrind=disabled
+ -Dexynos=disabled
+ -Dfreedreno=disabled
+ -Domap=disabled
+ -Detnaviv=disabled
+ -Dintel=enabled
+ -Dnouveau=enabled
+ -Dradeon=enabled
+ -Damdgpu=enabled
)
if [[ $TARGET == linux* ]]; then
From 9210cc598df1180b33757cd33dd05101c1872f96 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Fri, 2 Sep 2022 14:26:23 +0200
Subject: [PATCH 075/160] Add incremenal backoff and random delay to retry tool
---
images/base/retry-tool.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/images/base/retry-tool.sh b/images/base/retry-tool.sh
index 548e2e4..75c8b8d 100755
--- a/images/base/retry-tool.sh
+++ b/images/base/retry-tool.sh
@@ -2,10 +2,12 @@
set -xe
RETRY_COUNTER=0
-MAX_RETRY=15
+MAX_RETRY=10
+CUR_TIMEOUT=120
while [[ $RETRY_COUNTER -lt $MAX_RETRY ]]; do
- timeout 120 "$@" && break || sleep 10
+ timeout $CUR_TIMEOUT "$@" && break || sleep $(shuf -i 5-90 -n 1)
RETRY_COUNTER=$(( $RETRY_COUNTER + 1 ))
+ CUR_TIMEOUT=$(( $CUR_TIMEOUT + 60 ))
echo "Retry $RETRY_COUNTER..."
done
if [[ $RETRY_COUNTER -ge $MAX_RETRY ]]; then
From 7689f421fda5f4bf704109f5f56ef805e4aa6de3 Mon Sep 17 00:00:00 2001
From: nanake <nanake@users.noreply.github.com>
Date: Sat, 3 Sep 2022 10:52:46 +0900
Subject: [PATCH 076/160] libssh: remove workaround
fixed as https://git.libssh.org/projects/libssh.git/commit/?id=17aec429f539517468446191e3da91df40e352d1
Signed-off-by: nanake <nanake@users.noreply.github.com>
---
scripts.d/50-libssh.sh | 5 -----
1 file changed, 5 deletions(-)
diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh
index 31ea81c..b4415ec 100755
--- a/scripts.d/50-libssh.sh
+++ b/scripts.d/50-libssh.sh
@@ -13,11 +13,6 @@ ffbuild_dockerbuild() {
mkdir build && cd build
- if [[ $TARGET == win* ]]; then
- export CFLAGS="$CFLAGS -Dgettimeofday=ssh_gettimeofday"
- export CXXFLAGS="$CFLAGS -Dgettimeofday=ssh_gettimeofday"
- fi
-
cmake -GNinja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
-DBUILD_SHARED_LIBS=OFF \
-DWITH_EXAMPLES=OFF -DWITH_SERVER=OFF \
From 7d31bb2d06bf297352c0c9cbe2f34f9b259efb6e Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 12 Sep 2022 21:27:05 +0200
Subject: [PATCH 077/160] Fix building latest rav1e
---
scripts.d/50-rav1e.sh | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index f291f85..58e5a71 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/rav1e.git"
-SCRIPT_COMMIT="db7a71ae53a31a60bf31bd0635f46e15bdcc444c"
+SCRIPT_COMMIT="25f6c0fadc51f65a0c05ca4540cb8699eba5c644"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
@@ -29,12 +29,9 @@ ffbuild_dockerbuild() {
)
fi
- export CC="${FFBUILD_CROSS_PREFIX}gcc"
- export CXX="${FFBUILD_CROSS_PREFIX}g++"
- export LD="${FFBUILD_CROSS_PREFIX}gcc"
- export AR="${FFBUILD_CROSS_PREFIX}ar"
-
if [[ -n "$FFBUILD_RUST_TARGET" ]]; then
+ unset PKG_CONFIG_LIBDIR
+
myconf+=(
--target="$FFBUILD_RUST_TARGET"
)
@@ -42,8 +39,8 @@ ffbuild_dockerbuild() {
[build]
target = "$FFBUILD_RUST_TARGET"
[target.$FFBUILD_RUST_TARGET]
-linker = "$LD"
-ar = "$AR"
+linker = "${FFBUILD_CROSS_PREFIX}ld"
+ar = "${FFBUILD_CROSS_PREFIX}ar"
EOF
fi
From bd13b3b07df20f2e7dde7147f99e61f26e7c58d9 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 12 Sep 2022 21:43:10 +0200
Subject: [PATCH 078/160] Windows fix breaks Linux-Build
---
scripts.d/50-rav1e.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index 58e5a71..5f03384 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -30,7 +30,9 @@ ffbuild_dockerbuild() {
fi
if [[ -n "$FFBUILD_RUST_TARGET" ]]; then
- unset PKG_CONFIG_LIBDIR
+ if [[ $TARGET == win* ]]; then
+ unset PKG_CONFIG_LIBDIR
+ fi
myconf+=(
--target="$FFBUILD_RUST_TARGET"
From 7bb917633037b8b0b8d0982de8f44ce6530a9d48 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 12 Sep 2022 22:46:28 +0200
Subject: [PATCH 079/160] Fix rust build some more
---
scripts.d/50-rav1e.sh | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index 5f03384..2904264 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -30,18 +30,14 @@ ffbuild_dockerbuild() {
fi
if [[ -n "$FFBUILD_RUST_TARGET" ]]; then
- if [[ $TARGET == win* ]]; then
- unset PKG_CONFIG_LIBDIR
- fi
+ unset PKG_CONFIG_LIBDIR
myconf+=(
--target="$FFBUILD_RUST_TARGET"
)
cat <<EOF >$CARGO_HOME/config.toml
-[build]
-target = "$FFBUILD_RUST_TARGET"
[target.$FFBUILD_RUST_TARGET]
-linker = "${FFBUILD_CROSS_PREFIX}ld"
+linker = "${FFBUILD_CROSS_PREFIX}gcc"
ar = "${FFBUILD_CROSS_PREFIX}ar"
EOF
fi
From 8bc793644e535cc96bfe0710ecd0cd3080c16be9 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 12 Sep 2022 23:47:09 +0200
Subject: [PATCH 080/160] Fix rust cross-build. Again.
---
scripts.d/50-rav1e.sh | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index 2904264..5d76585 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -32,6 +32,16 @@ ffbuild_dockerbuild() {
if [[ -n "$FFBUILD_RUST_TARGET" ]]; then
unset PKG_CONFIG_LIBDIR
+ export CC="gcc"
+ export CXX="g++"
+ export TARGET_CC="${FFBUILD_CROSS_PREFIX}gcc"
+ export TARGET_CXX="${FFBUILD_CROSS_PREFIX}g++"
+ export CROSS_COMPILE=1
+ export TARGET_CFLAGS="$CFLAGS"
+ export TARGET_CXXFLAGS="$CFLAGS"
+ unset CFLAGS
+ unset CXXFLAGS
+
myconf+=(
--target="$FFBUILD_RUST_TARGET"
)
From 22440fc54941badb27ddeda9da749eeb18ec3daf Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 6 Oct 2022 00:40:44 +0200
Subject: [PATCH 081/160] Update dependencies
---
scripts.d/10-mingw.sh | 2 +-
scripts.d/20-libxml2.sh | 2 +-
scripts.d/25-fftw3.sh | 2 +-
scripts.d/25-freetype.sh | 2 +-
scripts.d/25-fribidi.sh | 2 +-
scripts.d/25-gmp.sh | 2 +-
scripts.d/25-xz.sh | 2 +-
scripts.d/35-fontconfig.sh | 2 +-
scripts.d/45-harfbuzz.sh | 2 +-
scripts.d/45-opencl.sh | 4 ++--
scripts.d/45-pulseaudio.sh | 2 +-
scripts.d/45-vmaf.sh | 2 +-
scripts.d/45-x11/10-xcbproto.sh | 2 +-
scripts.d/45-x11/10-xproto.sh | 2 +-
scripts.d/45-x11/30-libxcb.sh | 2 +-
scripts.d/45-x11/40-libx11.sh | 2 +-
scripts.d/45-x11/50-libxrender.sh | 2 +-
scripts.d/45-x11/50-libxxf86vm.sh | 2 +-
scripts.d/45-x11/60-libglvnd.sh | 2 +-
scripts.d/50-aom.sh | 2 +-
scripts.d/50-aribb24/25-libpng.sh | 2 +-
scripts.d/50-avisynth.sh | 2 +-
scripts.d/50-dav1d.sh | 2 +-
scripts.d/50-davs2.sh | 2 +-
scripts.d/50-kvazaar.sh | 2 +-
scripts.d/50-libass.sh | 2 +-
scripts.d/50-libbluray.sh | 2 +-
scripts.d/50-libjxl/50-libjxl.sh | 2 +-
scripts.d/50-libopus.sh | 2 +-
scripts.d/50-libssh.sh | 2 +-
scripts.d/50-libvpx.sh | 2 +-
scripts.d/50-libwebp.sh | 2 +-
scripts.d/50-lilv/96-lv2.sh | 2 +-
scripts.d/50-lilv/96-serd.sh | 2 +-
scripts.d/50-lilv/97-sord.sh | 2 +-
scripts.d/50-lilv/98-sratom.sh | 2 +-
scripts.d/50-lilv/99-lilv.sh | 2 +-
scripts.d/50-onevpl.sh | 2 +-
scripts.d/50-openh264.sh | 2 +-
scripts.d/50-openmpt.sh | 2 +-
scripts.d/50-rav1e.sh | 2 +-
scripts.d/50-rubberband.sh | 2 +-
scripts.d/50-sdl.sh | 2 +-
scripts.d/50-srt.sh | 2 +-
scripts.d/50-svtav1.sh | 2 +-
scripts.d/50-uavs3d.sh | 2 +-
scripts.d/50-vaapi/40-libdrm.sh | 2 +-
scripts.d/50-vaapi/50-libva.sh | 2 +-
scripts.d/50-vulkan/45-vulkan.sh | 2 +-
scripts.d/50-vulkan/50-shaderc.sh | 2 +-
scripts.d/50-vulkan/55-spirv-cross.sh | 2 +-
scripts.d/50-vulkan/60-libplacebo.sh | 2 +-
scripts.d/50-x264.sh | 2 +-
scripts.d/50-x265.sh | 2 +-
scripts.d/50-zimg.sh | 2 +-
55 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index 66a39f9..12145c9 100755
--- a/scripts.d/10-mingw.sh
+++ b/scripts.d/10-mingw.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/mirror/mingw-w64.git"
-SCRIPT_COMMIT="d4a0c84d908243a45255a06dc293d3d7c06db98c"
+SCRIPT_COMMIT="ee5758234f77a6b573e415b26a1d387c46717f6b"
ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh
index f7393c5..c671968 100755
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-SCRIPT_COMMIT="ad338ca737c4df5a4d1c28f8ee18b878572f2964"
+SCRIPT_COMMIT="e2bae1bc049f7ffac9c35eefa33f8a00d4032170"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh
index 755858a..31be29a 100755
--- a/scripts.d/25-fftw3.sh
+++ b/scripts.d/25-fftw3.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/FFTW/fftw3.git"
-SCRIPT_COMMIT="619564efbf84199f87e1a3047da00b600208fca2"
+SCRIPT_COMMIT="9426cd59106ffddde1f55131c07fa9c562fa2f8e"
ffbuild_enabled() {
# Dependency of GPL-Only librubberband
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index ad34c24..8c84b61 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
-SCRIPT_COMMIT="dd91f6e7f5a051818070c49715125fb72074023e"
+SCRIPT_COMMIT="15f687349528fb0d7cba1ee7a8becf0af29116ec"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-fribidi.sh b/scripts.d/25-fribidi.sh
index bfc1375..00b6273 100755
--- a/scripts.d/25-fribidi.sh
+++ b/scripts.d/25-fribidi.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/fribidi/fribidi.git"
-SCRIPT_COMMIT="6428d8469e536bcbb6e12c7b79ba6659371c435a"
+SCRIPT_COMMIT="a6a4defff24aabf9195f462f9a7736f3d9e9c120"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh
index cb0ecab..59fcb7e 100755
--- a/scripts.d/25-gmp.sh
+++ b/scripts.d/25-gmp.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gmplib.org/repo/gmp/"
-SCRIPT_HGREV="b0d6b9f5807e"
+SCRIPT_HGREV="261268754dec"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh
index 0576bac..890a381 100755
--- a/scripts.d/25-xz.sh
+++ b/scripts.d/25-xz.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xz-mirror/xz.git"
-SCRIPT_COMMIT="4773608554d1b684a05ff9c1d879cf5c42266d33"
+SCRIPT_COMMIT="508a44372c5b0dede8863fd0d358d4a9d8645c95"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh
index 20144cd..bab6ad1 100755
--- a/scripts.d/35-fontconfig.sh
+++ b/scripts.d/35-fontconfig.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
-SCRIPT_COMMIT="fd0753af88f746fd3d729bf6e1df08eefeeaa3ac"
+SCRIPT_COMMIT="b9e2f17c43c32400328259c7b4c06f89b6a44c94"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index febc106..5081c93 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="29d5c7f67adc673391bcb8ab1ffeb8f4d4524eb8"
+SCRIPT_COMMIT="99f4668e1969a0a688044433803b3e7797391688"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh
index fe2cafa..4442021 100755
--- a/scripts.d/45-opencl.sh
+++ b/scripts.d/45-opencl.sh
@@ -1,10 +1,10 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
-SCRIPT_COMMIT="3c4c95c2cd1b1ba1f13dabe827d047db30f68257"
+SCRIPT_COMMIT="b590a6bfe034ea3a418b7b523e3490956bcb367a"
SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
-SCRIPT_COMMIT2="7072cf2ae9d9acb6be8f4fc956f1cdbf0675695b"
+SCRIPT_COMMIT2="c5a6e013ad7c8b379fc94e3c849aa3396900a63c"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index ac773a1..5689d26 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-SCRIPT_COMMIT="8fe50bbc31e11abf2f30864f1e2dbdaa16d0e1c3"
+SCRIPT_COMMIT="45df212d6614ad7f57d9e53616c0faac00195c86"
ffbuild_enabled() {
[[ $TARGET == linux* ]] || return 1
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index 09e3faa..7a3758a 100755
--- a/scripts.d/45-vmaf.sh
+++ b/scripts.d/45-vmaf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
-SCRIPT_COMMIT="23d3bb6d4d6f33cdc057bc5660c12ea896908741"
+SCRIPT_COMMIT="ea1150057190f113a2c07ded0ff4fb5a6260c1d3"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh
index 9588597..3d8708c 100755
--- a/scripts.d/45-x11/10-xcbproto.sh
+++ b/scripts.d/45-x11/10-xcbproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-SCRIPT_COMMIT="23865049477f44a6b2fdc9580ee6e857a7f99854"
+SCRIPT_COMMIT="0d440c579b0f364bd655d97d1976d4eeddecf488"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh
index 23a6b58..6e3a9cb 100755
--- a/scripts.d/45-x11/10-xproto.sh
+++ b/scripts.d/45-x11/10-xproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
-SCRIPT_COMMIT="aa1543ef9d156ff5f41e31777310cb2f8bc92a92"
+SCRIPT_COMMIT="ae81c3c694b7cc0a810e55eb5d410dc8e7f55e21"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh
index bebf5cc..bf2c49e 100755
--- a/scripts.d/45-x11/30-libxcb.sh
+++ b/scripts.d/45-x11/30-libxcb.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
-SCRIPT_COMMIT="9dcb08170898d3bd5ddb3bc26c514a6bfccf3fae"
+SCRIPT_COMMIT="d53ad60d774176c5b057e2ed4d03a4658ee13690"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index b1ffe24..5edd84d 100755
--- a/scripts.d/45-x11/40-libx11.sh
+++ b/scripts.d/45-x11/40-libx11.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-SCRIPT_COMMIT="1272879074ad9612314858a75cf844783c1963b2"
+SCRIPT_COMMIT="1f8fd7ff1cf688ec1d3b34397c6d58110bb0cae5"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxrender.sh b/scripts.d/45-x11/50-libxrender.sh
index 81c30a2..57ce01d 100755
--- a/scripts.d/45-x11/50-libxrender.sh
+++ b/scripts.d/45-x11/50-libxrender.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrender.git"
-SCRIPT_COMMIT="e314946813bcb96e8baedc1a290c48a2aa6ef162"
+SCRIPT_COMMIT="f6504f02ade1d27950ad0486a2032e1d665d72b8"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxxf86vm.sh b/scripts.d/45-x11/50-libxxf86vm.sh
index b319453..2d706a1 100755
--- a/scripts.d/45-x11/50-libxxf86vm.sh
+++ b/scripts.d/45-x11/50-libxxf86vm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxxf86vm.git"
-SCRIPT_COMMIT="8cb2b07b8f83bc6385c41c7cdd6051a66dced0ff"
+SCRIPT_COMMIT="7fe2d41f164d3015216c1079cc7fbce1eea90c98"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh
index 2cd164f..08ee3e5 100755
--- a/scripts.d/45-x11/60-libglvnd.sh
+++ b/scripts.d/45-x11/60-libglvnd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-SCRIPT_COMMIT="1d270ce502bd5510754422377139a2028e7f477f"
+SCRIPT_COMMIT="9215f347d2dce08916f250b7b57f7b26315a8fa7"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index 2469909..4f43f39 100755
--- a/scripts.d/50-aom.sh
+++ b/scripts.d/50-aom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://aomedia.googlesource.com/aom"
-SCRIPT_COMMIT="ff3923f48404c91ae3000cf66399f6a18f396ab0"
+SCRIPT_COMMIT="e9efda0ceb39a8702830d536b48b400727ecded8"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh
index ce3d386..47872e5 100755
--- a/scripts.d/50-aribb24/25-libpng.sh
+++ b/scripts.d/50-aribb24/25-libpng.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/glennrp/libpng.git"
-SCRIPT_COMMIT="a37d4836519517bdce6cb9d956092321eca3e73b"
+SCRIPT_COMMIT="12222e6fbdc90523be77633ed430144cfee22772"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh
index 33956b6..898140d 100755
--- a/scripts.d/50-avisynth.sh
+++ b/scripts.d/50-avisynth.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/AviSynth/AviSynthPlus.git"
-SCRIPT_COMMIT="9b55e9cd7e0f2b251b6a3d6930af08d31cd90d6e"
+SCRIPT_COMMIT="f26fab3120a71c712238d6ec2f5469db65cc24a3"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index 389e797..3ecf713 100755
--- a/scripts.d/50-dav1d.sh
+++ b/scripts.d/50-dav1d.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="a3a55b18494f5dd1e34f289298f78ffa4f32a25d"
+SCRIPT_COMMIT="cac76e4b6641dd26dd87fd749261526ae7469d3e"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-davs2.sh b/scripts.d/50-davs2.sh
index 47377db..96651f4 100755
--- a/scripts.d/50-davs2.sh
+++ b/scripts.d/50-davs2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/pkuvcl/davs2.git"
-SCRIPT_COMMIT="b06d7585620f4e90a6d19a2926bb4e59793b8942"
+SCRIPT_COMMIT="b41cf117452e2d73d827f02d3e30aa20f1c721ac"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-kvazaar.sh b/scripts.d/50-kvazaar.sh
index 7ed2345..d798049 100755
--- a/scripts.d/50-kvazaar.sh
+++ b/scripts.d/50-kvazaar.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/ultravideo/kvazaar.git"
-SCRIPT_COMMIT="d6032feab140a294cb72da708ea19c05a27d77d0"
+SCRIPT_COMMIT="a085e802ec6d24319160fec32c4027122e73580f"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index 712a909..a64034d 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libass/libass.git"
-SCRIPT_COMMIT="a48c98c274df25cc8d60cac1402948387d49840c"
+SCRIPT_COMMIT="44f6532daf5eb13cb1aa95f5449a77b5df1dd85b"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh
index 91e0df3..12f2fdf 100755
--- a/scripts.d/50-libbluray.sh
+++ b/scripts.d/50-libbluray.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libbluray.git"
-SCRIPT_COMMIT="9a2d23d049760ef9cc9661ff90011a84d90368f1"
+SCRIPT_COMMIT="5539addbbf8c26d756fc2cb76b3919f8b73be66a"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index b390606..1a45a45 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
-SCRIPT_COMMIT="0103e5a901b776c46b55081fd6b647fbdd618472"
+SCRIPT_COMMIT="004f66baa16fe13eb2b83be68ee95b60d77820ae"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh
index 03d0e56..c4cc95b 100755
--- a/scripts.d/50-libopus.sh
+++ b/scripts.d/50-libopus.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/opus.git"
-SCRIPT_COMMIT="997fdf54e781ae1c04dee42018f35388a04fe483"
+SCRIPT_COMMIT="bce1f392353d72d77d543bb2069a044ae1045e9d"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh
index b4415ec..fb439fd 100755
--- a/scripts.d/50-libssh.sh
+++ b/scripts.d/50-libssh.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://git.libssh.org/projects/libssh.git"
-SCRIPT_COMMIT="e5af9524e325eb534528df4964e84037ed2f8b2d"
+SCRIPT_COMMIT="37deed27d66ba342e7e8c0a993bfe519f3967337"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index 2afbc67..e75a192 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="028fc1b50f196cab1ec93816654fbefe64f20cf3"
+SCRIPT_COMMIT="c03c882785dc96ed91799280e68f8998bec50b90"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index a689dcb..9a10d16 100755
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="e8f83de2867456a75b13aa1e876b22e2d1e1c077"
+SCRIPT_COMMIT="e407d4b37c296643e3824d8f19466fe6211dc5eb"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh
index eb4cfa6..fe0f919 100755
--- a/scripts.d/50-lilv/96-lv2.sh
+++ b/scripts.d/50-lilv/96-lv2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lv2.git"
-SCRIPT_COMMIT="6594c7c90901bb027b288363b8830d724581fbc3"
+SCRIPT_COMMIT="3a3da7a493507655b4d6f83878692280b48a8579"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh
index 381dc83..b3acc9c 100755
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/serd.git"
-SCRIPT_COMMIT="26579820a960fcb02576a92d6adb26e87ff271ad"
+SCRIPT_COMMIT="1a8312b6cc119788ea0d3f4e6ebf3a2ae2a3075f"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh
index 9449f0a..260c429 100755
--- a/scripts.d/50-lilv/97-sord.sh
+++ b/scripts.d/50-lilv/97-sord.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/sord.git"
-SCRIPT_COMMIT="53f071a571899faf27dd730ea24838c16887836c"
+SCRIPT_COMMIT="d877d78c98d90fbf57136bb73919524e618fd859"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh
index 5ac74cd..6230a4a 100755
--- a/scripts.d/50-lilv/98-sratom.sh
+++ b/scripts.d/50-lilv/98-sratom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/sratom.git"
-SCRIPT_COMMIT="145ed2fe9756f707d9fd5f03ada5327d04e1b972"
+SCRIPT_COMMIT="482374c4e4f9fee9477ee53b8fa6d51d5602f3cd"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh
index f5ac07e..a981e84 100755
--- a/scripts.d/50-lilv/99-lilv.sh
+++ b/scripts.d/50-lilv/99-lilv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lilv.git"
-SCRIPT_COMMIT="8cbf2a3dfce848c099536cf0f5e59c4fa8e04d87"
+SCRIPT_COMMIT="3386725522269a1bbdd342cb9e3fa6fb00e0f37f"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh
index 3dbd138..e257e34 100755
--- a/scripts.d/50-onevpl.sh
+++ b/scripts.d/50-onevpl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/oneapi-src/oneVPL.git"
-SCRIPT_COMMIT="15b79165c30fc4a7bf6efdf261a39b128b63b896"
+SCRIPT_COMMIT="250d806b58678bdce13820a2dcbc8fd73987724c"
ffbuild_enabled() {
[[ $TARGET == *arm64 ]] && return -1
diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh
index 712da5d..f13816c 100755
--- a/scripts.d/50-openh264.sh
+++ b/scripts.d/50-openh264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/cisco/openh264.git"
-SCRIPT_COMMIT="ef270363115315a592685967901ebf462ea74dea"
+SCRIPT_COMMIT="0c19a5c266275693484ed84edf6ff8cb7cd89d4e"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index 78d070a..92fbf0e 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-SCRIPT_REV="17803"
+SCRIPT_REV="17986"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index 5d76585..0938b8b 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/rav1e.git"
-SCRIPT_COMMIT="25f6c0fadc51f65a0c05ca4540cb8699eba5c644"
+SCRIPT_COMMIT="f9310a9aa994594f8e144d4b1d59a4034e6dff6c"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index c6d4f27..7143852 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/breakfastquay/rubberband.git"
-SCRIPT_COMMIT="20d22f76d6ee7d58e23516659ec93bbc58962cd2"
+SCRIPT_COMMIT="64d2989d28db8a171e82777f91ef4c571a58783f"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index c35837b..606ab28 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
-SCRIPT_COMMIT="6c2c01e0d1f7bc8c161dda26d983bd270ce0d176"
+SCRIPT_COMMIT="92c71ae385d9770e7ac3db4c9a072151e923012d"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index 99fec49..2c228fb 100755
--- a/scripts.d/50-srt.sh
+++ b/scripts.d/50-srt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Haivision/srt.git"
-SCRIPT_COMMIT="daf838e459d51fa2015bc6758379867ecf56b774"
+SCRIPT_COMMIT="1b20a48ce1617c4a36220d173191065210ee65e1"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index 841698f..18a8ba4 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="8ff99c90359330d2e807757c9425560bbc452ff3"
+SCRIPT_COMMIT="02b12fdb6353993b088b63fa04c2dd2b71fbb1b5"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh
index b396f94..ef1e955 100755
--- a/scripts.d/50-uavs3d.sh
+++ b/scripts.d/50-uavs3d.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/uavs3/uavs3d.git"
-SCRIPT_COMMIT="6a6b98a91f221fb0d4d9febe9a045ed287c588bb"
+SCRIPT_COMMIT="0133ee4b4bbbef7b88802e7ad019b14b9b852c2b"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index 0048d3b..a2130b8 100755
--- a/scripts.d/50-vaapi/40-libdrm.sh
+++ b/scripts.d/50-vaapi/40-libdrm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-SCRIPT_COMMIT="fb5c0c301aa9b6d984ffee522775ca19ea7c7be6"
+SCRIPT_COMMIT="0bd3e4e94f8270e64c7fd1e361a71da4a1547b1b"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh
index e961c26..97f4823 100755
--- a/scripts.d/50-vaapi/50-libva.sh
+++ b/scripts.d/50-vaapi/50-libva.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/intel/libva.git"
-SCRIPT_COMMIT="e4603ed481aa305002ba133b0108d210d308f45c"
+SCRIPT_COMMIT="ef1df02f3ad45ac98b1fa57c373176d7c14dcc57"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index e47a7ee..d6c44f8 100755
--- a/scripts.d/50-vulkan/45-vulkan.sh
+++ b/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-SCRIPT_COMMIT="v1.3.226"
+SCRIPT_COMMIT="v1.3.230"
SCRIPT_TAGFILTER="v?.*.*"
ffbuild_enabled() {
diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh
index 15d1e1c..d718b18 100755
--- a/scripts.d/50-vulkan/50-shaderc.sh
+++ b/scripts.d/50-vulkan/50-shaderc.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/google/shaderc.git"
-SCRIPT_COMMIT="31bddbb37ef1e974da7bce859ab59bcfc5ad9ee7"
+SCRIPT_COMMIT="7ea834ecc59258a5c13c3d3e6fa0582bdde7c543"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh
index c5854ab..9edbb86 100755
--- a/scripts.d/50-vulkan/55-spirv-cross.sh
+++ b/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SCRIPT_COMMIT="c93ee9261ed38be0b37b7cc40e2c5c47eaf5615d"
+SCRIPT_COMMIT="f09ba2777714871bddb70d049878af34b94fa54d"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index ad41151..15e08e4 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git"
-SCRIPT_COMMIT="0ce3fa4f28f41b20928476e6d7e09f5e611e7005"
+SCRIPT_COMMIT="35cbea8b1b293998b5da44a1ce9d7d1f2b51da1e"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh
index 415f110..c0d4c7e 100755
--- a/scripts.d/50-x264.sh
+++ b/scripts.d/50-x264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/mirror/x264.git"
-SCRIPT_COMMIT="f7074e12d90de71f22aebd5040b8c6d31ca8f926"
+SCRIPT_COMMIT="ed0f7a634050a62c1da27c99eea710824d4c3705"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh
index a99205a..2e4cc7b 100755
--- a/scripts.d/50-x265.sh
+++ b/scripts.d/50-x265.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git"
-SCRIPT_COMMIT="20255e6f0ead5b2ef65a520f202cedd5965f8541"
+SCRIPT_COMMIT="0b75c44c10e605fe9e9ebed58f04a46271131827"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh
index aff943a..b0f1e56 100755
--- a/scripts.d/50-zimg.sh
+++ b/scripts.d/50-zimg.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git"
-SCRIPT_COMMIT="afae03a94937cc6c84da93f7de815ec0a9e52089"
+SCRIPT_COMMIT="fc993b40effd6536518444fcbd435b825b30ca73"
ffbuild_enabled() {
return 0
From 17c294f25cb66a6d4b1ef55d0d8d39befc91ad81 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 6 Oct 2022 01:11:36 +0200
Subject: [PATCH 082/160] Fix libplacebo build
---
scripts.d/50-vulkan/60-libplacebo.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index 15e08e4..9352b43 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -20,7 +20,7 @@ ffbuild_dockerbuild() {
--buildtype=release
--default-library=static
-Dvulkan=enabled
- -Dvulkan-link=false
+ -Dvk-proc-addr=disabled
-Dvulkan-registry="$FFBUILD_PREFIX"/share/vulkan/registry/vk.xml
-Dshaderc=enabled
-Dglslang=disabled
From bce41a5cce331b98e87573abac2d852654de93cb Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 6 Oct 2022 14:33:36 +0200
Subject: [PATCH 083/160] Disable liblzma/xz symbol versioning
Does not make a whole lot of sense for static builds to begin with,
and since https://github.com/xz-mirror/xz/commit/913ddc5572b9455fa0cf299be2e35c708840e922
it's outright broken for unknown reasons:
ld: libavcodec/libavcodec.so.59: version node not found for symbol lzma_get_progress@XZ_5.2.2
ld: failed to set dynamic section sizes: bad value
---
scripts.d/25-xz.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh
index 890a381..17e3619 100755
--- a/scripts.d/25-xz.sh
+++ b/scripts.d/25-xz.sh
@@ -15,6 +15,7 @@ ffbuild_dockerbuild() {
local myconf=(
--prefix="$FFBUILD_PREFIX"
+ --disable-symbol-versions
--disable-shared
--enable-static
--with-pic
From 36f1ff77a4b3ef14ac41906633881ecc14a6e509 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 10 Oct 2022 13:12:36 +0200
Subject: [PATCH 084/160] Disable Debug for mp3lame
https://code.videolan.org/videolan/vlc/-/commit/c9e146e7872a6a16f9cf05e3f36aab14105cffa8
Closes #198
---
scripts.d/50-libmp3lame.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts.d/50-libmp3lame.sh b/scripts.d/50-libmp3lame.sh
index c9ed783..e5418f2 100755
--- a/scripts.d/50-libmp3lame.sh
+++ b/scripts.d/50-libmp3lame.sh
@@ -33,6 +33,8 @@ ffbuild_dockerbuild() {
return -1
fi
+ export CFLAGS="$CFLAGS -DNDEBUG"
+
./configure "${myconf[@]}"
make -j$(nproc)
make install
From 3b673c516974ceddaf2dd876e36de51213c9d5a8 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 19 Oct 2022 23:33:57 +0200
Subject: [PATCH 085/160] Rename clashing but exported internal libass symbol
---
scripts.d/50-libass.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index a64034d..bdcbff1 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -29,6 +29,8 @@ ffbuild_dockerbuild() {
return -1
fi
+ export CFLAGS="$CFLAGS -Dread_file=libass_internal_read_file"
+
./configure "${myconf[@]}"
make -j$(nproc)
make install
From ce62fe2fee38fc5825484b5d0e110fbd1ef16db4 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 23 Oct 2022 02:51:12 +0200
Subject: [PATCH 086/160] Fix use of deprecated set-output
---
.github/workflows/build.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 241f0bf..9304bac 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,7 +43,7 @@ jobs:
password: ${{ github.token }}
- name: Image Name
id: imagename
- run: echo "::set-output name=name::ghcr.io/${GITHUB_REPOSITORY,,}/base"
+ run: echo "name=ghcr.io/${GITHUB_REPOSITORY,,}/base" >> $GITHUB_OUTPUT
- name: Stop Commands
run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
- name: Build target base image
@@ -79,7 +79,7 @@ jobs:
password: ${{ github.token }}
- name: Image Name
id: imagename
- run: echo "::set-output name=name::ghcr.io/${GITHUB_REPOSITORY,,}/base-${{ matrix.target }}"
+ run: echo "name=ghcr.io/${GITHUB_REPOSITORY,,}/base-${{ matrix.target }}" >> $GITHUB_OUTPUT
- name: Stop Commands
run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
- name: Build target base image
@@ -120,8 +120,8 @@ jobs:
id: imagename
run: |
IMG="ghcr.io/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}"
- echo "::set-output name=name::${IMG/ /-}"
- echo "::set-output name=gh_repo::${GITHUB_REPOSITORY,,}"
+ echo "name=${IMG/ /-}" >> $GITHUB_OUTPUT
+ echo "gh_repo=${GITHUB_REPOSITORY,,}" >> $GITHUB_OUTPUT
- name: Stop Commands
run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
- name: Build target base image
@@ -185,8 +185,8 @@ jobs:
NAME="Auto-Build $RELDATE"
TAGNAME="autobuild-$(date +'%Y-%m-%d-%H-%M')"
hub release create $(for a in artifacts/*.{zip,tar.xz}; do echo -a $a; done) -m "$NAME" -t "master" "$TAGNAME"
- echo "::set-output name=tag_name::${TAGNAME}"
- echo "::set-output name=rel_date::${RELDATE}"
+ echo "tag_name=${TAGNAME}" >> $GITHUB_OUTPUT
+ echo "rel_date=${RELDATE}" >> $GITHUB_OUTPUT
env:
GITHUB_TOKEN: ${{ github.token }}
- name: Update Latest
From 5bd1b6a1e1ee80a024ae9abc5ba94993143dc777 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 23 Oct 2022 17:16:34 +0200
Subject: [PATCH 087/160] Bump ct-ng configs
---
images/base-linux64/ct-ng-config | 34 +++++++++++++++++++++--------
images/base-linuxarm64/ct-ng-config | 34 +++++++++++++++++++++--------
images/base-win32/ct-ng-config | 28 ++++++++++++++++--------
images/base-win64/ct-ng-config | 29 ++++++++++++++++--------
4 files changed, 89 insertions(+), 36 deletions(-)
diff --git a/images/base-linux64/ct-ng-config b/images/base-linux64/ct-ng-config
index 3fdade0..dbb6f81 100644
--- a/images/base-linux64/ct-ng-config
+++ b/images/base-linux64/ct-ng-config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.25.0.55_3defb7b Configuration
+# crosstool-NG 1.25.0.90_cf9beb1 Configuration
#
CT_CONFIGURE_has_static_link=y
CT_CONFIGURE_has_cxx11=y
@@ -19,6 +19,7 @@ CT_CONFIGURE_has_automake_1_15_or_newer=y
CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
CT_CONFIGURE_has_python_3_4_or_newer=y
CT_CONFIGURE_has_bison_2_7_or_newer=y
+CT_CONFIGURE_has_bison_3_0_4_or_newer=y
CT_CONFIGURE_has_python=y
CT_CONFIGURE_has_svn=y
CT_CONFIGURE_has_git=y
@@ -27,7 +28,7 @@ CT_CONFIGURE_has_sha1sum=y
CT_CONFIGURE_has_sha256sum=y
CT_CONFIGURE_has_sha512sum=y
CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.25.0.55_3defb7b"
+CT_VERSION="1.25.0.90_cf9beb1"
CT_VCHECK=""
CT_CONFIG_VERSION_ENV="4"
CT_CONFIG_VERSION_CURRENT="4"
@@ -137,6 +138,7 @@ CT_LOG_LEVEL_MAX="EXTRA"
# CT_ARCH_ARM is not set
# CT_ARCH_AVR is not set
# CT_ARCH_C6X is not set
+# CT_ARCH_LOONGARCH is not set
# CT_ARCH_M68K is not set
# CT_ARCH_MICROBLAZE is not set
# CT_ARCH_MIPS is not set
@@ -161,7 +163,7 @@ CT_ARCH_X86_SHOW=y
# Options for x86
#
CT_ARCH_X86_PKG_KSYM=""
-CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
+CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
CT_ARCH_SUFFIX=""
# CT_OMIT_TARGET_VENDOR is not set
@@ -171,6 +173,7 @@ CT_ARCH_SUFFIX=""
# CT_MULTILIB is not set
CT_DEMULTILIB=y
CT_ARCH_USE_MMU=y
+CT_ARCH_SUPPORTS_LIBSANITIZER=y
CT_ARCH_SUPPORTS_32=y
CT_ARCH_SUPPORTS_64=y
CT_ARCH_DEFAULT_32=y
@@ -264,6 +267,8 @@ CT_LINUX_PATCH_GLOBAL=y
# CT_LINUX_PATCH_LOCAL_BUNDLED is not set
# CT_LINUX_PATCH_NONE is not set
CT_LINUX_PATCH_ORDER="global"
+# CT_LINUX_V_6_0 is not set
+# CT_LINUX_V_5_19 is not set
# CT_LINUX_V_5_18 is not set
# CT_LINUX_V_5_17 is not set
# CT_LINUX_V_5_16 is not set
@@ -310,6 +315,8 @@ CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_LINUX_ARCHIVE_FORMATS=".tar.xz .tar.gz"
CT_LINUX_SIGNATURE_FORMAT="unpacked/.sign"
+CT_LINUX_5_19_or_older=y
+CT_LINUX_older_than_5_19=y
CT_LINUX_5_12_or_older=y
CT_LINUX_older_than_5_12=y
CT_LINUX_5_5_or_older=y
@@ -365,7 +372,8 @@ CT_BINUTILS_PATCH_GLOBAL=y
# CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
# CT_BINUTILS_PATCH_NONE is not set
CT_BINUTILS_PATCH_ORDER="global"
-CT_BINUTILS_V_2_38=y
+CT_BINUTILS_V_2_39=y
+# CT_BINUTILS_V_2_38 is not set
# CT_BINUTILS_V_2_37 is not set
# CT_BINUTILS_V_2_36 is not set
# CT_BINUTILS_V_2_35 is not set
@@ -378,12 +386,14 @@ CT_BINUTILS_V_2_38=y
# CT_BINUTILS_V_2_28 is not set
# CT_BINUTILS_V_2_27 is not set
# CT_BINUTILS_V_2_26 is not set
-CT_BINUTILS_VERSION="2.38"
+CT_BINUTILS_VERSION="2.39"
CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig"
+CT_BINUTILS_2_39_or_later=y
+CT_BINUTILS_2_39_or_older=y
CT_BINUTILS_later_than_2_30=y
CT_BINUTILS_2_30_or_later=y
CT_BINUTILS_later_than_2_27=y
@@ -438,6 +448,7 @@ CT_GLIBC_PATCH_GLOBAL=y
# CT_GLIBC_PATCH_LOCAL_BUNDLED is not set
# CT_GLIBC_PATCH_NONE is not set
CT_GLIBC_PATCH_ORDER="global"
+# CT_GLIBC_V_2_36 is not set
# CT_GLIBC_V_2_35 is not set
# CT_GLIBC_V_2_34 is not set
# CT_GLIBC_V_2_33 is not set
@@ -459,6 +470,8 @@ CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
CT_GLIBC_SIGNATURE_FORMAT="packed/.sig"
+CT_GLIBC_2_36_or_older=y
+CT_GLIBC_older_than_2_36=y
CT_GLIBC_2_34_or_older=y
CT_GLIBC_older_than_2_34=y
CT_GLIBC_2_32_or_older=y
@@ -569,7 +582,7 @@ CT_GCC_V_12=y
# CT_GCC_V_6 is not set
# CT_GCC_V_5 is not set
# CT_GCC_V_4_9 is not set
-CT_GCC_VERSION="12.1.0"
+CT_GCC_VERSION="12.2.0"
CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -612,6 +625,7 @@ CT_CC_GCC_LTO_ZSTD=m
#
# Settings for libraries running on target
#
+CT_CC_GCC_ENABLE_DEFAULT_PIE=y
# CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
# CT_CC_GCC_LIBMUDFLAP is not set
CT_CC_GCC_LIBGOMP=y
@@ -619,6 +633,7 @@ CT_CC_GCC_LIBSSP=m
# CT_CC_GCC_LIBQUADMATH is not set
# CT_CC_GCC_LIBSANITIZER is not set
# CT_CC_GCC_LIBMPX is not set
+# CT_CC_GCC_LIBSTDCXX_VERBOSE is not set
#
# Misc. obscure options.
@@ -882,9 +897,10 @@ CT_ZLIB_PATCH_GLOBAL=y
# CT_ZLIB_PATCH_LOCAL_BUNDLED is not set
# CT_ZLIB_PATCH_NONE is not set
CT_ZLIB_PATCH_ORDER="global"
-CT_ZLIB_V_1_2_12=y
-CT_ZLIB_VERSION="1.2.12"
-CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
+CT_ZLIB_V_1_2_13=y
+# CT_ZLIB_V_1_2_12 is not set
+CT_ZLIB_VERSION="1.2.13"
+CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION} https://www.zlib.net/"
CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
diff --git a/images/base-linuxarm64/ct-ng-config b/images/base-linuxarm64/ct-ng-config
index 2851302..76e556f 100644
--- a/images/base-linuxarm64/ct-ng-config
+++ b/images/base-linuxarm64/ct-ng-config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.25.0.55_3defb7b Configuration
+# crosstool-NG 1.25.0.90_cf9beb1 Configuration
#
CT_CONFIGURE_has_static_link=y
CT_CONFIGURE_has_cxx11=y
@@ -19,6 +19,7 @@ CT_CONFIGURE_has_automake_1_15_or_newer=y
CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
CT_CONFIGURE_has_python_3_4_or_newer=y
CT_CONFIGURE_has_bison_2_7_or_newer=y
+CT_CONFIGURE_has_bison_3_0_4_or_newer=y
CT_CONFIGURE_has_python=y
CT_CONFIGURE_has_svn=y
CT_CONFIGURE_has_git=y
@@ -27,7 +28,7 @@ CT_CONFIGURE_has_sha1sum=y
CT_CONFIGURE_has_sha256sum=y
CT_CONFIGURE_has_sha512sum=y
CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.25.0.55_3defb7b"
+CT_VERSION="1.25.0.90_cf9beb1"
CT_VCHECK=""
CT_CONFIG_VERSION_ENV="4"
CT_CONFIG_VERSION_CURRENT="4"
@@ -137,6 +138,7 @@ CT_LOG_LEVEL_MAX="EXTRA"
CT_ARCH_ARM=y
# CT_ARCH_AVR is not set
# CT_ARCH_C6X is not set
+# CT_ARCH_LOONGARCH is not set
# CT_ARCH_M68K is not set
# CT_ARCH_MICROBLAZE is not set
# CT_ARCH_MIPS is not set
@@ -161,7 +163,7 @@ CT_ARCH_ARM_SHOW=y
# Options for arm
#
CT_ARCH_ARM_PKG_KSYM=""
-CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
+CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
CT_ARCH_SUFFIX=""
# CT_OMIT_TARGET_VENDOR is not set
@@ -174,6 +176,7 @@ CT_ARCH_SUPPORTS_BOTH_MMU=y
CT_ARCH_DEFAULT_HAS_MMU=y
CT_ARCH_USE_MMU=y
CT_ARCH_SUPPORTS_FLAT_FORMAT=y
+CT_ARCH_SUPPORTS_LIBSANITIZER=y
CT_ARCH_SUPPORTS_EITHER_ENDIAN=y
CT_ARCH_DEFAULT_LE=y
# CT_ARCH_BE is not set
@@ -271,6 +274,8 @@ CT_LINUX_PATCH_GLOBAL=y
# CT_LINUX_PATCH_LOCAL_BUNDLED is not set
# CT_LINUX_PATCH_NONE is not set
CT_LINUX_PATCH_ORDER="global"
+# CT_LINUX_V_6_0 is not set
+# CT_LINUX_V_5_19 is not set
# CT_LINUX_V_5_18 is not set
# CT_LINUX_V_5_17 is not set
# CT_LINUX_V_5_16 is not set
@@ -314,6 +319,8 @@ CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_LINUX_ARCHIVE_FORMATS=".tar.xz .tar.gz"
CT_LINUX_SIGNATURE_FORMAT="unpacked/.sign"
+CT_LINUX_5_19_or_older=y
+CT_LINUX_older_than_5_19=y
CT_LINUX_5_12_or_older=y
CT_LINUX_older_than_5_12=y
CT_LINUX_5_5_or_older=y
@@ -371,7 +378,8 @@ CT_BINUTILS_PATCH_GLOBAL=y
# CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
# CT_BINUTILS_PATCH_NONE is not set
CT_BINUTILS_PATCH_ORDER="global"
-CT_BINUTILS_V_2_38=y
+CT_BINUTILS_V_2_39=y
+# CT_BINUTILS_V_2_38 is not set
# CT_BINUTILS_V_2_37 is not set
# CT_BINUTILS_V_2_36 is not set
# CT_BINUTILS_V_2_35 is not set
@@ -384,12 +392,14 @@ CT_BINUTILS_V_2_38=y
# CT_BINUTILS_V_2_28 is not set
# CT_BINUTILS_V_2_27 is not set
# CT_BINUTILS_V_2_26 is not set
-CT_BINUTILS_VERSION="2.38"
+CT_BINUTILS_VERSION="2.39"
CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig"
+CT_BINUTILS_2_39_or_later=y
+CT_BINUTILS_2_39_or_older=y
CT_BINUTILS_later_than_2_30=y
CT_BINUTILS_2_30_or_later=y
CT_BINUTILS_later_than_2_27=y
@@ -444,6 +454,7 @@ CT_GLIBC_PATCH_GLOBAL=y
# CT_GLIBC_PATCH_LOCAL_BUNDLED is not set
# CT_GLIBC_PATCH_NONE is not set
CT_GLIBC_PATCH_ORDER="global"
+# CT_GLIBC_V_2_36 is not set
# CT_GLIBC_V_2_35 is not set
# CT_GLIBC_V_2_34 is not set
# CT_GLIBC_V_2_33 is not set
@@ -465,6 +476,8 @@ CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
CT_GLIBC_SIGNATURE_FORMAT="packed/.sig"
+CT_GLIBC_2_36_or_older=y
+CT_GLIBC_older_than_2_36=y
CT_GLIBC_2_34_or_older=y
CT_GLIBC_older_than_2_34=y
CT_GLIBC_2_32_or_older=y
@@ -581,7 +594,7 @@ CT_GCC_V_12=y
# CT_GCC_V_6 is not set
# CT_GCC_V_5 is not set
# CT_GCC_V_4_9 is not set
-CT_GCC_VERSION="12.1.0"
+CT_GCC_VERSION="12.2.0"
CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -625,12 +638,14 @@ CT_CC_GCC_LTO_ZSTD=m
#
# Settings for libraries running on target
#
+CT_CC_GCC_ENABLE_DEFAULT_PIE=y
# CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
# CT_CC_GCC_LIBMUDFLAP is not set
CT_CC_GCC_LIBGOMP=y
CT_CC_GCC_LIBSSP=m
# CT_CC_GCC_LIBQUADMATH is not set
# CT_CC_GCC_LIBSANITIZER is not set
+# CT_CC_GCC_LIBSTDCXX_VERBOSE is not set
#
# Misc. obscure options.
@@ -894,9 +909,10 @@ CT_ZLIB_PATCH_GLOBAL=y
# CT_ZLIB_PATCH_LOCAL_BUNDLED is not set
# CT_ZLIB_PATCH_NONE is not set
CT_ZLIB_PATCH_ORDER="global"
-CT_ZLIB_V_1_2_12=y
-CT_ZLIB_VERSION="1.2.12"
-CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
+CT_ZLIB_V_1_2_13=y
+# CT_ZLIB_V_1_2_12 is not set
+CT_ZLIB_VERSION="1.2.13"
+CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION} https://www.zlib.net/"
CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
diff --git a/images/base-win32/ct-ng-config b/images/base-win32/ct-ng-config
index 25f27f5..1211d93 100644
--- a/images/base-win32/ct-ng-config
+++ b/images/base-win32/ct-ng-config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.25.0.55_3defb7b Configuration
+# crosstool-NG 1.25.0.90_cf9beb1 Configuration
#
CT_CONFIGURE_has_static_link=y
CT_CONFIGURE_has_cxx11=y
@@ -19,6 +19,7 @@ CT_CONFIGURE_has_automake_1_15_or_newer=y
CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
CT_CONFIGURE_has_python_3_4_or_newer=y
CT_CONFIGURE_has_bison_2_7_or_newer=y
+CT_CONFIGURE_has_bison_3_0_4_or_newer=y
CT_CONFIGURE_has_python=y
CT_CONFIGURE_has_svn=y
CT_CONFIGURE_has_git=y
@@ -27,7 +28,7 @@ CT_CONFIGURE_has_sha1sum=y
CT_CONFIGURE_has_sha256sum=y
CT_CONFIGURE_has_sha512sum=y
CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.25.0.55_3defb7b"
+CT_VERSION="1.25.0.90_cf9beb1"
CT_VCHECK=""
CT_CONFIG_VERSION_ENV="4"
CT_CONFIG_VERSION_CURRENT="4"
@@ -137,6 +138,7 @@ CT_LOG_LEVEL_MAX="EXTRA"
# CT_ARCH_ARM is not set
# CT_ARCH_AVR is not set
# CT_ARCH_C6X is not set
+# CT_ARCH_LOONGARCH is not set
# CT_ARCH_M68K is not set
# CT_ARCH_MICROBLAZE is not set
# CT_ARCH_MIPS is not set
@@ -161,7 +163,7 @@ CT_ARCH_X86_SHOW=y
# Options for x86
#
CT_ARCH_X86_PKG_KSYM=""
-CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
+CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
CT_ARCH_SUFFIX=""
# CT_OMIT_TARGET_VENDOR is not set
@@ -241,6 +243,7 @@ CT_BUILD_SUFFIX=""
# Operating System
#
CT_WINDOWS=y
+CT_KERNEL_SUPPORTS_SHARED_LIBS=y
# CT_KERNEL_BARE_METAL is not set
# CT_KERNEL_LINUX is not set
CT_KERNEL_WINDOWS=y
@@ -257,6 +260,7 @@ CT_ALL_KERNEL_CHOICES="BARE_METAL LINUX WINDOWS"
#
# Common kernel options
#
+CT_SHARED_LIBS=y
# end of Operating System
#
@@ -288,7 +292,8 @@ CT_BINUTILS_PATCH_GLOBAL=y
# CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
# CT_BINUTILS_PATCH_NONE is not set
CT_BINUTILS_PATCH_ORDER="global"
-CT_BINUTILS_V_2_38=y
+CT_BINUTILS_V_2_39=y
+# CT_BINUTILS_V_2_38 is not set
# CT_BINUTILS_V_2_37 is not set
# CT_BINUTILS_V_2_36 is not set
# CT_BINUTILS_V_2_35 is not set
@@ -301,12 +306,14 @@ CT_BINUTILS_V_2_38=y
# CT_BINUTILS_V_2_28 is not set
# CT_BINUTILS_V_2_27 is not set
# CT_BINUTILS_V_2_26 is not set
-CT_BINUTILS_VERSION="2.38"
+CT_BINUTILS_VERSION="2.39"
CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig"
+CT_BINUTILS_2_39_or_later=y
+CT_BINUTILS_2_39_or_older=y
CT_BINUTILS_later_than_2_30=y
CT_BINUTILS_2_30_or_later=y
CT_BINUTILS_later_than_2_27=y
@@ -384,6 +391,8 @@ CT_LIBC_SUPPORT_THREADS_POSIX=y
#
# CT_THREADS_NATIVE is not set
CT_THREADS_POSIX=y
+# CT_CREATE_LDSO_CONF is not set
+CT_LIBC_XLDD=y
# end of C-library
#
@@ -431,7 +440,7 @@ CT_GCC_V_12=y
# CT_GCC_V_6 is not set
# CT_GCC_V_5 is not set
# CT_GCC_V_4_9 is not set
-CT_GCC_VERSION="12.1.0"
+CT_GCC_VERSION="12.2.0"
CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -479,6 +488,7 @@ CT_CC_GCC_LTO_ZSTD=m
CT_CC_GCC_LIBGOMP=y
CT_CC_GCC_LIBSSP=m
# CT_CC_GCC_LIBQUADMATH is not set
+# CT_CC_GCC_LIBSTDCXX_VERBOSE is not set
#
# Misc. obscure options.
@@ -691,9 +701,9 @@ CT_ZLIB_PATCH_GLOBAL=y
# CT_ZLIB_PATCH_LOCAL_BUNDLED is not set
# CT_ZLIB_PATCH_NONE is not set
CT_ZLIB_PATCH_ORDER="global"
-CT_ZLIB_V_1_2_12=y
-CT_ZLIB_VERSION="1.2.12"
-CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
+CT_ZLIB_V_1_2_13=y
+CT_ZLIB_VERSION="1.2.13"
+CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION} https://www.zlib.net/"
CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
diff --git a/images/base-win64/ct-ng-config b/images/base-win64/ct-ng-config
index 01d48d7..1dc6f29 100644
--- a/images/base-win64/ct-ng-config
+++ b/images/base-win64/ct-ng-config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.25.0.55_3defb7b Configuration
+# crosstool-NG 1.25.0.90_cf9beb1 Configuration
#
CT_CONFIGURE_has_static_link=y
CT_CONFIGURE_has_cxx11=y
@@ -19,6 +19,7 @@ CT_CONFIGURE_has_automake_1_15_or_newer=y
CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
CT_CONFIGURE_has_python_3_4_or_newer=y
CT_CONFIGURE_has_bison_2_7_or_newer=y
+CT_CONFIGURE_has_bison_3_0_4_or_newer=y
CT_CONFIGURE_has_python=y
CT_CONFIGURE_has_svn=y
CT_CONFIGURE_has_git=y
@@ -27,7 +28,7 @@ CT_CONFIGURE_has_sha1sum=y
CT_CONFIGURE_has_sha256sum=y
CT_CONFIGURE_has_sha512sum=y
CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.25.0.55_3defb7b"
+CT_VERSION="1.25.0.90_cf9beb1"
CT_VCHECK=""
CT_CONFIG_VERSION_ENV="4"
CT_CONFIG_VERSION_CURRENT="4"
@@ -137,6 +138,7 @@ CT_LOG_LEVEL_MAX="EXTRA"
# CT_ARCH_ARM is not set
# CT_ARCH_AVR is not set
# CT_ARCH_C6X is not set
+# CT_ARCH_LOONGARCH is not set
# CT_ARCH_M68K is not set
# CT_ARCH_MICROBLAZE is not set
# CT_ARCH_MIPS is not set
@@ -161,7 +163,7 @@ CT_ARCH_X86_SHOW=y
# Options for x86
#
CT_ARCH_X86_PKG_KSYM=""
-CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
+CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
CT_ARCH_SUFFIX=""
# CT_OMIT_TARGET_VENDOR is not set
@@ -171,6 +173,7 @@ CT_ARCH_SUFFIX=""
# CT_MULTILIB is not set
CT_DEMULTILIB=y
CT_ARCH_USE_MMU=y
+CT_ARCH_SUPPORTS_LIBSANITIZER=y
CT_ARCH_SUPPORTS_32=y
CT_ARCH_SUPPORTS_64=y
CT_ARCH_DEFAULT_32=y
@@ -241,6 +244,7 @@ CT_BUILD_SUFFIX=""
# Operating System
#
CT_WINDOWS=y
+CT_KERNEL_SUPPORTS_SHARED_LIBS=y
# CT_KERNEL_BARE_METAL is not set
# CT_KERNEL_LINUX is not set
CT_KERNEL_WINDOWS=y
@@ -257,6 +261,7 @@ CT_ALL_KERNEL_CHOICES="BARE_METAL LINUX WINDOWS"
#
# Common kernel options
#
+CT_SHARED_LIBS=y
# end of Operating System
#
@@ -288,7 +293,8 @@ CT_BINUTILS_PATCH_GLOBAL=y
# CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
# CT_BINUTILS_PATCH_NONE is not set
CT_BINUTILS_PATCH_ORDER="global"
-CT_BINUTILS_V_2_38=y
+CT_BINUTILS_V_2_39=y
+# CT_BINUTILS_V_2_38 is not set
# CT_BINUTILS_V_2_37 is not set
# CT_BINUTILS_V_2_36 is not set
# CT_BINUTILS_V_2_35 is not set
@@ -301,12 +307,14 @@ CT_BINUTILS_V_2_38=y
# CT_BINUTILS_V_2_28 is not set
# CT_BINUTILS_V_2_27 is not set
# CT_BINUTILS_V_2_26 is not set
-CT_BINUTILS_VERSION="2.38"
+CT_BINUTILS_VERSION="2.39"
CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig"
+CT_BINUTILS_2_39_or_later=y
+CT_BINUTILS_2_39_or_older=y
CT_BINUTILS_later_than_2_30=y
CT_BINUTILS_2_30_or_later=y
CT_BINUTILS_later_than_2_27=y
@@ -384,6 +392,8 @@ CT_LIBC_SUPPORT_THREADS_POSIX=y
#
# CT_THREADS_NATIVE is not set
CT_THREADS_POSIX=y
+# CT_CREATE_LDSO_CONF is not set
+CT_LIBC_XLDD=y
# end of C-library
#
@@ -431,7 +441,7 @@ CT_GCC_V_12=y
# CT_GCC_V_6 is not set
# CT_GCC_V_5 is not set
# CT_GCC_V_4_9 is not set
-CT_GCC_VERSION="12.1.0"
+CT_GCC_VERSION="12.2.0"
CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -479,6 +489,7 @@ CT_CC_GCC_LTO_ZSTD=m
CT_CC_GCC_LIBGOMP=y
CT_CC_GCC_LIBSSP=m
# CT_CC_GCC_LIBQUADMATH is not set
+# CT_CC_GCC_LIBSTDCXX_VERBOSE is not set
#
# Misc. obscure options.
@@ -691,9 +702,9 @@ CT_ZLIB_PATCH_GLOBAL=y
# CT_ZLIB_PATCH_LOCAL_BUNDLED is not set
# CT_ZLIB_PATCH_NONE is not set
CT_ZLIB_PATCH_ORDER="global"
-CT_ZLIB_V_1_2_12=y
-CT_ZLIB_VERSION="1.2.12"
-CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
+CT_ZLIB_V_1_2_13=y
+CT_ZLIB_VERSION="1.2.13"
+CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION} https://www.zlib.net/"
CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
From 15babf288b043bdbb5c131604947b45260b96672 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 23 Oct 2022 17:17:33 +0200
Subject: [PATCH 088/160] Bump zlib
---
scripts.d/20-zlib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/20-zlib.sh b/scripts.d/20-zlib.sh
index 4f3da7b..c400b17 100755
--- a/scripts.d/20-zlib.sh
+++ b/scripts.d/20-zlib.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/madler/zlib.git"
-SCRIPT_COMMIT="21767c654d31d2dccdde4330529775c6c5fd5389"
+SCRIPT_COMMIT="04f42ceca40f73e2978b50e93806c2a18c1281fc"
ffbuild_enabled() {
return 0
From 37f2a44634c75a60b4380794ccbe4e8457df3c8a Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 23 Oct 2022 18:17:09 +0200
Subject: [PATCH 089/160] Bump linux64 minimum toolchain version
The old-old stuff finally started breaking things
---
README.md | 6 ++---
images/base-linux64/ct-ng-config | 43 +++++++++++++++++++-------------
2 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/README.md b/README.md
index e4a98cb..19f501e 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,7 @@ Static Windows (x86_64) and Linux (x86_64) Builds of ffmpeg master and latest re
Windows builds are targetting Windows 7 and newer.
-Linux (x86_64) builds are targetting Ubuntu 16.04 (glibc-2.23 + linux-4.4) and anything more recent.
-
-Linux (arm64) builds are targetting Ubuntu 18.04 (glibc-2.27 + linux-4.15) and anything more recent.
+Linux builds are targetting Ubuntu 18.04 (glibc-2.27 + linux-4.15) and anything more recent.
## Auto-Builds
@@ -47,7 +45,7 @@ On success, the resulting zip file will be in the `artifacts` subdir.
Available targets:
* `win64` (x86_64 Windows)
* `win32` (x86 Windows)
-* `linux64` (x86_64 Linux, glibc>=2.23, linux>=4.4)
+* `linux64` (x86_64 Linux, glibc>=2.27, linux>=4.15)
* `linuxarm64` (arm64 (aarch64) Linux, glibc>=2.27, linux>=4.15)
The linuxarm64 target will not build some dependencies due to lack of arm64 (aarch64) architecture support or cross-compiling restrictions.
diff --git a/images/base-linux64/ct-ng-config b/images/base-linux64/ct-ng-config
index dbb6f81..0f164fe 100644
--- a/images/base-linux64/ct-ng-config
+++ b/images/base-linux64/ct-ng-config
@@ -292,14 +292,14 @@ CT_LINUX_PATCH_ORDER="global"
# CT_LINUX_V_4_18 is not set
# CT_LINUX_V_4_17 is not set
# CT_LINUX_V_4_16 is not set
-# CT_LINUX_V_4_15 is not set
+CT_LINUX_V_4_15=y
# CT_LINUX_V_4_14 is not set
# CT_LINUX_V_4_13 is not set
# CT_LINUX_V_4_12 is not set
# CT_LINUX_V_4_11 is not set
# CT_LINUX_V_4_10 is not set
# CT_LINUX_V_4_9 is not set
-CT_LINUX_V_4_4=y
+# CT_LINUX_V_4_4 is not set
# CT_LINUX_V_4_1 is not set
# CT_LINUX_V_3_18 is not set
# CT_LINUX_V_3_16 is not set
@@ -308,8 +308,7 @@ CT_LINUX_V_4_4=y
# CT_LINUX_V_3_10 is not set
# CT_LINUX_V_3_4 is not set
# CT_LINUX_V_3_2 is not set
-# CT_LINUX_V_2_6_32 is not set
-CT_LINUX_VERSION="4.4.302"
+CT_LINUX_VERSION="4.15.18"
CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})"
CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -323,12 +322,13 @@ CT_LINUX_5_5_or_older=y
CT_LINUX_older_than_5_5=y
CT_LINUX_5_3_or_older=y
CT_LINUX_older_than_5_3=y
-CT_LINUX_4_8_or_older=y
-CT_LINUX_older_than_4_8=y
+CT_LINUX_later_than_4_8=y
+CT_LINUX_4_8_or_later=y
CT_LINUX_later_than_3_7=y
CT_LINUX_3_7_or_later=y
CT_LINUX_later_than_3_2=y
CT_LINUX_3_2_or_later=y
+CT_LINUX_REQUIRE_3_2_or_later=y
CT_KERNEL_DEP_RSYNC=y
CT_KERNEL_LINUX_VERBOSITY_0=y
# CT_KERNEL_LINUX_VERBOSITY_1 is not set
@@ -457,14 +457,14 @@ CT_GLIBC_PATCH_ORDER="global"
# CT_GLIBC_V_2_30 is not set
# CT_GLIBC_V_2_29 is not set
# CT_GLIBC_V_2_28 is not set
-# CT_GLIBC_V_2_27 is not set
+CT_GLIBC_V_2_27=y
# CT_GLIBC_V_2_26 is not set
# CT_GLIBC_V_2_25 is not set
# CT_GLIBC_V_2_24 is not set
-CT_GLIBC_V_2_23=y
+# CT_GLIBC_V_2_23 is not set
# CT_GLIBC_V_2_19 is not set
# CT_GLIBC_V_2_17 is not set
-CT_GLIBC_VERSION="2.23"
+CT_GLIBC_VERSION="2.27"
CT_GLIBC_MIRRORS="$(CT_Mirrors GNU glibc)"
CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -484,16 +484,16 @@ CT_GLIBC_2_29_or_older=y
CT_GLIBC_older_than_2_29=y
CT_GLIBC_2_28_or_older=y
CT_GLIBC_older_than_2_28=y
+CT_GLIBC_2_27_or_later=y
CT_GLIBC_2_27_or_older=y
-CT_GLIBC_older_than_2_27=y
-CT_GLIBC_2_26_or_older=y
-CT_GLIBC_older_than_2_26=y
-CT_GLIBC_2_25_or_older=y
-CT_GLIBC_older_than_2_25=y
-CT_GLIBC_2_24_or_older=y
-CT_GLIBC_older_than_2_24=y
+CT_GLIBC_later_than_2_26=y
+CT_GLIBC_2_26_or_later=y
+CT_GLIBC_later_than_2_25=y
+CT_GLIBC_2_25_or_later=y
+CT_GLIBC_later_than_2_24=y
+CT_GLIBC_2_24_or_later=y
+CT_GLIBC_later_than_2_23=y
CT_GLIBC_2_23_or_later=y
-CT_GLIBC_2_23_or_older=y
CT_GLIBC_later_than_2_20=y
CT_GLIBC_2_20_or_later=y
CT_GLIBC_later_than_2_17=y
@@ -506,6 +506,7 @@ CT_GLIBC_DEP_GCC=y
CT_GLIBC_DEP_PYTHON=y
CT_GLIBC_SPARC_ALLOW_V7=y
CT_THREADS="nptl"
+CT_GLIBC_BUILD_SSP=y
CT_GLIBC_HAS_LIBIDN_ADDON=y
# CT_GLIBC_USE_LIBIDN_ADDON is not set
CT_GLIBC_NO_SPARC_V8=y
@@ -523,7 +524,12 @@ CT_GLIBC_FORCE_UNWIND=y
# CT_GLIBC_KERNEL_VERSION_NONE is not set
CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_GLIBC_MIN_KERNEL="4.4.302"
+CT_GLIBC_MIN_KERNEL="4.15.18"
+CT_GLIBC_SSP_DEFAULT=y
+# CT_GLIBC_SSP_NO is not set
+# CT_GLIBC_SSP_YES is not set
+# CT_GLIBC_SSP_ALL is not set
+# CT_GLIBC_SSP_STRONG is not set
CT_GLIBC_ENABLE_COMMON_FLAG=y
CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
CT_LIBC_SUPPORT_THREADS_ANY=y
@@ -606,6 +612,7 @@ CT_GCC_later_than_5=y
CT_GCC_5_or_later=y
CT_GCC_later_than_4_9=y
CT_GCC_4_9_or_later=y
+CT_GCC_REQUIRE_4_9_or_later=y
CT_CC_GCC_ENABLE_PLUGINS=y
CT_CC_GCC_HAS_LIBMPX=y
CT_CC_GCC_ENABLE_CXX_FLAGS=""
From b6b1d68d83c6d4c6145bf7549a6d2538f6e28d09 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 23 Oct 2022 19:20:49 +0200
Subject: [PATCH 090/160] Revert "Bump linux64 minimum toolchain version"
This reverts commit 37f2a44634c75a60b4380794ccbe4e8457df3c8a.
---
README.md | 6 +++--
images/base-linux64/ct-ng-config | 43 +++++++++++++-------------------
2 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/README.md b/README.md
index 19f501e..e4a98cb 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,9 @@ Static Windows (x86_64) and Linux (x86_64) Builds of ffmpeg master and latest re
Windows builds are targetting Windows 7 and newer.
-Linux builds are targetting Ubuntu 18.04 (glibc-2.27 + linux-4.15) and anything more recent.
+Linux (x86_64) builds are targetting Ubuntu 16.04 (glibc-2.23 + linux-4.4) and anything more recent.
+
+Linux (arm64) builds are targetting Ubuntu 18.04 (glibc-2.27 + linux-4.15) and anything more recent.
## Auto-Builds
@@ -45,7 +47,7 @@ On success, the resulting zip file will be in the `artifacts` subdir.
Available targets:
* `win64` (x86_64 Windows)
* `win32` (x86 Windows)
-* `linux64` (x86_64 Linux, glibc>=2.27, linux>=4.15)
+* `linux64` (x86_64 Linux, glibc>=2.23, linux>=4.4)
* `linuxarm64` (arm64 (aarch64) Linux, glibc>=2.27, linux>=4.15)
The linuxarm64 target will not build some dependencies due to lack of arm64 (aarch64) architecture support or cross-compiling restrictions.
diff --git a/images/base-linux64/ct-ng-config b/images/base-linux64/ct-ng-config
index 0f164fe..dbb6f81 100644
--- a/images/base-linux64/ct-ng-config
+++ b/images/base-linux64/ct-ng-config
@@ -292,14 +292,14 @@ CT_LINUX_PATCH_ORDER="global"
# CT_LINUX_V_4_18 is not set
# CT_LINUX_V_4_17 is not set
# CT_LINUX_V_4_16 is not set
-CT_LINUX_V_4_15=y
+# CT_LINUX_V_4_15 is not set
# CT_LINUX_V_4_14 is not set
# CT_LINUX_V_4_13 is not set
# CT_LINUX_V_4_12 is not set
# CT_LINUX_V_4_11 is not set
# CT_LINUX_V_4_10 is not set
# CT_LINUX_V_4_9 is not set
-# CT_LINUX_V_4_4 is not set
+CT_LINUX_V_4_4=y
# CT_LINUX_V_4_1 is not set
# CT_LINUX_V_3_18 is not set
# CT_LINUX_V_3_16 is not set
@@ -308,7 +308,8 @@ CT_LINUX_V_4_15=y
# CT_LINUX_V_3_10 is not set
# CT_LINUX_V_3_4 is not set
# CT_LINUX_V_3_2 is not set
-CT_LINUX_VERSION="4.15.18"
+# CT_LINUX_V_2_6_32 is not set
+CT_LINUX_VERSION="4.4.302"
CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})"
CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -322,13 +323,12 @@ CT_LINUX_5_5_or_older=y
CT_LINUX_older_than_5_5=y
CT_LINUX_5_3_or_older=y
CT_LINUX_older_than_5_3=y
-CT_LINUX_later_than_4_8=y
-CT_LINUX_4_8_or_later=y
+CT_LINUX_4_8_or_older=y
+CT_LINUX_older_than_4_8=y
CT_LINUX_later_than_3_7=y
CT_LINUX_3_7_or_later=y
CT_LINUX_later_than_3_2=y
CT_LINUX_3_2_or_later=y
-CT_LINUX_REQUIRE_3_2_or_later=y
CT_KERNEL_DEP_RSYNC=y
CT_KERNEL_LINUX_VERBOSITY_0=y
# CT_KERNEL_LINUX_VERBOSITY_1 is not set
@@ -457,14 +457,14 @@ CT_GLIBC_PATCH_ORDER="global"
# CT_GLIBC_V_2_30 is not set
# CT_GLIBC_V_2_29 is not set
# CT_GLIBC_V_2_28 is not set
-CT_GLIBC_V_2_27=y
+# CT_GLIBC_V_2_27 is not set
# CT_GLIBC_V_2_26 is not set
# CT_GLIBC_V_2_25 is not set
# CT_GLIBC_V_2_24 is not set
-# CT_GLIBC_V_2_23 is not set
+CT_GLIBC_V_2_23=y
# CT_GLIBC_V_2_19 is not set
# CT_GLIBC_V_2_17 is not set
-CT_GLIBC_VERSION="2.27"
+CT_GLIBC_VERSION="2.23"
CT_GLIBC_MIRRORS="$(CT_Mirrors GNU glibc)"
CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -484,16 +484,16 @@ CT_GLIBC_2_29_or_older=y
CT_GLIBC_older_than_2_29=y
CT_GLIBC_2_28_or_older=y
CT_GLIBC_older_than_2_28=y
-CT_GLIBC_2_27_or_later=y
CT_GLIBC_2_27_or_older=y
-CT_GLIBC_later_than_2_26=y
-CT_GLIBC_2_26_or_later=y
-CT_GLIBC_later_than_2_25=y
-CT_GLIBC_2_25_or_later=y
-CT_GLIBC_later_than_2_24=y
-CT_GLIBC_2_24_or_later=y
-CT_GLIBC_later_than_2_23=y
+CT_GLIBC_older_than_2_27=y
+CT_GLIBC_2_26_or_older=y
+CT_GLIBC_older_than_2_26=y
+CT_GLIBC_2_25_or_older=y
+CT_GLIBC_older_than_2_25=y
+CT_GLIBC_2_24_or_older=y
+CT_GLIBC_older_than_2_24=y
CT_GLIBC_2_23_or_later=y
+CT_GLIBC_2_23_or_older=y
CT_GLIBC_later_than_2_20=y
CT_GLIBC_2_20_or_later=y
CT_GLIBC_later_than_2_17=y
@@ -506,7 +506,6 @@ CT_GLIBC_DEP_GCC=y
CT_GLIBC_DEP_PYTHON=y
CT_GLIBC_SPARC_ALLOW_V7=y
CT_THREADS="nptl"
-CT_GLIBC_BUILD_SSP=y
CT_GLIBC_HAS_LIBIDN_ADDON=y
# CT_GLIBC_USE_LIBIDN_ADDON is not set
CT_GLIBC_NO_SPARC_V8=y
@@ -524,12 +523,7 @@ CT_GLIBC_FORCE_UNWIND=y
# CT_GLIBC_KERNEL_VERSION_NONE is not set
CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_GLIBC_MIN_KERNEL="4.15.18"
-CT_GLIBC_SSP_DEFAULT=y
-# CT_GLIBC_SSP_NO is not set
-# CT_GLIBC_SSP_YES is not set
-# CT_GLIBC_SSP_ALL is not set
-# CT_GLIBC_SSP_STRONG is not set
+CT_GLIBC_MIN_KERNEL="4.4.302"
CT_GLIBC_ENABLE_COMMON_FLAG=y
CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
CT_LIBC_SUPPORT_THREADS_ANY=y
@@ -612,7 +606,6 @@ CT_GCC_later_than_5=y
CT_GCC_5_or_later=y
CT_GCC_later_than_4_9=y
CT_GCC_4_9_or_later=y
-CT_GCC_REQUIRE_4_9_or_later=y
CT_CC_GCC_ENABLE_PLUGINS=y
CT_CC_GCC_HAS_LIBMPX=y
CT_CC_GCC_ENABLE_CXX_FLAGS=""
From 869e2575115c1290e7da960819f11082519304af Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 23 Oct 2022 21:52:39 +0200
Subject: [PATCH 091/160] Increase ct-ng log level
---
images/base-linux64/ct-ng-config | 6 +++---
images/base-linuxarm64/ct-ng-config | 6 +++---
images/base-win32/ct-ng-config | 6 +++---
images/base-win64/ct-ng-config | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/images/base-linux64/ct-ng-config b/images/base-linux64/ct-ng-config
index dbb6f81..c6bad3d 100644
--- a/images/base-linux64/ct-ng-config
+++ b/images/base-linux64/ct-ng-config
@@ -121,10 +121,10 @@ CT_CONFIG_SHELL="${bash}"
# CT_LOG_ERROR is not set
# CT_LOG_WARN is not set
# CT_LOG_INFO is not set
-CT_LOG_EXTRA=y
+# CT_LOG_EXTRA is not set
# CT_LOG_ALL is not set
-# CT_LOG_DEBUG is not set
-CT_LOG_LEVEL_MAX="EXTRA"
+CT_LOG_DEBUG=y
+CT_LOG_LEVEL_MAX="DEBUG"
# CT_LOG_SEE_TOOLS_WARN is not set
# CT_LOG_PROGRESS_BAR is not set
# CT_LOG_TO_FILE is not set
diff --git a/images/base-linuxarm64/ct-ng-config b/images/base-linuxarm64/ct-ng-config
index 76e556f..f84b646 100644
--- a/images/base-linuxarm64/ct-ng-config
+++ b/images/base-linuxarm64/ct-ng-config
@@ -121,10 +121,10 @@ CT_CONFIG_SHELL="${bash}"
# CT_LOG_ERROR is not set
# CT_LOG_WARN is not set
# CT_LOG_INFO is not set
-CT_LOG_EXTRA=y
+# CT_LOG_EXTRA is not set
# CT_LOG_ALL is not set
-# CT_LOG_DEBUG is not set
-CT_LOG_LEVEL_MAX="EXTRA"
+CT_LOG_DEBUG=y
+CT_LOG_LEVEL_MAX="DEBUG"
# CT_LOG_SEE_TOOLS_WARN is not set
# CT_LOG_PROGRESS_BAR is not set
# CT_LOG_TO_FILE is not set
diff --git a/images/base-win32/ct-ng-config b/images/base-win32/ct-ng-config
index 1211d93..6c71169 100644
--- a/images/base-win32/ct-ng-config
+++ b/images/base-win32/ct-ng-config
@@ -121,10 +121,10 @@ CT_CONFIG_SHELL="${bash}"
# CT_LOG_ERROR is not set
# CT_LOG_WARN is not set
# CT_LOG_INFO is not set
-CT_LOG_EXTRA=y
+# CT_LOG_EXTRA is not set
# CT_LOG_ALL is not set
-# CT_LOG_DEBUG is not set
-CT_LOG_LEVEL_MAX="EXTRA"
+CT_LOG_DEBUG=y
+CT_LOG_LEVEL_MAX="DEBUG"
# CT_LOG_SEE_TOOLS_WARN is not set
# CT_LOG_PROGRESS_BAR is not set
# CT_LOG_TO_FILE is not set
diff --git a/images/base-win64/ct-ng-config b/images/base-win64/ct-ng-config
index 1dc6f29..78c5552 100644
--- a/images/base-win64/ct-ng-config
+++ b/images/base-win64/ct-ng-config
@@ -121,10 +121,10 @@ CT_CONFIG_SHELL="${bash}"
# CT_LOG_ERROR is not set
# CT_LOG_WARN is not set
# CT_LOG_INFO is not set
-CT_LOG_EXTRA=y
+# CT_LOG_EXTRA is not set
# CT_LOG_ALL is not set
-# CT_LOG_DEBUG is not set
-CT_LOG_LEVEL_MAX="EXTRA"
+CT_LOG_DEBUG=y
+CT_LOG_LEVEL_MAX="DEBUG"
# CT_LOG_SEE_TOOLS_WARN is not set
# CT_LOG_PROGRESS_BAR is not set
# CT_LOG_TO_FILE is not set
From f83799c36f8732fb98591131b809af2778005eff Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 23 Oct 2022 21:52:10 +0200
Subject: [PATCH 092/160] Fix build of old glibc with default-pie gcc
---
images/base-linux64/ct-ng-config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/images/base-linux64/ct-ng-config b/images/base-linux64/ct-ng-config
index c6bad3d..5b07472 100644
--- a/images/base-linux64/ct-ng-config
+++ b/images/base-linux64/ct-ng-config
@@ -513,7 +513,7 @@ CT_GLIBC_HAS_OBSOLETE_RPC=y
CT_GLIBC_EXTRA_CONFIG_ARRAY="--with-pic"
CT_GLIBC_CONFIGPARMS=""
# CT_GLIBC_ENABLE_DEBUG is not set
-CT_GLIBC_EXTRA_CFLAGS="-fPIC -DPIC"
+CT_GLIBC_EXTRA_CFLAGS="-fPIC -DPIC -no-pie"
CT_GLIBC_ENABLE_OBSOLETE_RPC=y
# CT_GLIBC_ENABLE_FORTIFIED_BUILD is not set
# CT_GLIBC_DISABLE_VERSIONING is not set
From 8fff2b2a8ee851f7b0ff401f6ca64b792a9e9f71 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 23 Oct 2022 22:05:38 +0200
Subject: [PATCH 093/160] Switch to onevpl by default
Closes #182
---
addins/onevpl.sh | 1 -
scripts.d/50-mfx.sh | 5 +++--
scripts.d/50-onevpl.sh | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
delete mode 100644 addins/onevpl.sh
diff --git a/addins/onevpl.sh b/addins/onevpl.sh
deleted file mode 100644
index a9bf588..0000000
--- a/addins/onevpl.sh
+++ /dev/null
@@ -1 +0,0 @@
-#!/bin/bash
diff --git a/scripts.d/50-mfx.sh b/scripts.d/50-mfx.sh
index 85e15eb..332a3ae 100755
--- a/scripts.d/50-mfx.sh
+++ b/scripts.d/50-mfx.sh
@@ -4,7 +4,8 @@ SCRIPT_REPO="https://github.com/lu-zero/mfx_dispatch.git"
SCRIPT_COMMIT="7e4d221c36c630c1250b23a5dfa15657bc04c10c"
ffbuild_enabled() {
- [[ $TARGET == linuxarm64 ]] && return -1
+ [[ $TARGET == *arm64 ]] && return -1
+ [[ $ADDINS_STR != *4.4* && $ADDINS_STR == *5.0* && $ADDINS_STR == *5.1* ]] && return -1
return 0
}
@@ -38,7 +39,7 @@ ffbuild_dockerbuild() {
}
ffbuild_configure() {
- [[ $ADDINS_STR == *onevpl* ]] || echo --enable-libmfx
+ echo --enable-libmfx
}
ffbuild_unconfigure() {
diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh
index e257e34..ea5e6f8 100755
--- a/scripts.d/50-onevpl.sh
+++ b/scripts.d/50-onevpl.sh
@@ -32,7 +32,7 @@ ffbuild_dockerbuild() {
}
ffbuild_configure() {
- [[ $ADDINS_STR == *onevpl* ]] && echo --enable-libvpl
+ echo --enable-libvpl
}
ffbuild_unconfigure() {
From 2c3417550cccb1a94d95a52a0af16d2ed6554109 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 24 Oct 2022 14:04:17 +0200
Subject: [PATCH 094/160] Fix mfx disabling logic
---
scripts.d/50-mfx.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-mfx.sh b/scripts.d/50-mfx.sh
index 332a3ae..3ab4017 100755
--- a/scripts.d/50-mfx.sh
+++ b/scripts.d/50-mfx.sh
@@ -5,7 +5,7 @@ SCRIPT_COMMIT="7e4d221c36c630c1250b23a5dfa15657bc04c10c"
ffbuild_enabled() {
[[ $TARGET == *arm64 ]] && return -1
- [[ $ADDINS_STR != *4.4* && $ADDINS_STR == *5.0* && $ADDINS_STR == *5.1* ]] && return -1
+ [[ $ADDINS_STR != *4.4* && $ADDINS_STR != *5.0* && $ADDINS_STR != *5.1* ]] && return -1
return 0
}
From 86e25e0657fb6364229177910d39e449fab46a5f Mon Sep 17 00:00:00 2001
From: mrintrepide <40322493+mrintrepide@users.noreply.github.com>
Date: Sat, 22 Oct 2022 15:18:19 +0200
Subject: [PATCH 095/160] Update SVT-AV1 to v1.3.0
---
scripts.d/50-svtav1.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index 18a8ba4..c4c79a2 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="02b12fdb6353993b088b63fa04c2dd2b71fbb1b5"
+SCRIPT_COMMIT="91b94efb2809e83d9bf041d8575b32f234dfef27"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
From ef36e7e00d375786e594721294497892ee63ba26 Mon Sep 17 00:00:00 2001
From: mrintrepide <40322493+mrintrepide@users.noreply.github.com>
Date: Sat, 22 Oct 2022 15:51:56 +0200
Subject: [PATCH 096/160] Enable AVX512 support for SVT-AV1
---
scripts.d/50-svtav1.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index c4c79a2..f5c1b72 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -15,7 +15,7 @@ ffbuild_dockerbuild() {
mkdir build && cd build
- cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DBUILD_APPS=OFF ..
+ cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DBUILD_APPS=OFF -DENABLE_AVX512=ON ..
make -j$(nproc)
make install
}
From 1896b0d138cd0ee7224477eb004af26763b9e62a Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 26 Oct 2022 14:19:55 +0200
Subject: [PATCH 097/160] Fix another use of deprecated set-output
---
build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index ef82b48..80ec56a 100755
--- a/build.sh
+++ b/build.sh
@@ -100,6 +100,6 @@ cd -
rm -rf ffbuild
if [[ -n "$GITHUB_ACTIONS" ]]; then
- echo "::set-output name=build_name::${BUILD_NAME}"
+ echo "build_name=${BUILD_NAME}" >> "$GITHUB_OUTPUT"
echo "${OUTPUT_FNAME}" > "${ARTIFACTS_PATH}/${TARGET}-${VARIANT}${ADDINS_STR:+-}${ADDINS_STR}.txt"
fi
From 7028cb01c4140265b055e28692c242b045672186 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sat, 29 Oct 2022 18:50:06 +0200
Subject: [PATCH 098/160] Add OpenAL
Needs fixes to ffmpeg configure before it can be enabled
---
scripts.d/50-openal.sh | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100755 scripts.d/50-openal.sh
diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh
new file mode 100755
index 0000000..27f768c
--- /dev/null
+++ b/scripts.d/50-openal.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+SCRIPT_REPO="https://github.com/kcat/openal-soft.git"
+SCRIPT_COMMIT="f1f3672f0b8c45b87fcf3b3b99868c274569eaf4"
+
+ffbuild_enabled() {
+ return 0
+}
+
+ffbuild_dockerbuild() {
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openal
+ cd openal
+
+ mkdir cm_build && cd cm_build
+
+ cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
+ -DLIBTYPE=STATIC -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF ..
+ make -j$(nproc)
+ make install
+
+ echo "Libs.private: -lstdc++" >> "$FFBUILD_PREFIX"/lib/pkgconfig/openal.pc
+}
From 6f44be6038450dbc918f288806f2df7e20f0400f Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sat, 29 Oct 2022 19:19:28 +0200
Subject: [PATCH 099/160] Add missing OpenAL dependency to its .pc file
---
scripts.d/50-openal.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh
index 27f768c..ccfc9cd 100755
--- a/scripts.d/50-openal.sh
+++ b/scripts.d/50-openal.sh
@@ -19,4 +19,8 @@ ffbuild_dockerbuild() {
make install
echo "Libs.private: -lstdc++" >> "$FFBUILD_PREFIX"/lib/pkgconfig/openal.pc
+
+ if [[ $TARGET == win* ]]; then
+ echo "Libs.private: -lole32" >> "$FFBUILD_PREFIX"/lib/pkgconfig/openal.pc
+ fi
}
From f5cf1599d6d6623e7cee74e571c12abce2c39f4f Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 30 Oct 2022 01:27:14 +0200
Subject: [PATCH 100/160] Update OpenSSL
---
scripts.d/25-openssl.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh
index 28216a7..02b5e2b 100755
--- a/scripts.d/25-openssl.sh
+++ b/scripts.d/25-openssl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/openssl/openssl.git"
-SCRIPT_COMMIT="OpenSSL_1_1_1q"
+SCRIPT_COMMIT="OpenSSL_1_1_1r"
SCRIPT_TAGFILTER="OpenSSL_1_1_1*"
ffbuild_enabled() {
@@ -47,6 +47,9 @@ ffbuild_dockerbuild() {
return -1
fi
+ export CFLAGS="$CFLAGS -fno-strict-aliasing"
+ export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+
./Configure "${myconf[@]}"
sed -i -e "/^CFLAGS=/s|=.*|=${CFLAGS}|" -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" Makefile
From e768af40fb1cee5204a24bccce014910311d57c7 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 30 Oct 2022 17:50:30 +0100
Subject: [PATCH 101/160] Enable gcc LTO optimization
---
images/base-linux64/ct-ng-config | 2 +-
images/base-linuxarm64/ct-ng-config | 2 +-
images/base-win32/ct-ng-config | 4 ++--
images/base-win64/ct-ng-config | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/images/base-linux64/ct-ng-config b/images/base-linux64/ct-ng-config
index 5b07472..7cfd776 100644
--- a/images/base-linux64/ct-ng-config
+++ b/images/base-linux64/ct-ng-config
@@ -610,7 +610,7 @@ CT_CC_GCC_ENABLE_PLUGINS=y
CT_CC_GCC_HAS_LIBMPX=y
CT_CC_GCC_ENABLE_CXX_FLAGS=""
CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-host-shared --enable-default-ssp"
-CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-host-shared --enable-default-ssp"
+CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-host-shared --enable-default-ssp --with-build-config=bootstrap-lto-lean --enable-link-serialization=2"
# CT_CC_GCC_STATIC_LIBSTDCXX is not set
# CT_CC_GCC_SYSTEM_ZLIB is not set
CT_CC_GCC_CONFIG_TLS=m
diff --git a/images/base-linuxarm64/ct-ng-config b/images/base-linuxarm64/ct-ng-config
index f84b646..39137ab 100644
--- a/images/base-linuxarm64/ct-ng-config
+++ b/images/base-linuxarm64/ct-ng-config
@@ -623,7 +623,7 @@ CT_CC_GCC_ENABLE_PLUGINS=y
CT_CC_GCC_HAS_LIBMPX=y
CT_CC_GCC_ENABLE_CXX_FLAGS=""
CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-host-shared --enable-default-ssp"
-CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-host-shared --enable-default-ssp"
+CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-host-shared --enable-default-ssp --with-build-config=bootstrap-lto-lean --enable-link-serialization=2"
# CT_CC_GCC_STATIC_LIBSTDCXX is not set
# CT_CC_GCC_SYSTEM_ZLIB is not set
CT_CC_GCC_CONFIG_TLS=m
diff --git a/images/base-win32/ct-ng-config b/images/base-win32/ct-ng-config
index 6c71169..07bdd9f 100644
--- a/images/base-win32/ct-ng-config
+++ b/images/base-win32/ct-ng-config
@@ -467,8 +467,8 @@ CT_GCC_4_9_or_later=y
CT_CC_GCC_ENABLE_PLUGINS=y
CT_CC_GCC_HAS_LIBMPX=y
CT_CC_GCC_ENABLE_CXX_FLAGS=""
-CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY=""
-CT_CC_GCC_EXTRA_CONFIG_ARRAY=""
+CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-default-ssp"
+CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-default-ssp --with-build-config=bootstrap-lto-lean --enable-link-serialization=2"
CT_CC_GCC_STATIC_LIBSTDCXX=y
CT_CC_GCC_SYSTEM_ZLIB=y
CT_CC_GCC_CONFIG_TLS=m
diff --git a/images/base-win64/ct-ng-config b/images/base-win64/ct-ng-config
index 78c5552..83b65cb 100644
--- a/images/base-win64/ct-ng-config
+++ b/images/base-win64/ct-ng-config
@@ -468,8 +468,8 @@ CT_GCC_4_9_or_later=y
CT_CC_GCC_ENABLE_PLUGINS=y
CT_CC_GCC_HAS_LIBMPX=y
CT_CC_GCC_ENABLE_CXX_FLAGS=""
-CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY=""
-CT_CC_GCC_EXTRA_CONFIG_ARRAY=""
+CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-default-ssp"
+CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-default-ssp --with-build-config=bootstrap-lto-lean --enable-link-serialization=2"
CT_CC_GCC_STATIC_LIBSTDCXX=y
CT_CC_GCC_SYSTEM_ZLIB=y
CT_CC_GCC_CONFIG_TLS=m
From cf6565ec661fa7ff777db529b5127f000fbdc940 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 30 Oct 2022 21:42:22 +0100
Subject: [PATCH 102/160] Disable unused libvpx unit-tests
---
scripts.d/50-libvpx.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index e75a192..6dad9d4 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -18,6 +18,7 @@ ffbuild_dockerbuild() {
--disable-examples
--disable-tools
--disable-docs
+ --disable-unit-tests
--enable-vp9-highbitdepth
--prefix="$FFBUILD_PREFIX"
)
From 768ded56fa0ae5558e0b960f772bb220cd0457ac Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 30 Oct 2022 21:42:44 +0100
Subject: [PATCH 103/160] Fix x/davs2 configure for recent binutils+gcc
---
scripts.d/50-davs2.sh | 4 ++++
scripts.d/50-xavs2.sh | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/scripts.d/50-davs2.sh b/scripts.d/50-davs2.sh
index 96651f4..fb5dcbb 100755
--- a/scripts.d/50-davs2.sh
+++ b/scripts.d/50-davs2.sh
@@ -33,6 +33,10 @@ ffbuild_dockerbuild() {
return -1
fi
+ # Work around configure endian check failing on modern gcc/binutils.
+ # Assumes all supported archs are little endian.
+ sed -i -e 's/EGIB/bss/g' -e 's/naidnePF/bss/g' configure
+
./configure "${myconf[@]}"
make -j$(nproc)
make install
diff --git a/scripts.d/50-xavs2.sh b/scripts.d/50-xavs2.sh
index 108693c..bd128b3 100755
--- a/scripts.d/50-xavs2.sh
+++ b/scripts.d/50-xavs2.sh
@@ -41,6 +41,10 @@ ffbuild_dockerbuild() {
return -1
fi
+ # Work around configure endian check failing on modern gcc/binutils.
+ # Assumes all supported archs are little endian.
+ sed -i -e 's/EGIB/bss/g' -e 's/naidnePF/bss/g' configure
+
./configure "${myconf[@]}"
make -j$(nproc)
make install
From 18e540f47d3db164f64b7541f78c4f985449ece4 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 31 Oct 2022 20:44:20 +0100
Subject: [PATCH 104/160] Enable OpenAL for master builds
---
scripts.d/50-openal.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh
index ccfc9cd..69d803c 100755
--- a/scripts.d/50-openal.sh
+++ b/scripts.d/50-openal.sh
@@ -4,6 +4,9 @@ SCRIPT_REPO="https://github.com/kcat/openal-soft.git"
SCRIPT_COMMIT="f1f3672f0b8c45b87fcf3b3b99868c274569eaf4"
ffbuild_enabled() {
+ [[ $ADDINS_STR == *4.4* ]] && return -1
+ [[ $ADDINS_STR == *5.0* ]] && return -1
+ [[ $ADDINS_STR == *5.1* ]] && return -1
return 0
}
@@ -24,3 +27,11 @@ ffbuild_dockerbuild() {
echo "Libs.private: -lole32" >> "$FFBUILD_PREFIX"/lib/pkgconfig/openal.pc
fi
}
+
+ffbuild_configure() {
+ echo --enable-openal
+}
+
+ffbuild_unconfigure() {
+ echo --disable-openal
+}
From 41079cb7bfb177b2777ce54c910707ceb3b278eb Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 31 Oct 2022 21:47:07 +0100
Subject: [PATCH 105/160] Reduce duplication of toolchain name a bit
---
images/base-linux64/Dockerfile | 6 +++---
images/base-linuxarm64/Dockerfile | 6 +++---
images/base-win32/Dockerfile | 8 ++++----
images/base-win64/Dockerfile | 8 ++++----
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/images/base-linux64/Dockerfile b/images/base-linux64/Dockerfile
index a99ac97..5b86090 100644
--- a/images/base-linux64/Dockerfile
+++ b/images/base-linux64/Dockerfile
@@ -39,10 +39,10 @@ ADD cross.meson /cross.meson
ADD gen-implib.sh /usr/bin/gen-implib
RUN git clone --filter=blob:none --depth=1 https://github.com/yugr/Implib.so /opt/implib
+ENV FFBUILD_TOOLCHAIN=x86_64-ffbuild-linux-gnu
ENV PATH="/opt/ct-ng/bin:${PATH}" \
- FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-ffbuild-linux-gnu- --arch=x86_64 --target-os=linux" \
- FFBUILD_TOOLCHAIN=x86_64-ffbuild-linux-gnu \
- FFBUILD_CROSS_PREFIX="x86_64-ffbuild-linux-gnu-" \
+ FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=${FFBUILD_TOOLCHAIN}- --arch=x86_64 --target-os=linux" \
+ FFBUILD_CROSS_PREFIX="${FFBUILD_TOOLCHAIN}-" \
FFBUILD_RUST_TARGET="x86_64-unknown-linux-gnu" \
FFBUILD_PREFIX=/opt/ffbuild \
FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \
diff --git a/images/base-linuxarm64/Dockerfile b/images/base-linuxarm64/Dockerfile
index eb39ec5..8e3f555 100644
--- a/images/base-linuxarm64/Dockerfile
+++ b/images/base-linuxarm64/Dockerfile
@@ -41,10 +41,10 @@ ADD cross.meson /cross.meson
ADD gen-implib.sh /usr/bin/gen-implib
RUN git clone --filter=blob:none --depth=1 https://github.com/yugr/Implib.so /opt/implib
+ENV FFBUILD_TOOLCHAIN=aarch64-ffbuild-linux-gnu
ENV PATH="/opt/ct-ng/bin:${PATH}" \
- FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=aarch64-ffbuild-linux-gnu- --arch=aarch64 --target-os=linux" \
- FFBUILD_TOOLCHAIN=aarch64-ffbuild-linux-gnu \
- FFBUILD_CROSS_PREFIX="aarch64-ffbuild-linux-gnu-" \
+ FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=${FFBUILD_TOOLCHAIN}- --arch=aarch64 --target-os=linux" \
+ FFBUILD_CROSS_PREFIX="${FFBUILD_TOOLCHAIN}-" \
FFBUILD_RUST_TARGET="aarch64-unknown-linux-gnu" \
FFBUILD_PREFIX=/opt/ffbuild \
FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \
diff --git a/images/base-win32/Dockerfile b/images/base-win32/Dockerfile
index 4a01efd..b7415a4 100644
--- a/images/base-win32/Dockerfile
+++ b/images/base-win32/Dockerfile
@@ -24,10 +24,10 @@ RUN rustup target add i686-pc-windows-gnu
ADD toolchain.cmake /toolchain.cmake
ADD cross.meson /cross.meson
+ENV FFBUILD_TOOLCHAIN=i686-w64-mingw32
ENV PATH="/opt/ct-ng/bin:${PATH}" \
- FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=i686-w64-mingw32- --arch=i686 --target-os=mingw32" \
- FFBUILD_TOOLCHAIN=i686-w64-mingw32 \
- FFBUILD_CROSS_PREFIX=i686-w64-mingw32- \
+ FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=${FFBUILD_TOOLCHAIN}- --arch=i686 --target-os=mingw32" \
+ FFBUILD_CROSS_PREFIX=${FFBUILD_TOOLCHAIN}- \
FFBUILD_RUST_TARGET=i686-pc-windows-gnu \
FFBUILD_PREFIX=/opt/ffbuild \
FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \
@@ -36,6 +36,6 @@ ENV PATH="/opt/ct-ng/bin:${PATH}" \
CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong" \
- DLLTOOL="i686-w64-mingw32-dlltool" \
+ DLLTOOL="${FFBUILD_TOOLCHAIN}-dlltool" \
STAGE_CFLAGS="-fno-semantic-interposition" \
STAGE_CXXFLAGS="-fno-semantic-interposition"
diff --git a/images/base-win64/Dockerfile b/images/base-win64/Dockerfile
index 120ce8c..3031e89 100644
--- a/images/base-win64/Dockerfile
+++ b/images/base-win64/Dockerfile
@@ -24,10 +24,10 @@ RUN rustup target add x86_64-pc-windows-gnu
ADD toolchain.cmake /toolchain.cmake
ADD cross.meson /cross.meson
+ENV FFBUILD_TOOLCHAIN=x86_64-w64-mingw32
ENV PATH="/opt/ct-ng/bin:${PATH}" \
- FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-w64-mingw32- --arch=x86_64 --target-os=mingw32" \
- FFBUILD_TOOLCHAIN=x86_64-w64-mingw32 \
- FFBUILD_CROSS_PREFIX=x86_64-w64-mingw32- \
+ FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=${FFBUILD_TOOLCHAIN}- --arch=x86_64 --target-os=mingw32" \
+ FFBUILD_CROSS_PREFIX=${FFBUILD_TOOLCHAIN}- \
FFBUILD_RUST_TARGET=x86_64-pc-windows-gnu \
FFBUILD_PREFIX=/opt/ffbuild \
FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \
@@ -36,6 +36,6 @@ ENV PATH="/opt/ct-ng/bin:${PATH}" \
CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong" \
- DLLTOOL="x86_64-w64-mingw32-dlltool" \
+ DLLTOOL="${FFBUILD_TOOLCHAIN}-dlltool" \
STAGE_CFLAGS="-fno-semantic-interposition" \
STAGE_CXXFLAGS="-fno-semantic-interposition"
From 782f7313504cf0785508c7a95a1a86d5a1777cd4 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 2 Nov 2022 21:50:05 +0100
Subject: [PATCH 106/160] Add function for addins to generate Dockerfile header
---
generate.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/generate.sh b/generate.sh
index c919417..18a25bc 100755
--- a/generate.sh
+++ b/generate.sh
@@ -29,6 +29,13 @@ to_df() {
to_df "FROM ${REGISTRY}/${REPO}/base-${TARGET}:latest AS base"
to_df "ENV TARGET=$TARGET VARIANT=$VARIANT REPO=$REPO ADDINS_STR=$ADDINS_STR"
+for addin in "${ADDINS[@]}"; do
+(
+ source addins/"${addin}.sh"
+ type ffbuild_dockeraddin &>/dev/null && ffbuild_dockeraddin
+)
+done
+
PREVLAYER="base"
for ID in $(ls -1d scripts.d/??-* | sed -s 's|^.*/\(..\).*|\1|' | sort -u); do
LAYER="layer-$ID"
From 1f74f0a60a2db8fdcb5d20da162283fb80a11c45 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 31 Oct 2022 22:32:58 +0100
Subject: [PATCH 107/160] Consolidate/clean up meson and cmake toolchain files
---
images/base-linux64/cross.meson | 3 ++-
images/base-linux64/toolchain.cmake | 4 ++--
images/base-linuxarm64/cross.meson | 3 ++-
images/base-linuxarm64/toolchain.cmake | 4 ++--
images/base-win32/cross.meson | 3 ++-
images/base-win32/toolchain.cmake | 14 +++++++++-----
images/base-win64/cross.meson | 3 ++-
images/base-win64/toolchain.cmake | 14 +++++++++-----
8 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/images/base-linux64/cross.meson b/images/base-linux64/cross.meson
index da9e709..8619c70 100644
--- a/images/base-linux64/cross.meson
+++ b/images/base-linux64/cross.meson
@@ -2,7 +2,8 @@
c = 'x86_64-ffbuild-linux-gnu-gcc'
cpp = 'x86_64-ffbuild-linux-gnu-g++'
ld = 'x86_64-ffbuild-linux-gnu-ld'
-ar = 'x86_64-ffbuild-linux-gnu-ar'
+ar = 'x86_64-ffbuild-linux-gnu-gcc-ar'
+ranlib = 'x86_64-ffbuild-linux-gnu-gcc-ranlib'
strip = 'x86_64-ffbuild-linux-gnu-strip'
[host_machine]
diff --git a/images/base-linux64/toolchain.cmake b/images/base-linux64/toolchain.cmake
index dd73670..91f8226 100644
--- a/images/base-linux64/toolchain.cmake
+++ b/images/base-linux64/toolchain.cmake
@@ -5,8 +5,8 @@ set(triple x86_64-ffbuild-linux-gnu)
set(CMAKE_C_COMPILER ${triple}-gcc)
set(CMAKE_CXX_COMPILER ${triple}-g++)
-set(CMAKE_RANLIB ${triple}-ranlib)
-set(CMAKE_AR ${triple}-ar)
+set(CMAKE_RANLIB ${triple}-gcc-ranlib)
+set(CMAKE_AR ${triple}-gcc-ar)
set(CMAKE_SYSROOT /opt/ct-ng/${triple}/sysroot)
set(CMAKE_FIND_ROOT_PATH /opt/ct-ng /opt/ct-ng/${triple}/sysroot /opt/ffbuild)
diff --git a/images/base-linuxarm64/cross.meson b/images/base-linuxarm64/cross.meson
index b40ba85..88a8609 100644
--- a/images/base-linuxarm64/cross.meson
+++ b/images/base-linuxarm64/cross.meson
@@ -2,7 +2,8 @@
c = 'aarch64-ffbuild-linux-gnu-gcc'
cpp = 'aarch64-ffbuild-linux-gnu-g++'
ld = 'aarch64-ffbuild-linux-gnu-ld'
-ar = 'aarch64-ffbuild-linux-gnu-ar'
+ar = 'aarch64-ffbuild-linux-gnu-gcc-ar'
+ranlib = 'x86_64-ffbuild-linux-gnu-gcc-ranlib'
strip = 'aarch64-ffbuild-linux-gnu-strip'
[host_machine]
diff --git a/images/base-linuxarm64/toolchain.cmake b/images/base-linuxarm64/toolchain.cmake
index 38fe7c6..9ca16df 100644
--- a/images/base-linuxarm64/toolchain.cmake
+++ b/images/base-linuxarm64/toolchain.cmake
@@ -5,8 +5,8 @@ set(triple aarch64-ffbuild-linux-gnu)
set(CMAKE_C_COMPILER ${triple}-gcc)
set(CMAKE_CXX_COMPILER ${triple}-g++)
-set(CMAKE_RANLIB ${triple}-ranlib)
-set(CMAKE_AR ${triple}-ar)
+set(CMAKE_RANLIB ${triple}-gcc-ranlib)
+set(CMAKE_AR ${triple}-gcc-ar)
set(CMAKE_SYSROOT /opt/ct-ng/${triple}/sysroot)
set(CMAKE_FIND_ROOT_PATH /opt/ct-ng /opt/ct-ng/${triple}/sysroot /opt/ffbuild)
diff --git a/images/base-win32/cross.meson b/images/base-win32/cross.meson
index 5b99ce3..a52a835 100644
--- a/images/base-win32/cross.meson
+++ b/images/base-win32/cross.meson
@@ -1,7 +1,8 @@
[binaries]
c = 'i686-w64-mingw32-gcc'
cpp = 'i686-w64-mingw32-g++'
-ar = 'i686-w64-mingw32-ar'
+ar = 'i686-w64-mingw32-gcc-ar'
+ranlib = 'i686-w64-mingw32-gcc-ranlib'
strip = 'i686-w64-mingw32-strip'
windres = 'i686-w64-mingw32-windres'
exe_wrapper = ['wine']
diff --git a/images/base-win32/toolchain.cmake b/images/base-win32/toolchain.cmake
index 526610e..4ef5d4c 100644
--- a/images/base-win32/toolchain.cmake
+++ b/images/base-win32/toolchain.cmake
@@ -1,12 +1,16 @@
set(CMAKE_SYSTEM_NAME Windows)
set(CMAKE_SYSTEM_PROCESSOR i686)
-set(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
-set(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
-set(CMAKE_RC_COMPILER i686-w64-mingw32-windres)
-set(CMAKE_RANLIB i686-w64-mingw32-ranlib)
+set(triple i686-w64-mingw32)
-set(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32 /opt/ffbuild)
+set(CMAKE_C_COMPILER ${triple}-gcc)
+set(CMAKE_CXX_COMPILER ${triple}-g++)
+set(CMAKE_RC_COMPILER ${triple}-windres)
+set(CMAKE_RANLIB ${triple}-gcc-ranlib)
+set(CMAKE_AR ${triple}-gcc-ar)
+
+set(CMAKE_SYSROOT /opt/ct-ng/${triple}/sysroot)
+set(CMAKE_FIND_ROOT_PATH /opt/ct-ng /opt/ct-ng/${triple}/sysroot /opt/ffbuild)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
diff --git a/images/base-win64/cross.meson b/images/base-win64/cross.meson
index f5743f0..eb16efb 100644
--- a/images/base-win64/cross.meson
+++ b/images/base-win64/cross.meson
@@ -1,7 +1,8 @@
[binaries]
c = 'x86_64-w64-mingw32-gcc'
cpp = 'x86_64-w64-mingw32-g++'
-ar = 'x86_64-w64-mingw32-ar'
+ar = 'x86_64-w64-mingw32-gcc-ar'
+ranlib = 'x86_64-w64-mingw32-gcc-ranlib'
strip = 'x86_64-w64-mingw32-strip'
windres = 'x86_64-w64-mingw32-windres'
exe_wrapper = ['wine']
diff --git a/images/base-win64/toolchain.cmake b/images/base-win64/toolchain.cmake
index 72e09eb..7b21acb 100644
--- a/images/base-win64/toolchain.cmake
+++ b/images/base-win64/toolchain.cmake
@@ -1,12 +1,16 @@
set(CMAKE_SYSTEM_NAME Windows)
set(CMAKE_SYSTEM_PROCESSOR x86_64)
-set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
-set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
-set(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
-set(CMAKE_RANLIB x86_64-w64-mingw32-ranlib)
+set(triple x86_64-w64-mingw32)
-set(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32 /opt/ffbuild)
+set(CMAKE_C_COMPILER ${triple}-gcc)
+set(CMAKE_CXX_COMPILER ${triple}-g++)
+set(CMAKE_RC_COMPILER ${triple}-windres)
+set(CMAKE_RANLIB ${triple}-gcc-ranlib)
+set(CMAKE_AR ${triple}-gcc-ar)
+
+set(CMAKE_SYSROOT /opt/ct-ng/${triple}/sysroot)
+set(CMAKE_FIND_ROOT_PATH /opt/ct-ng /opt/ct-ng/${triple}/sysroot /opt/ffbuild)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
From 2f0d9dbf8bce6252c4942308157a46632b121043 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 2 Nov 2022 22:02:09 +0100
Subject: [PATCH 108/160] Explicitly declare toolchain tools in base image
---
images/base-linux64/Dockerfile | 6 ++++++
images/base-linuxarm64/Dockerfile | 6 ++++++
images/base-win32/Dockerfile | 8 +++++++-
images/base-win64/Dockerfile | 8 +++++++-
scripts.d/25-openssl.sh | 6 ++++++
5 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/images/base-linux64/Dockerfile b/images/base-linux64/Dockerfile
index 5b86090..c81a27f 100644
--- a/images/base-linux64/Dockerfile
+++ b/images/base-linux64/Dockerfile
@@ -48,6 +48,12 @@ ENV PATH="/opt/ct-ng/bin:${PATH}" \
FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \
PKG_CONFIG=pkg-config \
PKG_CONFIG_LIBDIR=/opt/ffbuild/lib/pkgconfig:/opt/ffbuild/share/pkgconfig \
+ CC="${FFBUILD_TOOLCHAIN}-gcc" \
+ CXX="${FFBUILD_TOOLCHAIN}-g++" \
+ LD="${FFBUILD_TOOLCHAIN}-ld" \
+ AR="${FFBUILD_TOOLCHAIN}-gcc-ar" \
+ RANLIB="${FFBUILD_TOOLCHAIN}-gcc-ranlib" \
+ NM="${FFBUILD_TOOLCHAIN}-gcc-nm" \
CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \
CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \
LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -Wl,-z,relro,-z,now -pthread -lm" \
diff --git a/images/base-linuxarm64/Dockerfile b/images/base-linuxarm64/Dockerfile
index 8e3f555..8e786b1 100644
--- a/images/base-linuxarm64/Dockerfile
+++ b/images/base-linuxarm64/Dockerfile
@@ -50,6 +50,12 @@ ENV PATH="/opt/ct-ng/bin:${PATH}" \
FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \
PKG_CONFIG=pkg-config \
PKG_CONFIG_LIBDIR=/opt/ffbuild/lib/pkgconfig:/opt/ffbuild/share/pkgconfig \
+ CC="${FFBUILD_TOOLCHAIN}-gcc" \
+ CXX="${FFBUILD_TOOLCHAIN}-g++" \
+ LD="${FFBUILD_TOOLCHAIN}-ld" \
+ AR="${FFBUILD_TOOLCHAIN}-gcc-ar" \
+ RANLIB="${FFBUILD_TOOLCHAIN}-gcc-ranlib" \
+ NM="${FFBUILD_TOOLCHAIN}-gcc-nm" \
CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \
CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \
LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -Wl,-z,relro,-z,now -pthread -lm" \
diff --git a/images/base-win32/Dockerfile b/images/base-win32/Dockerfile
index b7415a4..01105ef 100644
--- a/images/base-win32/Dockerfile
+++ b/images/base-win32/Dockerfile
@@ -33,9 +33,15 @@ ENV PATH="/opt/ct-ng/bin:${PATH}" \
FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \
PKG_CONFIG=pkg-config \
PKG_CONFIG_LIBDIR=/opt/ffbuild/lib/pkgconfig:/opt/ffbuild/share/pkgconfig \
+ CC="${FFBUILD_TOOLCHAIN}-gcc" \
+ CXX="${FFBUILD_TOOLCHAIN}-g++" \
+ LD="${FFBUILD_TOOLCHAIN}-ld" \
+ AR="${FFBUILD_TOOLCHAIN}-gcc-ar" \
+ RANLIB="${FFBUILD_TOOLCHAIN}-gcc-ranlib" \
+ NM="${FFBUILD_TOOLCHAIN}-gcc-nm" \
+ DLLTOOL="${FFBUILD_TOOLCHAIN}-dlltool" \
CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong" \
- DLLTOOL="${FFBUILD_TOOLCHAIN}-dlltool" \
STAGE_CFLAGS="-fno-semantic-interposition" \
STAGE_CXXFLAGS="-fno-semantic-interposition"
diff --git a/images/base-win64/Dockerfile b/images/base-win64/Dockerfile
index 3031e89..5966a0c 100644
--- a/images/base-win64/Dockerfile
+++ b/images/base-win64/Dockerfile
@@ -33,9 +33,15 @@ ENV PATH="/opt/ct-ng/bin:${PATH}" \
FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \
PKG_CONFIG=pkg-config \
PKG_CONFIG_LIBDIR=/opt/ffbuild/lib/pkgconfig:/opt/ffbuild/share/pkgconfig \
+ CC="${FFBUILD_TOOLCHAIN}-gcc" \
+ CXX="${FFBUILD_TOOLCHAIN}-g++" \
+ LD="${FFBUILD_TOOLCHAIN}-ld" \
+ AR="${FFBUILD_TOOLCHAIN}-gcc-ar" \
+ RANLIB="${FFBUILD_TOOLCHAIN}-gcc-ranlib" \
+ NM="${FFBUILD_TOOLCHAIN}-gcc-nm" \
+ DLLTOOL="${FFBUILD_TOOLCHAIN}-dlltool" \
CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong" \
- DLLTOOL="${FFBUILD_TOOLCHAIN}-dlltool" \
STAGE_CFLAGS="-fno-semantic-interposition" \
STAGE_CXXFLAGS="-fno-semantic-interposition"
diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh
index 02b5e2b..a7bc599 100755
--- a/scripts.d/25-openssl.sh
+++ b/scripts.d/25-openssl.sh
@@ -50,6 +50,12 @@ ffbuild_dockerbuild() {
export CFLAGS="$CFLAGS -fno-strict-aliasing"
export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+ # OpenSSL build system prepends the cross prefix itself
+ export CC="gcc"
+ export CXX="g++"
+ export AR="gcc-ar"
+ export RANLIB="gcc-ranlib"
+
./Configure "${myconf[@]}"
sed -i -e "/^CFLAGS=/s|=.*|=${CFLAGS}|" -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" Makefile
From ec535f414f2ddef277b3e4afcde579fc9b355e40 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 2 Nov 2022 22:06:40 +0100
Subject: [PATCH 109/160] Update base Image to Ubuntu 22.10
This has newer meson, which fixes an important LTO related issue.
---
images/base/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/images/base/Dockerfile b/images/base/Dockerfile
index 237502d..5270033 100644
--- a/images/base/Dockerfile
+++ b/images/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:22.10
ENV DEBIAN_FRONTEND noninteractive
RUN \
From 009c5168608c4233584c4d676690dd75e945005c Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 2 Nov 2022 22:09:11 +0100
Subject: [PATCH 110/160] Run ranlib on libvpx.a after install
libvpx strips it, which mangles the symbol index when LTO is enabled.
ranlib fixes it again.
---
scripts.d/50-libvpx.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index 6dad9d4..c160b78 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -51,6 +51,9 @@ ffbuild_dockerbuild() {
./configure "${myconf[@]}"
make -j$(nproc)
make install
+
+ # Work around strip breaking LTO symbol index
+ "$RANLIB" "$FFBUILD_PREFIX"/lib/libvpx.a
}
ffbuild_configure() {
From fe0e366d9357dc1100880c1dcd20bd595c892d5b Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 2 Nov 2022 22:14:55 +0100
Subject: [PATCH 111/160] Add LTO addin
---
addins/lto.sh | 7 +++++++
1 file changed, 7 insertions(+)
create mode 100644 addins/lto.sh
diff --git a/addins/lto.sh b/addins/lto.sh
new file mode 100644
index 0000000..26fa2c2
--- /dev/null
+++ b/addins/lto.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+FF_CONFIGURE="$FF_CONFIGURE --enable-lto"
+
+ffbuild_dockeraddin() {
+ to_df 'ENV CFLAGS="$CFLAGS -flto=auto" CXXFLAGS="$CXXFLAGS -flto=auto" LDFLAGS="$LDFLAGS -flto=auto"'
+ to_df 'ENV FFBUILD_TARGET_FLAGS="$FFBUILD_TARGET_FLAGS --ar=${FFBUILD_TOOLCHAIN}-gcc-ar --nm=${FFBUILD_TOOLCHAIN}-gcc-nm --ranlib=${FFBUILD_TOOLCHAIN}-gcc-ranlib"'
+}
From bbad7e705774f5f9498bd18382f2a198e601c4fd Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 3 Nov 2022 01:41:44 +0100
Subject: [PATCH 112/160] Don't bail on missing dockeraddin
---
generate.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/generate.sh b/generate.sh
index 18a25bc..29d505d 100755
--- a/generate.sh
+++ b/generate.sh
@@ -32,7 +32,7 @@ to_df "ENV TARGET=$TARGET VARIANT=$VARIANT REPO=$REPO ADDINS_STR=$ADDINS_STR"
for addin in "${ADDINS[@]}"; do
(
source addins/"${addin}.sh"
- type ffbuild_dockeraddin &>/dev/null && ffbuild_dockeraddin
+ type ffbuild_dockeraddin &>/dev/null && ffbuild_dockeraddin || true
)
done
From fd4fac0ec77cd74bdd9f6aaaba0a1fd5a3c1074e Mon Sep 17 00:00:00 2001
From: nanake <nanake@users.noreply.github.com>
Date: Fri, 4 Nov 2022 21:04:44 +0900
Subject: [PATCH 113/160] Update rubberband build options
Signed-off-by: nanake <nanake@users.noreply.github.com>
---
scripts.d/50-rubberband.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index 7143852..36b8b6b 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -17,6 +17,8 @@ ffbuild_dockerbuild() {
local myconf=(
--prefix="$FFBUILD_PREFIX"
-Ddefault_library=static
+ -Dfft=fftw
+ -Dresampler=libsamplerate
)
if [[ $TARGET == win* || $TARGET == linux* ]]; then
@@ -31,9 +33,6 @@ ffbuild_dockerbuild() {
meson "${myconf[@]}" ..
ninja -j$(nproc)
ninja install
-
- # Fix static linking
- echo "Requires.private: fftw3 samplerate" >> "$FFBUILD_PREFIX"/lib/pkgconfig/rubberband.pc
}
ffbuild_configure() {
From c03ab7a812599f6b7292fe7fb800fce897c252e5 Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Thu, 3 Nov 2022 23:35:13 +0800
Subject: [PATCH 114/160] Add chromaprint
Signed-off-by: nyanmisaka <nst799610810@gmail.com>
---
scripts.d/25-fftw3.sh | 2 --
scripts.d/50-chromaprint.sh | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 2 deletions(-)
create mode 100755 scripts.d/50-chromaprint.sh
diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh
index 31be29a..bd97245 100755
--- a/scripts.d/25-fftw3.sh
+++ b/scripts.d/25-fftw3.sh
@@ -4,8 +4,6 @@ SCRIPT_REPO="https://github.com/FFTW/fftw3.git"
SCRIPT_COMMIT="9426cd59106ffddde1f55131c07fa9c562fa2f8e"
ffbuild_enabled() {
- # Dependency of GPL-Only librubberband
- [[ $VARIANT == lgpl* ]] && return -1
return 0
}
diff --git a/scripts.d/50-chromaprint.sh b/scripts.d/50-chromaprint.sh
new file mode 100755
index 0000000..64c6104
--- /dev/null
+++ b/scripts.d/50-chromaprint.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+SCRIPT_REPO="https://github.com/acoustid/chromaprint.git"
+SCRIPT_COMMIT="41e23c212594ee22d30a9d64b3438efae7ab6148"
+
+ffbuild_enabled() {
+ # pkg-config check is currently only available in master
+ [[ $ADDINS_STR == *4.4* ]] && return -1
+ [[ $ADDINS_STR == *5.0* ]] && return -1
+ [[ $ADDINS_STR == *5.1* ]] && return -1
+ return 0
+}
+
+ffbuild_dockerbuild() {
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" chromaprint
+ cd chromaprint
+
+ mkdir build && cd build
+
+ cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF -DFFT_LIB=fftw3 ..
+ make -j$(nproc)
+ make install
+
+ echo "Libs.private: -lfftw3 -lstdc++" >> "$FFBUILD_PREFIX"/lib/pkgconfig/libchromaprint.pc
+ echo "Cflags.private: -DCHROMAPRINT_NODLL" >> "$FFBUILD_PREFIX"/lib/pkgconfig/libchromaprint.pc
+}
+
+ffbuild_configure() {
+ echo --enable-chromaprint
+}
+
+ffbuild_unconfigure() {
+ echo --disable-chromaprint
+}
From f395efe8a1276bea49a6bf3b0d692c7b71095a60 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sat, 5 Nov 2022 21:04:57 +0100
Subject: [PATCH 115/160] Update libxml2
---
scripts.d/20-libxml2.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh
index c671968..c5a7fda 100755
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-SCRIPT_COMMIT="e2bae1bc049f7ffac9c35eefa33f8a00d4032170"
+SCRIPT_COMMIT="a24937211244f3a33ff6f3e64f3ab2c294f095dc"
ffbuild_enabled() {
return 0
From 3bb2b17e48330854887b8658481bb02ab0fe82e4 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 6 Nov 2022 01:21:33 +0100
Subject: [PATCH 116/160] Bump ffnvcodec for master only
---
scripts.d/50-ffnvcodec.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh
index f20e6b0..f6ae1a6 100755
--- a/scripts.d/50-ffnvcodec.sh
+++ b/scripts.d/50-ffnvcodec.sh
@@ -1,13 +1,21 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git"
-SCRIPT_COMMIT="3ed7c9a0a2c0b698b83088e13008f3ec983219b2"
+SCRIPT_COMMIT="ec8a8278609e93e632334a6770e6bf77f286e620"
+
+SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git"
+SCRIPT_COMMIT2="b550d4042f1ac0990efa1fa9f0f0c08fb6b24446"
+SCRIPT_BRANCH2="sdk/11.1"
ffbuild_enabled() {
return 0
}
ffbuild_dockerbuild() {
+ if [[ $ADDINS_STR == *4.4* || $ADDINS_STR == *5.0* || $ADDINS_STR == *5.1* ]]; then
+ SCRIPT_COMMIT="$SCRIPT_COMMIT2"
+ fi
+
git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ffnvcodec
cd ffnvcodec
From e7853fda681ded3252f5d49ae6fed813820b257a Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 6 Nov 2022 01:22:37 +0100
Subject: [PATCH 117/160] Bump openssl
---
scripts.d/25-openssl.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh
index a7bc599..01e8746 100755
--- a/scripts.d/25-openssl.sh
+++ b/scripts.d/25-openssl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/openssl/openssl.git"
-SCRIPT_COMMIT="OpenSSL_1_1_1r"
+SCRIPT_COMMIT="OpenSSL_1_1_1s"
SCRIPT_TAGFILTER="OpenSSL_1_1_1*"
ffbuild_enabled() {
From 81c3431e572f3b8763fdf6fa7412ef8d9f4435a4 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 6 Nov 2022 12:25:08 +0100
Subject: [PATCH 118/160] Enable 10 bit support for uavs3d
Closes #211
---
scripts.d/50-uavs3d.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh
index ef1e955..611adfc 100755
--- a/scripts.d/50-uavs3d.sh
+++ b/scripts.d/50-uavs3d.sh
@@ -16,7 +16,8 @@ ffbuild_dockerbuild() {
mkdir build/linux
cd build/linux
- cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=NO ../..
+ cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
+ -DCOMPILE_10BIT=1 -DBUILD_SHARED_LIBS=NO ../..
make -j$(nproc)
make install
}
From cca0f227ac8a7f0bf988296689007511f6444e69 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 6 Nov 2022 13:01:12 +0100
Subject: [PATCH 119/160] Update README.md
Closes #170
---
README.md | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index e4a98cb..7072348 100644
--- a/README.md
+++ b/README.md
@@ -34,11 +34,11 @@ Every file corresponds to its respective package.
### Build Image
-* `./makeimage.sh target variant [addins]`
+* `./makeimage.sh target variant [addin [addin] [addin] ...]`
### Build FFmpeg
-* `./build.sh target variant [addins]`
+* `./build.sh target variant [addin [addin] [addin] ...]`
On success, the resulting zip file will be in the `artifacts` subdir.
@@ -55,7 +55,7 @@ The linuxarm64 target will not build some dependencies due to lack of arm64 (aar
* `davs2` and `xavs2`: aarch64 support is broken.
* `libmfx` and `libva`: Library for Intel QSV, so there is no aarch64 support.
-Available:
+Available variants:
* `gpl` Includes all dependencies, even those that require full GPL instead of just LGPL.
* `lgpl` Lacking libraries that are GPL-only. Most prominently libx264 and libx265.
* `nonfree` Includes fdk-aac in addition to all the dependencies of the gpl variant.
@@ -63,7 +63,9 @@ Available:
* `lgpl-shared` Same again, but with the lgpl set of dependencies.
* `nonfree-shared` Same again, but with the nonfree set of dependencies.
-All of those can be optionally combined with any combination of addins.
+All of those can be optionally combined with any combination of addins:
* `4.4` to build from the 4.4 release branch instead of master.
* `5.0` to build from the 5.0 release branch instead of master.
+* `5.1` to build from the 5.1 release branch instead of master.
* `debug` to not strip debug symbols from the binaries. This increases the output size by about 250MB.
+* `lto` build all dependencies and ffmpeg with -flto=auto (HIGHLY EXPERIMENTAL, broken for Windows, sometimes works for Linux)
From c83db5db6a825fc4660b381f320cf46d01fdaa56 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 6 Nov 2022 14:06:20 +0100
Subject: [PATCH 120/160] Update dependencies
---
scripts.d/10-mingw.sh | 2 +-
scripts.d/25-freetype.sh | 2 +-
scripts.d/25-gmp.sh | 2 +-
scripts.d/25-libogg.sh | 2 +-
scripts.d/25-xz.sh | 2 +-
scripts.d/35-fontconfig.sh | 2 +-
scripts.d/45-harfbuzz.sh | 2 +-
scripts.d/45-pulseaudio.sh | 2 +-
scripts.d/45-vmaf.sh | 2 +-
scripts.d/45-x11/10-xcbproto.sh | 2 +-
scripts.d/45-x11/10-xproto.sh | 2 +-
scripts.d/45-x11/30-libxcb.sh | 2 +-
scripts.d/45-x11/40-libx11.sh | 2 +-
scripts.d/45-x11/50-libxext.sh | 2 +-
scripts.d/45-x11/50-libxinerama.sh | 2 +-
scripts.d/45-x11/50-libxrender.sh | 2 +-
scripts.d/45-x11/60-libglvnd.sh | 2 +-
scripts.d/45-x11/60-libxrandr.sh | 2 +-
scripts.d/45-x11/60-libxv.sh | 2 +-
scripts.d/50-aom.sh | 2 +-
scripts.d/50-aribb24/25-libpng.sh | 2 +-
scripts.d/50-avisynth.sh | 2 +-
scripts.d/50-chromaprint.sh | 2 +-
scripts.d/50-dav1d.sh | 2 +-
scripts.d/50-kvazaar.sh | 2 +-
scripts.d/50-libass.sh | 2 +-
scripts.d/50-libbluray.sh | 2 +-
scripts.d/50-libjxl/45-brotli.sh | 2 +-
scripts.d/50-libjxl/50-libjxl.sh | 2 +-
scripts.d/50-libssh.sh | 2 +-
scripts.d/50-libvpx.sh | 2 +-
scripts.d/50-libwebp.sh | 2 +-
scripts.d/50-lilv/96-lv2.sh | 2 +-
scripts.d/50-lilv/96-serd.sh | 2 +-
scripts.d/50-lilv/97-sord.sh | 2 +-
scripts.d/50-lilv/98-sratom.sh | 2 +-
scripts.d/50-lilv/99-lilv.sh | 2 +-
scripts.d/50-onevpl.sh | 2 +-
scripts.d/50-openal.sh | 2 +-
scripts.d/50-openh264.sh | 2 +-
scripts.d/50-openjpeg.sh | 2 +-
scripts.d/50-openmpt.sh | 2 +-
scripts.d/50-rav1e.sh | 20 +++++---------------
scripts.d/50-rubberband.sh | 2 +-
scripts.d/50-sdl.sh | 2 +-
scripts.d/50-srt.sh | 2 +-
scripts.d/50-svtav1.sh | 2 +-
scripts.d/50-vaapi/30-libpciaccess.sh | 2 +-
scripts.d/50-vaapi/40-libdrm.sh | 2 +-
scripts.d/50-vaapi/50-libva.sh | 2 +-
scripts.d/50-vulkan/45-vulkan.sh | 2 +-
scripts.d/50-vulkan/50-shaderc.sh | 2 +-
scripts.d/50-vulkan/55-spirv-cross.sh | 2 +-
scripts.d/50-vulkan/60-libplacebo.sh | 2 +-
scripts.d/50-x264.sh | 2 +-
scripts.d/50-x265.sh | 2 +-
56 files changed, 60 insertions(+), 70 deletions(-)
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index 12145c9..b72b680 100755
--- a/scripts.d/10-mingw.sh
+++ b/scripts.d/10-mingw.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/mirror/mingw-w64.git"
-SCRIPT_COMMIT="ee5758234f77a6b573e415b26a1d387c46717f6b"
+SCRIPT_COMMIT="13f9449c11e8c2ceadde1e7f405db117055bb1d0"
ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index 8c84b61..515b939 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
-SCRIPT_COMMIT="15f687349528fb0d7cba1ee7a8becf0af29116ec"
+SCRIPT_COMMIT="ae4eb996ab1ed43a52fac19461de3bdcaf1a1742"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh
index 59fcb7e..0ab4836 100755
--- a/scripts.d/25-gmp.sh
+++ b/scripts.d/25-gmp.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gmplib.org/repo/gmp/"
-SCRIPT_HGREV="261268754dec"
+SCRIPT_HGREV="3ac5afa36be5"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-libogg.sh b/scripts.d/25-libogg.sh
index aeeb914..5b48232 100755
--- a/scripts.d/25-libogg.sh
+++ b/scripts.d/25-libogg.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/ogg.git"
-SCRIPT_COMMIT="3069cc2bb44160982cdb21b2b8f0660c76b17572"
+SCRIPT_COMMIT="db5c7a49ce7ebda47b15b78471e78fb7f2483e22"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh
index 17e3619..ce6e96b 100755
--- a/scripts.d/25-xz.sh
+++ b/scripts.d/25-xz.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xz-mirror/xz.git"
-SCRIPT_COMMIT="508a44372c5b0dede8863fd0d358d4a9d8645c95"
+SCRIPT_COMMIT="cf118c014683069b5dbe91898acdc40f2f0a1f5d"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh
index bab6ad1..1755eec 100755
--- a/scripts.d/35-fontconfig.sh
+++ b/scripts.d/35-fontconfig.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
-SCRIPT_COMMIT="b9e2f17c43c32400328259c7b4c06f89b6a44c94"
+SCRIPT_COMMIT="eb0a199e0658d3ba64ff19072cb2ae39c5ca7c4c"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index 5081c93..7034d77 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="99f4668e1969a0a688044433803b3e7797391688"
+SCRIPT_COMMIT="f53ef69d5941514b06f5afbcd83709cf724eb74d"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index 5689d26..37741b1 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-SCRIPT_COMMIT="45df212d6614ad7f57d9e53616c0faac00195c86"
+SCRIPT_COMMIT="3f9455411c90d2b2d1043c47ee24185fabb8e401"
ffbuild_enabled() {
[[ $TARGET == linux* ]] || return 1
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index 7a3758a..0af5990 100755
--- a/scripts.d/45-vmaf.sh
+++ b/scripts.d/45-vmaf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
-SCRIPT_COMMIT="ea1150057190f113a2c07ded0ff4fb5a6260c1d3"
+SCRIPT_COMMIT="b8cbf16603e2558dc6427e0b12d3ab99732197df"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh
index 3d8708c..1726024 100755
--- a/scripts.d/45-x11/10-xcbproto.sh
+++ b/scripts.d/45-x11/10-xcbproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-SCRIPT_COMMIT="0d440c579b0f364bd655d97d1976d4eeddecf488"
+SCRIPT_COMMIT="842d91316243eb1f2e208231acc1512c2cf43a1f"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh
index 6e3a9cb..b23858d 100755
--- a/scripts.d/45-x11/10-xproto.sh
+++ b/scripts.d/45-x11/10-xproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
-SCRIPT_COMMIT="ae81c3c694b7cc0a810e55eb5d410dc8e7f55e21"
+SCRIPT_COMMIT="9740bd9bfa75a858853f07b8c06dd813ef692778"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh
index bf2c49e..e992eda 100755
--- a/scripts.d/45-x11/30-libxcb.sh
+++ b/scripts.d/45-x11/30-libxcb.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
-SCRIPT_COMMIT="d53ad60d774176c5b057e2ed4d03a4658ee13690"
+SCRIPT_COMMIT="33f3dbe3699a92e8ca18f470adac456e0b935e75"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index 5edd84d..6b5fd06 100755
--- a/scripts.d/45-x11/40-libx11.sh
+++ b/scripts.d/45-x11/40-libx11.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-SCRIPT_COMMIT="1f8fd7ff1cf688ec1d3b34397c6d58110bb0cae5"
+SCRIPT_COMMIT="a04b84f0f7bb3a78088756759f4b9b8bb363251e"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxext.sh b/scripts.d/45-x11/50-libxext.sh
index e7340a6..2695b96 100755
--- a/scripts.d/45-x11/50-libxext.sh
+++ b/scripts.d/45-x11/50-libxext.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxext.git"
-SCRIPT_COMMIT="c6eded76e212419518bd955cad58c96b8653840e"
+SCRIPT_COMMIT="67e82cc395f44faddd83ec3d0d21624fe91c6fc0"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxinerama.sh b/scripts.d/45-x11/50-libxinerama.sh
index 64482c4..1af078e 100755
--- a/scripts.d/45-x11/50-libxinerama.sh
+++ b/scripts.d/45-x11/50-libxinerama.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxinerama.git"
-SCRIPT_COMMIT="f7c9b2cdd92cfcc1fcf0eb94c7fc5daaed2786f4"
+SCRIPT_COMMIT="71dfee64feb84f907016940263b235a61c9e8960"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxrender.sh b/scripts.d/45-x11/50-libxrender.sh
index 57ce01d..529d747 100755
--- a/scripts.d/45-x11/50-libxrender.sh
+++ b/scripts.d/45-x11/50-libxrender.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrender.git"
-SCRIPT_COMMIT="f6504f02ade1d27950ad0486a2032e1d665d72b8"
+SCRIPT_COMMIT="e5e23272394c90731debd7e18dd167e8c25b5c15"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh
index 08ee3e5..39ffba4 100755
--- a/scripts.d/45-x11/60-libglvnd.sh
+++ b/scripts.d/45-x11/60-libglvnd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-SCRIPT_COMMIT="9215f347d2dce08916f250b7b57f7b26315a8fa7"
+SCRIPT_COMMIT="58d49d7f1db39aa2ffb018de478bef30e2e855f6"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libxrandr.sh b/scripts.d/45-x11/60-libxrandr.sh
index 9c0e3f8..48c1505 100755
--- a/scripts.d/45-x11/60-libxrandr.sh
+++ b/scripts.d/45-x11/60-libxrandr.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrandr.git"
-SCRIPT_COMMIT="d66693441f688867e6fd4a5d4a4bdade9a338755"
+SCRIPT_COMMIT="7181160b2c32b1bb804792990783fa25c1122bae"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libxv.sh b/scripts.d/45-x11/60-libxv.sh
index 7efdfa3..a26734d 100755
--- a/scripts.d/45-x11/60-libxv.sh
+++ b/scripts.d/45-x11/60-libxv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxv.git"
-SCRIPT_COMMIT="ee48980aca0bc9deb61458fdb5ebda3928d944a0"
+SCRIPT_COMMIT="9744d1f77b092eb4982c60e4750136fb19683545"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index 4f43f39..787a832 100755
--- a/scripts.d/50-aom.sh
+++ b/scripts.d/50-aom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://aomedia.googlesource.com/aom"
-SCRIPT_COMMIT="e9efda0ceb39a8702830d536b48b400727ecded8"
+SCRIPT_COMMIT="3ed9597d23f3039202de80cbba4365bd8e5cba8e"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh
index 47872e5..9203848 100755
--- a/scripts.d/50-aribb24/25-libpng.sh
+++ b/scripts.d/50-aribb24/25-libpng.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/glennrp/libpng.git"
-SCRIPT_COMMIT="12222e6fbdc90523be77633ed430144cfee22772"
+SCRIPT_COMMIT="04c016d79f97eb072c601787a4bc1b039a500025"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh
index 898140d..97bce98 100755
--- a/scripts.d/50-avisynth.sh
+++ b/scripts.d/50-avisynth.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/AviSynth/AviSynthPlus.git"
-SCRIPT_COMMIT="f26fab3120a71c712238d6ec2f5469db65cc24a3"
+SCRIPT_COMMIT="e0a3fd0f5f4b38e94c8d84d372b9ea02177b34a5"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-chromaprint.sh b/scripts.d/50-chromaprint.sh
index 64c6104..3339658 100755
--- a/scripts.d/50-chromaprint.sh
+++ b/scripts.d/50-chromaprint.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/acoustid/chromaprint.git"
-SCRIPT_COMMIT="41e23c212594ee22d30a9d64b3438efae7ab6148"
+SCRIPT_COMMIT="b6d5f131e0c693ea877cbf49e0174be9fb0f9856"
ffbuild_enabled() {
# pkg-config check is currently only available in master
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index 3ecf713..7f108cc 100755
--- a/scripts.d/50-dav1d.sh
+++ b/scripts.d/50-dav1d.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="cac76e4b6641dd26dd87fd749261526ae7469d3e"
+SCRIPT_COMMIT="8f16314dba8bd1ec9d958bbb8bfba002967bd6a8"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-kvazaar.sh b/scripts.d/50-kvazaar.sh
index d798049..2f8c737 100755
--- a/scripts.d/50-kvazaar.sh
+++ b/scripts.d/50-kvazaar.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/ultravideo/kvazaar.git"
-SCRIPT_COMMIT="a085e802ec6d24319160fec32c4027122e73580f"
+SCRIPT_COMMIT="a4005046ae2ebb3c88e92ff06736ce57b60fdcc7"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index bdcbff1..cb455bd 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libass/libass.git"
-SCRIPT_COMMIT="44f6532daf5eb13cb1aa95f5449a77b5df1dd85b"
+SCRIPT_COMMIT="52783a46c0f56ccfb66795667f069a1d2993cfcf"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh
index 12f2fdf..a2257a6 100755
--- a/scripts.d/50-libbluray.sh
+++ b/scripts.d/50-libbluray.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libbluray.git"
-SCRIPT_COMMIT="5539addbbf8c26d756fc2cb76b3919f8b73be66a"
+SCRIPT_COMMIT="c923cc09c274934452f795aa06d3a5aadb31d6fb"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh
index 58a4602..146c16b 100755
--- a/scripts.d/50-libjxl/45-brotli.sh
+++ b/scripts.d/50-libjxl/45-brotli.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/google/brotli.git"
-SCRIPT_COMMIT="9801a2c5d6c67c467ffad676ac301379bb877fc3"
+SCRIPT_COMMIT="6d03dfbedda1615c4cba1211f8d81735575209c8"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index 1a45a45..54a6276 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
-SCRIPT_COMMIT="004f66baa16fe13eb2b83be68ee95b60d77820ae"
+SCRIPT_COMMIT="997069d111d4ba6c516580c218255c6f46c45c57"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh
index fb439fd..c047ee8 100755
--- a/scripts.d/50-libssh.sh
+++ b/scripts.d/50-libssh.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://git.libssh.org/projects/libssh.git"
-SCRIPT_COMMIT="37deed27d66ba342e7e8c0a993bfe519f3967337"
+SCRIPT_COMMIT="23cebfadea156aea377462eaf5971955c77d2d61"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index c160b78..0a34365 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="c03c882785dc96ed91799280e68f8998bec50b90"
+SCRIPT_COMMIT="3f08aa0d0b2828b670073f808ae079acb35902a4"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index 9a10d16..0d6295a 100755
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="e407d4b37c296643e3824d8f19466fe6211dc5eb"
+SCRIPT_COMMIT="3f73e8f7ac83e97a26346886b529b61809a839f5"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh
index fe0f919..072f0af 100755
--- a/scripts.d/50-lilv/96-lv2.sh
+++ b/scripts.d/50-lilv/96-lv2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lv2.git"
-SCRIPT_COMMIT="3a3da7a493507655b4d6f83878692280b48a8579"
+SCRIPT_COMMIT="778c112790ae84e7deabdac84de4147baf7937a4"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh
index b3acc9c..1337ebd 100755
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/serd.git"
-SCRIPT_COMMIT="1a8312b6cc119788ea0d3f4e6ebf3a2ae2a3075f"
+SCRIPT_COMMIT="655c7fcf6c7ce9f98106dfca9cff5dede749b1bd"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh
index 260c429..b5a3417 100755
--- a/scripts.d/50-lilv/97-sord.sh
+++ b/scripts.d/50-lilv/97-sord.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/sord.git"
-SCRIPT_COMMIT="d877d78c98d90fbf57136bb73919524e618fd859"
+SCRIPT_COMMIT="96a865694af80227af1c5c8d96554f9d943687b2"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh
index 6230a4a..65813b3 100755
--- a/scripts.d/50-lilv/98-sratom.sh
+++ b/scripts.d/50-lilv/98-sratom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/sratom.git"
-SCRIPT_COMMIT="482374c4e4f9fee9477ee53b8fa6d51d5602f3cd"
+SCRIPT_COMMIT="36fd5599e7c67f9d99046aa1570e7f0d308b7092"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh
index a981e84..4463b00 100755
--- a/scripts.d/50-lilv/99-lilv.sh
+++ b/scripts.d/50-lilv/99-lilv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lilv.git"
-SCRIPT_COMMIT="3386725522269a1bbdd342cb9e3fa6fb00e0f37f"
+SCRIPT_COMMIT="97876806b31fedd0ebdded6ace70270277815c68"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh
index ea5e6f8..f8dcaa0 100755
--- a/scripts.d/50-onevpl.sh
+++ b/scripts.d/50-onevpl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/oneapi-src/oneVPL.git"
-SCRIPT_COMMIT="250d806b58678bdce13820a2dcbc8fd73987724c"
+SCRIPT_COMMIT="8b69f025de671b7bf97464f0e7fd7e2c5932dab7"
ffbuild_enabled() {
[[ $TARGET == *arm64 ]] && return -1
diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh
index 69d803c..f7b6bda 100755
--- a/scripts.d/50-openal.sh
+++ b/scripts.d/50-openal.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/kcat/openal-soft.git"
-SCRIPT_COMMIT="f1f3672f0b8c45b87fcf3b3b99868c274569eaf4"
+SCRIPT_COMMIT="e9ad8571ba93dd6631a9c05a05a28ede95728d9e"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh
index f13816c..cc52c3e 100755
--- a/scripts.d/50-openh264.sh
+++ b/scripts.d/50-openh264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/cisco/openh264.git"
-SCRIPT_COMMIT="0c19a5c266275693484ed84edf6ff8cb7cd89d4e"
+SCRIPT_COMMIT="db956674bbdfbaab5acdd3fdb4117c2fef5527e9"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh
index 96d78b2..3e75289 100755
--- a/scripts.d/50-openjpeg.sh
+++ b/scripts.d/50-openjpeg.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/uclouvain/openjpeg.git"
-SCRIPT_COMMIT="be95561917aa9b1d8ea4614820a534917cfa6bbe"
+SCRIPT_COMMIT="2d606701e8b7aa83f657d113c3367508e99bd12b"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index 92fbf0e..7664cd2 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-SCRIPT_REV="17986"
+SCRIPT_REV="18146"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index 0938b8b..8291849 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/rav1e.git"
-SCRIPT_COMMIT="f9310a9aa994594f8e144d4b1d59a4034e6dff6c"
+SCRIPT_COMMIT="8deb5caef2579ea155798d3040c14ca2e4b9dbc8"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
@@ -13,22 +13,12 @@ ffbuild_dockerbuild() {
cd rav1e
local myconf=(
- --prefix="$FFBUILD_PREFIX" \
- --library-type=staticlib \
- --crt-static \
+ --prefix="$FFBUILD_PREFIX"
+ --library-type=staticlib
+ --crt-static
+ --release
)
- if [[ $TARGET == win_not_yet ]]; then
- # CHECKME: back to release once lto is fixed
- myconf+=(
- --profile release-no-lto
- )
- else
- myconf+=(
- --release
- )
- fi
-
if [[ -n "$FFBUILD_RUST_TARGET" ]]; then
unset PKG_CONFIG_LIBDIR
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index 36b8b6b..e623c1f 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/breakfastquay/rubberband.git"
-SCRIPT_COMMIT="64d2989d28db8a171e82777f91ef4c571a58783f"
+SCRIPT_COMMIT="3d3cd0454b38fe1d108375a19b5baed5c2f318fd"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index 606ab28..2bd6777 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
-SCRIPT_COMMIT="92c71ae385d9770e7ac3db4c9a072151e923012d"
+SCRIPT_COMMIT="9d1dbd2ad86805c316cf4f2ee8ab2b361be18f4d"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index 2c228fb..9db4cc7 100755
--- a/scripts.d/50-srt.sh
+++ b/scripts.d/50-srt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Haivision/srt.git"
-SCRIPT_COMMIT="1b20a48ce1617c4a36220d173191065210ee65e1"
+SCRIPT_COMMIT="f7a024a06958f8b048d70241980ee1a73c2f7c9a"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index f5c1b72..44f7e41 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="91b94efb2809e83d9bf041d8575b32f234dfef27"
+SCRIPT_COMMIT="f946d52255cce50c6f2af33489282e2b19f98508"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-vaapi/30-libpciaccess.sh b/scripts.d/50-vaapi/30-libpciaccess.sh
index 3da7c2c..34201c9 100755
--- a/scripts.d/50-vaapi/30-libpciaccess.sh
+++ b/scripts.d/50-vaapi/30-libpciaccess.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git"
-SCRIPT_COMMIT="d193fa690415333420b435edb5782789a6f3ea57"
+SCRIPT_COMMIT="935f0b4d6983f77c4f35e6d492f9f2c2d1ed57f9"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index a2130b8..4bbe479 100755
--- a/scripts.d/50-vaapi/40-libdrm.sh
+++ b/scripts.d/50-vaapi/40-libdrm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-SCRIPT_COMMIT="0bd3e4e94f8270e64c7fd1e361a71da4a1547b1b"
+SCRIPT_COMMIT="b9ca37b3134861048986b75896c0915cbf2e97f9"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh
index 97f4823..4ae9a96 100755
--- a/scripts.d/50-vaapi/50-libva.sh
+++ b/scripts.d/50-vaapi/50-libva.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/intel/libva.git"
-SCRIPT_COMMIT="ef1df02f3ad45ac98b1fa57c373176d7c14dcc57"
+SCRIPT_COMMIT="96435ffc4032a9f19e287f349f6aea5571ca080f"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index d6c44f8..f0056b8 100755
--- a/scripts.d/50-vulkan/45-vulkan.sh
+++ b/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-SCRIPT_COMMIT="v1.3.230"
+SCRIPT_COMMIT="v1.3.233"
SCRIPT_TAGFILTER="v?.*.*"
ffbuild_enabled() {
diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh
index d718b18..264afdb 100755
--- a/scripts.d/50-vulkan/50-shaderc.sh
+++ b/scripts.d/50-vulkan/50-shaderc.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/google/shaderc.git"
-SCRIPT_COMMIT="7ea834ecc59258a5c13c3d3e6fa0582bdde7c543"
+SCRIPT_COMMIT="dc9d28ae95594edaef725012acd9de15a7342048"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh
index 9edbb86..3c7cb10 100755
--- a/scripts.d/50-vulkan/55-spirv-cross.sh
+++ b/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SCRIPT_COMMIT="f09ba2777714871bddb70d049878af34b94fa54d"
+SCRIPT_COMMIT="abc31207bffbc1bef4192746af44b3be1abcff17"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index 9352b43..4d6e8f2 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git"
-SCRIPT_COMMIT="35cbea8b1b293998b5da44a1ce9d7d1f2b51da1e"
+SCRIPT_COMMIT="7ac2950a13a3dc06cb83aa5f110c1e6399c6f9a0"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh
index c0d4c7e..265122e 100755
--- a/scripts.d/50-x264.sh
+++ b/scripts.d/50-x264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/mirror/x264.git"
-SCRIPT_COMMIT="ed0f7a634050a62c1da27c99eea710824d4c3705"
+SCRIPT_COMMIT="b093bbe7d9bc642c8f24067cbdcc73bb43562eab"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh
index 2e4cc7b..92412a1 100755
--- a/scripts.d/50-x265.sh
+++ b/scripts.d/50-x265.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git"
-SCRIPT_COMMIT="0b75c44c10e605fe9e9ebed58f04a46271131827"
+SCRIPT_COMMIT="49ab9e83b0de7394ff785cfd1c2c82eb8f148889"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
From e6e28d4704bbc9f0a112174bbc64b6018073c200 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 10 Nov 2022 15:33:05 +0100
Subject: [PATCH 121/160] Bump ffnvcodec
---
scripts.d/50-ffnvcodec.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh
index f6ae1a6..0cfd4b2 100755
--- a/scripts.d/50-ffnvcodec.sh
+++ b/scripts.d/50-ffnvcodec.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git"
-SCRIPT_COMMIT="ec8a8278609e93e632334a6770e6bf77f286e620"
+SCRIPT_COMMIT="4b4dee0e27160c7ffef0d4bd7a3a7ea3b916a737"
SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git"
SCRIPT_COMMIT2="b550d4042f1ac0990efa1fa9f0f0c08fb6b24446"
From d74737d76baf9bd79872ffd07a5bc6afc037d801 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 24 Nov 2022 13:26:47 +0100
Subject: [PATCH 122/160] Reduce wait time after deleting old latest release
---
.github/workflows/build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9304bac..06307fc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -199,7 +199,7 @@ jobs:
TAGNAME="latest"
hub release delete "$TAGNAME" || true
git push --delete origin "$TAGNAME" || true
- sleep 30
+ sleep 5
hub release create $(for a in latest_artifacts/*; do echo -a $a; done) -m "$NAME" -t "master" "$TAGNAME"
env:
GITHUB_TOKEN: ${{ github.token }}
From 37d82154fd0866bb8dfb802bee992174323cf6e7 Mon Sep 17 00:00:00 2001
From: Yicheng Liu <liuchen250.student@gmail.com>
Date: Fri, 2 Dec 2022 09:03:07 +0800
Subject: [PATCH 123/160] Update SVT-AV1 to v1.4.0
---
scripts.d/50-svtav1.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index 44f7e41..714fcb8 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="f946d52255cce50c6f2af33489282e2b19f98508"
+SCRIPT_COMMIT="5f32f7b4af71af8501810e4716eb1fbe89d80574"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
From d88a84b308611d8fcea5fa0c83675d7a0015eccd Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Fri, 2 Dec 2022 16:21:37 +0100
Subject: [PATCH 124/160] Update dependencies
---
scripts.d/10-mingw.sh | 2 +-
scripts.d/20-libxml2.sh | 2 +-
scripts.d/25-freetype.sh | 2 +-
scripts.d/25-gmp.sh | 2 +-
scripts.d/35-fontconfig.sh | 2 +-
scripts.d/45-harfbuzz.sh | 2 +-
scripts.d/45-libsamplerate.sh | 2 +-
scripts.d/45-opencl.sh | 4 ++--
scripts.d/45-pulseaudio.sh | 2 +-
scripts.d/45-vmaf.sh | 2 +-
scripts.d/45-x11/40-libx11.sh | 2 +-
scripts.d/45-x11/50-libxfixes.sh | 2 +-
scripts.d/45-x11/50-libxscrnsaver.sh | 2 +-
scripts.d/45-x11/60-libglvnd.sh | 2 +-
scripts.d/45-x11/60-libxrandr.sh | 2 +-
scripts.d/45-x11/60-libxv.sh | 2 +-
scripts.d/50-amf.sh | 2 +-
scripts.d/50-aom.sh | 2 +-
scripts.d/50-aribb24/25-libpng.sh | 2 +-
scripts.d/50-avisynth.sh | 2 +-
scripts.d/50-dav1d.sh | 2 +-
scripts.d/50-libass.sh | 2 +-
scripts.d/50-libbluray.sh | 2 +-
scripts.d/50-libjxl/45-brotli.sh | 2 +-
scripts.d/50-libjxl/50-libjxl.sh | 2 +-
scripts.d/50-libopus.sh | 2 +-
scripts.d/50-libssh.sh | 2 +-
scripts.d/50-libvpx.sh | 2 +-
scripts.d/50-libwebp.sh | 2 +-
scripts.d/50-lilv/96-lv2.sh | 2 +-
scripts.d/50-lilv/96-serd.sh | 2 +-
scripts.d/50-lilv/97-sord.sh | 2 +-
scripts.d/50-lilv/99-lilv.sh | 2 +-
scripts.d/50-onevpl.sh | 2 +-
scripts.d/50-openal.sh | 2 +-
scripts.d/50-openh264.sh | 2 +-
scripts.d/50-openmpt.sh | 2 +-
scripts.d/50-rav1e.sh | 2 +-
scripts.d/50-rubberband.sh | 2 +-
scripts.d/50-sdl.sh | 2 +-
scripts.d/50-srt.sh | 2 +-
scripts.d/50-vaapi/40-libdrm.sh | 2 +-
scripts.d/50-vaapi/50-libva.sh | 2 +-
scripts.d/50-vidstab.sh | 3 +--
scripts.d/50-vulkan/45-vulkan.sh | 2 +-
scripts.d/50-vulkan/50-shaderc.sh | 2 +-
scripts.d/50-vulkan/55-spirv-cross.sh | 2 +-
scripts.d/50-vulkan/60-libplacebo.sh | 2 +-
scripts.d/50-x265.sh | 2 +-
scripts.d/50-zimg.sh | 2 +-
50 files changed, 51 insertions(+), 52 deletions(-)
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index b72b680..ee6f158 100755
--- a/scripts.d/10-mingw.sh
+++ b/scripts.d/10-mingw.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/mirror/mingw-w64.git"
-SCRIPT_COMMIT="13f9449c11e8c2ceadde1e7f405db117055bb1d0"
+SCRIPT_COMMIT="beebfd9b96322140c588b5c076681afbc2f28dc0"
ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh
index c5a7fda..4db1447 100755
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-SCRIPT_COMMIT="a24937211244f3a33ff6f3e64f3ab2c294f095dc"
+SCRIPT_COMMIT="4b959ee1680e2ffbf49cd260cbef08f94e0ab6b0"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index 515b939..fd04a84 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
-SCRIPT_COMMIT="ae4eb996ab1ed43a52fac19461de3bdcaf1a1742"
+SCRIPT_COMMIT="aca4ec5907e0bfb5bbeb01370257a121f3f47a0f"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh
index 0ab4836..926f715 100755
--- a/scripts.d/25-gmp.sh
+++ b/scripts.d/25-gmp.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gmplib.org/repo/gmp/"
-SCRIPT_HGREV="3ac5afa36be5"
+SCRIPT_HGREV="614a1cd8bb1d"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh
index 1755eec..a21ae4f 100755
--- a/scripts.d/35-fontconfig.sh
+++ b/scripts.d/35-fontconfig.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
-SCRIPT_COMMIT="eb0a199e0658d3ba64ff19072cb2ae39c5ca7c4c"
+SCRIPT_COMMIT="6663fe457dd3edd9dca8430603ffbec1905be4d4"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index 7034d77..7b5c656 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="f53ef69d5941514b06f5afbcd83709cf724eb74d"
+SCRIPT_COMMIT="6012d3b228bc30397ab46eda48776fb414043315"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh
index 213fb8c..8cee53b 100755
--- a/scripts.d/45-libsamplerate.sh
+++ b/scripts.d/45-libsamplerate.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsndfile/libsamplerate.git"
-SCRIPT_COMMIT="aee38d0bc797d0d1a3774ef574af1d5d248d2398"
+SCRIPT_COMMIT="af61800ffd60f300cb94b2ea84f06f811a35e68a"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh
index 4442021..64162cf 100755
--- a/scripts.d/45-opencl.sh
+++ b/scripts.d/45-opencl.sh
@@ -1,10 +1,10 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
-SCRIPT_COMMIT="b590a6bfe034ea3a418b7b523e3490956bcb367a"
+SCRIPT_COMMIT="8f33fba7c14b926c6551bf86b5b255e3e0f47f86"
SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
-SCRIPT_COMMIT2="c5a6e013ad7c8b379fc94e3c849aa3396900a63c"
+SCRIPT_COMMIT2="9a3e962f16f5097d2054233ad8b6dad51b6f41b7"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index 37741b1..e6c1fc7 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-SCRIPT_COMMIT="3f9455411c90d2b2d1043c47ee24185fabb8e401"
+SCRIPT_COMMIT="0cbbc408aee2b5f2c42280d24dc615405387b5b1"
ffbuild_enabled() {
[[ $TARGET == linux* ]] || return 1
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index 0af5990..be3d4a9 100755
--- a/scripts.d/45-vmaf.sh
+++ b/scripts.d/45-vmaf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
-SCRIPT_COMMIT="b8cbf16603e2558dc6427e0b12d3ab99732197df"
+SCRIPT_COMMIT="0ed836399c3c72459f66ebf939a0be4116ac6e9d"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index 6b5fd06..365245e 100755
--- a/scripts.d/45-x11/40-libx11.sh
+++ b/scripts.d/45-x11/40-libx11.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-SCRIPT_COMMIT="a04b84f0f7bb3a78088756759f4b9b8bb363251e"
+SCRIPT_COMMIT="a9e845809bcaae22496bc8aa3ca252b410d5f39b"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxfixes.sh b/scripts.d/45-x11/50-libxfixes.sh
index 4b042ae..fa8efc9 100755
--- a/scripts.d/45-x11/50-libxfixes.sh
+++ b/scripts.d/45-x11/50-libxfixes.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxfixes.git"
-SCRIPT_COMMIT="d10ec36c81a6b488d1f700a28c5bff4714287b78"
+SCRIPT_COMMIT="332394278b7110a774b5277bb3cfc58c42cd888c"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxscrnsaver.sh b/scripts.d/45-x11/50-libxscrnsaver.sh
index ed251c5..6043c71 100755
--- a/scripts.d/45-x11/50-libxscrnsaver.sh
+++ b/scripts.d/45-x11/50-libxscrnsaver.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver.git"
-SCRIPT_COMMIT="d39f92be6b513c28546ebb0baf335f32ab154a89"
+SCRIPT_COMMIT="9dc9fb1bb8ca8e304a191430278703b7bc092eb2"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh
index 39ffba4..dd47993 100755
--- a/scripts.d/45-x11/60-libglvnd.sh
+++ b/scripts.d/45-x11/60-libglvnd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-SCRIPT_COMMIT="58d49d7f1db39aa2ffb018de478bef30e2e855f6"
+SCRIPT_COMMIT="b05bbcdaeb9b700cf7877e6d66f8fc3ac952295b"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libxrandr.sh b/scripts.d/45-x11/60-libxrandr.sh
index 48c1505..5ba854c 100755
--- a/scripts.d/45-x11/60-libxrandr.sh
+++ b/scripts.d/45-x11/60-libxrandr.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrandr.git"
-SCRIPT_COMMIT="7181160b2c32b1bb804792990783fa25c1122bae"
+SCRIPT_COMMIT="3387129532899eaeee3477a2d92fa662d7292a84"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libxv.sh b/scripts.d/45-x11/60-libxv.sh
index a26734d..ac29669 100755
--- a/scripts.d/45-x11/60-libxv.sh
+++ b/scripts.d/45-x11/60-libxv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxv.git"
-SCRIPT_COMMIT="9744d1f77b092eb4982c60e4750136fb19683545"
+SCRIPT_COMMIT="7afb4d5b020780f8081564bfcc8ed3df7515899f"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh
index a48d5b5..c018885 100755
--- a/scripts.d/50-amf.sh
+++ b/scripts.d/50-amf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
-SCRIPT_COMMIT="9f558757af85029541110139586c35f8d4c6b2ad"
+SCRIPT_COMMIT="734a9ae3ab446cbedb70028469bd323be45700f2"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index 787a832..06f893f 100755
--- a/scripts.d/50-aom.sh
+++ b/scripts.d/50-aom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://aomedia.googlesource.com/aom"
-SCRIPT_COMMIT="3ed9597d23f3039202de80cbba4365bd8e5cba8e"
+SCRIPT_COMMIT="77d6984c82c152d34852cfcf20c659c59e080d55"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh
index 9203848..6bff0db 100755
--- a/scripts.d/50-aribb24/25-libpng.sh
+++ b/scripts.d/50-aribb24/25-libpng.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/glennrp/libpng.git"
-SCRIPT_COMMIT="04c016d79f97eb072c601787a4bc1b039a500025"
+SCRIPT_COMMIT="61bfdb0cb02a6f3a62c929dbc9e832894c0a8df2"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh
index 97bce98..07bcdb6 100755
--- a/scripts.d/50-avisynth.sh
+++ b/scripts.d/50-avisynth.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/AviSynth/AviSynthPlus.git"
-SCRIPT_COMMIT="e0a3fd0f5f4b38e94c8d84d372b9ea02177b34a5"
+SCRIPT_COMMIT="bee4cfbd1b6a38997cf0280a1929c55dace3b1c9"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index 7f108cc..c181ba4 100755
--- a/scripts.d/50-dav1d.sh
+++ b/scripts.d/50-dav1d.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="8f16314dba8bd1ec9d958bbb8bfba002967bd6a8"
+SCRIPT_COMMIT="4b9f5b704e299543afcea87f375a308b90ef6c70"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index cb455bd..bd8e21c 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libass/libass.git"
-SCRIPT_COMMIT="52783a46c0f56ccfb66795667f069a1d2993cfcf"
+SCRIPT_COMMIT="039b2870c372c2c2a8525636367079a090e720b4"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh
index a2257a6..1e71eac 100755
--- a/scripts.d/50-libbluray.sh
+++ b/scripts.d/50-libbluray.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libbluray.git"
-SCRIPT_COMMIT="c923cc09c274934452f795aa06d3a5aadb31d6fb"
+SCRIPT_COMMIT="bb5bc108ec695889855f06df338958004ff289ef"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh
index 146c16b..11a907f 100755
--- a/scripts.d/50-libjxl/45-brotli.sh
+++ b/scripts.d/50-libjxl/45-brotli.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/google/brotli.git"
-SCRIPT_COMMIT="6d03dfbedda1615c4cba1211f8d81735575209c8"
+SCRIPT_COMMIT="3914999fcc1fda92e750ef9190aa6db9bf7bdb07"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index 54a6276..beaecf0 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
-SCRIPT_COMMIT="997069d111d4ba6c516580c218255c6f46c45c57"
+SCRIPT_COMMIT="b6e5dfd5b588e41da14fa29ee42ec5e7ea1bdc7c"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh
index c4cc95b..41bb879 100755
--- a/scripts.d/50-libopus.sh
+++ b/scripts.d/50-libopus.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/opus.git"
-SCRIPT_COMMIT="bce1f392353d72d77d543bb2069a044ae1045e9d"
+SCRIPT_COMMIT="757c53f775a0b651b0512a1992d67f4b2159a378"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh
index c047ee8..9aa9b06 100755
--- a/scripts.d/50-libssh.sh
+++ b/scripts.d/50-libssh.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://git.libssh.org/projects/libssh.git"
-SCRIPT_COMMIT="23cebfadea156aea377462eaf5971955c77d2d61"
+SCRIPT_COMMIT="9a3e218b6f00d0429b8284c0c220b7e0cbb1fbbc"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index 0a34365..021e8f6 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="3f08aa0d0b2828b670073f808ae079acb35902a4"
+SCRIPT_COMMIT="d998bd82372881d3a2d4514fc6162614b6b18552"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index 0d6295a..1b27a04 100755
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="3f73e8f7ac83e97a26346886b529b61809a839f5"
+SCRIPT_COMMIT="e5fe2cfc1bea149106d94ef5233c488ed1287b68"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh
index 072f0af..c341537 100755
--- a/scripts.d/50-lilv/96-lv2.sh
+++ b/scripts.d/50-lilv/96-lv2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lv2.git"
-SCRIPT_COMMIT="778c112790ae84e7deabdac84de4147baf7937a4"
+SCRIPT_COMMIT="8726bffa337e6374b04d0739df2812798b2c8858"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh
index 1337ebd..1e0d2e1 100755
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/serd.git"
-SCRIPT_COMMIT="655c7fcf6c7ce9f98106dfca9cff5dede749b1bd"
+SCRIPT_COMMIT="79ba155516166b8b7be14ab30c22f6f6d93b550f"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh
index b5a3417..a6e0585 100755
--- a/scripts.d/50-lilv/97-sord.sh
+++ b/scripts.d/50-lilv/97-sord.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/sord.git"
-SCRIPT_COMMIT="96a865694af80227af1c5c8d96554f9d943687b2"
+SCRIPT_COMMIT="64c1306c85964417849376e28436086face489f8"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh
index 4463b00..9f021d4 100755
--- a/scripts.d/50-lilv/99-lilv.sh
+++ b/scripts.d/50-lilv/99-lilv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lilv.git"
-SCRIPT_COMMIT="97876806b31fedd0ebdded6ace70270277815c68"
+SCRIPT_COMMIT="c3a4d586848f1a5a6e663a42ac5e841218109620"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh
index f8dcaa0..3f98ee2 100755
--- a/scripts.d/50-onevpl.sh
+++ b/scripts.d/50-onevpl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/oneapi-src/oneVPL.git"
-SCRIPT_COMMIT="8b69f025de671b7bf97464f0e7fd7e2c5932dab7"
+SCRIPT_COMMIT="17f1ef9abb52c10ca88c57508a30de63c4e1bb16"
ffbuild_enabled() {
[[ $TARGET == *arm64 ]] && return -1
diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh
index f7b6bda..c844bf9 100755
--- a/scripts.d/50-openal.sh
+++ b/scripts.d/50-openal.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/kcat/openal-soft.git"
-SCRIPT_COMMIT="e9ad8571ba93dd6631a9c05a05a28ede95728d9e"
+SCRIPT_COMMIT="5c7b8425daf967c8f59a66eb4f21886172c5a1cb"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh
index cc52c3e..60e61b3 100755
--- a/scripts.d/50-openh264.sh
+++ b/scripts.d/50-openh264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/cisco/openh264.git"
-SCRIPT_COMMIT="db956674bbdfbaab5acdd3fdb4117c2fef5527e9"
+SCRIPT_COMMIT="8422de81d0f18edde1487b47f3b0a40f0a108edf"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index 7664cd2..ceac85b 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-SCRIPT_REV="18146"
+SCRIPT_REV="18175"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index 8291849..624087a 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/rav1e.git"
-SCRIPT_COMMIT="8deb5caef2579ea155798d3040c14ca2e4b9dbc8"
+SCRIPT_COMMIT="0fb96baa0a8c2a539ad0c148b6b2f9cfed37707a"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index e623c1f..67cf8bb 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/breakfastquay/rubberband.git"
-SCRIPT_COMMIT="3d3cd0454b38fe1d108375a19b5baed5c2f318fd"
+SCRIPT_COMMIT="c871f92b2e377742d232d2d723c9ef0b6b3561f2"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index 2bd6777..ec0cc37 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
-SCRIPT_COMMIT="9d1dbd2ad86805c316cf4f2ee8ab2b361be18f4d"
+SCRIPT_COMMIT="4713db1484c5519967b7e1dc2a00ee0b36853428"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index 9db4cc7..4d1f8f4 100755
--- a/scripts.d/50-srt.sh
+++ b/scripts.d/50-srt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Haivision/srt.git"
-SCRIPT_COMMIT="f7a024a06958f8b048d70241980ee1a73c2f7c9a"
+SCRIPT_COMMIT="37d44f42fe0c522642a32aae67c054e075c69b66"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index 4bbe479..6948fc9 100755
--- a/scripts.d/50-vaapi/40-libdrm.sh
+++ b/scripts.d/50-vaapi/40-libdrm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-SCRIPT_COMMIT="b9ca37b3134861048986b75896c0915cbf2e97f9"
+SCRIPT_COMMIT="07dae1d10869f55412fa69db885edca58bedeef8"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh
index 4ae9a96..8a9724f 100755
--- a/scripts.d/50-vaapi/50-libva.sh
+++ b/scripts.d/50-vaapi/50-libva.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/intel/libva.git"
-SCRIPT_COMMIT="96435ffc4032a9f19e287f349f6aea5571ca080f"
+SCRIPT_COMMIT="393e7af16d4787034df03587191e4c245f853482"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vidstab.sh b/scripts.d/50-vidstab.sh
index f3730dc..3268a3d 100755
--- a/scripts.d/50-vidstab.sh
+++ b/scripts.d/50-vidstab.sh
@@ -1,8 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/georgmartius/vid.stab.git"
-# TODO: clamp to e7715fc until georgmartius/vid.stab#104 get fixed
-SCRIPT_COMMIT_PINNED="e7715fcf329573cdcff5c57d0e4a25f4c3a0cb7f"
+SCRIPT_COMMIT="90c76aca2cb06c3ff6f7476a7cd6851b39436656"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index f0056b8..6bf27c3 100755
--- a/scripts.d/50-vulkan/45-vulkan.sh
+++ b/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-SCRIPT_COMMIT="v1.3.233"
+SCRIPT_COMMIT="v1.3.236"
SCRIPT_TAGFILTER="v?.*.*"
ffbuild_enabled() {
diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh
index 264afdb..a5bacd2 100755
--- a/scripts.d/50-vulkan/50-shaderc.sh
+++ b/scripts.d/50-vulkan/50-shaderc.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/google/shaderc.git"
-SCRIPT_COMMIT="dc9d28ae95594edaef725012acd9de15a7342048"
+SCRIPT_COMMIT="b2428cbf4f73c409f7c3316f6aee0b4b57652064"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh
index 3c7cb10..256ffcd 100755
--- a/scripts.d/50-vulkan/55-spirv-cross.sh
+++ b/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SCRIPT_COMMIT="abc31207bffbc1bef4192746af44b3be1abcff17"
+SCRIPT_COMMIT="c77b09b57c27837dc2d41aa371ed3d236ce9ce47"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index 4d6e8f2..163f441 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git"
-SCRIPT_COMMIT="7ac2950a13a3dc06cb83aa5f110c1e6399c6f9a0"
+SCRIPT_COMMIT="7ead30db8aa75db28236eee40899f0ff6e3c9688"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh
index 92412a1..302203e 100755
--- a/scripts.d/50-x265.sh
+++ b/scripts.d/50-x265.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git"
-SCRIPT_COMMIT="49ab9e83b0de7394ff785cfd1c2c82eb8f148889"
+SCRIPT_COMMIT="cc25ead66daa466ab27cc14897a48a1b61bcf64e"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh
index b0f1e56..2d1b226 100755
--- a/scripts.d/50-zimg.sh
+++ b/scripts.d/50-zimg.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git"
-SCRIPT_COMMIT="fc993b40effd6536518444fcbd435b825b30ca73"
+SCRIPT_COMMIT="48eec5c68b086bbae0f75498e25b5a229e5ea684"
ffbuild_enabled() {
return 0
From 8dac144f1ce81d5a96284f61caf6076271e7d4dc Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Fri, 2 Dec 2022 18:11:12 +0100
Subject: [PATCH 125/160] Stick to SDL2 instead of 3
---
scripts.d/50-sdl.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index ec0cc37..83fcdb2 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -1,7 +1,8 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
-SCRIPT_COMMIT="4713db1484c5519967b7e1dc2a00ee0b36853428"
+SCRIPT_COMMIT="07d6d116ed413a34d77af0657788667bcbefcae7"
+SCRIPT_BRANCH="SDL2"
ffbuild_enabled() {
return 0
From 6eab5153f5f3699ca44f2f58a993d571dfb09187 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Fri, 2 Dec 2022 21:02:37 +0100
Subject: [PATCH 126/160] Add new lilv dep
---
scripts.d/50-lilv/96-zix.sh | 38 +++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100755 scripts.d/50-lilv/96-zix.sh
diff --git a/scripts.d/50-lilv/96-zix.sh b/scripts.d/50-lilv/96-zix.sh
new file mode 100755
index 0000000..1de4508
--- /dev/null
+++ b/scripts.d/50-lilv/96-zix.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+SCRIPT_REPO="https://github.com/drobilla/zix.git"
+SCRIPT_COMMIT="577356481bbcb12468bcf669ef7107dfb057b833"
+
+ffbuild_enabled() {
+ return 0
+}
+
+ffbuild_dockerbuild() {
+ git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" zix
+ cd zix
+
+ mkdir build && cd build
+
+ local myconf=(
+ --prefix="$FFBUILD_PREFIX"
+ --buildtype=release
+ --default-library=static
+ -Ddocs=disabled
+ -Dbenchmarks=disabled
+ -Dtests=disabled
+ -Dtests_cpp=disabled
+ )
+
+ if [[ $TARGET == win* || $TARGET == linux* ]]; then
+ myconf+=(
+ --cross-file=/cross.meson
+ )
+ else
+ echo "Unknown target"
+ return -1
+ fi
+
+ meson "${myconf[@]}" ..
+ ninja -j"$(nproc)"
+ ninja install
+}
From ab4299b595e91c67de734a58ac845db193644bc0 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sat, 3 Dec 2022 01:14:46 +0100
Subject: [PATCH 127/160] Fix lib-Prefixless OpenCL library linking
---
scripts.d/45-opencl.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh
index 64162cf..9065586 100755
--- a/scripts.d/45-opencl.sh
+++ b/scripts.d/45-opencl.sh
@@ -22,7 +22,10 @@ ffbuild_dockerbuild() {
mkdir build && cd build
- cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DOPENCL_ICD_LOADER_HEADERS_DIR="$FFBUILD_PREFIX"/include -DOPENCL_ICD_LOADER_BUILD_SHARED_LIBS=OFF -DOPENCL_ICD_LOADER_DISABLE_OPENCLON12=ON -DOPENCL_ICD_LOADER_PIC=ON -DOPENCL_ICD_LOADER_BUILD_TESTING=OFF -DBUILD_TESTING=OFF ..
+ cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
+ -DOPENCL_ICD_LOADER_HEADERS_DIR="$FFBUILD_PREFIX"/include -DOPENCL_ICD_LOADER_BUILD_SHARED_LIBS=OFF \
+ -DOPENCL_ICD_LOADER_DISABLE_OPENCLON12=ON -DOPENCL_ICD_LOADER_PIC=ON \
+ -DOPENCL_ICD_LOADER_BUILD_TESTING=OFF -DBUILD_TESTING=OFF ..
make -j$(nproc)
make install
@@ -34,12 +37,13 @@ ffbuild_dockerbuild() {
echo "Name: OpenCL" >> OpenCL.pc
echo "Description: OpenCL ICD Loader" >> OpenCL.pc
echo "Version: 9999" >> OpenCL.pc
- echo "Libs: -L\${libdir} -lOpenCL" >> OpenCL.pc
echo "Cflags: -I\${includedir}" >> OpenCL.pc
if [[ $TARGET == linux* ]]; then
+ echo "Libs: -L\${libdir} -lOpenCL" >> OpenCL.pc
echo "Libs.private: -ldl" >> OpenCL.pc
elif [[ $TARGET == win* ]]; then
+ echo "Libs: -L\${libdir} -l:OpenCL.a" >> OpenCL.pc
echo "Libs.private: -lole32 -lshlwapi -lcfgmgr32" >> OpenCL.pc
fi
From d89d75ea4a335f0d7f4187219f55ccdf3a954921 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 5 Dec 2022 18:57:54 +0100
Subject: [PATCH 128/160] Enable -fstack-clash-protection on all targets
---
images/base-linux64/Dockerfile | 6 +++---
images/base-linuxarm64/Dockerfile | 6 +++---
images/base-win32/Dockerfile | 6 +++---
images/base-win64/Dockerfile | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/images/base-linux64/Dockerfile b/images/base-linux64/Dockerfile
index c81a27f..d91dd19 100644
--- a/images/base-linux64/Dockerfile
+++ b/images/base-linux64/Dockerfile
@@ -54,8 +54,8 @@ ENV PATH="/opt/ct-ng/bin:${PATH}" \
AR="${FFBUILD_TOOLCHAIN}-gcc-ar" \
RANLIB="${FFBUILD_TOOLCHAIN}-gcc-ranlib" \
NM="${FFBUILD_TOOLCHAIN}-gcc-nm" \
- CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \
- CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \
- LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -Wl,-z,relro,-z,now -pthread -lm" \
+ CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection -pthread" \
+ CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection -pthread" \
+ LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -fstack-clash-protection -Wl,-z,relro,-z,now -pthread -lm" \
STAGE_CFLAGS="-fvisibility=hidden -fno-semantic-interposition" \
STAGE_CXXFLAGS="-fvisibility=hidden -fno-semantic-interposition"
diff --git a/images/base-linuxarm64/Dockerfile b/images/base-linuxarm64/Dockerfile
index 8e786b1..89be1fd 100644
--- a/images/base-linuxarm64/Dockerfile
+++ b/images/base-linuxarm64/Dockerfile
@@ -56,8 +56,8 @@ ENV PATH="/opt/ct-ng/bin:${PATH}" \
AR="${FFBUILD_TOOLCHAIN}-gcc-ar" \
RANLIB="${FFBUILD_TOOLCHAIN}-gcc-ranlib" \
NM="${FFBUILD_TOOLCHAIN}-gcc-nm" \
- CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \
- CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \
- LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -Wl,-z,relro,-z,now -pthread -lm" \
+ CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection -pthread" \
+ CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection -pthread" \
+ LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -fstack-clash-protection -Wl,-z,relro,-z,now -pthread -lm" \
STAGE_CFLAGS="-fvisibility=hidden -fno-semantic-interposition" \
STAGE_CXXFLAGS="-fvisibility=hidden -fno-semantic-interposition"
diff --git a/images/base-win32/Dockerfile b/images/base-win32/Dockerfile
index 01105ef..91802b4 100644
--- a/images/base-win32/Dockerfile
+++ b/images/base-win32/Dockerfile
@@ -40,8 +40,8 @@ ENV PATH="/opt/ct-ng/bin:${PATH}" \
RANLIB="${FFBUILD_TOOLCHAIN}-gcc-ranlib" \
NM="${FFBUILD_TOOLCHAIN}-gcc-nm" \
DLLTOOL="${FFBUILD_TOOLCHAIN}-dlltool" \
- CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
- CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
- LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong" \
+ CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection" \
+ CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection" \
+ LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -fstack-clash-protection" \
STAGE_CFLAGS="-fno-semantic-interposition" \
STAGE_CXXFLAGS="-fno-semantic-interposition"
diff --git a/images/base-win64/Dockerfile b/images/base-win64/Dockerfile
index 5966a0c..344c1f1 100644
--- a/images/base-win64/Dockerfile
+++ b/images/base-win64/Dockerfile
@@ -40,8 +40,8 @@ ENV PATH="/opt/ct-ng/bin:${PATH}" \
RANLIB="${FFBUILD_TOOLCHAIN}-gcc-ranlib" \
NM="${FFBUILD_TOOLCHAIN}-gcc-nm" \
DLLTOOL="${FFBUILD_TOOLCHAIN}-dlltool" \
- CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
- CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
- LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong" \
+ CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection" \
+ CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection" \
+ LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -fstack-clash-protection" \
STAGE_CFLAGS="-fno-semantic-interposition" \
STAGE_CXXFLAGS="-fno-semantic-interposition"
From ef8c6edf641aab846778daa327aeaa0785aa908c Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 5 Dec 2022 21:33:15 +0100
Subject: [PATCH 129/160] Disable -fstack-clash-protection on Windows
Apparently broken and unneccesary anyway: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90458#c4
---
images/base-win32/Dockerfile | 6 +++---
images/base-win64/Dockerfile | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/images/base-win32/Dockerfile b/images/base-win32/Dockerfile
index 91802b4..01105ef 100644
--- a/images/base-win32/Dockerfile
+++ b/images/base-win32/Dockerfile
@@ -40,8 +40,8 @@ ENV PATH="/opt/ct-ng/bin:${PATH}" \
RANLIB="${FFBUILD_TOOLCHAIN}-gcc-ranlib" \
NM="${FFBUILD_TOOLCHAIN}-gcc-nm" \
DLLTOOL="${FFBUILD_TOOLCHAIN}-dlltool" \
- CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection" \
- CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection" \
- LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -fstack-clash-protection" \
+ CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
+ CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
+ LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong" \
STAGE_CFLAGS="-fno-semantic-interposition" \
STAGE_CXXFLAGS="-fno-semantic-interposition"
diff --git a/images/base-win64/Dockerfile b/images/base-win64/Dockerfile
index 344c1f1..5966a0c 100644
--- a/images/base-win64/Dockerfile
+++ b/images/base-win64/Dockerfile
@@ -40,8 +40,8 @@ ENV PATH="/opt/ct-ng/bin:${PATH}" \
RANLIB="${FFBUILD_TOOLCHAIN}-gcc-ranlib" \
NM="${FFBUILD_TOOLCHAIN}-gcc-nm" \
DLLTOOL="${FFBUILD_TOOLCHAIN}-dlltool" \
- CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection" \
- CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection" \
- LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -fstack-clash-protection" \
+ CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
+ CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
+ LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong" \
STAGE_CFLAGS="-fno-semantic-interposition" \
STAGE_CXXFLAGS="-fno-semantic-interposition"
From e676b22a7194baddfb53ef7e38f91b15aca7e944 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sat, 24 Dec 2022 15:23:31 +0100
Subject: [PATCH 130/160] Update dependencies
---
scripts.d/10-mingw.sh | 2 +-
scripts.d/20-libxml2.sh | 2 +-
scripts.d/25-freetype.sh | 2 +-
scripts.d/25-fribidi.sh | 2 +-
scripts.d/25-xz.sh | 2 +-
scripts.d/35-fontconfig.sh | 2 +-
scripts.d/45-harfbuzz.sh | 2 +-
scripts.d/45-libsamplerate.sh | 2 +-
scripts.d/45-pulseaudio.sh | 2 +-
scripts.d/45-vmaf.sh | 2 +-
scripts.d/45-x11/20-libxau.sh | 2 +-
scripts.d/45-x11/30-libxcb.sh | 2 +-
scripts.d/45-x11/40-libx11.sh | 2 +-
scripts.d/45-x11/50-libxext.sh | 2 +-
scripts.d/45-x11/50-libxscrnsaver.sh | 2 +-
scripts.d/45-x11/60-libglvnd.sh | 2 +-
scripts.d/45-x11/60-libxv.sh | 2 +-
scripts.d/50-amf.sh | 2 +-
scripts.d/50-aom.sh | 2 +-
scripts.d/50-chromaprint.sh | 2 +-
scripts.d/50-dav1d.sh | 2 +-
scripts.d/50-ffnvcodec.sh | 2 +-
scripts.d/50-libass.sh | 2 +-
scripts.d/50-libjxl/45-brotli.sh | 2 +-
scripts.d/50-libjxl/50-libjxl.sh | 2 +-
scripts.d/50-librist/40-mbedtls.sh | 2 +-
scripts.d/50-libssh.sh | 2 +-
scripts.d/50-libvpx.sh | 2 +-
scripts.d/50-libwebp.sh | 2 +-
scripts.d/50-lilv/96-lv2.sh | 2 +-
scripts.d/50-lilv/96-serd.sh | 2 +-
scripts.d/50-lilv/96-zix.sh | 2 +-
scripts.d/50-lilv/97-sord.sh | 2 +-
scripts.d/50-lilv/98-sratom.sh | 2 +-
scripts.d/50-lilv/99-lilv.sh | 2 +-
scripts.d/50-openal.sh | 2 +-
scripts.d/50-openh264.sh | 2 +-
scripts.d/50-openmpt.sh | 2 +-
scripts.d/50-rav1e.sh | 2 +-
scripts.d/50-rubberband.sh | 2 +-
scripts.d/50-sdl.sh | 2 +-
scripts.d/50-srt.sh | 2 +-
scripts.d/50-svtav1.sh | 2 +-
scripts.d/50-vaapi/30-libpciaccess.sh | 2 +-
scripts.d/50-vaapi/40-libdrm.sh | 2 +-
scripts.d/50-vaapi/50-libva.sh | 2 +-
scripts.d/50-vulkan/45-vulkan.sh | 2 +-
scripts.d/50-vulkan/50-shaderc.sh | 2 +-
scripts.d/50-vulkan/55-spirv-cross.sh | 2 +-
scripts.d/50-vulkan/60-libplacebo.sh | 2 +-
scripts.d/50-x264.sh | 2 +-
scripts.d/50-x265.sh | 2 +-
52 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index ee6f158..b511f38 100755
--- a/scripts.d/10-mingw.sh
+++ b/scripts.d/10-mingw.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/mirror/mingw-w64.git"
-SCRIPT_COMMIT="beebfd9b96322140c588b5c076681afbc2f28dc0"
+SCRIPT_COMMIT="fc55e181b2d84c8817e3fd9d86c6944ac709acc9"
ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh
index 4db1447..da7cfb9 100755
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-SCRIPT_COMMIT="4b959ee1680e2ffbf49cd260cbef08f94e0ab6b0"
+SCRIPT_COMMIT="c885bebb5d423b3faad21e62d9b962e824feaf93"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index fd04a84..dad7b70 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
-SCRIPT_COMMIT="aca4ec5907e0bfb5bbeb01370257a121f3f47a0f"
+SCRIPT_COMMIT="0bcb664de8ea44299f57c45d01433328596bc2a7"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-fribidi.sh b/scripts.d/25-fribidi.sh
index 00b6273..18b8a75 100755
--- a/scripts.d/25-fribidi.sh
+++ b/scripts.d/25-fribidi.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/fribidi/fribidi.git"
-SCRIPT_COMMIT="a6a4defff24aabf9195f462f9a7736f3d9e9c120"
+SCRIPT_COMMIT="2c2a014bf7161d43ed9f0f23f383be176a4f9df3"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh
index ce6e96b..cadb60e 100755
--- a/scripts.d/25-xz.sh
+++ b/scripts.d/25-xz.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xz-mirror/xz.git"
-SCRIPT_COMMIT="cf118c014683069b5dbe91898acdc40f2f0a1f5d"
+SCRIPT_COMMIT="8fd225a2c149f30aeac377e68eb5abf6b28300ad"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh
index a21ae4f..6398cba 100755
--- a/scripts.d/35-fontconfig.sh
+++ b/scripts.d/35-fontconfig.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
-SCRIPT_COMMIT="6663fe457dd3edd9dca8430603ffbec1905be4d4"
+SCRIPT_COMMIT="6e3fe92b20edb1d91683efa9aea68d35a887a83c"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index 7b5c656..b912591 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="6012d3b228bc30397ab46eda48776fb414043315"
+SCRIPT_COMMIT="0066e824f02efce79e026f60391f3fd95214e1ac"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh
index 8cee53b..a5ea233 100755
--- a/scripts.d/45-libsamplerate.sh
+++ b/scripts.d/45-libsamplerate.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsndfile/libsamplerate.git"
-SCRIPT_COMMIT="af61800ffd60f300cb94b2ea84f06f811a35e68a"
+SCRIPT_COMMIT="a9945ab36e827260cacf7b3e4f6e783b460e21ee"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index e6c1fc7..063397d 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-SCRIPT_COMMIT="0cbbc408aee2b5f2c42280d24dc615405387b5b1"
+SCRIPT_COMMIT="96bd4e57b5b02dc04b61528033f283f5fea7e723"
ffbuild_enabled() {
[[ $TARGET == linux* ]] || return 1
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index be3d4a9..5e7961d 100755
--- a/scripts.d/45-vmaf.sh
+++ b/scripts.d/45-vmaf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
-SCRIPT_COMMIT="0ed836399c3c72459f66ebf939a0be4116ac6e9d"
+SCRIPT_COMMIT="f36ecd6c29c7fea1f55d0ecf7a03fce80216fc17"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh
index fd4efaa..8dc79c5 100755
--- a/scripts.d/45-x11/20-libxau.sh
+++ b/scripts.d/45-x11/20-libxau.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git"
-SCRIPT_COMMIT="4fbefa02d6c842401ff79065d364edd7087a12a6"
+SCRIPT_COMMIT="14fdf25db9f21c8f3ad37f0d32a5b8e726efdc0d"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh
index e992eda..989843a 100755
--- a/scripts.d/45-x11/30-libxcb.sh
+++ b/scripts.d/45-x11/30-libxcb.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
-SCRIPT_COMMIT="33f3dbe3699a92e8ca18f470adac456e0b935e75"
+SCRIPT_COMMIT="cb8c70f5a65b4bd68b449dcaa637c3c4753e2f81"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index 365245e..c91c262 100755
--- a/scripts.d/45-x11/40-libx11.sh
+++ b/scripts.d/45-x11/40-libx11.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-SCRIPT_COMMIT="a9e845809bcaae22496bc8aa3ca252b410d5f39b"
+SCRIPT_COMMIT="48487c4b9028e9eec5371742f51e1d64c2e17296"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxext.sh b/scripts.d/45-x11/50-libxext.sh
index 2695b96..d9c10ce 100755
--- a/scripts.d/45-x11/50-libxext.sh
+++ b/scripts.d/45-x11/50-libxext.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxext.git"
-SCRIPT_COMMIT="67e82cc395f44faddd83ec3d0d21624fe91c6fc0"
+SCRIPT_COMMIT="e8556ab06e03b59e9a512eb02955247efd4c4054"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxscrnsaver.sh b/scripts.d/45-x11/50-libxscrnsaver.sh
index 6043c71..0f152d2 100755
--- a/scripts.d/45-x11/50-libxscrnsaver.sh
+++ b/scripts.d/45-x11/50-libxscrnsaver.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver.git"
-SCRIPT_COMMIT="9dc9fb1bb8ca8e304a191430278703b7bc092eb2"
+SCRIPT_COMMIT="34f3f72b88c0a0a10d618e9dfbc88474ae5ce880"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh
index dd47993..cd51237 100755
--- a/scripts.d/45-x11/60-libglvnd.sh
+++ b/scripts.d/45-x11/60-libglvnd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-SCRIPT_COMMIT="b05bbcdaeb9b700cf7877e6d66f8fc3ac952295b"
+SCRIPT_COMMIT="dba80d0158b587de91640fae5c0b420c23599d1e"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libxv.sh b/scripts.d/45-x11/60-libxv.sh
index ac29669..ebcf8da 100755
--- a/scripts.d/45-x11/60-libxv.sh
+++ b/scripts.d/45-x11/60-libxv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxv.git"
-SCRIPT_COMMIT="7afb4d5b020780f8081564bfcc8ed3df7515899f"
+SCRIPT_COMMIT="d419928942dbf1897c9627475aa4a2828a81240f"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh
index c018885..27d7472 100755
--- a/scripts.d/50-amf.sh
+++ b/scripts.d/50-amf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
-SCRIPT_COMMIT="734a9ae3ab446cbedb70028469bd323be45700f2"
+SCRIPT_COMMIT="9e2ebb91b5447c766b02b43826ca287f06789e5c"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index 06f893f..67458ca 100755
--- a/scripts.d/50-aom.sh
+++ b/scripts.d/50-aom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://aomedia.googlesource.com/aom"
-SCRIPT_COMMIT="77d6984c82c152d34852cfcf20c659c59e080d55"
+SCRIPT_COMMIT="19f4bc6f6ce7808098b2b719480680f415acc625"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-chromaprint.sh b/scripts.d/50-chromaprint.sh
index 3339658..85c7149 100755
--- a/scripts.d/50-chromaprint.sh
+++ b/scripts.d/50-chromaprint.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/acoustid/chromaprint.git"
-SCRIPT_COMMIT="b6d5f131e0c693ea877cbf49e0174be9fb0f9856"
+SCRIPT_COMMIT="aa67c95b9e486884a6d3ee8b0c91207d8c2b0551"
ffbuild_enabled() {
# pkg-config check is currently only available in master
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index c181ba4..5dc6044 100755
--- a/scripts.d/50-dav1d.sh
+++ b/scripts.d/50-dav1d.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="4b9f5b704e299543afcea87f375a308b90ef6c70"
+SCRIPT_COMMIT="ed63a7459376a21e88b871006574dc2055a2ea35"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh
index 0cfd4b2..cdd6dd9 100755
--- a/scripts.d/50-ffnvcodec.sh
+++ b/scripts.d/50-ffnvcodec.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git"
-SCRIPT_COMMIT="4b4dee0e27160c7ffef0d4bd7a3a7ea3b916a737"
+SCRIPT_COMMIT="c12df23d145431fb65c2116481aac19340b2cc30"
SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git"
SCRIPT_COMMIT2="b550d4042f1ac0990efa1fa9f0f0c08fb6b24446"
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index bd8e21c..02b39df 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libass/libass.git"
-SCRIPT_COMMIT="039b2870c372c2c2a8525636367079a090e720b4"
+SCRIPT_COMMIT="062d4ec598b4fd06f75c0cd6a0f43f5d0939a764"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh
index 11a907f..a48ea94 100755
--- a/scripts.d/50-libjxl/45-brotli.sh
+++ b/scripts.d/50-libjxl/45-brotli.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/google/brotli.git"
-SCRIPT_COMMIT="3914999fcc1fda92e750ef9190aa6db9bf7bdb07"
+SCRIPT_COMMIT="509d4419bd2e7f40ac97106324abf0b49d9fd7ff"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index beaecf0..6fd97a5 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
-SCRIPT_COMMIT="b6e5dfd5b588e41da14fa29ee42ec5e7ea1bdc7c"
+SCRIPT_COMMIT="5853ad97044c3b9da46d10b611e66063b1297cc5"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh
index 3ffcfa8..ca129ba 100755
--- a/scripts.d/50-librist/40-mbedtls.sh
+++ b/scripts.d/50-librist/40-mbedtls.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/ARMmbed/mbedtls.git"
-SCRIPT_COMMIT="v3.2.1"
+SCRIPT_COMMIT="v3.3.0"
SCRIPT_TAGFILTER="v3.*"
ffbuild_enabled() {
diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh
index 9aa9b06..48b9744 100755
--- a/scripts.d/50-libssh.sh
+++ b/scripts.d/50-libssh.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://git.libssh.org/projects/libssh.git"
-SCRIPT_COMMIT="9a3e218b6f00d0429b8284c0c220b7e0cbb1fbbc"
+SCRIPT_COMMIT="54c1703cb22b917222a6eb2a5d2fde22319d9b7a"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index 021e8f6..b0548a3 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="d998bd82372881d3a2d4514fc6162614b6b18552"
+SCRIPT_COMMIT="11151943b1877824da6086ea0c89b5617caecb67"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index 1b27a04..59f3b82 100755
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="e5fe2cfc1bea149106d94ef5233c488ed1287b68"
+SCRIPT_COMMIT="106a57c1dbacc063d3111ef0774e49a655866968"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh
index c341537..00023e5 100755
--- a/scripts.d/50-lilv/96-lv2.sh
+++ b/scripts.d/50-lilv/96-lv2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lv2.git"
-SCRIPT_COMMIT="8726bffa337e6374b04d0739df2812798b2c8858"
+SCRIPT_COMMIT="9dc04ad3c5b62d0018eae14dc177be2993dbcbd4"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh
index 1e0d2e1..16f4c48 100755
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/serd.git"
-SCRIPT_COMMIT="79ba155516166b8b7be14ab30c22f6f6d93b550f"
+SCRIPT_COMMIT="19bd8dd62aca4f256616b129177aef277d87728e"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-zix.sh b/scripts.d/50-lilv/96-zix.sh
index 1de4508..0b1f9e8 100755
--- a/scripts.d/50-lilv/96-zix.sh
+++ b/scripts.d/50-lilv/96-zix.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/zix.git"
-SCRIPT_COMMIT="577356481bbcb12468bcf669ef7107dfb057b833"
+SCRIPT_COMMIT="56ec14c4369c591f5efbb500b0829b760bee7800"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh
index a6e0585..2336841 100755
--- a/scripts.d/50-lilv/97-sord.sh
+++ b/scripts.d/50-lilv/97-sord.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/sord.git"
-SCRIPT_COMMIT="64c1306c85964417849376e28436086face489f8"
+SCRIPT_COMMIT="b9818bc8381dc34cb8b1a293e460d37645a3d3b1"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh
index 65813b3..aa23932 100755
--- a/scripts.d/50-lilv/98-sratom.sh
+++ b/scripts.d/50-lilv/98-sratom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/sratom.git"
-SCRIPT_COMMIT="36fd5599e7c67f9d99046aa1570e7f0d308b7092"
+SCRIPT_COMMIT="2eca3218ca1ac8fa582f86ab5f055474ad369d7d"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh
index 9f021d4..5602fdf 100755
--- a/scripts.d/50-lilv/99-lilv.sh
+++ b/scripts.d/50-lilv/99-lilv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lilv.git"
-SCRIPT_COMMIT="c3a4d586848f1a5a6e663a42ac5e841218109620"
+SCRIPT_COMMIT="3a9b8e38a146dfdbb618d95f6db8fa919fa2e3e6"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh
index c844bf9..0783b97 100755
--- a/scripts.d/50-openal.sh
+++ b/scripts.d/50-openal.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/kcat/openal-soft.git"
-SCRIPT_COMMIT="5c7b8425daf967c8f59a66eb4f21886172c5a1cb"
+SCRIPT_COMMIT="4fe6eba8c79a4c9cad91d6f6835506cde96a48c4"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh
index 60e61b3..cbb5eea 100755
--- a/scripts.d/50-openh264.sh
+++ b/scripts.d/50-openh264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/cisco/openh264.git"
-SCRIPT_COMMIT="8422de81d0f18edde1487b47f3b0a40f0a108edf"
+SCRIPT_COMMIT="c4156d5b76a9a8be6cbbeb36e62f35d5e5bd745e"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index ceac85b..bc404c6 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-SCRIPT_REV="18175"
+SCRIPT_REV="18285"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index 624087a..f57343d 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/rav1e.git"
-SCRIPT_COMMIT="0fb96baa0a8c2a539ad0c148b6b2f9cfed37707a"
+SCRIPT_COMMIT="1c8c77210ea57ad67014f114ff59f4fd4b124315"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index 67cf8bb..37ee882 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/breakfastquay/rubberband.git"
-SCRIPT_COMMIT="c871f92b2e377742d232d2d723c9ef0b6b3561f2"
+SCRIPT_COMMIT="8edf1723c4f8a8f3b558607b2b1055c23aed48cb"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index 83fcdb2..9266106 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
-SCRIPT_COMMIT="07d6d116ed413a34d77af0657788667bcbefcae7"
+SCRIPT_COMMIT="af54c82138bbb6823f6a77d94710c871ccb1309d"
SCRIPT_BRANCH="SDL2"
ffbuild_enabled() {
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index 4d1f8f4..f43fe9a 100755
--- a/scripts.d/50-srt.sh
+++ b/scripts.d/50-srt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Haivision/srt.git"
-SCRIPT_COMMIT="37d44f42fe0c522642a32aae67c054e075c69b66"
+SCRIPT_COMMIT="98b1b00460d1c5d562e0cb4b2b27a428adaf4792"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index 714fcb8..19cc444 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="5f32f7b4af71af8501810e4716eb1fbe89d80574"
+SCRIPT_COMMIT="91832ee292c9c4df6246937551edbb470d54e5e7"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-vaapi/30-libpciaccess.sh b/scripts.d/50-vaapi/30-libpciaccess.sh
index 34201c9..d284296 100755
--- a/scripts.d/50-vaapi/30-libpciaccess.sh
+++ b/scripts.d/50-vaapi/30-libpciaccess.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git"
-SCRIPT_COMMIT="935f0b4d6983f77c4f35e6d492f9f2c2d1ed57f9"
+SCRIPT_COMMIT="833c86ce15cee2a84a37ae71015f236fd32615d9"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index 6948fc9..857a156 100755
--- a/scripts.d/50-vaapi/40-libdrm.sh
+++ b/scripts.d/50-vaapi/40-libdrm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-SCRIPT_COMMIT="07dae1d10869f55412fa69db885edca58bedeef8"
+SCRIPT_COMMIT="64d6fabaa1d98331c8e1a9248c582014a9050293"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh
index 8a9724f..fdd1b92 100755
--- a/scripts.d/50-vaapi/50-libva.sh
+++ b/scripts.d/50-vaapi/50-libva.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/intel/libva.git"
-SCRIPT_COMMIT="393e7af16d4787034df03587191e4c245f853482"
+SCRIPT_COMMIT="455d49a3c32d643905727aa3abd834fd3c9b4e2f"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index 6bf27c3..62db56a 100755
--- a/scripts.d/50-vulkan/45-vulkan.sh
+++ b/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-SCRIPT_COMMIT="v1.3.236"
+SCRIPT_COMMIT="v1.3.238"
SCRIPT_TAGFILTER="v?.*.*"
ffbuild_enabled() {
diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh
index a5bacd2..32d321e 100755
--- a/scripts.d/50-vulkan/50-shaderc.sh
+++ b/scripts.d/50-vulkan/50-shaderc.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/google/shaderc.git"
-SCRIPT_COMMIT="b2428cbf4f73c409f7c3316f6aee0b4b57652064"
+SCRIPT_COMMIT="209acaf91644acc1cadcdf1843be0dcdaca9f545"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh
index 256ffcd..5dbab6e 100755
--- a/scripts.d/50-vulkan/55-spirv-cross.sh
+++ b/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SCRIPT_COMMIT="c77b09b57c27837dc2d41aa371ed3d236ce9ce47"
+SCRIPT_COMMIT="a89dea3c499b1e322b39c7e6127af2777c4aa49b"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index 163f441..d70e673 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git"
-SCRIPT_COMMIT="7ead30db8aa75db28236eee40899f0ff6e3c9688"
+SCRIPT_COMMIT="22ce304a16bfbf9445a5987452f90f53efbe594f"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh
index 265122e..a33b0fd 100755
--- a/scripts.d/50-x264.sh
+++ b/scripts.d/50-x264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/mirror/x264.git"
-SCRIPT_COMMIT="b093bbe7d9bc642c8f24067cbdcc73bb43562eab"
+SCRIPT_COMMIT="941cae6d1d6d6344c9a1d27440eaf2872b18ca9a"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh
index 302203e..056009e 100755
--- a/scripts.d/50-x265.sh
+++ b/scripts.d/50-x265.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git"
-SCRIPT_COMMIT="cc25ead66daa466ab27cc14897a48a1b61bcf64e"
+SCRIPT_COMMIT="a7cd02c18aa4591f46119b675c64817f165ed9a3"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
From 12473a216f14387cfabc8cf3beacd6373cb043bd Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sat, 24 Dec 2022 15:55:49 +0100
Subject: [PATCH 131/160] Add new python dependency
---
images/base/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/images/base/Dockerfile b/images/base/Dockerfile
index 5270033..8162026 100644
--- a/images/base/Dockerfile
+++ b/images/base/Dockerfile
@@ -11,7 +11,7 @@ RUN \
gperf itstool ragel libc6-dev libssl-dev \
gtk-doc-tools gobject-introspection gawk \
ocaml ocamlbuild libnum-ocaml-dev indent p7zip-full \
- python3-distutils python3-jinja2 python3-apt python-is-python3 && \
+ python3-distutils python3-jinja2 python3-jsonschema python3-apt python-is-python3 && \
apt-get -y clean && \
git config --global user.email "builder@localhost" && \
git config --global user.name "Builder" && \
From b1fcac316efe2f6cf376a5071b7feac3a7f4ef79 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sat, 24 Dec 2022 21:37:48 +0100
Subject: [PATCH 132/160] Account for fixed bortli buildsystem
---
scripts.d/50-libjxl/45-brotli.sh | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh
index a48ea94..083bdf1 100755
--- a/scripts.d/50-libjxl/45-brotli.sh
+++ b/scripts.d/50-libjxl/45-brotli.sh
@@ -13,22 +13,8 @@ ffbuild_dockerbuild() {
mkdir build && cd build
- cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DCMAKE_POSITION_INDEPENDENT_CODE=ON ..
+ cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
+ -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF ..
ninja -j$(nproc)
ninja install
-
- # Build system is severely lacking in options, clean up after it
- rm -r "${FFBUILD_PREFIX}"/bin
- mv "${FFBUILD_PREFIX}"/lib/libbrotlienc{-static,}.a
- mv "${FFBUILD_PREFIX}"/lib/libbrotlidec{-static,}.a
- mv "${FFBUILD_PREFIX}"/lib/libbrotlicommon{-static,}.a
-
- if [[ $TARGET == win* ]]; then
- rm "${FFBUILD_PREFIX}"/lib/libbrotli*.dll.a
- elif [[ $TARGET == linux* ]]; then
- rm "${FFBUILD_PREFIX}"/lib/libbrotli*.so*
- else
- echo "Unknown target"
- return -1
- fi
}
From 98b1aa8b2d807d2a0702436e4c4bef15c207a549 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 25 Dec 2022 00:37:03 +0100
Subject: [PATCH 133/160] Downgrade vulkan headers
---
scripts.d/50-vulkan/45-vulkan.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index 62db56a..ca7f4ab 100755
--- a/scripts.d/50-vulkan/45-vulkan.sh
+++ b/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-SCRIPT_COMMIT="v1.3.238"
+SCRIPT_COMMIT="v1.3.237"
SCRIPT_TAGFILTER="v?.*.*"
ffbuild_enabled() {
From 0d2e5c705102b28051b0c81052bc2e7fdf604df2 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 29 Jan 2023 14:09:53 +0100
Subject: [PATCH 134/160] Fix rusts nonsensical root-only permissions on its
library
Fixes #234
---
scripts.d/50-rav1e.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index f57343d..834b323 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -43,6 +43,8 @@ EOF
fi
cargo cinstall -v "${myconf[@]}"
+
+ chmod 644 "${FFBUILD_PREFIX}"/lib/*rav1e*
}
ffbuild_configure() {
From 583334e450108c2dfddddf1025b9e01623d02e36 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 1 Feb 2023 15:31:20 +0100
Subject: [PATCH 135/160] Bump libiconv
---
scripts.d/20-libiconv.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh
index 99ceda8..026acbb 100755
--- a/scripts.d/20-libiconv.sh
+++ b/scripts.d/20-libiconv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git"
-SCRIPT_COMMIT="2582e7bb06f1638877713400e2d11db547798a49"
+SCRIPT_COMMIT="e46dee2f581c1167137bcd045e114e96a9f00483"
ffbuild_enabled() {
return 0
From 60ce7242b74801b482ac5d950414fc5fe4aa59a4 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Tue, 7 Feb 2023 21:01:26 +0100
Subject: [PATCH 136/160] Update libiconv
Closes #237
---
scripts.d/20-libiconv.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh
index 026acbb..6c755fe 100755
--- a/scripts.d/20-libiconv.sh
+++ b/scripts.d/20-libiconv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git"
-SCRIPT_COMMIT="e46dee2f581c1167137bcd045e114e96a9f00483"
+SCRIPT_COMMIT="0a05ca75c08ae899f6fca5f79254491e13ffb500"
ffbuild_enabled() {
return 0
From 3183ec99b387cc90a807f15d5ef906238b8e8657 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 12 Feb 2023 14:40:12 +0100
Subject: [PATCH 137/160] Update dependencies
---
scripts.d/10-mingw.sh | 2 +-
scripts.d/20-libxml2.sh | 2 +-
scripts.d/25-freetype.sh | 2 +-
scripts.d/25-openssl.sh | 2 +-
scripts.d/25-xz.sh | 2 +-
scripts.d/35-fontconfig.sh | 2 +-
scripts.d/45-harfbuzz.sh | 2 +-
scripts.d/45-libsamplerate.sh | 2 +-
scripts.d/45-opencl.sh | 4 ++--
scripts.d/45-pulseaudio.sh | 2 +-
scripts.d/45-vmaf.sh | 2 +-
scripts.d/45-x11/10-xproto.sh | 2 +-
scripts.d/45-x11/30-libxcb.sh | 2 +-
scripts.d/45-x11/40-libx11.sh | 2 +-
scripts.d/45-x11/60-libxcursor.sh | 2 +-
scripts.d/50-amf.sh | 2 +-
scripts.d/50-aom.sh | 2 +-
scripts.d/50-aribb24/25-libpng.sh | 2 +-
scripts.d/50-avisynth.sh | 2 +-
scripts.d/50-dav1d.sh | 2 +-
scripts.d/50-ffnvcodec.sh | 4 ++--
scripts.d/50-frei0r.sh | 2 +-
scripts.d/50-kvazaar.sh | 2 +-
scripts.d/50-libass.sh | 2 +-
scripts.d/50-libjxl/45-brotli.sh | 2 +-
scripts.d/50-libjxl/50-libjxl.sh | 2 +-
scripts.d/50-libopus.sh | 2 +-
scripts.d/50-libssh.sh | 2 +-
scripts.d/50-libvpx.sh | 2 +-
scripts.d/50-libwebp.sh | 2 +-
scripts.d/50-lilv/96-lv2.sh | 2 +-
scripts.d/50-lilv/96-serd.sh | 2 +-
scripts.d/50-lilv/96-zix.sh | 2 +-
scripts.d/50-lilv/97-sord.sh | 2 +-
scripts.d/50-lilv/98-sratom.sh | 2 +-
scripts.d/50-lilv/99-lilv.sh | 2 +-
scripts.d/50-mfx.sh | 2 +-
scripts.d/50-onevpl.sh | 2 +-
scripts.d/50-openal.sh | 2 +-
scripts.d/50-openh264.sh | 2 +-
scripts.d/50-openjpeg.sh | 2 +-
scripts.d/50-openmpt.sh | 2 +-
scripts.d/50-rav1e.sh | 2 +-
scripts.d/50-rubberband.sh | 2 +-
scripts.d/50-sdl.sh | 2 +-
scripts.d/50-srt.sh | 2 +-
scripts.d/50-svtav1.sh | 2 +-
scripts.d/50-uavs3d.sh | 2 +-
scripts.d/50-vaapi/40-libdrm.sh | 2 +-
scripts.d/50-vaapi/50-libva.sh | 2 +-
scripts.d/50-vulkan/45-vulkan.sh | 2 +-
scripts.d/50-vulkan/50-shaderc.sh | 2 +-
scripts.d/50-vulkan/55-spirv-cross.sh | 2 +-
scripts.d/50-vulkan/60-libplacebo.sh | 2 +-
scripts.d/50-x264.sh | 2 +-
scripts.d/50-x265.sh | 2 +-
scripts.d/50-zimg.sh | 2 +-
57 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index b511f38..1ad40ec 100755
--- a/scripts.d/10-mingw.sh
+++ b/scripts.d/10-mingw.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/mirror/mingw-w64.git"
-SCRIPT_COMMIT="fc55e181b2d84c8817e3fd9d86c6944ac709acc9"
+SCRIPT_COMMIT="8708b7d92f0d923c0f7196dd7d2aa12c02aa766d"
ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh
index da7cfb9..cda35ae 100755
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-SCRIPT_COMMIT="c885bebb5d423b3faad21e62d9b962e824feaf93"
+SCRIPT_COMMIT="15c9f4353311c7b765e9e72e63779a161c21f010"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index dad7b70..2b57937 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
-SCRIPT_COMMIT="0bcb664de8ea44299f57c45d01433328596bc2a7"
+SCRIPT_COMMIT="dacbb55433079fb3539163862958a6b9466a0661"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh
index 01e8746..f7ce7e3 100755
--- a/scripts.d/25-openssl.sh
+++ b/scripts.d/25-openssl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/openssl/openssl.git"
-SCRIPT_COMMIT="OpenSSL_1_1_1s"
+SCRIPT_COMMIT="OpenSSL_1_1_1t"
SCRIPT_TAGFILTER="OpenSSL_1_1_1*"
ffbuild_enabled() {
diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh
index cadb60e..4f02f98 100755
--- a/scripts.d/25-xz.sh
+++ b/scripts.d/25-xz.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xz-mirror/xz.git"
-SCRIPT_COMMIT="8fd225a2c149f30aeac377e68eb5abf6b28300ad"
+SCRIPT_COMMIT="1dbe12b90cff79bb51923733ac0840747b4b4131"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh
index 6398cba..3c20840 100755
--- a/scripts.d/35-fontconfig.sh
+++ b/scripts.d/35-fontconfig.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
-SCRIPT_COMMIT="6e3fe92b20edb1d91683efa9aea68d35a887a83c"
+SCRIPT_COMMIT="2ef790a0dbbab24235d1b8c0325ab4414de5f0a9"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index b912591..e908674 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="0066e824f02efce79e026f60391f3fd95214e1ac"
+SCRIPT_COMMIT="8bdaeddfcd86aa66f560ff1ae1ae71b1e1723463"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh
index a5ea233..4f06107 100755
--- a/scripts.d/45-libsamplerate.sh
+++ b/scripts.d/45-libsamplerate.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsndfile/libsamplerate.git"
-SCRIPT_COMMIT="a9945ab36e827260cacf7b3e4f6e783b460e21ee"
+SCRIPT_COMMIT="c01e2405612ad3561bf93e8e6dddb9ba0dffe4d9"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh
index 9065586..affb991 100755
--- a/scripts.d/45-opencl.sh
+++ b/scripts.d/45-opencl.sh
@@ -1,10 +1,10 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
-SCRIPT_COMMIT="8f33fba7c14b926c6551bf86b5b255e3e0f47f86"
+SCRIPT_COMMIT="4c82e9cfaaad18c340f48af3cf5d09ff33e8c1b7"
SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
-SCRIPT_COMMIT2="9a3e962f16f5097d2054233ad8b6dad51b6f41b7"
+SCRIPT_COMMIT2="2cde5d09953a041786d1cfdcb1c08704a82cb904"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index 063397d..8d96ad0 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-SCRIPT_COMMIT="96bd4e57b5b02dc04b61528033f283f5fea7e723"
+SCRIPT_COMMIT="300db779224625144d6279d230c2daa857c967d8"
ffbuild_enabled() {
[[ $TARGET == linux* ]] || return 1
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index 5e7961d..bf70802 100755
--- a/scripts.d/45-vmaf.sh
+++ b/scripts.d/45-vmaf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
-SCRIPT_COMMIT="f36ecd6c29c7fea1f55d0ecf7a03fce80216fc17"
+SCRIPT_COMMIT="e81d12e75629f6f0730077bfa7e28764c41b2907"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh
index b23858d..a4f3bc7 100755
--- a/scripts.d/45-x11/10-xproto.sh
+++ b/scripts.d/45-x11/10-xproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
-SCRIPT_COMMIT="9740bd9bfa75a858853f07b8c06dd813ef692778"
+SCRIPT_COMMIT="1b6e63b2c38a0cf6cd1c70bfc5483cac0d1710e1"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh
index 989843a..267d9f7 100755
--- a/scripts.d/45-x11/30-libxcb.sh
+++ b/scripts.d/45-x11/30-libxcb.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
-SCRIPT_COMMIT="cb8c70f5a65b4bd68b449dcaa637c3c4753e2f81"
+SCRIPT_COMMIT="4d1a578dd5348909ade2a853d806272326d228d7"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index c91c262..c5b4fcc 100755
--- a/scripts.d/45-x11/40-libx11.sh
+++ b/scripts.d/45-x11/40-libx11.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-SCRIPT_COMMIT="48487c4b9028e9eec5371742f51e1d64c2e17296"
+SCRIPT_COMMIT="fc5ec8edda1efdf5d66db4e76796e3c407527b3b"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libxcursor.sh b/scripts.d/45-x11/60-libxcursor.sh
index 1cbaa1d..8ddb57c 100755
--- a/scripts.d/45-x11/60-libxcursor.sh
+++ b/scripts.d/45-x11/60-libxcursor.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git"
-SCRIPT_COMMIT="27adb16027fa99d83818a0ed9f6623cb03f0c574"
+SCRIPT_COMMIT="87a30b1758b7757dd74d0a70e871d7af1cac3a44"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh
index 27d7472..72311dc 100755
--- a/scripts.d/50-amf.sh
+++ b/scripts.d/50-amf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
-SCRIPT_COMMIT="9e2ebb91b5447c766b02b43826ca287f06789e5c"
+SCRIPT_COMMIT="37452e9e60940f04fc235a923ffcc31c407240fa"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index 67458ca..de0f852 100755
--- a/scripts.d/50-aom.sh
+++ b/scripts.d/50-aom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://aomedia.googlesource.com/aom"
-SCRIPT_COMMIT="19f4bc6f6ce7808098b2b719480680f415acc625"
+SCRIPT_COMMIT="93fc4d7a259cde11f1c7612867eb33973a26b72d"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh
index 6bff0db..267c86c 100755
--- a/scripts.d/50-aribb24/25-libpng.sh
+++ b/scripts.d/50-aribb24/25-libpng.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/glennrp/libpng.git"
-SCRIPT_COMMIT="61bfdb0cb02a6f3a62c929dbc9e832894c0a8df2"
+SCRIPT_COMMIT="aab24fa1b3ccaab8770902a3c50ea9564925d053"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh
index 07bcdb6..8aea76b 100755
--- a/scripts.d/50-avisynth.sh
+++ b/scripts.d/50-avisynth.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/AviSynth/AviSynthPlus.git"
-SCRIPT_COMMIT="bee4cfbd1b6a38997cf0280a1929c55dace3b1c9"
+SCRIPT_COMMIT="09f362bd2402335afd0b766b496bcd0855c58aa0"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index 5dc6044..17051f1 100755
--- a/scripts.d/50-dav1d.sh
+++ b/scripts.d/50-dav1d.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="ed63a7459376a21e88b871006574dc2055a2ea35"
+SCRIPT_COMMIT="9b4b2448106f863bfa4789ba6e86555ad57c838f"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh
index cdd6dd9..920a82e 100755
--- a/scripts.d/50-ffnvcodec.sh
+++ b/scripts.d/50-ffnvcodec.sh
@@ -1,10 +1,10 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git"
-SCRIPT_COMMIT="c12df23d145431fb65c2116481aac19340b2cc30"
+SCRIPT_COMMIT="c5e4af74850a616c42d39ed45b9b8568b71bf8bf"
SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git"
-SCRIPT_COMMIT2="b550d4042f1ac0990efa1fa9f0f0c08fb6b24446"
+SCRIPT_COMMIT2="2055784e5d5bfb3df78d4d3645f345f19062dce2"
SCRIPT_BRANCH2="sdk/11.1"
ffbuild_enabled() {
diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh
index 90a714d..5b1ea79 100755
--- a/scripts.d/50-frei0r.sh
+++ b/scripts.d/50-frei0r.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/dyne/frei0r.git"
-SCRIPT_COMMIT="a9d15ff07e130baf3408da6e1f1b22f82e7c62b6"
+SCRIPT_COMMIT="599b47843400a248d2b415f46df6d1777902e865"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-kvazaar.sh b/scripts.d/50-kvazaar.sh
index 2f8c737..d864353 100755
--- a/scripts.d/50-kvazaar.sh
+++ b/scripts.d/50-kvazaar.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/ultravideo/kvazaar.git"
-SCRIPT_COMMIT="a4005046ae2ebb3c88e92ff06736ce57b60fdcc7"
+SCRIPT_COMMIT="37a0404bc8ccdc39515a5aed706205dc53810019"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index 02b39df..06fae4f 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libass/libass.git"
-SCRIPT_COMMIT="062d4ec598b4fd06f75c0cd6a0f43f5d0939a764"
+SCRIPT_COMMIT="077328ca6715e2e2826881003946640f56cb763c"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh
index 083bdf1..33cd082 100755
--- a/scripts.d/50-libjxl/45-brotli.sh
+++ b/scripts.d/50-libjxl/45-brotli.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/google/brotli.git"
-SCRIPT_COMMIT="509d4419bd2e7f40ac97106324abf0b49d9fd7ff"
+SCRIPT_COMMIT="ed1995b6bda19244070ab5d331111f16f67c8054"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index 6fd97a5..b10cbdd 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
-SCRIPT_COMMIT="5853ad97044c3b9da46d10b611e66063b1297cc5"
+SCRIPT_COMMIT="6280645ef5530e186ddba0f814f1ea5f6d754e3e"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh
index 41bb879..f81dee0 100755
--- a/scripts.d/50-libopus.sh
+++ b/scripts.d/50-libopus.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/opus.git"
-SCRIPT_COMMIT="757c53f775a0b651b0512a1992d67f4b2159a378"
+SCRIPT_COMMIT="8cf872a186b96085b1bb3a547afd598354ebeb87"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh
index 48b9744..fd0f99b 100755
--- a/scripts.d/50-libssh.sh
+++ b/scripts.d/50-libssh.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://git.libssh.org/projects/libssh.git"
-SCRIPT_COMMIT="54c1703cb22b917222a6eb2a5d2fde22319d9b7a"
+SCRIPT_COMMIT="7291f2173ccfcaf0a90b2df863a2d7b8b2833b1b"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index b0548a3..e666570 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="11151943b1877824da6086ea0c89b5617caecb67"
+SCRIPT_COMMIT="5595e18870b24fdfd8fdeb4cfa5ea51824486273"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index 59f3b82..9682b9c 100755
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="106a57c1dbacc063d3111ef0774e49a655866968"
+SCRIPT_COMMIT="1347a32d82276ecf4daba12f6e9142cc4e1f2401"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh
index 00023e5..7f3a984 100755
--- a/scripts.d/50-lilv/96-lv2.sh
+++ b/scripts.d/50-lilv/96-lv2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lv2.git"
-SCRIPT_COMMIT="9dc04ad3c5b62d0018eae14dc177be2993dbcbd4"
+SCRIPT_COMMIT="c287eaa2948b7553ccce877115e7a94a07530d80"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh
index 16f4c48..f6f89e6 100755
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/serd.git"
-SCRIPT_COMMIT="19bd8dd62aca4f256616b129177aef277d87728e"
+SCRIPT_COMMIT="c7f85701199b42695ce78b28b120a3c56e114fd6"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-zix.sh b/scripts.d/50-lilv/96-zix.sh
index 0b1f9e8..74313e0 100755
--- a/scripts.d/50-lilv/96-zix.sh
+++ b/scripts.d/50-lilv/96-zix.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/zix.git"
-SCRIPT_COMMIT="56ec14c4369c591f5efbb500b0829b760bee7800"
+SCRIPT_COMMIT="18e62483cb7173c6604f7dd2097299e47c2a4c0c"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh
index 2336841..5ff235f 100755
--- a/scripts.d/50-lilv/97-sord.sh
+++ b/scripts.d/50-lilv/97-sord.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/sord.git"
-SCRIPT_COMMIT="b9818bc8381dc34cb8b1a293e460d37645a3d3b1"
+SCRIPT_COMMIT="4113c78db9969054354b153819bde4ff0c8b6a73"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh
index aa23932..c94d244 100755
--- a/scripts.d/50-lilv/98-sratom.sh
+++ b/scripts.d/50-lilv/98-sratom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/sratom.git"
-SCRIPT_COMMIT="2eca3218ca1ac8fa582f86ab5f055474ad369d7d"
+SCRIPT_COMMIT="988162496bbb66a2c52d384ef2ca602698024267"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh
index 5602fdf..90deec3 100755
--- a/scripts.d/50-lilv/99-lilv.sh
+++ b/scripts.d/50-lilv/99-lilv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lilv.git"
-SCRIPT_COMMIT="3a9b8e38a146dfdbb618d95f6db8fa919fa2e3e6"
+SCRIPT_COMMIT="803be790d97a0bd219e15dbe2c9483f33af5877c"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-mfx.sh b/scripts.d/50-mfx.sh
index 3ab4017..28c34d4 100755
--- a/scripts.d/50-mfx.sh
+++ b/scripts.d/50-mfx.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lu-zero/mfx_dispatch.git"
-SCRIPT_COMMIT="7e4d221c36c630c1250b23a5dfa15657bc04c10c"
+SCRIPT_COMMIT="5a3f178be7f406cec920b9f52f46c1ae29f29bb2"
ffbuild_enabled() {
[[ $TARGET == *arm64 ]] && return -1
diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh
index 3f98ee2..29b1794 100755
--- a/scripts.d/50-onevpl.sh
+++ b/scripts.d/50-onevpl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/oneapi-src/oneVPL.git"
-SCRIPT_COMMIT="17f1ef9abb52c10ca88c57508a30de63c4e1bb16"
+SCRIPT_COMMIT="6ca7a09c4b5b2c1ae6b52d73bc44c334ab66adbc"
ffbuild_enabled() {
[[ $TARGET == *arm64 ]] && return -1
diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh
index 0783b97..13dc57a 100755
--- a/scripts.d/50-openal.sh
+++ b/scripts.d/50-openal.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/kcat/openal-soft.git"
-SCRIPT_COMMIT="4fe6eba8c79a4c9cad91d6f6835506cde96a48c4"
+SCRIPT_COMMIT="b22f9410dde0da5b3795ba62f1a728590238349e"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh
index cbb5eea..4de93b9 100755
--- a/scripts.d/50-openh264.sh
+++ b/scripts.d/50-openh264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/cisco/openh264.git"
-SCRIPT_COMMIT="c4156d5b76a9a8be6cbbeb36e62f35d5e5bd745e"
+SCRIPT_COMMIT="045aeac1dd01df12dec7b1ef8191b3193cf4273c"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh
index 3e75289..3277557 100755
--- a/scripts.d/50-openjpeg.sh
+++ b/scripts.d/50-openjpeg.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/uclouvain/openjpeg.git"
-SCRIPT_COMMIT="2d606701e8b7aa83f657d113c3367508e99bd12b"
+SCRIPT_COMMIT="ee58d77047867dd422593163e660e66a109ba1c0"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index bc404c6..eefa723 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-SCRIPT_REV="18285"
+SCRIPT_REV="18737"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index 834b323..cc8ed36 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/rav1e.git"
-SCRIPT_COMMIT="1c8c77210ea57ad67014f114ff59f4fd4b124315"
+SCRIPT_COMMIT="c548b8498c039614fa3c8583cdf093ffa8fdd742"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index 37ee882..4c7e9fa 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/breakfastquay/rubberband.git"
-SCRIPT_COMMIT="8edf1723c4f8a8f3b558607b2b1055c23aed48cb"
+SCRIPT_COMMIT="b317d0e81a8e0ea84269cc2c1dab2906ca8df271"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index 9266106..a36f6ea 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
-SCRIPT_COMMIT="af54c82138bbb6823f6a77d94710c871ccb1309d"
+SCRIPT_COMMIT="2b66ef0df4eee18c5d9fdc77157cc109b6976efc"
SCRIPT_BRANCH="SDL2"
ffbuild_enabled() {
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index f43fe9a..3ca615e 100755
--- a/scripts.d/50-srt.sh
+++ b/scripts.d/50-srt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Haivision/srt.git"
-SCRIPT_COMMIT="98b1b00460d1c5d562e0cb4b2b27a428adaf4792"
+SCRIPT_COMMIT="3ffc93f2f6d04dcea765a10e9e5caa7fb071291c"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index 19cc444..c674694 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="91832ee292c9c4df6246937551edbb470d54e5e7"
+SCRIPT_COMMIT="93fc87b0ff0823d5703d31516cb4093aff86c848"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh
index 611adfc..8ebd2c5 100755
--- a/scripts.d/50-uavs3d.sh
+++ b/scripts.d/50-uavs3d.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/uavs3/uavs3d.git"
-SCRIPT_COMMIT="0133ee4b4bbbef7b88802e7ad019b14b9b852c2b"
+SCRIPT_COMMIT="b8f8e215297ff98ee78162fdc3d9c52d16b113d5"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index 857a156..fa0a05b 100755
--- a/scripts.d/50-vaapi/40-libdrm.sh
+++ b/scripts.d/50-vaapi/40-libdrm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-SCRIPT_COMMIT="64d6fabaa1d98331c8e1a9248c582014a9050293"
+SCRIPT_COMMIT="c6d6dce99fb3e7e681fbba9e198345fdbd10e49e"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh
index fdd1b92..65baac9 100755
--- a/scripts.d/50-vaapi/50-libva.sh
+++ b/scripts.d/50-vaapi/50-libva.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/intel/libva.git"
-SCRIPT_COMMIT="455d49a3c32d643905727aa3abd834fd3c9b4e2f"
+SCRIPT_COMMIT="9ac72efe2e123321d8fd5500fb1aca51cd31bc97"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index ca7f4ab..36499f2 100755
--- a/scripts.d/50-vulkan/45-vulkan.sh
+++ b/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-SCRIPT_COMMIT="v1.3.237"
+SCRIPT_COMMIT="v1.3.240"
SCRIPT_TAGFILTER="v?.*.*"
ffbuild_enabled() {
diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh
index 32d321e..2e5c868 100755
--- a/scripts.d/50-vulkan/50-shaderc.sh
+++ b/scripts.d/50-vulkan/50-shaderc.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/google/shaderc.git"
-SCRIPT_COMMIT="209acaf91644acc1cadcdf1843be0dcdaca9f545"
+SCRIPT_COMMIT="dde14deee743b1ae4ec8ad541f3cd268941051bb"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh
index 5dbab6e..7ef0f3a 100755
--- a/scripts.d/50-vulkan/55-spirv-cross.sh
+++ b/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SCRIPT_COMMIT="a89dea3c499b1e322b39c7e6127af2777c4aa49b"
+SCRIPT_COMMIT="4e2fdb25671c742a9fbe93a6034eb1542244c7e1"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index d70e673..4f6a8e2 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git"
-SCRIPT_COMMIT="22ce304a16bfbf9445a5987452f90f53efbe594f"
+SCRIPT_COMMIT="855280962b3f5adb453e53d89ea20387e25a1a81"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh
index a33b0fd..38997cb 100755
--- a/scripts.d/50-x264.sh
+++ b/scripts.d/50-x264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/mirror/x264.git"
-SCRIPT_COMMIT="941cae6d1d6d6344c9a1d27440eaf2872b18ca9a"
+SCRIPT_COMMIT="eaa68fad9e5d201d42fde51665f2d137ae96baf0"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh
index 056009e..962dd70 100755
--- a/scripts.d/50-x265.sh
+++ b/scripts.d/50-x265.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git"
-SCRIPT_COMMIT="a7cd02c18aa4591f46119b675c64817f165ed9a3"
+SCRIPT_COMMIT="6da609e41ca5ae1d661a1b5c4805ed7a3f4117cc"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh
index 2d1b226..80c3347 100755
--- a/scripts.d/50-zimg.sh
+++ b/scripts.d/50-zimg.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git"
-SCRIPT_COMMIT="48eec5c68b086bbae0f75498e25b5a229e5ea684"
+SCRIPT_COMMIT="5a5397c2b149fc9e5cb898973121de6edea77c70"
ffbuild_enabled() {
return 0
From 74a2af19778cf1a0858fd1129ffd72dea1cd2035 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 12 Feb 2023 17:11:50 +0100
Subject: [PATCH 138/160] Switch frei0r to "cmake"
---
scripts.d/50-frei0r.sh | 28 ++++++++--------------------
1 file changed, 8 insertions(+), 20 deletions(-)
diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh
index 5b1ea79..ffd05ba 100755
--- a/scripts.d/50-frei0r.sh
+++ b/scripts.d/50-frei0r.sh
@@ -13,29 +13,17 @@ ffbuild_dockerbuild() {
git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" frei0r
cd frei0r
- ./autogen.sh
+ mkdir build && cd build
- local myconf=(
- --prefix="$FFBUILD_PREFIX"
- --disable-shared
- --enable-static
- --with-pic
- --enable-cpuflags
- )
+ cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" ..
- if [[ $TARGET == win* || $TARGET == linux* ]]; then
- myconf+=(
- --host="$FFBUILD_TOOLCHAIN"
- )
- else
- echo "Unknown target"
- return -1
- fi
+ mkdir -p "$FFBUILD_PREFIX"/lib/pkgconfig
+ cp frei0r.pc "$FFBUILD_PREFIX"/lib/pkgconfig
- ./configure "${myconf[@]}"
- make -C include -j$(nproc)
- make -C include install
- make install-pkgconfigDATA
+ mkdir -p "$FFBUILD_PREFIX"/include
+ cp ../include/frei0r.h "$FFBUILD_PREFIX"/include
+
+ cat frei0r.pc
}
ffbuild_configure() {
From 2bb8f6d5e0328f4f1e83b760db8ac1dee05e3343 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 15 Feb 2023 16:54:25 +0100
Subject: [PATCH 139/160] Alaways do full clone of iconv repo
---
scripts.d/20-libiconv.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh
index 6c755fe..aed20d1 100755
--- a/scripts.d/20-libiconv.sh
+++ b/scripts.d/20-libiconv.sh
@@ -8,8 +8,9 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" iconv
+ git clone --filter=blob:none "$SCRIPT_REPO" iconv
cd iconv
+ git checkout "$SCRIPT_COMMIT"
./gitsub.sh pull
./autogen.sh
From 7e91dfcaa58d36c6016b537f75579c574a044ef1 Mon Sep 17 00:00:00 2001
From: "Dennis E. Mungai" <dmngaie@gmail.com>
Date: Wed, 15 Feb 2023 21:14:59 +0300
Subject: [PATCH 140/160] Omit the ``--filter=blob:none`` option passed to git
clone
This should prevent the "filtering not recognized by server, ignoring" warning on git clone.
---
scripts.d/20-libiconv.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh
index aed20d1..016c49a 100755
--- a/scripts.d/20-libiconv.sh
+++ b/scripts.d/20-libiconv.sh
@@ -8,7 +8,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git clone --filter=blob:none "$SCRIPT_REPO" iconv
+ git clone "$SCRIPT_REPO" iconv
cd iconv
git checkout "$SCRIPT_COMMIT"
From 75f7b8e218587dc9ed1a852bf9927741288618d1 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 23 Feb 2023 12:11:08 +0100
Subject: [PATCH 141/160] Bump uavs3d
---
scripts.d/50-uavs3d.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh
index 8ebd2c5..02ca0e5 100755
--- a/scripts.d/50-uavs3d.sh
+++ b/scripts.d/50-uavs3d.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/uavs3/uavs3d.git"
-SCRIPT_COMMIT="b8f8e215297ff98ee78162fdc3d9c52d16b113d5"
+SCRIPT_COMMIT="1fd04917cff50fac72ae23e45f82ca6fd9130bd8"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
From 1a3257f655fbd8c09cecf1936cf457f6f1ad8128 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Tue, 28 Feb 2023 15:09:04 +0100
Subject: [PATCH 142/160] Add ffmpeg 6.0 addin
---
addins/6.0.sh | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 addins/6.0.sh
diff --git a/addins/6.0.sh b/addins/6.0.sh
new file mode 100644
index 0000000..720a9cd
--- /dev/null
+++ b/addins/6.0.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+GIT_BRANCH="release/6.0"
From 0e5f512f8abe1da608fd4302ba54b63e03ea1a08 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Fri, 3 Mar 2023 18:55:03 +0100
Subject: [PATCH 143/160] Add 6.0 to builds
Will probably drop 4.4 if this causes build times to be too crazy, or if
it exhausts the asset size limit.
---
.github/workflows/build.yml | 4 ++--
.github/workflows/pr.yml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 06307fc..ba3434b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -100,7 +100,7 @@ jobs:
fail-fast: false
matrix:
target: [win64,linux64,linuxarm64]
- variant: [gpl,lgpl,gpl 4.4,gpl 5.1,lgpl 4.4,lgpl 5.1,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.1,lgpl-shared 4.4,lgpl-shared 5.1]
+ variant: [gpl,lgpl,gpl 4.4,gpl 5.1,gpl 6.0,lgpl 4.4,lgpl 5.1,lgpl 6.0,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.1,gpl-shared 6.0,lgpl-shared 4.4,lgpl-shared 5.1,lgpl-shared 6.0]
steps:
- name: Checkout
uses: actions/checkout@v3
@@ -144,7 +144,7 @@ jobs:
fail-fast: false
matrix:
target: [win64,linux64,linuxarm64]
- variant: [gpl,lgpl,gpl 4.4,gpl 5.1,lgpl 4.4,lgpl 5.1,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.1,lgpl-shared 4.4,lgpl-shared 5.1]
+ variant: [gpl,lgpl,gpl 4.4,gpl 5.1,gpl 6.0,lgpl 4.4,lgpl 5.1,lgpl 6.0,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.1,gpl-shared 6.0,lgpl-shared 4.4,lgpl-shared 5.1,lgpl-shared 6.0]
steps:
- name: Checkout
uses: actions/checkout@v3
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 9c7fbb3..cc42dd8 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
target: [win64,linux64,linuxarm64]
- variant: [lgpl,gpl 4.4,gpl 5.1,lgpl 4.4,lgpl 5.1,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.1,lgpl-shared 4.4,lgpl-shared 5.1]
+ variant: [lgpl,gpl 6.0,gpl 5.1,lgpl 6.0,lgpl 5.1,gpl-shared,lgpl-shared,gpl-shared 6.0,gpl-shared 5.1,lgpl-shared 6.0,lgpl-shared 5.1]
quickbuild: [1]
include:
- target: win64
From 193f55691bf0363e4b92ce6b4a36842b047d52eb Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 8 Mar 2023 23:19:42 +0100
Subject: [PATCH 144/160] Remove libvpl debugging leftover
---
scripts.d/50-onevpl.sh | 2 --
1 file changed, 2 deletions(-)
diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh
index 29b1794..34f6e69 100755
--- a/scripts.d/50-onevpl.sh
+++ b/scripts.d/50-onevpl.sh
@@ -27,8 +27,6 @@ ffbuild_dockerbuild() {
ninja install
rm -rf "$FFBUILD_PREFIX"/{etc,share}
-
- cat /opt/ffbuild/lib/pkgconfig/vpl.pc
}
ffbuild_configure() {
From a6e38b38fd9f6a7329b72c59d382edd2d8a0203d Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Sun, 12 Mar 2023 13:12:43 +0800
Subject: [PATCH 145/160] Fix the path to fontconfig configuration file
instead of using the install prefix + /etc or /var
Signed-off-by: nyanmisaka <nst799610810@gmail.com>
---
scripts.d/35-fontconfig.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh
index 3c20840..cb12f14 100755
--- a/scripts.d/35-fontconfig.sh
+++ b/scripts.d/35-fontconfig.sh
@@ -22,7 +22,13 @@ ffbuild_dockerbuild() {
--enable-static
)
- if [[ $TARGET == win* || $TARGET == linux* ]]; then
+ if [[ $TARGET == linux* ]]; then
+ myconf+=(
+ --sysconfdir=/etc
+ --localstatedir=/var
+ --host="$FFBUILD_TOOLCHAIN"
+ )
+ elif [[ $TARGET == win* ]]; then
myconf+=(
--host="$FFBUILD_TOOLCHAIN"
)
From f0568e9a9a65fe6e3df17050c0ae4812623c42ce Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 12 Mar 2023 17:16:25 +0100
Subject: [PATCH 146/160] Update readme for 6.0 addin
Closes #246
---
README.md | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 7072348..0185e90 100644
--- a/README.md
+++ b/README.md
@@ -64,8 +64,6 @@ Available variants:
* `nonfree-shared` Same again, but with the nonfree set of dependencies.
All of those can be optionally combined with any combination of addins:
-* `4.4` to build from the 4.4 release branch instead of master.
-* `5.0` to build from the 5.0 release branch instead of master.
-* `5.1` to build from the 5.1 release branch instead of master.
+* `4.4`/`5.0`/`5.1`/`6.0` to build from the respective release branch instead of master.
* `debug` to not strip debug symbols from the binaries. This increases the output size by about 250MB.
* `lto` build all dependencies and ffmpeg with -flto=auto (HIGHLY EXPERIMENTAL, broken for Windows, sometimes works for Linux)
From 3aaec67422e38504ed0d1ae355d9cc98a3ce6d2c Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 16 Mar 2023 17:48:38 +0100
Subject: [PATCH 147/160] Retry flaky iconv clone
---
scripts.d/20-libiconv.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh
index 016c49a..32b5f46 100755
--- a/scripts.d/20-libiconv.sh
+++ b/scripts.d/20-libiconv.sh
@@ -8,7 +8,7 @@ ffbuild_enabled() {
}
ffbuild_dockerbuild() {
- git clone "$SCRIPT_REPO" iconv
+ retry-tool sh -c "rm -rf iconv && git clone '$SCRIPT_REPO' iconv"
cd iconv
git checkout "$SCRIPT_COMMIT"
From b78f798c9f58519fc23a2c73d7f9117694f4c08d Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sat, 18 Mar 2023 14:19:24 +0100
Subject: [PATCH 148/160] Add cleanup workflow
---
.github/workflows/clean.yml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 .github/workflows/clean.yml
diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml
new file mode 100644
index 0000000..1f53b93
--- /dev/null
+++ b/.github/workflows/clean.yml
@@ -0,0 +1,20 @@
+name: Cleanup
+
+on:
+ workflow_dispatch: ~
+ schedule:
+ - cron: '0 20 * * *'
+
+jobs:
+ cleanup:
+ name: Cleanup
+ runs-on: ubuntu-latest
+ steps:
+ - name: Cleanup
+ uses: Chizkiyahu/delete-untagged-ghcr-action@v2
+ with:
+ token: ${{ github.token }}
+ repository_owner: ${{ github.repository_owner }}
+ repository: ${{ github.repository }}
+ owner_type: user
+ untagged_only: true
From c6c7051948a4132d4171cb00e663916019193b62 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sat, 18 Mar 2023 14:27:17 +0100
Subject: [PATCH 149/160] Use PAT for cleanup
---
.github/workflows/clean.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml
index 1f53b93..83a568a 100644
--- a/.github/workflows/clean.yml
+++ b/.github/workflows/clean.yml
@@ -13,7 +13,7 @@ jobs:
- name: Cleanup
uses: Chizkiyahu/delete-untagged-ghcr-action@v2
with:
- token: ${{ github.token }}
+ token: ${{ secrets.CLEANUP_PAT }}
repository_owner: ${{ github.repository_owner }}
repository: ${{ github.repository }}
owner_type: user
From ffa7c41e0f4074f682fb70fec915d6d11116df46 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sat, 18 Mar 2023 14:30:26 +0100
Subject: [PATCH 150/160] Work around PAT existence check
---
.github/workflows/clean.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml
index 83a568a..0280d35 100644
--- a/.github/workflows/clean.yml
+++ b/.github/workflows/clean.yml
@@ -9,8 +9,11 @@ jobs:
cleanup:
name: Cleanup
runs-on: ubuntu-latest
+ env:
+ HAVE_PAT: ${{ secrets.CLEANUP_PAT != '' }}
steps:
- name: Cleanup
+ if: ${{ env.HAVE_PAT == 'true' }}
uses: Chizkiyahu/delete-untagged-ghcr-action@v2
with:
token: ${{ secrets.CLEANUP_PAT }}
From 1b3fd62fbf2cdc35860678d84739c58c29960962 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sat, 18 Mar 2023 14:58:57 +0100
Subject: [PATCH 151/160] Do package cleanup as part of build workflow
---
.github/workflows/build.yml | 46 +++++++++++++++++++++++++++++++++----
.github/workflows/clean.yml | 23 -------------------
2 files changed, 42 insertions(+), 27 deletions(-)
delete mode 100644 .github/workflows/clean.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ba3434b..d929bf4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,6 +22,7 @@ on:
env:
DOCKER_BUILDKIT: 1
+ HAVE_CLEANUP_PAT: ${{ secrets.CLEANUP_PAT != '' }}
jobs:
build_base:
@@ -43,7 +44,10 @@ jobs:
password: ${{ github.token }}
- name: Image Name
id: imagename
- run: echo "name=ghcr.io/${GITHUB_REPOSITORY,,}/base" >> $GITHUB_OUTPUT
+ run: |
+ IMG="${GITHUB_REPOSITORY,,}/base"
+ echo "name=ghcr.io/${IMG/ /-}" >> $GITHUB_OUTPUT
+ echo "rawname=${IMG/ /-}" >> $GITHUB_OUTPUT
- name: Stop Commands
run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
- name: Build target base image
@@ -55,6 +59,16 @@ jobs:
tags: ${{ steps.imagename.outputs.name }}:latest
cache-to: type=registry,mode=max,ref=${{ steps.imagename.outputs.name }}:cache
cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache
+ - name: Cleanup
+ if: ${{ env.HAVE_CLEANUP_PAT == 'true' }}
+ uses: BtbN/delete-untagged-ghcr-action@main
+ with:
+ token: ${{ secrets.CLEANUP_PAT }}
+ package_name: ${{ steps.imagename.outputs.rawname }}
+ repository_owner: ${{ github.repository_owner }}
+ repository: ${{ github.repository }}
+ owner_type: user
+ untagged_only: true
build_target_bases:
name: Build target base image
if: ${{ github.event.inputs.buildOnly != 'true' }}
@@ -79,7 +93,10 @@ jobs:
password: ${{ github.token }}
- name: Image Name
id: imagename
- run: echo "name=ghcr.io/${GITHUB_REPOSITORY,,}/base-${{ matrix.target }}" >> $GITHUB_OUTPUT
+ run: |
+ IMG="${GITHUB_REPOSITORY,,}/base-${{ matrix.target }}"
+ echo "name=ghcr.io/${IMG/ /-}" >> $GITHUB_OUTPUT
+ echo "rawname=${IMG/ /-}" >> $GITHUB_OUTPUT
- name: Stop Commands
run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
- name: Build target base image
@@ -91,6 +108,16 @@ jobs:
tags: ${{ steps.imagename.outputs.name }}:latest
cache-to: type=registry,mode=max,ref=${{ steps.imagename.outputs.name }}:cache
cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache
+ - name: Cleanup
+ if: ${{ env.HAVE_CLEANUP_PAT == 'true' }}
+ uses: BtbN/delete-untagged-ghcr-action@main
+ with:
+ token: ${{ secrets.CLEANUP_PAT }}
+ package_name: ${{ steps.imagename.outputs.rawname }}
+ repository_owner: ${{ github.repository_owner }}
+ repository: ${{ github.repository }}
+ owner_type: user
+ untagged_only: true
build_targets:
name: Build target-variant image
if: ${{ github.event.inputs.buildOnly != 'true' }}
@@ -119,8 +146,9 @@ jobs:
- name: Image Name
id: imagename
run: |
- IMG="ghcr.io/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}"
- echo "name=${IMG/ /-}" >> $GITHUB_OUTPUT
+ IMG="${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}"
+ echo "name=ghcr.io/${IMG/ /-}" >> $GITHUB_OUTPUT
+ echo "rawname=${IMG/ /-}" >> $GITHUB_OUTPUT
echo "gh_repo=${GITHUB_REPOSITORY,,}" >> $GITHUB_OUTPUT
- name: Stop Commands
run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
@@ -135,6 +163,16 @@ jobs:
cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache
build-args: |
GH_REPO=ghcr.io/${{ steps.imagename.outputs.gh_repo }}
+ - name: Cleanup
+ if: ${{ env.HAVE_CLEANUP_PAT == 'true' }}
+ uses: BtbN/delete-untagged-ghcr-action@main
+ with:
+ token: ${{ secrets.CLEANUP_PAT }}
+ package_name: ${{ steps.imagename.outputs.rawname }}
+ repository_owner: ${{ github.repository_owner }}
+ repository: ${{ github.repository }}
+ owner_type: user
+ untagged_only: true
build_ffmpeg:
name: Build ffmpeg
if: ${{ ( github.event.inputs.buildOnly == 'true' && !cancelled() ) || success() }}
diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml
deleted file mode 100644
index 0280d35..0000000
--- a/.github/workflows/clean.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Cleanup
-
-on:
- workflow_dispatch: ~
- schedule:
- - cron: '0 20 * * *'
-
-jobs:
- cleanup:
- name: Cleanup
- runs-on: ubuntu-latest
- env:
- HAVE_PAT: ${{ secrets.CLEANUP_PAT != '' }}
- steps:
- - name: Cleanup
- if: ${{ env.HAVE_PAT == 'true' }}
- uses: Chizkiyahu/delete-untagged-ghcr-action@v2
- with:
- token: ${{ secrets.CLEANUP_PAT }}
- repository_owner: ${{ github.repository_owner }}
- repository: ${{ github.repository }}
- owner_type: user
- untagged_only: true
From 13129c7061a4b8105feda0fb1df760cbfceb887b Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sat, 18 Mar 2023 15:12:08 +0100
Subject: [PATCH 152/160] Allow cleanup step to fail
---
.github/workflows/build.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d929bf4..d750bce 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,6 +61,7 @@ jobs:
cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache
- name: Cleanup
if: ${{ env.HAVE_CLEANUP_PAT == 'true' }}
+ continue-on-error: true
uses: BtbN/delete-untagged-ghcr-action@main
with:
token: ${{ secrets.CLEANUP_PAT }}
@@ -110,6 +111,7 @@ jobs:
cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache
- name: Cleanup
if: ${{ env.HAVE_CLEANUP_PAT == 'true' }}
+ continue-on-error: true
uses: BtbN/delete-untagged-ghcr-action@main
with:
token: ${{ secrets.CLEANUP_PAT }}
@@ -165,6 +167,7 @@ jobs:
GH_REPO=ghcr.io/${{ steps.imagename.outputs.gh_repo }}
- name: Cleanup
if: ${{ env.HAVE_CLEANUP_PAT == 'true' }}
+ continue-on-error: true
uses: BtbN/delete-untagged-ghcr-action@main
with:
token: ${{ secrets.CLEANUP_PAT }}
From 521d708a8ee4f71f951b67ad2358098082a0cb8b Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 19 Mar 2023 12:26:11 +0100
Subject: [PATCH 153/160] Update dependencies
---
scripts.d/10-mingw.sh | 2 +-
scripts.d/10-xorg-macros.sh | 2 +-
scripts.d/20-libiconv.sh | 2 +-
scripts.d/20-libxml2.sh | 2 +-
scripts.d/25-fftw3.sh | 2 +-
scripts.d/25-freetype.sh | 2 +-
scripts.d/35-fontconfig.sh | 2 +-
scripts.d/45-harfbuzz.sh | 2 +-
scripts.d/45-libsamplerate.sh | 2 +-
scripts.d/45-opencl.sh | 4 ++--
scripts.d/45-pulseaudio.sh | 2 +-
scripts.d/45-vmaf.sh | 2 +-
scripts.d/45-x11/10-xcbproto.sh | 2 +-
scripts.d/45-x11/10-xproto.sh | 2 +-
scripts.d/45-x11/20-libxau.sh | 2 +-
scripts.d/45-x11/30-libxcb.sh | 2 +-
scripts.d/45-x11/40-libx11.sh | 2 +-
scripts.d/45-x11/50-libxext.sh | 2 +-
scripts.d/45-x11/50-libxfixes.sh | 2 +-
scripts.d/45-x11/50-libxi.sh | 2 +-
scripts.d/45-x11/50-libxinerama.sh | 2 +-
scripts.d/45-x11/50-libxrender.sh | 2 +-
scripts.d/45-x11/50-libxscrnsaver.sh | 2 +-
scripts.d/45-x11/50-libxxf86vm.sh | 2 +-
scripts.d/45-x11/60-libglvnd.sh | 2 +-
scripts.d/45-x11/60-libxcursor.sh | 2 +-
scripts.d/45-x11/60-libxrandr.sh | 2 +-
scripts.d/45-x11/60-libxv.sh | 2 +-
scripts.d/50-amf.sh | 2 +-
scripts.d/50-aom.sh | 2 +-
scripts.d/50-aribb24/25-libpng.sh | 2 +-
scripts.d/50-avisynth.sh | 2 +-
scripts.d/50-dav1d.sh | 2 +-
scripts.d/50-ffnvcodec.sh | 2 +-
scripts.d/50-frei0r.sh | 2 +-
scripts.d/50-libass.sh | 2 +-
scripts.d/50-libjxl/50-libjxl.sh | 2 +-
scripts.d/50-librist/50-librist.sh | 2 +-
scripts.d/50-libssh.sh | 2 +-
scripts.d/50-libvpx.sh | 2 +-
scripts.d/50-libwebp.sh | 2 +-
scripts.d/50-lilv/96-lv2.sh | 2 +-
scripts.d/50-lilv/96-serd.sh | 2 +-
scripts.d/50-lilv/96-zix.sh | 2 +-
scripts.d/50-lilv/97-sord.sh | 2 +-
scripts.d/50-lilv/98-sratom.sh | 2 +-
scripts.d/50-lilv/99-lilv.sh | 2 +-
scripts.d/50-onevpl.sh | 2 +-
scripts.d/50-openal.sh | 2 +-
scripts.d/50-openh264.sh | 2 +-
scripts.d/50-openjpeg.sh | 2 +-
scripts.d/50-openmpt.sh | 2 +-
scripts.d/50-rav1e.sh | 2 +-
scripts.d/50-rubberband.sh | 2 +-
scripts.d/50-sdl.sh | 2 +-
scripts.d/50-srt.sh | 2 +-
scripts.d/50-svtav1.sh | 2 +-
scripts.d/50-vaapi/40-libdrm.sh | 2 +-
scripts.d/50-vaapi/50-libva.sh | 2 +-
scripts.d/50-vulkan/45-vulkan.sh | 2 +-
scripts.d/50-vulkan/50-shaderc.sh | 2 +-
scripts.d/50-vulkan/55-spirv-cross.sh | 2 +-
scripts.d/50-vulkan/60-libplacebo.sh | 2 +-
scripts.d/50-x265.sh | 2 +-
scripts.d/50-zimg.sh | 2 +-
65 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index 1ad40ec..083ed7b 100755
--- a/scripts.d/10-mingw.sh
+++ b/scripts.d/10-mingw.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/mirror/mingw-w64.git"
-SCRIPT_COMMIT="8708b7d92f0d923c0f7196dd7d2aa12c02aa766d"
+SCRIPT_COMMIT="0f2264e7b8fedbe225921367e82aeb97ddfed46b"
ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
diff --git a/scripts.d/10-xorg-macros.sh b/scripts.d/10-xorg-macros.sh
index 0de4dd6..6cb4611 100755
--- a/scripts.d/10-xorg-macros.sh
+++ b/scripts.d/10-xorg-macros.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/util/macros.git"
-SCRIPT_COMMIT="0326ba3c4caa34116c0e7e4af98661858cf25d1c"
+SCRIPT_COMMIT="cb147377e9341af05232f95814022abdecf14024"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh
index 32b5f46..2d689d0 100755
--- a/scripts.d/20-libiconv.sh
+++ b/scripts.d/20-libiconv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git"
-SCRIPT_COMMIT="0a05ca75c08ae899f6fca5f79254491e13ffb500"
+SCRIPT_COMMIT="c593e206b2d4bc689950c742a0fb00b8013756a0"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh
index cda35ae..e29e35a 100755
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-SCRIPT_COMMIT="15c9f4353311c7b765e9e72e63779a161c21f010"
+SCRIPT_COMMIT="b1319c902f6e44d08f8cb33f1fc28847f2bc8aeb"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh
index bd97245..9d91ed6 100755
--- a/scripts.d/25-fftw3.sh
+++ b/scripts.d/25-fftw3.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/FFTW/fftw3.git"
-SCRIPT_COMMIT="9426cd59106ffddde1f55131c07fa9c562fa2f8e"
+SCRIPT_COMMIT="c277d55689eef1616fa622b3bf6794af3a58e960"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index 2b57937..ad03a62 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
-SCRIPT_COMMIT="dacbb55433079fb3539163862958a6b9466a0661"
+SCRIPT_COMMIT="8fc6df1028ba7173fbcc467a4402bb7ef8a84f8f"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh
index cb12f14..108f97a 100755
--- a/scripts.d/35-fontconfig.sh
+++ b/scripts.d/35-fontconfig.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
-SCRIPT_COMMIT="2ef790a0dbbab24235d1b8c0325ab4414de5f0a9"
+SCRIPT_COMMIT="04546f18768e1ce57c24743035118b3eabbd4181"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index e908674..4f322db 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="8bdaeddfcd86aa66f560ff1ae1ae71b1e1723463"
+SCRIPT_COMMIT="79233a149209e3da199bb4e2f74271668502c574"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh
index 4f06107..cf6fe1e 100755
--- a/scripts.d/45-libsamplerate.sh
+++ b/scripts.d/45-libsamplerate.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsndfile/libsamplerate.git"
-SCRIPT_COMMIT="c01e2405612ad3561bf93e8e6dddb9ba0dffe4d9"
+SCRIPT_COMMIT="215c75ea9d6e1685893716100ddae3ebfc9f5cfe"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh
index affb991..d0591ec 100755
--- a/scripts.d/45-opencl.sh
+++ b/scripts.d/45-opencl.sh
@@ -1,10 +1,10 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
-SCRIPT_COMMIT="4c82e9cfaaad18c340f48af3cf5d09ff33e8c1b7"
+SCRIPT_COMMIT="1080743ea047d6467bc609f979a21f00e06ac928"
SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
-SCRIPT_COMMIT2="2cde5d09953a041786d1cfdcb1c08704a82cb904"
+SCRIPT_COMMIT2="ece91448a958099b9c277f050fca9df96a2ea718"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index 8d96ad0..5cf662f 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-SCRIPT_COMMIT="300db779224625144d6279d230c2daa857c967d8"
+SCRIPT_COMMIT="3aaeb5113d2cec907bd101df22bb28b1a1b8394d"
ffbuild_enabled() {
[[ $TARGET == linux* ]] || return 1
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index bf70802..a6496a9 100755
--- a/scripts.d/45-vmaf.sh
+++ b/scripts.d/45-vmaf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
-SCRIPT_COMMIT="e81d12e75629f6f0730077bfa7e28764c41b2907"
+SCRIPT_COMMIT="d48ab28eebac8276369cfebeb7cfcbfeb28408c2"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh
index 1726024..4fa10ec 100755
--- a/scripts.d/45-x11/10-xcbproto.sh
+++ b/scripts.d/45-x11/10-xcbproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-SCRIPT_COMMIT="842d91316243eb1f2e208231acc1512c2cf43a1f"
+SCRIPT_COMMIT="15d140d7867e8e654ce917b8d6d1dbd45b3de3b8"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh
index a4f3bc7..b133f58 100755
--- a/scripts.d/45-x11/10-xproto.sh
+++ b/scripts.d/45-x11/10-xproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
-SCRIPT_COMMIT="1b6e63b2c38a0cf6cd1c70bfc5483cac0d1710e1"
+SCRIPT_COMMIT="423098656f145afeb72cbf21aaa0b3a3f9bc36bb"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh
index 8dc79c5..4ab0d1e 100755
--- a/scripts.d/45-x11/20-libxau.sh
+++ b/scripts.d/45-x11/20-libxau.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git"
-SCRIPT_COMMIT="14fdf25db9f21c8f3ad37f0d32a5b8e726efdc0d"
+SCRIPT_COMMIT="c52f54e9533046a52edf84bcc02abedc2dbcb1a7"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh
index 267d9f7..6884226 100755
--- a/scripts.d/45-x11/30-libxcb.sh
+++ b/scripts.d/45-x11/30-libxcb.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
-SCRIPT_COMMIT="4d1a578dd5348909ade2a853d806272326d228d7"
+SCRIPT_COMMIT="18e109d755c5ce18157fdabb6de8ee6845b348ff"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index c5b4fcc..dba7079 100755
--- a/scripts.d/45-x11/40-libx11.sh
+++ b/scripts.d/45-x11/40-libx11.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-SCRIPT_COMMIT="fc5ec8edda1efdf5d66db4e76796e3c407527b3b"
+SCRIPT_COMMIT="ca99e338a9b8aad300933b1336f9e3c091392213"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxext.sh b/scripts.d/45-x11/50-libxext.sh
index d9c10ce..c482aa3 100755
--- a/scripts.d/45-x11/50-libxext.sh
+++ b/scripts.d/45-x11/50-libxext.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxext.git"
-SCRIPT_COMMIT="e8556ab06e03b59e9a512eb02955247efd4c4054"
+SCRIPT_COMMIT="de2ebd62c1eb8fe16c11aceac4a6981bda124cf4"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxfixes.sh b/scripts.d/45-x11/50-libxfixes.sh
index fa8efc9..9ade485 100755
--- a/scripts.d/45-x11/50-libxfixes.sh
+++ b/scripts.d/45-x11/50-libxfixes.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxfixes.git"
-SCRIPT_COMMIT="332394278b7110a774b5277bb3cfc58c42cd888c"
+SCRIPT_COMMIT="ad22c5ade8789cdb606b244336106a713473318c"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxi.sh b/scripts.d/45-x11/50-libxi.sh
index 6dfa355..3f6e8e7 100755
--- a/scripts.d/45-x11/50-libxi.sh
+++ b/scripts.d/45-x11/50-libxi.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxi.git"
-SCRIPT_COMMIT="08431d0684f9a1edf199f6c6060d2bef1ac78399"
+SCRIPT_COMMIT="826215af0cc46b19555063b8894de6781d4c5993"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxinerama.sh b/scripts.d/45-x11/50-libxinerama.sh
index 1af078e..72d96ac 100755
--- a/scripts.d/45-x11/50-libxinerama.sh
+++ b/scripts.d/45-x11/50-libxinerama.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxinerama.git"
-SCRIPT_COMMIT="71dfee64feb84f907016940263b235a61c9e8960"
+SCRIPT_COMMIT="51c28095951676a5896437c4c3aa40fb1972bad2"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxrender.sh b/scripts.d/45-x11/50-libxrender.sh
index 529d747..826ba7d 100755
--- a/scripts.d/45-x11/50-libxrender.sh
+++ b/scripts.d/45-x11/50-libxrender.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrender.git"
-SCRIPT_COMMIT="e5e23272394c90731debd7e18dd167e8c25b5c15"
+SCRIPT_COMMIT="07efd80468f6b595e6432edd28b8560ca7695ba0"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxscrnsaver.sh b/scripts.d/45-x11/50-libxscrnsaver.sh
index 0f152d2..10a606b 100755
--- a/scripts.d/45-x11/50-libxscrnsaver.sh
+++ b/scripts.d/45-x11/50-libxscrnsaver.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver.git"
-SCRIPT_COMMIT="34f3f72b88c0a0a10d618e9dfbc88474ae5ce880"
+SCRIPT_COMMIT="9b4e000c6c4ae213a3e52345751d885543f17929"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxxf86vm.sh b/scripts.d/45-x11/50-libxxf86vm.sh
index 2d706a1..e18c26d 100755
--- a/scripts.d/45-x11/50-libxxf86vm.sh
+++ b/scripts.d/45-x11/50-libxxf86vm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxxf86vm.git"
-SCRIPT_COMMIT="7fe2d41f164d3015216c1079cc7fbce1eea90c98"
+SCRIPT_COMMIT="cfda59347e3a04415340a99f925a9cd85c0531b2"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh
index cd51237..6d19fb2 100755
--- a/scripts.d/45-x11/60-libglvnd.sh
+++ b/scripts.d/45-x11/60-libglvnd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-SCRIPT_COMMIT="dba80d0158b587de91640fae5c0b420c23599d1e"
+SCRIPT_COMMIT="056feac0780220822e71a2fd38a83353102e5b36"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libxcursor.sh b/scripts.d/45-x11/60-libxcursor.sh
index 8ddb57c..8e9c967 100755
--- a/scripts.d/45-x11/60-libxcursor.sh
+++ b/scripts.d/45-x11/60-libxcursor.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git"
-SCRIPT_COMMIT="87a30b1758b7757dd74d0a70e871d7af1cac3a44"
+SCRIPT_COMMIT="81dc4a481b64499ab7c355ee43c91e4fe0767545"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libxrandr.sh b/scripts.d/45-x11/60-libxrandr.sh
index 5ba854c..42273fd 100755
--- a/scripts.d/45-x11/60-libxrandr.sh
+++ b/scripts.d/45-x11/60-libxrandr.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrandr.git"
-SCRIPT_COMMIT="3387129532899eaeee3477a2d92fa662d7292a84"
+SCRIPT_COMMIT="5b96863cf2a34ee9e72ffc4ec6415bc59b6121fc"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libxv.sh b/scripts.d/45-x11/60-libxv.sh
index ebcf8da..19531b7 100755
--- a/scripts.d/45-x11/60-libxv.sh
+++ b/scripts.d/45-x11/60-libxv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxv.git"
-SCRIPT_COMMIT="d419928942dbf1897c9627475aa4a2828a81240f"
+SCRIPT_COMMIT="b022c9cf7004fe6f794c4c00dd519a2e4c74eca0"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh
index 72311dc..b19b5e8 100755
--- a/scripts.d/50-amf.sh
+++ b/scripts.d/50-amf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
-SCRIPT_COMMIT="37452e9e60940f04fc235a923ffcc31c407240fa"
+SCRIPT_COMMIT="4bfa819fc3d6aa4714ad28f8dab46d0fa95177ad"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index de0f852..046c976 100755
--- a/scripts.d/50-aom.sh
+++ b/scripts.d/50-aom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://aomedia.googlesource.com/aom"
-SCRIPT_COMMIT="93fc4d7a259cde11f1c7612867eb33973a26b72d"
+SCRIPT_COMMIT="fa2ff85f8963b37be9d74f6b5fd597c6ec1a6021"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh
index 267c86c..e48ada5 100755
--- a/scripts.d/50-aribb24/25-libpng.sh
+++ b/scripts.d/50-aribb24/25-libpng.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/glennrp/libpng.git"
-SCRIPT_COMMIT="aab24fa1b3ccaab8770902a3c50ea9564925d053"
+SCRIPT_COMMIT="e519af8b49f52c4ac400f50f23b48ebe36a5f4df"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh
index 8aea76b..03f8fff 100755
--- a/scripts.d/50-avisynth.sh
+++ b/scripts.d/50-avisynth.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/AviSynth/AviSynthPlus.git"
-SCRIPT_COMMIT="09f362bd2402335afd0b766b496bcd0855c58aa0"
+SCRIPT_COMMIT="21c6240b520db4697fd6d905e5d77f1039604b17"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index 17051f1..cef3bcf 100755
--- a/scripts.d/50-dav1d.sh
+++ b/scripts.d/50-dav1d.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="9b4b2448106f863bfa4789ba6e86555ad57c838f"
+SCRIPT_COMMIT="16c943484e63da7ed8a8a8d85af88995369f23cd"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh
index 920a82e..9853fae 100755
--- a/scripts.d/50-ffnvcodec.sh
+++ b/scripts.d/50-ffnvcodec.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git"
-SCRIPT_COMMIT="c5e4af74850a616c42d39ed45b9b8568b71bf8bf"
+SCRIPT_COMMIT="450f8a634309b8f212b1a642630e164150d6a427"
SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git"
SCRIPT_COMMIT2="2055784e5d5bfb3df78d4d3645f345f19062dce2"
diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh
index ffd05ba..e648287 100755
--- a/scripts.d/50-frei0r.sh
+++ b/scripts.d/50-frei0r.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/dyne/frei0r.git"
-SCRIPT_COMMIT="599b47843400a248d2b415f46df6d1777902e865"
+SCRIPT_COMMIT="3e1234b9f2ba86b1deebdd1034735e12d706c095"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index 06fae4f..ce74a4d 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libass/libass.git"
-SCRIPT_COMMIT="077328ca6715e2e2826881003946640f56cb763c"
+SCRIPT_COMMIT="218dacece7d24b45e4637ced4dc56564de29919d"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index b10cbdd..2154a87 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
-SCRIPT_COMMIT="6280645ef5530e186ddba0f814f1ea5f6d754e3e"
+SCRIPT_COMMIT="25adcd683c382b312ba3ee70bdda4ee1c315ef2c"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh
index a5ec29d..103d454 100755
--- a/scripts.d/50-librist/50-librist.sh
+++ b/scripts.d/50-librist/50-librist.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/rist/librist.git"
-SCRIPT_COMMIT="809390b3b75a259a704079d0fb4d8f1b5f7fa956"
+SCRIPT_COMMIT="9f09a3defd6e59839aae3e3b7b5411213fa04b8a"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh
index fd0f99b..a4fdca9 100755
--- a/scripts.d/50-libssh.sh
+++ b/scripts.d/50-libssh.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://git.libssh.org/projects/libssh.git"
-SCRIPT_COMMIT="7291f2173ccfcaf0a90b2df863a2d7b8b2833b1b"
+SCRIPT_COMMIT="7b12876f04ae375acd183de3c6cc82bcdc105e1e"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index e666570..009d427 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="5595e18870b24fdfd8fdeb4cfa5ea51824486273"
+SCRIPT_COMMIT="6788c75055899796c13787ed44cc6f1cc45e09d7"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index 9682b9c..8097ead 100755
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="1347a32d82276ecf4daba12f6e9142cc4e1f2401"
+SCRIPT_COMMIT="0825faa4c10d622f2747c5b2752e7b6a6848bf3f"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh
index 7f3a984..13035f1 100755
--- a/scripts.d/50-lilv/96-lv2.sh
+++ b/scripts.d/50-lilv/96-lv2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lv2.git"
-SCRIPT_COMMIT="c287eaa2948b7553ccce877115e7a94a07530d80"
+SCRIPT_COMMIT="dbdbe3e518daf7b2f3f0e7587d8b2493b1d5a59e"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh
index f6f89e6..673583c 100755
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/serd.git"
-SCRIPT_COMMIT="c7f85701199b42695ce78b28b120a3c56e114fd6"
+SCRIPT_COMMIT="61d53637dc62d15f9b3d1fa9e69891313c465c35"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-zix.sh b/scripts.d/50-lilv/96-zix.sh
index 74313e0..fe439b3 100755
--- a/scripts.d/50-lilv/96-zix.sh
+++ b/scripts.d/50-lilv/96-zix.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/zix.git"
-SCRIPT_COMMIT="18e62483cb7173c6604f7dd2097299e47c2a4c0c"
+SCRIPT_COMMIT="262d4a1522c38be0588746e874159da5c7bb457d"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh
index 5ff235f..8ce7802 100755
--- a/scripts.d/50-lilv/97-sord.sh
+++ b/scripts.d/50-lilv/97-sord.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/sord.git"
-SCRIPT_COMMIT="4113c78db9969054354b153819bde4ff0c8b6a73"
+SCRIPT_COMMIT="f5d33a2cda7b6f498bb7e5e61e298dce5510ed5c"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh
index c94d244..a2a3a38 100755
--- a/scripts.d/50-lilv/98-sratom.sh
+++ b/scripts.d/50-lilv/98-sratom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/sratom.git"
-SCRIPT_COMMIT="988162496bbb66a2c52d384ef2ca602698024267"
+SCRIPT_COMMIT="f1f063c8e170b2a6350eedf68c4859b974d85d5e"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh
index 90deec3..cd9f399 100755
--- a/scripts.d/50-lilv/99-lilv.sh
+++ b/scripts.d/50-lilv/99-lilv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lilv.git"
-SCRIPT_COMMIT="803be790d97a0bd219e15dbe2c9483f33af5877c"
+SCRIPT_COMMIT="efb392e32da0bce28dbeb6fb728dcd9183f4611b"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh
index 34f6e69..05ebe6a 100755
--- a/scripts.d/50-onevpl.sh
+++ b/scripts.d/50-onevpl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/oneapi-src/oneVPL.git"
-SCRIPT_COMMIT="6ca7a09c4b5b2c1ae6b52d73bc44c334ab66adbc"
+SCRIPT_COMMIT="4cdf44ccaa605460499c52f39eff5517da2fc3c8"
ffbuild_enabled() {
[[ $TARGET == *arm64 ]] && return -1
diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh
index 13dc57a..0e2cc48 100755
--- a/scripts.d/50-openal.sh
+++ b/scripts.d/50-openal.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/kcat/openal-soft.git"
-SCRIPT_COMMIT="b22f9410dde0da5b3795ba62f1a728590238349e"
+SCRIPT_COMMIT="186a29b77d8ec01c14d13797f9d51c7c21b22b60"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh
index 4de93b9..708fb27 100755
--- a/scripts.d/50-openh264.sh
+++ b/scripts.d/50-openh264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/cisco/openh264.git"
-SCRIPT_COMMIT="045aeac1dd01df12dec7b1ef8191b3193cf4273c"
+SCRIPT_COMMIT="f8aeaae8e40ea7bbf665c3c4010c78413421ccb4"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh
index 3277557..1b11993 100755
--- a/scripts.d/50-openjpeg.sh
+++ b/scripts.d/50-openjpeg.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/uclouvain/openjpeg.git"
-SCRIPT_COMMIT="ee58d77047867dd422593163e660e66a109ba1c0"
+SCRIPT_COMMIT="15c0dca5206d0101de2ce73b97138a2b26949011"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index eefa723..2f30ed5 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-SCRIPT_REV="18737"
+SCRIPT_REV="18892"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index cc8ed36..4d9a64d 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/rav1e.git"
-SCRIPT_COMMIT="c548b8498c039614fa3c8583cdf093ffa8fdd742"
+SCRIPT_COMMIT="92ed4e82f4aa72d5d14cf8678c85e78dd6f39033"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index 4c7e9fa..de05236 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/breakfastquay/rubberband.git"
-SCRIPT_COMMIT="b317d0e81a8e0ea84269cc2c1dab2906ca8df271"
+SCRIPT_COMMIT="9e5ebdbafbe1347f2d275fc7d06699e6adad64da"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index a36f6ea..ac49688 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
-SCRIPT_COMMIT="2b66ef0df4eee18c5d9fdc77157cc109b6976efc"
+SCRIPT_COMMIT="b57a6a1adf15f9a6e4a48e1980aa723d47fa2fe3"
SCRIPT_BRANCH="SDL2"
ffbuild_enabled() {
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index 3ca615e..cd73639 100755
--- a/scripts.d/50-srt.sh
+++ b/scripts.d/50-srt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Haivision/srt.git"
-SCRIPT_COMMIT="3ffc93f2f6d04dcea765a10e9e5caa7fb071291c"
+SCRIPT_COMMIT="39822840c506d72cef5a742d28f32ea28e144345"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index c674694..8d7ec41 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="93fc87b0ff0823d5703d31516cb4093aff86c848"
+SCRIPT_COMMIT="72fd3d479b315fbf6bd1d7e80dec7afe42037819"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index fa0a05b..2b0f7cf 100755
--- a/scripts.d/50-vaapi/40-libdrm.sh
+++ b/scripts.d/50-vaapi/40-libdrm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-SCRIPT_COMMIT="c6d6dce99fb3e7e681fbba9e198345fdbd10e49e"
+SCRIPT_COMMIT="d1681af05471176215ad3d437249c38768dc959f"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh
index 65baac9..07af537 100755
--- a/scripts.d/50-vaapi/50-libva.sh
+++ b/scripts.d/50-vaapi/50-libva.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/intel/libva.git"
-SCRIPT_COMMIT="9ac72efe2e123321d8fd5500fb1aca51cd31bc97"
+SCRIPT_COMMIT="ad032fb0bb310e11e945f054289a9c91c8231851"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index 36499f2..a2b8571 100755
--- a/scripts.d/50-vulkan/45-vulkan.sh
+++ b/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-SCRIPT_COMMIT="v1.3.240"
+SCRIPT_COMMIT="v1.3.244"
SCRIPT_TAGFILTER="v?.*.*"
ffbuild_enabled() {
diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh
index 2e5c868..31aa364 100755
--- a/scripts.d/50-vulkan/50-shaderc.sh
+++ b/scripts.d/50-vulkan/50-shaderc.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/google/shaderc.git"
-SCRIPT_COMMIT="dde14deee743b1ae4ec8ad541f3cd268941051bb"
+SCRIPT_COMMIT="f1268e6d36cfdcd647d5c7032a6c61a0aad8487b"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh
index 7ef0f3a..a48b38e 100755
--- a/scripts.d/50-vulkan/55-spirv-cross.sh
+++ b/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SCRIPT_COMMIT="4e2fdb25671c742a9fbe93a6034eb1542244c7e1"
+SCRIPT_COMMIT="d26c233e1c2629fec1ae1b6fdf538958e5d52bff"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index 4f6a8e2..2b3277a 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git"
-SCRIPT_COMMIT="855280962b3f5adb453e53d89ea20387e25a1a81"
+SCRIPT_COMMIT="5243e797afa4d6dde63d66df013b4667304cad4e"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh
index 962dd70..15ace41 100755
--- a/scripts.d/50-x265.sh
+++ b/scripts.d/50-x265.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git"
-SCRIPT_COMMIT="6da609e41ca5ae1d661a1b5c4805ed7a3f4117cc"
+SCRIPT_COMMIT="38cf1c379b5af08856bb2fdd65f65a1f99384886"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh
index 80c3347..50b4aac 100755
--- a/scripts.d/50-zimg.sh
+++ b/scripts.d/50-zimg.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git"
-SCRIPT_COMMIT="5a5397c2b149fc9e5cb898973121de6edea77c70"
+SCRIPT_COMMIT="71394bd10d833ac48faa255f085c3e702a42921d"
ffbuild_enabled() {
return 0
From a1fdcf77aef5937046bb7de81d9e0378d3d76ad7 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 19 Mar 2023 18:16:36 +0100
Subject: [PATCH 154/160] Downgrade libplacebo again
---
scripts.d/50-vulkan/60-libplacebo.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index 2b3277a..2d4f8b3 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git"
-SCRIPT_COMMIT="5243e797afa4d6dde63d66df013b4667304cad4e"
+SCRIPT_COMMIT="bc0fcb9689c282cd631fc37d1b6a67715cfd5fa0"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
From 01980b12aa8aa7ae3342641a8367904687accd12 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 22 Mar 2023 18:26:58 +0100
Subject: [PATCH 155/160] Update ct-ng config
---
images/base-linux64/ct-ng-config | 59 ++++++++++++++++++++-------
images/base-linuxarm64/ct-ng-config | 59 ++++++++++++++++++++-------
images/base-win32/ct-ng-config | 62 +++++++++++++++++++++--------
images/base-win64/ct-ng-config | 62 +++++++++++++++++++++--------
4 files changed, 182 insertions(+), 60 deletions(-)
diff --git a/images/base-linux64/ct-ng-config b/images/base-linux64/ct-ng-config
index 7cfd776..df45b9a 100644
--- a/images/base-linux64/ct-ng-config
+++ b/images/base-linux64/ct-ng-config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.25.0.90_cf9beb1 Configuration
+# crosstool-NG 1.25.0.152_89671bf Configuration
#
CT_CONFIGURE_has_static_link=y
CT_CONFIGURE_has_cxx11=y
@@ -13,9 +13,9 @@ CT_CONFIGURE_has_make_3_81_or_newer=y
CT_CONFIGURE_has_make_4_0_or_newer=y
CT_CONFIGURE_has_libtool_2_4_or_newer=y
CT_CONFIGURE_has_libtoolize_2_4_or_newer=y
-CT_CONFIGURE_has_autoconf_2_65_or_newer=y
-CT_CONFIGURE_has_autoreconf_2_65_or_newer=y
-CT_CONFIGURE_has_automake_1_15_or_newer=y
+CT_CONFIGURE_has_autoconf_2_71_or_newer=y
+CT_CONFIGURE_has_autoreconf_2_71_or_newer=y
+CT_CONFIGURE_has_automake_1_16_or_newer=y
CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
CT_CONFIGURE_has_python_3_4_or_newer=y
CT_CONFIGURE_has_bison_2_7_or_newer=y
@@ -28,7 +28,7 @@ CT_CONFIGURE_has_sha1sum=y
CT_CONFIGURE_has_sha256sum=y
CT_CONFIGURE_has_sha512sum=y
CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.25.0.90_cf9beb1"
+CT_VERSION="1.25.0.152_89671bf"
CT_VCHECK=""
CT_CONFIG_VERSION_ENV="4"
CT_CONFIG_VERSION_CURRENT="4"
@@ -46,6 +46,7 @@ CT_OBSOLETE=y
CT_EXPERIMENTAL=y
CT_ALLOW_BUILD_AS_ROOT=y
CT_ALLOW_BUILD_AS_ROOT_SURE=y
+# CT_ENABLE_EXPERIMENTAL_BUNDLED_PATCHES is not set
# CT_DEBUG_CT is not set
#
@@ -64,6 +65,7 @@ CT_REMOVE_DOCS=y
# CT_PREFIX_DIR_RO is not set
CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y
CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y
+# CT_TARBALL_RESULT is not set
#
# Downloading
@@ -126,7 +128,6 @@ CT_CONFIG_SHELL="${bash}"
CT_LOG_DEBUG=y
CT_LOG_LEVEL_MAX="DEBUG"
# CT_LOG_SEE_TOOLS_WARN is not set
-# CT_LOG_PROGRESS_BAR is not set
# CT_LOG_TO_FILE is not set
# end of Paths and misc options
@@ -137,6 +138,7 @@ CT_LOG_LEVEL_MAX="DEBUG"
# CT_ARCH_ARC is not set
# CT_ARCH_ARM is not set
# CT_ARCH_AVR is not set
+# CT_ARCH_BPF is not set
# CT_ARCH_C6X is not set
# CT_ARCH_LOONGARCH is not set
# CT_ARCH_M68K is not set
@@ -163,7 +165,7 @@ CT_ARCH_X86_SHOW=y
# Options for x86
#
CT_ARCH_X86_PKG_KSYM=""
-CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
+CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
CT_ARCH_SUFFIX=""
# CT_OMIT_TARGET_VENDOR is not set
@@ -267,6 +269,7 @@ CT_LINUX_PATCH_GLOBAL=y
# CT_LINUX_PATCH_LOCAL_BUNDLED is not set
# CT_LINUX_PATCH_NONE is not set
CT_LINUX_PATCH_ORDER="global"
+# CT_LINUX_V_6_1 is not set
# CT_LINUX_V_6_0 is not set
# CT_LINUX_V_5_19 is not set
# CT_LINUX_V_5_18 is not set
@@ -372,7 +375,8 @@ CT_BINUTILS_PATCH_GLOBAL=y
# CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
# CT_BINUTILS_PATCH_NONE is not set
CT_BINUTILS_PATCH_ORDER="global"
-CT_BINUTILS_V_2_39=y
+CT_BINUTILS_V_2_40=y
+# CT_BINUTILS_V_2_39 is not set
# CT_BINUTILS_V_2_38 is not set
# CT_BINUTILS_V_2_37 is not set
# CT_BINUTILS_V_2_36 is not set
@@ -386,14 +390,14 @@ CT_BINUTILS_V_2_39=y
# CT_BINUTILS_V_2_28 is not set
# CT_BINUTILS_V_2_27 is not set
# CT_BINUTILS_V_2_26 is not set
-CT_BINUTILS_VERSION="2.39"
+CT_BINUTILS_VERSION="2.40"
CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig"
+CT_BINUTILS_later_than_2_39=y
CT_BINUTILS_2_39_or_later=y
-CT_BINUTILS_2_39_or_older=y
CT_BINUTILS_later_than_2_30=y
CT_BINUTILS_2_30_or_later=y
CT_BINUTILS_later_than_2_27=y
@@ -448,6 +452,7 @@ CT_GLIBC_PATCH_GLOBAL=y
# CT_GLIBC_PATCH_LOCAL_BUNDLED is not set
# CT_GLIBC_PATCH_NONE is not set
CT_GLIBC_PATCH_ORDER="global"
+# CT_GLIBC_V_2_37 is not set
# CT_GLIBC_V_2_36 is not set
# CT_GLIBC_V_2_35 is not set
# CT_GLIBC_V_2_34 is not set
@@ -525,7 +530,7 @@ CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
CT_GLIBC_MIN_KERNEL="4.4.302"
CT_GLIBC_ENABLE_COMMON_FLAG=y
-CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
+CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG"
CT_LIBC_SUPPORT_THREADS_ANY=y
CT_LIBC_SUPPORT_THREADS_NATIVE=y
@@ -545,6 +550,7 @@ CT_CC_SUPPORT_CXX=y
CT_CC_SUPPORT_FORTRAN=y
CT_CC_SUPPORT_ADA=y
CT_CC_SUPPORT_D=y
+CT_CC_SUPPORT_JIT=y
CT_CC_SUPPORT_OBJC=y
CT_CC_SUPPORT_OBJCXX=y
CT_CC_SUPPORT_GOLANG=y
@@ -661,6 +667,7 @@ CT_ALL_CC_CHOICES="GCC"
#
CT_CC_LANG_CXX=y
# CT_CC_LANG_FORTRAN is not set
+# CT_CC_LANG_JIT is not set
# CT_CC_LANG_ADA is not set
# CT_CC_LANG_D is not set
# CT_CC_LANG_OBJC is not set
@@ -759,7 +766,8 @@ CT_ISL_PATCH_GLOBAL=y
# CT_ISL_PATCH_LOCAL_BUNDLED is not set
# CT_ISL_PATCH_NONE is not set
CT_ISL_PATCH_ORDER="global"
-CT_ISL_V_0_24=y
+CT_ISL_V_0_25=y
+# CT_ISL_V_0_24 is not set
# CT_ISL_V_0_23 is not set
# CT_ISL_V_0_22 is not set
# CT_ISL_V_0_21 is not set
@@ -770,7 +778,7 @@ CT_ISL_V_0_24=y
# CT_ISL_V_0_16 is not set
# CT_ISL_V_0_15 is not set
# CT_ISL_V_0_11 is not set
-CT_ISL_VERSION="0.24"
+CT_ISL_VERSION="0.25"
CT_ISL_MIRRORS="https://libisl.sourceforge.io"
CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -905,7 +913,28 @@ CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
CT_ZLIB_SIGNATURE_FORMAT="packed/.asc"
-CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB"
+CT_COMP_LIBS_ZSTD=y
+CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD"
+CT_ZSTD_DIR_NAME="zstd"
+CT_ZSTD_PKG_NAME="zstd"
+CT_ZSTD_SRC_RELEASE=y
+# CT_ZSTD_SRC_DEVEL is not set
+# CT_ZSTD_SRC_CUSTOM is not set
+CT_ZSTD_PATCH_GLOBAL=y
+# CT_ZSTD_PATCH_BUNDLED is not set
+# CT_ZSTD_PATCH_LOCAL is not set
+# CT_ZSTD_PATCH_BUNDLED_LOCAL is not set
+# CT_ZSTD_PATCH_LOCAL_BUNDLED is not set
+# CT_ZSTD_PATCH_NONE is not set
+CT_ZSTD_PATCH_ORDER="global"
+CT_ZSTD_V_1_5_2=y
+CT_ZSTD_VERSION="1.5.2"
+CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/"
+CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_ZSTD_ARCHIVE_FORMATS=".tar.gz"
+CT_ZSTD_SIGNATURE_FORMAT="packed/.sig"
+CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD"
CT_LIBICONV_NEEDED=y
CT_GETTEXT_NEEDED=y
CT_GMP_NEEDED=y
@@ -914,6 +943,7 @@ CT_ISL_NEEDED=y
CT_MPC_NEEDED=y
CT_NCURSES_NEEDED=y
CT_ZLIB_NEEDED=y
+CT_ZSTD_NEEDED=y
CT_LIBICONV=y
CT_GETTEXT=y
CT_GMP=y
@@ -922,6 +952,7 @@ CT_ISL=y
CT_MPC=y
CT_NCURSES=y
CT_ZLIB=y
+CT_ZSTD=y
# end of Companion libraries
#
diff --git a/images/base-linuxarm64/ct-ng-config b/images/base-linuxarm64/ct-ng-config
index 39137ab..a070e17 100644
--- a/images/base-linuxarm64/ct-ng-config
+++ b/images/base-linuxarm64/ct-ng-config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.25.0.90_cf9beb1 Configuration
+# crosstool-NG 1.25.0.152_89671bf Configuration
#
CT_CONFIGURE_has_static_link=y
CT_CONFIGURE_has_cxx11=y
@@ -13,9 +13,9 @@ CT_CONFIGURE_has_make_3_81_or_newer=y
CT_CONFIGURE_has_make_4_0_or_newer=y
CT_CONFIGURE_has_libtool_2_4_or_newer=y
CT_CONFIGURE_has_libtoolize_2_4_or_newer=y
-CT_CONFIGURE_has_autoconf_2_65_or_newer=y
-CT_CONFIGURE_has_autoreconf_2_65_or_newer=y
-CT_CONFIGURE_has_automake_1_15_or_newer=y
+CT_CONFIGURE_has_autoconf_2_71_or_newer=y
+CT_CONFIGURE_has_autoreconf_2_71_or_newer=y
+CT_CONFIGURE_has_automake_1_16_or_newer=y
CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
CT_CONFIGURE_has_python_3_4_or_newer=y
CT_CONFIGURE_has_bison_2_7_or_newer=y
@@ -28,7 +28,7 @@ CT_CONFIGURE_has_sha1sum=y
CT_CONFIGURE_has_sha256sum=y
CT_CONFIGURE_has_sha512sum=y
CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.25.0.90_cf9beb1"
+CT_VERSION="1.25.0.152_89671bf"
CT_VCHECK=""
CT_CONFIG_VERSION_ENV="4"
CT_CONFIG_VERSION_CURRENT="4"
@@ -46,6 +46,7 @@ CT_OBSOLETE=y
CT_EXPERIMENTAL=y
CT_ALLOW_BUILD_AS_ROOT=y
CT_ALLOW_BUILD_AS_ROOT_SURE=y
+# CT_ENABLE_EXPERIMENTAL_BUNDLED_PATCHES is not set
# CT_DEBUG_CT is not set
#
@@ -64,6 +65,7 @@ CT_REMOVE_DOCS=y
# CT_PREFIX_DIR_RO is not set
CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y
CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y
+# CT_TARBALL_RESULT is not set
#
# Downloading
@@ -126,7 +128,6 @@ CT_CONFIG_SHELL="${bash}"
CT_LOG_DEBUG=y
CT_LOG_LEVEL_MAX="DEBUG"
# CT_LOG_SEE_TOOLS_WARN is not set
-# CT_LOG_PROGRESS_BAR is not set
# CT_LOG_TO_FILE is not set
# end of Paths and misc options
@@ -137,6 +138,7 @@ CT_LOG_LEVEL_MAX="DEBUG"
# CT_ARCH_ARC is not set
CT_ARCH_ARM=y
# CT_ARCH_AVR is not set
+# CT_ARCH_BPF is not set
# CT_ARCH_C6X is not set
# CT_ARCH_LOONGARCH is not set
# CT_ARCH_M68K is not set
@@ -163,7 +165,7 @@ CT_ARCH_ARM_SHOW=y
# Options for arm
#
CT_ARCH_ARM_PKG_KSYM=""
-CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
+CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
CT_ARCH_SUFFIX=""
# CT_OMIT_TARGET_VENDOR is not set
@@ -274,6 +276,7 @@ CT_LINUX_PATCH_GLOBAL=y
# CT_LINUX_PATCH_LOCAL_BUNDLED is not set
# CT_LINUX_PATCH_NONE is not set
CT_LINUX_PATCH_ORDER="global"
+# CT_LINUX_V_6_1 is not set
# CT_LINUX_V_6_0 is not set
# CT_LINUX_V_5_19 is not set
# CT_LINUX_V_5_18 is not set
@@ -378,7 +381,8 @@ CT_BINUTILS_PATCH_GLOBAL=y
# CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
# CT_BINUTILS_PATCH_NONE is not set
CT_BINUTILS_PATCH_ORDER="global"
-CT_BINUTILS_V_2_39=y
+CT_BINUTILS_V_2_40=y
+# CT_BINUTILS_V_2_39 is not set
# CT_BINUTILS_V_2_38 is not set
# CT_BINUTILS_V_2_37 is not set
# CT_BINUTILS_V_2_36 is not set
@@ -392,14 +396,14 @@ CT_BINUTILS_V_2_39=y
# CT_BINUTILS_V_2_28 is not set
# CT_BINUTILS_V_2_27 is not set
# CT_BINUTILS_V_2_26 is not set
-CT_BINUTILS_VERSION="2.39"
+CT_BINUTILS_VERSION="2.40"
CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig"
+CT_BINUTILS_later_than_2_39=y
CT_BINUTILS_2_39_or_later=y
-CT_BINUTILS_2_39_or_older=y
CT_BINUTILS_later_than_2_30=y
CT_BINUTILS_2_30_or_later=y
CT_BINUTILS_later_than_2_27=y
@@ -454,6 +458,7 @@ CT_GLIBC_PATCH_GLOBAL=y
# CT_GLIBC_PATCH_LOCAL_BUNDLED is not set
# CT_GLIBC_PATCH_NONE is not set
CT_GLIBC_PATCH_ORDER="global"
+# CT_GLIBC_V_2_37 is not set
# CT_GLIBC_V_2_36 is not set
# CT_GLIBC_V_2_35 is not set
# CT_GLIBC_V_2_34 is not set
@@ -537,7 +542,7 @@ CT_GLIBC_SSP_DEFAULT=y
# CT_GLIBC_SSP_ALL is not set
# CT_GLIBC_SSP_STRONG is not set
CT_GLIBC_ENABLE_COMMON_FLAG=y
-CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
+CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG"
CT_LIBC_SUPPORT_THREADS_ANY=y
CT_LIBC_SUPPORT_THREADS_NATIVE=y
@@ -557,6 +562,7 @@ CT_CC_SUPPORT_CXX=y
CT_CC_SUPPORT_FORTRAN=y
CT_CC_SUPPORT_ADA=y
CT_CC_SUPPORT_D=y
+CT_CC_SUPPORT_JIT=y
CT_CC_SUPPORT_OBJC=y
CT_CC_SUPPORT_OBJCXX=y
CT_CC_SUPPORT_GOLANG=y
@@ -673,6 +679,7 @@ CT_ALL_CC_CHOICES="GCC"
#
CT_CC_LANG_CXX=y
# CT_CC_LANG_FORTRAN is not set
+# CT_CC_LANG_JIT is not set
# CT_CC_LANG_ADA is not set
# CT_CC_LANG_D is not set
# CT_CC_LANG_OBJC is not set
@@ -771,7 +778,8 @@ CT_ISL_PATCH_GLOBAL=y
# CT_ISL_PATCH_LOCAL_BUNDLED is not set
# CT_ISL_PATCH_NONE is not set
CT_ISL_PATCH_ORDER="global"
-CT_ISL_V_0_24=y
+CT_ISL_V_0_25=y
+# CT_ISL_V_0_24 is not set
# CT_ISL_V_0_23 is not set
# CT_ISL_V_0_22 is not set
# CT_ISL_V_0_21 is not set
@@ -782,7 +790,7 @@ CT_ISL_V_0_24=y
# CT_ISL_V_0_16 is not set
# CT_ISL_V_0_15 is not set
# CT_ISL_V_0_11 is not set
-CT_ISL_VERSION="0.24"
+CT_ISL_VERSION="0.25"
CT_ISL_MIRRORS="https://libisl.sourceforge.io"
CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -917,7 +925,28 @@ CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
CT_ZLIB_SIGNATURE_FORMAT="packed/.asc"
-CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB"
+CT_COMP_LIBS_ZSTD=y
+CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD"
+CT_ZSTD_DIR_NAME="zstd"
+CT_ZSTD_PKG_NAME="zstd"
+CT_ZSTD_SRC_RELEASE=y
+# CT_ZSTD_SRC_DEVEL is not set
+# CT_ZSTD_SRC_CUSTOM is not set
+CT_ZSTD_PATCH_GLOBAL=y
+# CT_ZSTD_PATCH_BUNDLED is not set
+# CT_ZSTD_PATCH_LOCAL is not set
+# CT_ZSTD_PATCH_BUNDLED_LOCAL is not set
+# CT_ZSTD_PATCH_LOCAL_BUNDLED is not set
+# CT_ZSTD_PATCH_NONE is not set
+CT_ZSTD_PATCH_ORDER="global"
+CT_ZSTD_V_1_5_2=y
+CT_ZSTD_VERSION="1.5.2"
+CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/"
+CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_ZSTD_ARCHIVE_FORMATS=".tar.gz"
+CT_ZSTD_SIGNATURE_FORMAT="packed/.sig"
+CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD"
CT_LIBICONV_NEEDED=y
CT_GETTEXT_NEEDED=y
CT_GMP_NEEDED=y
@@ -926,6 +955,7 @@ CT_ISL_NEEDED=y
CT_MPC_NEEDED=y
CT_NCURSES_NEEDED=y
CT_ZLIB_NEEDED=y
+CT_ZSTD_NEEDED=y
CT_LIBICONV=y
CT_GETTEXT=y
CT_GMP=y
@@ -934,6 +964,7 @@ CT_ISL=y
CT_MPC=y
CT_NCURSES=y
CT_ZLIB=y
+CT_ZSTD=y
# end of Companion libraries
#
diff --git a/images/base-win32/ct-ng-config b/images/base-win32/ct-ng-config
index 07bdd9f..97bdafd 100644
--- a/images/base-win32/ct-ng-config
+++ b/images/base-win32/ct-ng-config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.25.0.90_cf9beb1 Configuration
+# crosstool-NG 1.25.0.152_89671bf Configuration
#
CT_CONFIGURE_has_static_link=y
CT_CONFIGURE_has_cxx11=y
@@ -13,9 +13,9 @@ CT_CONFIGURE_has_make_3_81_or_newer=y
CT_CONFIGURE_has_make_4_0_or_newer=y
CT_CONFIGURE_has_libtool_2_4_or_newer=y
CT_CONFIGURE_has_libtoolize_2_4_or_newer=y
-CT_CONFIGURE_has_autoconf_2_65_or_newer=y
-CT_CONFIGURE_has_autoreconf_2_65_or_newer=y
-CT_CONFIGURE_has_automake_1_15_or_newer=y
+CT_CONFIGURE_has_autoconf_2_71_or_newer=y
+CT_CONFIGURE_has_autoreconf_2_71_or_newer=y
+CT_CONFIGURE_has_automake_1_16_or_newer=y
CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
CT_CONFIGURE_has_python_3_4_or_newer=y
CT_CONFIGURE_has_bison_2_7_or_newer=y
@@ -28,7 +28,7 @@ CT_CONFIGURE_has_sha1sum=y
CT_CONFIGURE_has_sha256sum=y
CT_CONFIGURE_has_sha512sum=y
CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.25.0.90_cf9beb1"
+CT_VERSION="1.25.0.152_89671bf"
CT_VCHECK=""
CT_CONFIG_VERSION_ENV="4"
CT_CONFIG_VERSION_CURRENT="4"
@@ -46,6 +46,7 @@ CT_MODULES=y
CT_EXPERIMENTAL=y
CT_ALLOW_BUILD_AS_ROOT=y
CT_ALLOW_BUILD_AS_ROOT_SURE=y
+# CT_ENABLE_EXPERIMENTAL_BUNDLED_PATCHES is not set
# CT_DEBUG_CT is not set
#
@@ -64,6 +65,7 @@ CT_REMOVE_DOCS=y
# CT_PREFIX_DIR_RO is not set
CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y
CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y
+# CT_TARBALL_RESULT is not set
#
# Downloading
@@ -126,7 +128,6 @@ CT_CONFIG_SHELL="${bash}"
CT_LOG_DEBUG=y
CT_LOG_LEVEL_MAX="DEBUG"
# CT_LOG_SEE_TOOLS_WARN is not set
-# CT_LOG_PROGRESS_BAR is not set
# CT_LOG_TO_FILE is not set
# end of Paths and misc options
@@ -137,6 +138,7 @@ CT_LOG_LEVEL_MAX="DEBUG"
# CT_ARCH_ARC is not set
# CT_ARCH_ARM is not set
# CT_ARCH_AVR is not set
+# CT_ARCH_BPF is not set
# CT_ARCH_C6X is not set
# CT_ARCH_LOONGARCH is not set
# CT_ARCH_M68K is not set
@@ -163,7 +165,7 @@ CT_ARCH_X86_SHOW=y
# Options for x86
#
CT_ARCH_X86_PKG_KSYM=""
-CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
+CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
CT_ARCH_SUFFIX=""
# CT_OMIT_TARGET_VENDOR is not set
@@ -292,7 +294,8 @@ CT_BINUTILS_PATCH_GLOBAL=y
# CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
# CT_BINUTILS_PATCH_NONE is not set
CT_BINUTILS_PATCH_ORDER="global"
-CT_BINUTILS_V_2_39=y
+CT_BINUTILS_V_2_40=y
+# CT_BINUTILS_V_2_39 is not set
# CT_BINUTILS_V_2_38 is not set
# CT_BINUTILS_V_2_37 is not set
# CT_BINUTILS_V_2_36 is not set
@@ -306,14 +309,14 @@ CT_BINUTILS_V_2_39=y
# CT_BINUTILS_V_2_28 is not set
# CT_BINUTILS_V_2_27 is not set
# CT_BINUTILS_V_2_26 is not set
-CT_BINUTILS_VERSION="2.39"
+CT_BINUTILS_VERSION="2.40"
CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig"
+CT_BINUTILS_later_than_2_39=y
CT_BINUTILS_2_39_or_later=y
-CT_BINUTILS_2_39_or_older=y
CT_BINUTILS_later_than_2_30=y
CT_BINUTILS_2_30_or_later=y
CT_BINUTILS_later_than_2_27=y
@@ -364,13 +367,14 @@ CT_MINGW_W64_PATCH_GLOBAL=y
# CT_MINGW_W64_PATCH_LOCAL_BUNDLED is not set
# CT_MINGW_W64_PATCH_NONE is not set
CT_MINGW_W64_PATCH_ORDER="global"
-CT_MINGW_W64_V_V9_0=y
+CT_MINGW_W64_V_V10_0=y
+# CT_MINGW_W64_V_V9_0 is not set
# CT_MINGW_W64_V_V8_0 is not set
# CT_MINGW_W64_V_V7_0 is not set
# CT_MINGW_W64_V_V6_0 is not set
# CT_MINGW_W64_V_V5_0 is not set
# CT_MINGW_W64_V_V4_0 is not set
-CT_MINGW_W64_VERSION="v9.0.0"
+CT_MINGW_W64_VERSION="v10.0.0"
CT_MINGW_W64_MIRRORS="http://downloads.sourceforge.net/sourceforge/mingw-w64 https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/"
CT_MINGW_W64_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_MINGW_W64_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -381,7 +385,7 @@ CT_MINGW_DIRECTX=y
CT_MINGW_DDK=y
CT_MINGW_TOOLS=y
CT_MINGW_TOOL_LIST_ARRAY="gendef genidl genlib genpeimg widl"
-CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
+CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG"
CT_LIBC_SUPPORT_THREADS_ANY=y
CT_LIBC_SUPPORT_THREADS_NATIVE=y
CT_LIBC_SUPPORT_THREADS_POSIX=y
@@ -403,6 +407,7 @@ CT_CC_SUPPORT_CXX=y
CT_CC_SUPPORT_FORTRAN=y
CT_CC_SUPPORT_ADA=y
CT_CC_SUPPORT_D=y
+CT_CC_SUPPORT_JIT=y
CT_CC_SUPPORT_OBJC=y
CT_CC_SUPPORT_OBJCXX=y
CT_CC_SUPPORT_GOLANG=y
@@ -516,6 +521,7 @@ CT_ALL_CC_CHOICES="GCC"
#
CT_CC_LANG_CXX=y
# CT_CC_LANG_FORTRAN is not set
+# CT_CC_LANG_JIT is not set
# CT_CC_LANG_ADA is not set
# CT_CC_LANG_D is not set
# CT_CC_LANG_OBJC is not set
@@ -614,7 +620,8 @@ CT_ISL_PATCH_GLOBAL=y
# CT_ISL_PATCH_LOCAL_BUNDLED is not set
# CT_ISL_PATCH_NONE is not set
CT_ISL_PATCH_ORDER="global"
-CT_ISL_V_0_24=y
+CT_ISL_V_0_25=y
+# CT_ISL_V_0_24 is not set
# CT_ISL_V_0_23 is not set
# CT_ISL_V_0_22 is not set
# CT_ISL_V_0_21 is not set
@@ -624,7 +631,7 @@ CT_ISL_V_0_24=y
# CT_ISL_V_0_17 is not set
# CT_ISL_V_0_16 is not set
# CT_ISL_V_0_15 is not set
-CT_ISL_VERSION="0.24"
+CT_ISL_VERSION="0.25"
CT_ISL_MIRRORS="https://libisl.sourceforge.io"
CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -708,7 +715,28 @@ CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
CT_ZLIB_SIGNATURE_FORMAT="packed/.asc"
-CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB"
+CT_COMP_LIBS_ZSTD=y
+CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD"
+CT_ZSTD_DIR_NAME="zstd"
+CT_ZSTD_PKG_NAME="zstd"
+CT_ZSTD_SRC_RELEASE=y
+# CT_ZSTD_SRC_DEVEL is not set
+# CT_ZSTD_SRC_CUSTOM is not set
+CT_ZSTD_PATCH_GLOBAL=y
+# CT_ZSTD_PATCH_BUNDLED is not set
+# CT_ZSTD_PATCH_LOCAL is not set
+# CT_ZSTD_PATCH_BUNDLED_LOCAL is not set
+# CT_ZSTD_PATCH_LOCAL_BUNDLED is not set
+# CT_ZSTD_PATCH_NONE is not set
+CT_ZSTD_PATCH_ORDER="global"
+CT_ZSTD_V_1_5_2=y
+CT_ZSTD_VERSION="1.5.2"
+CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/"
+CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_ZSTD_ARCHIVE_FORMATS=".tar.gz"
+CT_ZSTD_SIGNATURE_FORMAT="packed/.sig"
+CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD"
# CT_LIBICONV_NEEDED is not set
# CT_GETTEXT_NEEDED is not set
CT_GMP_NEEDED=y
@@ -716,11 +744,13 @@ CT_MPFR_NEEDED=y
CT_ISL_NEEDED=y
CT_MPC_NEEDED=y
CT_ZLIB_NEEDED=y
+CT_ZSTD_NEEDED=y
CT_GMP=y
CT_MPFR=y
CT_ISL=y
CT_MPC=y
CT_ZLIB=y
+CT_ZSTD=y
# end of Companion libraries
#
diff --git a/images/base-win64/ct-ng-config b/images/base-win64/ct-ng-config
index 83b65cb..90c00bf 100644
--- a/images/base-win64/ct-ng-config
+++ b/images/base-win64/ct-ng-config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.25.0.90_cf9beb1 Configuration
+# crosstool-NG 1.25.0.152_89671bf Configuration
#
CT_CONFIGURE_has_static_link=y
CT_CONFIGURE_has_cxx11=y
@@ -13,9 +13,9 @@ CT_CONFIGURE_has_make_3_81_or_newer=y
CT_CONFIGURE_has_make_4_0_or_newer=y
CT_CONFIGURE_has_libtool_2_4_or_newer=y
CT_CONFIGURE_has_libtoolize_2_4_or_newer=y
-CT_CONFIGURE_has_autoconf_2_65_or_newer=y
-CT_CONFIGURE_has_autoreconf_2_65_or_newer=y
-CT_CONFIGURE_has_automake_1_15_or_newer=y
+CT_CONFIGURE_has_autoconf_2_71_or_newer=y
+CT_CONFIGURE_has_autoreconf_2_71_or_newer=y
+CT_CONFIGURE_has_automake_1_16_or_newer=y
CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
CT_CONFIGURE_has_python_3_4_or_newer=y
CT_CONFIGURE_has_bison_2_7_or_newer=y
@@ -28,7 +28,7 @@ CT_CONFIGURE_has_sha1sum=y
CT_CONFIGURE_has_sha256sum=y
CT_CONFIGURE_has_sha512sum=y
CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.25.0.90_cf9beb1"
+CT_VERSION="1.25.0.152_89671bf"
CT_VCHECK=""
CT_CONFIG_VERSION_ENV="4"
CT_CONFIG_VERSION_CURRENT="4"
@@ -46,6 +46,7 @@ CT_MODULES=y
CT_EXPERIMENTAL=y
CT_ALLOW_BUILD_AS_ROOT=y
CT_ALLOW_BUILD_AS_ROOT_SURE=y
+# CT_ENABLE_EXPERIMENTAL_BUNDLED_PATCHES is not set
# CT_DEBUG_CT is not set
#
@@ -64,6 +65,7 @@ CT_REMOVE_DOCS=y
# CT_PREFIX_DIR_RO is not set
CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y
CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y
+# CT_TARBALL_RESULT is not set
#
# Downloading
@@ -126,7 +128,6 @@ CT_CONFIG_SHELL="${bash}"
CT_LOG_DEBUG=y
CT_LOG_LEVEL_MAX="DEBUG"
# CT_LOG_SEE_TOOLS_WARN is not set
-# CT_LOG_PROGRESS_BAR is not set
# CT_LOG_TO_FILE is not set
# end of Paths and misc options
@@ -137,6 +138,7 @@ CT_LOG_LEVEL_MAX="DEBUG"
# CT_ARCH_ARC is not set
# CT_ARCH_ARM is not set
# CT_ARCH_AVR is not set
+# CT_ARCH_BPF is not set
# CT_ARCH_C6X is not set
# CT_ARCH_LOONGARCH is not set
# CT_ARCH_M68K is not set
@@ -163,7 +165,7 @@ CT_ARCH_X86_SHOW=y
# Options for x86
#
CT_ARCH_X86_PKG_KSYM=""
-CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
+CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
CT_ARCH_SUFFIX=""
# CT_OMIT_TARGET_VENDOR is not set
@@ -293,7 +295,8 @@ CT_BINUTILS_PATCH_GLOBAL=y
# CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
# CT_BINUTILS_PATCH_NONE is not set
CT_BINUTILS_PATCH_ORDER="global"
-CT_BINUTILS_V_2_39=y
+CT_BINUTILS_V_2_40=y
+# CT_BINUTILS_V_2_39 is not set
# CT_BINUTILS_V_2_38 is not set
# CT_BINUTILS_V_2_37 is not set
# CT_BINUTILS_V_2_36 is not set
@@ -307,14 +310,14 @@ CT_BINUTILS_V_2_39=y
# CT_BINUTILS_V_2_28 is not set
# CT_BINUTILS_V_2_27 is not set
# CT_BINUTILS_V_2_26 is not set
-CT_BINUTILS_VERSION="2.39"
+CT_BINUTILS_VERSION="2.40"
CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig"
+CT_BINUTILS_later_than_2_39=y
CT_BINUTILS_2_39_or_later=y
-CT_BINUTILS_2_39_or_older=y
CT_BINUTILS_later_than_2_30=y
CT_BINUTILS_2_30_or_later=y
CT_BINUTILS_later_than_2_27=y
@@ -365,13 +368,14 @@ CT_MINGW_W64_PATCH_GLOBAL=y
# CT_MINGW_W64_PATCH_LOCAL_BUNDLED is not set
# CT_MINGW_W64_PATCH_NONE is not set
CT_MINGW_W64_PATCH_ORDER="global"
-CT_MINGW_W64_V_V9_0=y
+CT_MINGW_W64_V_V10_0=y
+# CT_MINGW_W64_V_V9_0 is not set
# CT_MINGW_W64_V_V8_0 is not set
# CT_MINGW_W64_V_V7_0 is not set
# CT_MINGW_W64_V_V6_0 is not set
# CT_MINGW_W64_V_V5_0 is not set
# CT_MINGW_W64_V_V4_0 is not set
-CT_MINGW_W64_VERSION="v9.0.0"
+CT_MINGW_W64_VERSION="v10.0.0"
CT_MINGW_W64_MIRRORS="http://downloads.sourceforge.net/sourceforge/mingw-w64 https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/"
CT_MINGW_W64_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_MINGW_W64_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -382,7 +386,7 @@ CT_MINGW_DIRECTX=y
CT_MINGW_DDK=y
CT_MINGW_TOOLS=y
CT_MINGW_TOOL_LIST_ARRAY="gendef genidl genlib genpeimg widl"
-CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
+CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG"
CT_LIBC_SUPPORT_THREADS_ANY=y
CT_LIBC_SUPPORT_THREADS_NATIVE=y
CT_LIBC_SUPPORT_THREADS_POSIX=y
@@ -404,6 +408,7 @@ CT_CC_SUPPORT_CXX=y
CT_CC_SUPPORT_FORTRAN=y
CT_CC_SUPPORT_ADA=y
CT_CC_SUPPORT_D=y
+CT_CC_SUPPORT_JIT=y
CT_CC_SUPPORT_OBJC=y
CT_CC_SUPPORT_OBJCXX=y
CT_CC_SUPPORT_GOLANG=y
@@ -517,6 +522,7 @@ CT_ALL_CC_CHOICES="GCC"
#
CT_CC_LANG_CXX=y
# CT_CC_LANG_FORTRAN is not set
+# CT_CC_LANG_JIT is not set
# CT_CC_LANG_ADA is not set
# CT_CC_LANG_D is not set
# CT_CC_LANG_OBJC is not set
@@ -615,7 +621,8 @@ CT_ISL_PATCH_GLOBAL=y
# CT_ISL_PATCH_LOCAL_BUNDLED is not set
# CT_ISL_PATCH_NONE is not set
CT_ISL_PATCH_ORDER="global"
-CT_ISL_V_0_24=y
+CT_ISL_V_0_25=y
+# CT_ISL_V_0_24 is not set
# CT_ISL_V_0_23 is not set
# CT_ISL_V_0_22 is not set
# CT_ISL_V_0_21 is not set
@@ -625,7 +632,7 @@ CT_ISL_V_0_24=y
# CT_ISL_V_0_17 is not set
# CT_ISL_V_0_16 is not set
# CT_ISL_V_0_15 is not set
-CT_ISL_VERSION="0.24"
+CT_ISL_VERSION="0.25"
CT_ISL_MIRRORS="https://libisl.sourceforge.io"
CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -709,7 +716,28 @@ CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
CT_ZLIB_SIGNATURE_FORMAT="packed/.asc"
-CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB"
+CT_COMP_LIBS_ZSTD=y
+CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD"
+CT_ZSTD_DIR_NAME="zstd"
+CT_ZSTD_PKG_NAME="zstd"
+CT_ZSTD_SRC_RELEASE=y
+# CT_ZSTD_SRC_DEVEL is not set
+# CT_ZSTD_SRC_CUSTOM is not set
+CT_ZSTD_PATCH_GLOBAL=y
+# CT_ZSTD_PATCH_BUNDLED is not set
+# CT_ZSTD_PATCH_LOCAL is not set
+# CT_ZSTD_PATCH_BUNDLED_LOCAL is not set
+# CT_ZSTD_PATCH_LOCAL_BUNDLED is not set
+# CT_ZSTD_PATCH_NONE is not set
+CT_ZSTD_PATCH_ORDER="global"
+CT_ZSTD_V_1_5_2=y
+CT_ZSTD_VERSION="1.5.2"
+CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/"
+CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_ZSTD_ARCHIVE_FORMATS=".tar.gz"
+CT_ZSTD_SIGNATURE_FORMAT="packed/.sig"
+CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD"
# CT_LIBICONV_NEEDED is not set
# CT_GETTEXT_NEEDED is not set
CT_GMP_NEEDED=y
@@ -717,11 +745,13 @@ CT_MPFR_NEEDED=y
CT_ISL_NEEDED=y
CT_MPC_NEEDED=y
CT_ZLIB_NEEDED=y
+CT_ZSTD_NEEDED=y
CT_GMP=y
CT_MPFR=y
CT_ISL=y
CT_MPC=y
CT_ZLIB=y
+CT_ZSTD=y
# end of Companion libraries
#
From ccbc205c57ef810b82ac8b71e1d2d84a20429156 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Tue, 28 Mar 2023 12:46:57 +0200
Subject: [PATCH 156/160] Increate latest re-release delay again
---
.github/workflows/build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d750bce..b2bae58 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -240,7 +240,7 @@ jobs:
TAGNAME="latest"
hub release delete "$TAGNAME" || true
git push --delete origin "$TAGNAME" || true
- sleep 5
+ sleep 15
hub release create $(for a in latest_artifacts/*; do echo -a $a; done) -m "$NAME" -t "master" "$TAGNAME"
env:
GITHUB_TOKEN: ${{ github.token }}
From 5e54b68d5ef0bd5977d1659dd64a3487ca37f2c7 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Tue, 28 Mar 2023 14:52:55 +0200
Subject: [PATCH 157/160] Update mbedtls
---
scripts.d/50-librist/40-mbedtls.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh
index ca129ba..93b9abb 100755
--- a/scripts.d/50-librist/40-mbedtls.sh
+++ b/scripts.d/50-librist/40-mbedtls.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/ARMmbed/mbedtls.git"
-SCRIPT_COMMIT="v3.3.0"
+SCRIPT_COMMIT="v3.4.0"
SCRIPT_TAGFILTER="v3.*"
ffbuild_enabled() {
From 341ed9f992033af6dd97a749cfb0d364ade34c69 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Tue, 18 Apr 2023 16:23:16 +0200
Subject: [PATCH 158/160] Update dependencies
---
scripts.d/10-mingw.sh | 2 +-
scripts.d/20-libiconv.sh | 2 +-
scripts.d/20-libxml2.sh | 2 +-
scripts.d/25-fftw3.sh | 2 +-
scripts.d/25-freetype.sh | 2 +-
scripts.d/35-fontconfig.sh | 2 +-
scripts.d/45-harfbuzz.sh | 2 +-
scripts.d/45-libsamplerate.sh | 2 +-
scripts.d/45-opencl.sh | 4 ++--
scripts.d/45-pulseaudio.sh | 2 +-
scripts.d/45-vmaf.sh | 2 +-
scripts.d/45-x11/10-xcbproto.sh | 2 +-
scripts.d/45-x11/10-xproto.sh | 2 +-
scripts.d/45-x11/10-xtrans.sh | 2 +-
scripts.d/45-x11/20-libxau.sh | 2 +-
scripts.d/45-x11/30-libxcb.sh | 2 +-
scripts.d/45-x11/40-libx11.sh | 2 +-
scripts.d/45-x11/50-libxfixes.sh | 2 +-
scripts.d/45-x11/60-libglvnd.sh | 2 +-
scripts.d/45-x11/60-libxcursor.sh | 2 +-
scripts.d/50-amf.sh | 2 +-
scripts.d/50-aom.sh | 2 +-
scripts.d/50-avisynth.sh | 2 +-
scripts.d/50-dav1d.sh | 2 +-
scripts.d/50-libass.sh | 2 +-
scripts.d/50-libjxl/50-libjxl.sh | 2 +-
scripts.d/50-librist/50-librist.sh | 2 +-
scripts.d/50-libssh.sh | 2 +-
scripts.d/50-libvpx.sh | 2 +-
scripts.d/50-libwebp.sh | 2 +-
scripts.d/50-lilv/96-lv2.sh | 2 +-
scripts.d/50-lilv/96-serd.sh | 2 +-
scripts.d/50-onevpl.sh | 2 +-
scripts.d/50-openal.sh | 2 +-
scripts.d/50-openh264.sh | 2 +-
scripts.d/50-openjpeg.sh | 2 +-
scripts.d/50-openmpt.sh | 2 +-
scripts.d/50-rav1e.sh | 2 +-
scripts.d/50-rubberband.sh | 2 +-
scripts.d/50-sdl.sh | 2 +-
scripts.d/50-srt.sh | 2 +-
scripts.d/50-svtav1.sh | 2 +-
scripts.d/50-vaapi/30-libpciaccess.sh | 2 +-
scripts.d/50-vaapi/40-libdrm.sh | 2 +-
scripts.d/50-vaapi/50-libva.sh | 2 +-
scripts.d/50-vidstab.sh | 2 +-
scripts.d/50-vulkan/45-vulkan.sh | 2 +-
scripts.d/50-vulkan/50-shaderc.sh | 2 +-
scripts.d/50-vulkan/55-spirv-cross.sh | 2 +-
scripts.d/50-vulkan/60-libplacebo.sh | 2 +-
scripts.d/50-x265.sh | 2 +-
51 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index 083ed7b..71293ef 100755
--- a/scripts.d/10-mingw.sh
+++ b/scripts.d/10-mingw.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/mirror/mingw-w64.git"
-SCRIPT_COMMIT="0f2264e7b8fedbe225921367e82aeb97ddfed46b"
+SCRIPT_COMMIT="eff726c461e09f35eeaed125a3570fa5f807f02b"
ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh
index 2d689d0..d1899ed 100755
--- a/scripts.d/20-libiconv.sh
+++ b/scripts.d/20-libiconv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git"
-SCRIPT_COMMIT="c593e206b2d4bc689950c742a0fb00b8013756a0"
+SCRIPT_COMMIT="33f08ec1e0fc1e8203a3d81e9161894dc5793908"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh
index e29e35a..8d56f60 100755
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-SCRIPT_COMMIT="b1319c902f6e44d08f8cb33f1fc28847f2bc8aeb"
+SCRIPT_COMMIT="33fb297b3685f7ff7b11002155c23f9f1ccd957b"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh
index 9d91ed6..ae071fe 100755
--- a/scripts.d/25-fftw3.sh
+++ b/scripts.d/25-fftw3.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/FFTW/fftw3.git"
-SCRIPT_COMMIT="c277d55689eef1616fa622b3bf6794af3a58e960"
+SCRIPT_COMMIT="0842f00ae6b6e1f3aade155bc0edd17a7313fa6a"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index ad03a62..ba9cdc5 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
-SCRIPT_COMMIT="8fc6df1028ba7173fbcc467a4402bb7ef8a84f8f"
+SCRIPT_COMMIT="c4fe77c3f072fab930267f95510562e7aeb03302"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh
index 108f97a..ab81dbd 100755
--- a/scripts.d/35-fontconfig.sh
+++ b/scripts.d/35-fontconfig.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
-SCRIPT_COMMIT="04546f18768e1ce57c24743035118b3eabbd4181"
+SCRIPT_COMMIT="222d058525506e587a45368f10e45e4b80ca541f"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index 4f322db..147a5d7 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="79233a149209e3da199bb4e2f74271668502c574"
+SCRIPT_COMMIT="3db6baa20e0a4661f99654860000e74a2770c2e0"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh
index cf6fe1e..cff6e1b 100755
--- a/scripts.d/45-libsamplerate.sh
+++ b/scripts.d/45-libsamplerate.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsndfile/libsamplerate.git"
-SCRIPT_COMMIT="215c75ea9d6e1685893716100ddae3ebfc9f5cfe"
+SCRIPT_COMMIT="22bd06eb114850ebe31981eb794d150a95439fef"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh
index d0591ec..9a90658 100755
--- a/scripts.d/45-opencl.sh
+++ b/scripts.d/45-opencl.sh
@@ -1,10 +1,10 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
-SCRIPT_COMMIT="1080743ea047d6467bc609f979a21f00e06ac928"
+SCRIPT_COMMIT="4fdcfb0ae675f2f63a9add9552e0af62c2b4ed30"
SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
-SCRIPT_COMMIT2="ece91448a958099b9c277f050fca9df96a2ea718"
+SCRIPT_COMMIT2="b1bce7c3c580a8345205cf65fc1a5f55ba9cdb01"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index 5cf662f..0788b5e 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-SCRIPT_COMMIT="3aaeb5113d2cec907bd101df22bb28b1a1b8394d"
+SCRIPT_COMMIT="86e9c901289d2e1a3c2c6cb5885294a829f3eb27"
ffbuild_enabled() {
[[ $TARGET == linux* ]] || return 1
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index a6496a9..4d9319f 100755
--- a/scripts.d/45-vmaf.sh
+++ b/scripts.d/45-vmaf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
-SCRIPT_COMMIT="d48ab28eebac8276369cfebeb7cfcbfeb28408c2"
+SCRIPT_COMMIT="bf80018c3f21151b7c90324da95ef2de80f49297"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh
index 4fa10ec..894477d 100755
--- a/scripts.d/45-x11/10-xcbproto.sh
+++ b/scripts.d/45-x11/10-xcbproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-SCRIPT_COMMIT="15d140d7867e8e654ce917b8d6d1dbd45b3de3b8"
+SCRIPT_COMMIT="cfcc51836c1f2c174b67073cc8bed92e7e9c9569"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh
index b133f58..b7360dd 100755
--- a/scripts.d/45-x11/10-xproto.sh
+++ b/scripts.d/45-x11/10-xproto.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
-SCRIPT_COMMIT="423098656f145afeb72cbf21aaa0b3a3f9bc36bb"
+SCRIPT_COMMIT="fca42f2e5a5da961b231dbbc10f87bb95588d5b1"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/10-xtrans.sh b/scripts.d/45-x11/10-xtrans.sh
index 44b02e0..f8ba5e3 100755
--- a/scripts.d/45-x11/10-xtrans.sh
+++ b/scripts.d/45-x11/10-xtrans.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxtrans.git"
-SCRIPT_COMMIT="c761c6505d49e8381a3eae94f2e5e118cbdf6487"
+SCRIPT_COMMIT="9d77996f9f972da63c06099fd8c0f0529159b98f"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh
index 4ab0d1e..4c2e8be 100755
--- a/scripts.d/45-x11/20-libxau.sh
+++ b/scripts.d/45-x11/20-libxau.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git"
-SCRIPT_COMMIT="c52f54e9533046a52edf84bcc02abedc2dbcb1a7"
+SCRIPT_COMMIT="df1bf4fe528a5a9eef420f78efb225e4696ac467"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh
index 6884226..ea21d78 100755
--- a/scripts.d/45-x11/30-libxcb.sh
+++ b/scripts.d/45-x11/30-libxcb.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
-SCRIPT_COMMIT="18e109d755c5ce18157fdabb6de8ee6845b348ff"
+SCRIPT_COMMIT="8935793f1f3751a6aa9d78955c7d6236177986de"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index dba7079..0c822d6 100755
--- a/scripts.d/45-x11/40-libx11.sh
+++ b/scripts.d/45-x11/40-libx11.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-SCRIPT_COMMIT="ca99e338a9b8aad300933b1336f9e3c091392213"
+SCRIPT_COMMIT="96cbac89a02220eb21e13ca5fa7c8c5adf77028a"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxfixes.sh b/scripts.d/45-x11/50-libxfixes.sh
index 9ade485..c60693b 100755
--- a/scripts.d/45-x11/50-libxfixes.sh
+++ b/scripts.d/45-x11/50-libxfixes.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxfixes.git"
-SCRIPT_COMMIT="ad22c5ade8789cdb606b244336106a713473318c"
+SCRIPT_COMMIT="c1cab28e27dd1c5a81394965248b57e490ccf2ca"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh
index 6d19fb2..94efdff 100755
--- a/scripts.d/45-x11/60-libglvnd.sh
+++ b/scripts.d/45-x11/60-libglvnd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-SCRIPT_COMMIT="056feac0780220822e71a2fd38a83353102e5b36"
+SCRIPT_COMMIT="179d7278d7485ceea2d440807be9d677d32aedc4"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libxcursor.sh b/scripts.d/45-x11/60-libxcursor.sh
index 8e9c967..18e4057 100755
--- a/scripts.d/45-x11/60-libxcursor.sh
+++ b/scripts.d/45-x11/60-libxcursor.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git"
-SCRIPT_COMMIT="81dc4a481b64499ab7c355ee43c91e4fe0767545"
+SCRIPT_COMMIT="a353f02a7ac4504ad5edb5407278c7a03c507aef"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh
index b19b5e8..b80b397 100755
--- a/scripts.d/50-amf.sh
+++ b/scripts.d/50-amf.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
-SCRIPT_COMMIT="4bfa819fc3d6aa4714ad28f8dab46d0fa95177ad"
+SCRIPT_COMMIT="daee84bf3cde928dc1cd0b502c1b6a50cbff2495"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index 046c976..0941c89 100755
--- a/scripts.d/50-aom.sh
+++ b/scripts.d/50-aom.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://aomedia.googlesource.com/aom"
-SCRIPT_COMMIT="fa2ff85f8963b37be9d74f6b5fd597c6ec1a6021"
+SCRIPT_COMMIT="d6b8177c9e7fe0fa381afb6ed3946c492fc4d6e9"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh
index 03f8fff..80666f7 100755
--- a/scripts.d/50-avisynth.sh
+++ b/scripts.d/50-avisynth.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/AviSynth/AviSynthPlus.git"
-SCRIPT_COMMIT="21c6240b520db4697fd6d905e5d77f1039604b17"
+SCRIPT_COMMIT="35706f838a7f6bdda422891c875e60d503d9bdb4"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index cef3bcf..7384fe8 100755
--- a/scripts.d/50-dav1d.sh
+++ b/scripts.d/50-dav1d.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="16c943484e63da7ed8a8a8d85af88995369f23cd"
+SCRIPT_COMMIT="0b809a9281e0a97441728ad763779e7874209d37"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index ce74a4d..d654acf 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libass/libass.git"
-SCRIPT_COMMIT="218dacece7d24b45e4637ced4dc56564de29919d"
+SCRIPT_COMMIT="32dea3434dbd85f9fb2700b6863c1bd92f00b86f"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index 2154a87..bf1b222 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
-SCRIPT_COMMIT="25adcd683c382b312ba3ee70bdda4ee1c315ef2c"
+SCRIPT_COMMIT="6c296fb8ca5ea17a36c123eb82bba2102e26c411"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh
index 103d454..94569eb 100755
--- a/scripts.d/50-librist/50-librist.sh
+++ b/scripts.d/50-librist/50-librist.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/rist/librist.git"
-SCRIPT_COMMIT="9f09a3defd6e59839aae3e3b7b5411213fa04b8a"
+SCRIPT_COMMIT="234c2e224c1dc60276a7b427acd3cc0f8bdb3bda"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh
index a4fdca9..a0a5eab 100755
--- a/scripts.d/50-libssh.sh
+++ b/scripts.d/50-libssh.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://git.libssh.org/projects/libssh.git"
-SCRIPT_COMMIT="7b12876f04ae375acd183de3c6cc82bcdc105e1e"
+SCRIPT_COMMIT="c3aa0cb18225f2f9fcefd96aad327c6ffbb2d77c"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index 009d427..636e70b 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="6788c75055899796c13787ed44cc6f1cc45e09d7"
+SCRIPT_COMMIT="8f14f66490f8bfbbf01ce809629c02631baf5b8f"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index 8097ead..ace60db 100755
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="0825faa4c10d622f2747c5b2752e7b6a6848bf3f"
+SCRIPT_COMMIT="761f49c3ab1c91b8e911840a4f6f246308b7c242"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh
index 13035f1..110e1d9 100755
--- a/scripts.d/50-lilv/96-lv2.sh
+++ b/scripts.d/50-lilv/96-lv2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/lv2/lv2.git"
-SCRIPT_COMMIT="dbdbe3e518daf7b2f3f0e7587d8b2493b1d5a59e"
+SCRIPT_COMMIT="bdaebafd3223551b3d9d890070ac0671b3b645c1"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh
index 673583c..e9f6137 100755
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/drobilla/serd.git"
-SCRIPT_COMMIT="61d53637dc62d15f9b3d1fa9e69891313c465c35"
+SCRIPT_COMMIT="a6cd7dd91d93015ec118286b868c3fd43133f3ac"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh
index 05ebe6a..19a6dc4 100755
--- a/scripts.d/50-onevpl.sh
+++ b/scripts.d/50-onevpl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/oneapi-src/oneVPL.git"
-SCRIPT_COMMIT="4cdf44ccaa605460499c52f39eff5517da2fc3c8"
+SCRIPT_COMMIT="fcabffb463299a8792c6baed69afbb69236ba6cb"
ffbuild_enabled() {
[[ $TARGET == *arm64 ]] && return -1
diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh
index 0e2cc48..b7a6529 100755
--- a/scripts.d/50-openal.sh
+++ b/scripts.d/50-openal.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/kcat/openal-soft.git"
-SCRIPT_COMMIT="186a29b77d8ec01c14d13797f9d51c7c21b22b60"
+SCRIPT_COMMIT="d9fed51aa6391debc31dbbca550f055c980afe70"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh
index 708fb27..7f42e4d 100755
--- a/scripts.d/50-openh264.sh
+++ b/scripts.d/50-openh264.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/cisco/openh264.git"
-SCRIPT_COMMIT="f8aeaae8e40ea7bbf665c3c4010c78413421ccb4"
+SCRIPT_COMMIT="09a4f3ec842a8932341b195c5b01e141c8a16eb7"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh
index 1b11993..76bb967 100755
--- a/scripts.d/50-openjpeg.sh
+++ b/scripts.d/50-openjpeg.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/uclouvain/openjpeg.git"
-SCRIPT_COMMIT="15c0dca5206d0101de2ce73b97138a2b26949011"
+SCRIPT_COMMIT="1ee6d115e80036d1d38bad7f95a680bfc612c1bf"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index 2f30ed5..d4cba17 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-SCRIPT_REV="18892"
+SCRIPT_REV="19055"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index 4d9a64d..c6e129f 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/xiph/rav1e.git"
-SCRIPT_COMMIT="92ed4e82f4aa72d5d14cf8678c85e78dd6f39033"
+SCRIPT_COMMIT="80d0ff2df4785e0d3b0050205541914faffd583d"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index de05236..426a25f 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/breakfastquay/rubberband.git"
-SCRIPT_COMMIT="9e5ebdbafbe1347f2d275fc7d06699e6adad64da"
+SCRIPT_COMMIT="b04b731a954fab2cdbe18e11b372a6d0f4114387"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index ac49688..3437642 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
-SCRIPT_COMMIT="b57a6a1adf15f9a6e4a48e1980aa723d47fa2fe3"
+SCRIPT_COMMIT="7ec9a4385a0829ef2f7b101ec93f68065ddd2571"
SCRIPT_BRANCH="SDL2"
ffbuild_enabled() {
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index cd73639..4b986be 100755
--- a/scripts.d/50-srt.sh
+++ b/scripts.d/50-srt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/Haivision/srt.git"
-SCRIPT_COMMIT="39822840c506d72cef5a742d28f32ea28e144345"
+SCRIPT_COMMIT="4c9a4178d77543aa816cdb09b382e5163bc40a18"
ffbuild_enabled() {
return 0
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index 8d7ec41..3ee6e81 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="72fd3d479b315fbf6bd1d7e80dec7afe42037819"
+SCRIPT_COMMIT="fca45816bb70e431b2e664374d93c39afecb2783"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-vaapi/30-libpciaccess.sh b/scripts.d/50-vaapi/30-libpciaccess.sh
index d284296..ff55e48 100755
--- a/scripts.d/50-vaapi/30-libpciaccess.sh
+++ b/scripts.d/50-vaapi/30-libpciaccess.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git"
-SCRIPT_COMMIT="833c86ce15cee2a84a37ae71015f236fd32615d9"
+SCRIPT_COMMIT="8980a39004b10298a7db1f1b0b711a19e8b73aee"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index 2b0f7cf..5ee1a87 100755
--- a/scripts.d/50-vaapi/40-libdrm.sh
+++ b/scripts.d/50-vaapi/40-libdrm.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-SCRIPT_COMMIT="d1681af05471176215ad3d437249c38768dc959f"
+SCRIPT_COMMIT="28d9a3c4fb4c99aafc31b288b3f735e19e728d64"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh
index 07af537..915a167 100755
--- a/scripts.d/50-vaapi/50-libva.sh
+++ b/scripts.d/50-vaapi/50-libva.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/intel/libva.git"
-SCRIPT_COMMIT="ad032fb0bb310e11e945f054289a9c91c8231851"
+SCRIPT_COMMIT="4bb5f16c57b059976110db350d771a0ba72b7ef1"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vidstab.sh b/scripts.d/50-vidstab.sh
index 3268a3d..18e8d3f 100755
--- a/scripts.d/50-vidstab.sh
+++ b/scripts.d/50-vidstab.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/georgmartius/vid.stab.git"
-SCRIPT_COMMIT="90c76aca2cb06c3ff6f7476a7cd6851b39436656"
+SCRIPT_COMMIT="77f3ba1b9a8d67be616ce576f24b4b4a73333e82"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index a2b8571..de8c11c 100755
--- a/scripts.d/50-vulkan/45-vulkan.sh
+++ b/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-SCRIPT_COMMIT="v1.3.244"
+SCRIPT_COMMIT="v1.3.247"
SCRIPT_TAGFILTER="v?.*.*"
ffbuild_enabled() {
diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh
index 31aa364..f36f2e9 100755
--- a/scripts.d/50-vulkan/50-shaderc.sh
+++ b/scripts.d/50-vulkan/50-shaderc.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/google/shaderc.git"
-SCRIPT_COMMIT="f1268e6d36cfdcd647d5c7032a6c61a0aad8487b"
+SCRIPT_COMMIT="4a8f5e537f20bbcfe4b11f1fe45314f1dcbfddf6"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh
index a48b38e..51e725a 100755
--- a/scripts.d/50-vulkan/55-spirv-cross.sh
+++ b/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SCRIPT_COMMIT="d26c233e1c2629fec1ae1b6fdf538958e5d52bff"
+SCRIPT_COMMIT="fc9bee27f445644635e83ef111ef54944bb6e3af"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index 2d4f8b3..a745226 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git"
-SCRIPT_COMMIT="bc0fcb9689c282cd631fc37d1b6a67715cfd5fa0"
+SCRIPT_COMMIT="ae154b4566420507f6821e423450840c8a35bcb9"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh
index 15ace41..460db94 100755
--- a/scripts.d/50-x265.sh
+++ b/scripts.d/50-x265.sh
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git"
-SCRIPT_COMMIT="38cf1c379b5af08856bb2fdd65f65a1f99384886"
+SCRIPT_COMMIT="753305affb093ae15d5e4b333125267b16258c21"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
From 8a044562114e7e4cea22d8c5c154a68e320cef54 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 19 Apr 2023 11:42:25 +0200
Subject: [PATCH 159/160] Disable libplacebo for all current versions
---
scripts.d/50-vulkan/60-libplacebo.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index a745226..7c44069 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -5,6 +5,9 @@ SCRIPT_COMMIT="ae154b4566420507f6821e423450840c8a35bcb9"
ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
+ [[ $ADDINS_STR == *5.0* ]] && return -1
+ [[ $ADDINS_STR == *5.1* ]] && return -1
+ [[ $ADDINS_STR == *6.0* ]] && return -1
return 0
}
From e2acf44a523bcfc996ce458bae2ba5d9f0812f94 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 19 Apr 2023 14:08:21 +0200
Subject: [PATCH 160/160] Add explicit enable step to vulkan script dir
---
scripts.d/50-vulkan/99-enable.sh | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100755 scripts.d/50-vulkan/99-enable.sh
diff --git a/scripts.d/50-vulkan/99-enable.sh b/scripts.d/50-vulkan/99-enable.sh
new file mode 100755
index 0000000..f9f8977
--- /dev/null
+++ b/scripts.d/50-vulkan/99-enable.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+SCRIPT_SKIP="1"
+
+ffbuild_enabled() {
+ [[ $ADDINS_STR == *4.4* ]] && return -1
+ return 0
+}
+
+ffbuild_dockerbuild() {
+ return 0
+}