diff --git a/images/base-linux64/ct-ng-config b/images/base-linux64/ct-ng-config index dc1039b2c..5ac75e361 100644 --- a/images/base-linux64/ct-ng-config +++ b/images/base-linux64/ct-ng-config @@ -1,21 +1,19 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.196_227d99d Configuration +# crosstool-NG 1.25.0.232_c175b21 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_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_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 @@ -28,7 +26,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.196_227d99d" +CT_VERSION="1.25.0.232_c175b21" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -269,6 +267,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_4 is not set # CT_LINUX_V_6_3 is not set # CT_LINUX_V_6_2 is not set # CT_LINUX_V_6_1 is not set @@ -454,6 +453,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_38 is not set # CT_GLIBC_V_2_37 is not set # CT_GLIBC_V_2_36 is not set # CT_GLIBC_V_2_35 is not set @@ -477,6 +477,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_38_or_older=y +CT_GLIBC_older_than_2_38=y CT_GLIBC_2_37_or_older=y CT_GLIBC_older_than_2_37=y CT_GLIBC_2_36_or_older=y @@ -593,7 +595,7 @@ CT_GCC_V_13=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="13.1.0" +CT_GCC_VERSION="13.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}" @@ -837,7 +839,7 @@ 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_MIRRORS="https://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" @@ -858,11 +860,12 @@ CT_MPFR_PATCH_GLOBAL=y # 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_2=y +# CT_MPFR_V_4_1 is not set # 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_VERSION="4.2.1" +CT_MPFR_MIRRORS="https://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" diff --git a/images/base-linux64/gen-implib.sh b/images/base-linux64/gen-implib.sh index fd1930f37..389996f83 100755 --- a/images/base-linux64/gen-implib.sh +++ b/images/base-linux64/gen-implib.sh @@ -13,5 +13,5 @@ cd "$TMPDIR" set -x python3 /opt/implib/implib-gen.py --target x86_64-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}gcc $CFLAGS $STAGE_CFLAGS -Wa,--noexecstack -DIMPLIB_HIDDEN_SHIMS -c *.tramp.S *.init.c ${FFBUILD_CROSS_PREFIX}ar -rcs "$OUT" *.tramp.o *.init.o diff --git a/images/base-linuxarm64/ct-ng-config b/images/base-linuxarm64/ct-ng-config index 1ab09e83b..939ed8c69 100644 --- a/images/base-linuxarm64/ct-ng-config +++ b/images/base-linuxarm64/ct-ng-config @@ -1,21 +1,19 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.196_227d99d Configuration +# crosstool-NG 1.25.0.232_c175b21 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_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_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 @@ -28,7 +26,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.196_227d99d" +CT_VERSION="1.25.0.232_c175b21" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -276,6 +274,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_4 is not set # CT_LINUX_V_6_3 is not set # CT_LINUX_V_6_2 is not set # CT_LINUX_V_6_1 is not set @@ -460,6 +459,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_38 is not set # CT_GLIBC_V_2_37 is not set # CT_GLIBC_V_2_36 is not set # CT_GLIBC_V_2_35 is not set @@ -483,6 +483,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_38_or_older=y +CT_GLIBC_older_than_2_38=y CT_GLIBC_2_37_or_older=y CT_GLIBC_older_than_2_37=y CT_GLIBC_2_36_or_older=y @@ -605,7 +607,7 @@ CT_GCC_V_13=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="13.1.0" +CT_GCC_VERSION="13.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}" @@ -849,7 +851,7 @@ 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_MIRRORS="https://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" @@ -870,11 +872,12 @@ CT_MPFR_PATCH_GLOBAL=y # 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_2=y +# CT_MPFR_V_4_1 is not set # 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_VERSION="4.2.1" +CT_MPFR_MIRRORS="https://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" diff --git a/images/base-linuxarm64/gen-implib.sh b/images/base-linuxarm64/gen-implib.sh index 71d6d4609..1e6bc8e18 100755 --- a/images/base-linuxarm64/gen-implib.sh +++ b/images/base-linuxarm64/gen-implib.sh @@ -13,5 +13,5 @@ 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}gcc $CFLAGS $STAGE_CFLAGS -Wa,--noexecstack -DIMPLIB_HIDDEN_SHIMS -c *.tramp.S *.init.c ${FFBUILD_CROSS_PREFIX}ar -rcs "$OUT" *.tramp.o *.init.o diff --git a/images/base-win32/ct-ng-config b/images/base-win32/ct-ng-config index 96759e1f0..2b6fd5bb9 100644 --- a/images/base-win32/ct-ng-config +++ b/images/base-win32/ct-ng-config @@ -1,21 +1,19 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.196_227d99d Configuration +# crosstool-NG 1.25.0.232_c175b21 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_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_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 @@ -28,7 +26,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.196_227d99d" +CT_VERSION="1.25.0.232_c175b21" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -451,7 +449,7 @@ CT_GCC_V_13=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="13.1.0" +CT_GCC_VERSION="13.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}" @@ -667,10 +665,8 @@ CT_MPC_PATCH_GLOBAL=y # 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_MIRRORS="https://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" @@ -691,11 +687,9 @@ CT_MPFR_PATCH_GLOBAL=y # 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_V_4_2=y +CT_MPFR_VERSION="4.2.1" +CT_MPFR_MIRRORS="https://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" diff --git a/images/base-win64/ct-ng-config b/images/base-win64/ct-ng-config index 340cccdd3..d388a1d54 100644 --- a/images/base-win64/ct-ng-config +++ b/images/base-win64/ct-ng-config @@ -1,21 +1,19 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.196_227d99d Configuration +# crosstool-NG 1.25.0.232_c175b21 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_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_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 @@ -28,7 +26,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.196_227d99d" +CT_VERSION="1.25.0.232_c175b21" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -451,7 +449,7 @@ CT_GCC_V_13=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="13.1.0" +CT_GCC_VERSION="13.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}" @@ -667,10 +665,8 @@ CT_MPC_PATCH_GLOBAL=y # 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_MIRRORS="https://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" @@ -691,11 +687,9 @@ CT_MPFR_PATCH_GLOBAL=y # 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_V_4_2=y +CT_MPFR_VERSION="4.2.1" +CT_MPFR_MIRRORS="https://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" diff --git a/makeimage.sh b/makeimage.sh index 2e63a436e..2b73e37bf 100755 --- a/makeimage.sh +++ b/makeimage.sh @@ -63,5 +63,7 @@ docker buildx --builder ffbuilder build \ --cache-to=type=local,mode=max,dest=.cache/"${IMAGE/:/_}" \ --load --tag "$IMAGE" . -docker container stop ffbuildreg -docker buildx rm -f ffbuilder +if [[ -z "$NOCLEAN" ]]; then + docker container stop ffbuildreg + docker buildx rm -f ffbuilder +fi diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index f720c0cbd..24b2be995 100755 --- a/scripts.d/10-mingw.sh +++ b/scripts.d/10-mingw.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.code.sf.net/p/mingw-w64/mingw-w64.git" -SCRIPT_COMMIT="e89de847dd3e05bb8e46344378ce3e124f4e7d1c" +SCRIPT_COMMIT="833753684d3a520ebcd3cd73e614c97bbb55ffb8" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh index 6303f14d7..583d75b89 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="6e2b31f6d66739c5abd850338ea68c6bd2012812" +SCRIPT_COMMIT="317dfadc6c68b3465205873b140200e5b0d0256f" ffbuild_enabled() { return 0 diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh index b5799f407..21403fcb7 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="9d80a2b134e7d681940e8e29f20922a0acf22e46" +SCRIPT_REPO="https://github.com/GNOME/libxml2.git" +SCRIPT_COMMIT="d7cfe356500906fad0f3b3d186e1abbd5489a23c" ffbuild_enabled() { return 0 diff --git a/scripts.d/20-zlib.sh b/scripts.d/20-zlib.sh index e52f0f43b..e1678a70c 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="d98251478246c8ef2f405d76e4ef1678c14d7eda" +SCRIPT_COMMIT="79a0e447a0dfa32979420cb21cfb96d684b2c9d5" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh index 45b60192c..552bc2cb5 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="a20de84e1608f9eb1d0391d7322b2e0e0f235aba" +SCRIPT_COMMIT="c4073d82517eff48458e166a6edfb0618b221a4d" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh index 0c39466cd..1e78b8068 100755 --- a/scripts.d/25-gmp.sh +++ b/scripts.d/25-gmp.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/BtbN/gmplib.git" -SCRIPT_COMMIT="d8c52e7b0ee334ab52406972d26b06cca1a78d46" +SCRIPT_COMMIT="3fe7fa49330acf6c23010575eaada2cd1197c586" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh index 1ac768241..6c7677d6c 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-3.0.10" +SCRIPT_COMMIT="openssl-3.0.11" SCRIPT_TAGFILTER="openssl-3.0.*" ffbuild_enabled() { @@ -20,6 +20,11 @@ ffbuild_dockerbuild() { threads zlib no-shared + no-tests + no-apps + no-legacy + no-ssl2 + no-ssl3 enable-camellia enable-ec enable-srp @@ -61,6 +66,9 @@ ffbuild_dockerbuild() { export AR="${AR/${FFBUILD_CROSS_PREFIX}/}" export RANLIB="${RANLIB/${FFBUILD_CROSS_PREFIX}/}" + # Actually allow Configure to disable apps + sed -i '/^my @disablables =/ s/$/"apps",/' Configure + ./Configure "${myconf[@]}" sed -i -e "/^CFLAGS=/s|=.*|=${CFLAGS}|" -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" Makefile diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh index e6d01bc25..c66760611 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="16068f6c30b888cdb873f6285af941d00f95741d" +SCRIPT_COMMIT="74c3449d8b816a724b12ebce7417e00fb597309a" ffbuild_enabled() { return 0 diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh index 80343ceea..9693b52d9 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="5d954398d1ebe04778a945d5c1546d9dbfb8e031" +SCRIPT_COMMIT="16eff2de2350144a08cdb8bec06fd4b0fe3f586b" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index d62d8f6a6..134a87d74 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="c7f2d440f463be31ae24cbae7ceb6ea72a15e990" +SCRIPT_COMMIT="d698133743caffe9611b57137cd5027ce076613f" ffbuild_enabled() { return 0 @@ -32,3 +32,11 @@ ffbuild_dockerbuild() { make -j$(nproc) make install } + +ffbuild_configure() { + [[ $ADDINS_STR == *4.4* ]] && return 0 + [[ $ADDINS_STR == *5.0* ]] && return 0 + [[ $ADDINS_STR == *5.1* ]] && return 0 + [[ $ADDINS_STR == *6.0* ]] && return 0 + echo --enable-libharfbuzz +} diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh index dfbda1663..5994cc2e8 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="e049b16b5f157e2f28e7b5c301e71e1ccb3fe288" +SCRIPT_COMMIT="10aaadf55d582934661ca9d66956696cf1d836dc" SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git" SCRIPT_COMMIT2="229410f86a8c8c9e0f86f195409e5481a2bae067" diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh index 0278b2d8e..a4c1a6367 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="421cf15486eea1b52f10e2b0be305018fee8c285" +SCRIPT_COMMIT="13ef02da1bc55b8a36ff35ca5f9d15cf7495932a" ffbuild_enabled() { [[ $TARGET == linux* ]] || return 1 diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index b092ff2ff..8b7f101f1 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="4c08f00bde5b2fa70e4b4f88c23c3aac2043e4f0" +SCRIPT_COMMIT="265263ffd51b4c7d3c585a2a9dd7d541b2ddfece" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh index 3832bfefa..3c87207c3 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="aec9d7266777e0b9243ef0f112fe0e07256bd446" +SCRIPT_COMMIT="f4fc44202b554e68093828b556f8c7fd9644ddb0" 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 975807b5f..b9b903e46 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="cc4b93c9cd93bad15b7106747b0213e4b9c53a1c" +SCRIPT_COMMIT="02a7bbed391859c79864b9aacf040d84f103d38a" 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 914f4bfad..761a29fd7 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="70f44d76fd8fad96f33ba5c80a394d68b77dda03" +SCRIPT_COMMIT="3962080b7846d79fd3cf10b16eddacf68eb321b7" 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 4f5566fe6..165ac417a 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="07efd80468f6b595e6432edd28b8560ca7695ba0" +SCRIPT_COMMIT="01e754610df2195536c5b31c1e8df756480599d1" 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 15c439fe7..31781d96b 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="179d7278d7485ceea2d440807be9d677d32aedc4" +SCRIPT_COMMIT="e9937526de57c22ef1184739df1eab2b51d58fa3" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index 31ee786d4..ec3ef8138 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="5a4ea09dc1f1767d9b5923f7a8f582d8820bbfa5" +SCRIPT_COMMIT="a77362f01379a730854f0b24857e798119e8e698" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index 82deec4db..3589bd189 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="e58afe4dd9057591882a01c31382c203e8a61c92" +SCRIPT_COMMIT="769bd1457a9567da5e50b8c670e49234b5bea8c0" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh index 7cf67b35c..98cc68111 100755 --- a/scripts.d/50-ffnvcodec.sh +++ b/scripts.d/50-ffnvcodec.sh @@ -1,11 +1,11 @@ #!/bin/bash SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git" -SCRIPT_COMMIT="9402b5a7693e9841f8a4f4488cd2df21ac55c685" +SCRIPT_COMMIT="451da99614412a7f9526ef301a5ee0c7a6f9ad76" SCRIPT_BRANCH="sdk/12.0" SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git" -SCRIPT_COMMIT2="dc3e4484dc83485734e503991fe5ed3bdf256fba" +SCRIPT_COMMIT2="43d91706e097565f57b311e567f0219838bcc2f6" SCRIPT_BRANCH2="sdk/11.1" ffbuild_enabled() { diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh index 6acad8d89..90a038b9e 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="91422bdb9497e8484b3248f5ae7eb50d41e2555d" +SCRIPT_COMMIT="5c15c883a4783641f7e71a6a1f440209965eb64f" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh index f89ece09c..852fb59d4 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="0f2157cc5e7f6a28bf648738c208ca825917589a" +SCRIPT_COMMIT="53947c15f57774f34f31c0dc485e5a7f5fd9794c" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index 6bd2019e4..dfec8c30f 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="5d20fbe1cfcdb54bcc7880fc8a59bb9047d8c60f" +SCRIPT_COMMIT="f19ccc68fcab2045f6301ffd0d50e7878738963c" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh index e69f098fc..9d659e029 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="9fc8fc4cf432640f284113ba502ee027268b0d9f" +SCRIPT_COMMIT="101a71e03bbf860aaafb7090a0e440675cb27660" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh index ccdf41305..6ca63b2b5 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="cda5bf5800be9f14ab3f2185fc47efb81ae09241" +SCRIPT_COMMIT="32dcfa18c2cb6341674c5cd0610a4e173bb2a526" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh index 0ede185b6..739cc4d83 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="a71e2f8f3747a1224e30d94a902dfcdb668b3f60" +SCRIPT_COMMIT="6cf5f0e340370ecdc80e300a2622f47fe04c5682" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index 1116f3988..5df5d5f62 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="e7bfd8b6c230a6824e7fd1efa2378a7322986128" +SCRIPT_COMMIT="fd2052d4c91ca9451563482817bbeab1da3f76e7" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index e0fc1dff3..4c5318f34 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="aac5c5d0df942ad12e4f026eed4603a2ffdebe3c" +SCRIPT_COMMIT="05c469843ce3947a63f5ac7ac2c3baa5df2c167d" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh index 7a14ca732..658ebc62b 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="bb6a2103c7adf3c1339728915d7f1497ee98dcbf" +SCRIPT_COMMIT="88a4334f8180c488ee7a14b301a9742cc751d908" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh index 3a5cbcb4c..cd3d65414 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="dbf48d099a78d2075e224549a28e690d56a6d503" +SCRIPT_COMMIT="3df98b4f22773ec1d6d3230d88f14b430cdcf91e" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-zix.sh b/scripts.d/50-lilv/96-zix.sh index 534e22401..3e1ca374c 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="a5c18d52a5351430d370084f25aaf7d166f7afd5" +SCRIPT_COMMIT="3d880e00f3a0d7129b642002c3fb51ddbb56ac96" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh index cce7ddaec..41317f2c3 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="46f4bcbe04330645a11d00e56a7754cc1386bc45" +SCRIPT_COMMIT="4aae0ffa8b38106202fe96962981562a14a26fc1" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh index d32e20000..2a7c3867c 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="b97b447d77fbf172260b4b40f184959f59c3623e" +SCRIPT_COMMIT="1d48d40ac4948b1864ca09e9d0a26fdd71bbee8d" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh index d026da626..18670fb75 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="54b32c1949d60225602a7161d5d6c4853230307a" +SCRIPT_COMMIT="fb0a4d0bf17af25f5a90f643695b016651867952" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh index 762cfb24b..5807ebc19 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="188a637c70019108d980f72b8521673b5648d19e" +SCRIPT_COMMIT="01597b42054fef632ac856ae8e2defa41dfc0307" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh index 39186fd88..d62b2add1 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="19586" +SCRIPT_REV="19733" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index b0289c0f1..0e1702587 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="0b9d8e679a26ee98bb055efd244c703b7dda8727" +SCRIPT_COMMIT="95a6f986a06b9ba2b5b09a04d03eccdd7f55d7db" SCRIPT_BRANCH="SDL2" ffbuild_enabled() { diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index 8d90543cf..c81c673ea 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="33a620bb3eb56ebcb14755b62ffb92466563aae5" +SCRIPT_COMMIT="f477af533562505abf5295f059cf2156b17be740" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index 1cf1949e7..ba80c22e6 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="903ff3add82744d586295c37ec1241dc51dab16e" +SCRIPT_COMMIT="a6f0981c2b82aea05205b96bfebb1e6cd53790de" 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 ce1f32104..cb7df88b5 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="3bc3cca230c5a064b2f554f26fdec27db0f5ead8" +SCRIPT_COMMIT="6abc164052e4902f67213baa279d743cf46227d4" 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 ff30ab0c9..2ab7d284e 100755 --- a/scripts.d/50-vaapi/50-libva.sh +++ b/scripts.d/50-vaapi/50-libva.sh @@ -1,10 +1,13 @@ #!/bin/bash SCRIPT_REPO="https://github.com/intel/libva.git" -SCRIPT_COMMIT="7d6c7d482b9d2330b1f3a8bac13a6a3205f33382" +SCRIPT_COMMIT="8575b2bbc6d5cbf31690e682f4fa268d742fcb62" ffbuild_enabled() { - [[ $TARGET != linux* ]] && return -1 + [[ $ADDINS_STR == *4.4* && $TARGET == win* ]] && return -1 + [[ $ADDINS_STR == *5.0* && $TARGET == win* ]] && return -1 + [[ $ADDINS_STR == *5.1* && $TARGET == win* ]] && return -1 + [[ $ADDINS_STR == *6.0* && $TARGET == win* ]] && return -1 [[ $TARGET == linuxarm64 ]] && return -1 return 0 } @@ -12,25 +15,39 @@ ffbuild_enabled() { ffbuild_dockerbuild() { cd "$FFBUILD_DLDIR/$SELF" - autoreconf -i + # This works around an issue of our libxcb-dri3 implib-wrapper not exporting data symbols. + # Under normal circumstances, this would break horribly. + # But we only want to generate another import lib for libva, so it doesn't matter. + echo "#include " >> va/x11/va_dri3.c + echo "xcb_extension_t xcb_dri3_id;" >> va/x11/va_dri3.c + + # Allow to actually toggle static linking + sed -i "s/shared_library/library/g" va/meson.build + + mkdir mybuild && cd mybuild local myconf=( --prefix="$FFBUILD_PREFIX" - --enable-shared - --disable-static - --with-pic - --disable-docs - --enable-drm - --enable-x11 - --disable-glx - --disable-wayland + --buildtype=release + -Denable_docs=false ) if [[ $TARGET == linux64 ]]; then myconf+=( - --host="$FFBUILD_TOOLCHAIN" - --with-drivers-path="/usr/lib/x86_64-linux-gnu/dri" + --cross-file=/cross.meson + --default-library=shared --sysconfdir="/etc" + -Ddriverdir="/usr/lib/x86_64-linux-gnu/dri" + -Ddisable_drm=false + -Dwith_x11=yes + -Dwith_glx=no + -Dwith_wayland=no + ) + elif [[ $TARGET == win* ]]; then + myconf+=( + --cross-file=/cross.meson + --default-library=static + -Dwith_win32=yes ) else echo "Unknown target" @@ -40,16 +57,18 @@ ffbuild_dockerbuild() { export CFLAGS="$RAW_CFLAGS" export LDFLAFS="$RAW_LDFLAGS" - ./configure "${myconf[@]}" - make -j$(nproc) - make install + meson "${myconf[@]}" .. + ninja -j"$(nproc)" + ninja install - gen-implib "$FFBUILD_PREFIX"/lib/{libva.so.2,libva.a} - gen-implib "$FFBUILD_PREFIX"/lib/{libva-drm.so.2,libva-drm.a} - gen-implib "$FFBUILD_PREFIX"/lib/{libva-x11.so.2,libva-x11.a} - rm "$FFBUILD_PREFIX"/lib/libva{,-drm,-x11}{.so*,.la} + if [[ $TARGET == linux* ]]; then + gen-implib "$FFBUILD_PREFIX"/lib/{libva.so.2,libva.a} + gen-implib "$FFBUILD_PREFIX"/lib/{libva-drm.so.2,libva-drm.a} + gen-implib "$FFBUILD_PREFIX"/lib/{libva-x11.so.2,libva-x11.a} + rm "$FFBUILD_PREFIX"/lib/libva{,-drm,-x11}.so* - echo "Libs: -ldl" >> "$FFBUILD_PREFIX"/lib/pkgconfig/libva.pc + echo "Libs: -ldl" >> "$FFBUILD_PREFIX"/lib/pkgconfig/libva.pc + fi } ffbuild_configure() { diff --git a/scripts.d/50-vaapi/99-finalize.sh b/scripts.d/50-vaapi/99-finalize.sh index ee8a518a8..54c7a931f 100755 --- a/scripts.d/50-vaapi/99-finalize.sh +++ b/scripts.d/50-vaapi/99-finalize.sh @@ -3,7 +3,6 @@ SCRIPT_SKIP="1" ffbuild_enabled() { - [[ $TARGET != linux* ]] && return -1 return 0 } @@ -12,6 +11,8 @@ ffbuild_dockerdl() { } ffbuild_dockerbuild() { - rm "$FFBUILD_PREFIX"/lib/lib*.so* || true - rm "$FFBUILD_PREFIX"/lib/*.la || true + if [[ $TARGET == linux* ]]; then + rm "$FFBUILD_PREFIX"/lib/lib*.so* || true + rm "$FFBUILD_PREFIX"/lib/*.la || true + fi } diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh index ebf53d79b..e135e2243 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.261" +SCRIPT_COMMIT="v1.3.264" 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 5b80c1485..54beaf6a9 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="633dc301350952a9a895c8db42eed371ea969a64" +SCRIPT_COMMIT="5e963d62fa3f2f0ff891c9f9ca150097127c3aad" 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 4110575c0..d3618b7ed 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="b2a5365d917e5974a4ac17275bce9bcefc41e21a" +SCRIPT_COMMIT="d1057ef5ed46968800771faa64a6d4a1fb049eab" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh index 14bc515a8..8b1fab548 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="8f18e3ad32684eee95e885e718655f93951128c3" +SCRIPT_COMMIT="8ee01d45b05cdbc9da89b884815257807a514bc8" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1