diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a803e4bd9c..d1bf20743c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,11 @@ jobs: name: Build base image if: ${{ github.event.inputs.buildOnly != 'true' }} needs: pre_check - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + runner: [ubuntu-latest,ubuntu-24.04-arm] + runs-on: ${{ matrix.runner }} steps: - name: Free Disk-Space run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc && df -h @@ -73,14 +77,16 @@ jobs: pull: true push: true provenance: false - 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 + tags: ${{ steps.imagename.outputs.name }}:latest${{ (contains(matrix.runner, 'arm') && '-arm') || '' }} + cache-to: type=registry,mode=max,ref=${{ steps.imagename.outputs.name }}:cache${{ (contains(matrix.runner, 'arm') && '-arm') || '' }} + cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache${{ (contains(matrix.runner, 'arm') && '-arm') || '' }} - name: Get download cache key + if: ${{ !cancelled() && !contains(matrix.runner, 'arm') }} id: dl_cache run: | echo "dltagname=$(./util/get_dl_cache_tag.sh)" >> $GITHUB_OUTPUT - name: Cache + if: ${{ !cancelled() && !contains(matrix.runner, 'arm') }} uses: actions/cache@v4 with: path: .cache/downloads @@ -88,6 +94,7 @@ jobs: restore-keys: | download-cache- - name: Update Cache + if: ${{ !cancelled() && !contains(matrix.runner, 'arm') }} run: | set -e ./download.sh @@ -165,8 +172,8 @@ jobs: strategy: fail-fast: false matrix: - target: [win64,linux64,linuxarm64] - variant: [gpl,lgpl,gpl 5.1,gpl 6.1,gpl 7.1,lgpl 5.1,lgpl 6.1,lgpl 7.1,gpl-shared,lgpl-shared,gpl-shared 5.1,gpl-shared 6.1,gpl-shared 7.1,lgpl-shared 5.1,lgpl-shared 6.1,lgpl-shared 7.1] + target: [win64,winarm64,linux64,linuxarm64] + variant: [gpl,lgpl,gpl 6.1,gpl 7.1,lgpl 6.1,lgpl 7.1,gpl-shared,lgpl-shared,gpl-shared 6.1,gpl-shared 7.1,lgpl-shared 6.1,lgpl-shared 7.1] steps: - name: Free Disk-Space run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc && df -h @@ -230,8 +237,8 @@ jobs: strategy: fail-fast: false matrix: - target: [win64,linux64,linuxarm64] - variant: [gpl,lgpl,gpl 5.1,gpl 6.1,gpl 7.1,lgpl 5.1,lgpl 6.1,lgpl 7.1,gpl-shared,lgpl-shared,gpl-shared 5.1,gpl-shared 6.1,gpl-shared 7.1,lgpl-shared 5.1,lgpl-shared 6.1,lgpl-shared 7.1] + target: [win64,winarm64,linux64,linuxarm64] + variant: [gpl,lgpl,gpl 6.1,gpl 7.1,lgpl 6.1,lgpl 7.1,gpl-shared,lgpl-shared,gpl-shared 6.1,gpl-shared 7.1,lgpl-shared 6.1,lgpl-shared 7.1] steps: - name: Free Disk-Space run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc && df -h diff --git a/images/base-linux64/ct-ng-config b/images/base-linux64/ct-ng-config index 3a627153b6..dab231fb1b 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.26.0.120_4d36f27 Configuration +# crosstool-NG 1.27.0.18_7458341 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y @@ -29,7 +29,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.26.0.120_4d36f27" +CT_VERSION="1.27.0.18_7458341" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -141,6 +141,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_AVR is not set # CT_ARCH_BPF is not set # CT_ARCH_C6X is not set +# CT_ARCH_LM32 is not set # CT_ARCH_LOONGARCH is not set # CT_ARCH_M68K is not set # CT_ARCH_MICROBLAZE is not set @@ -148,6 +149,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_MOXIE is not set # CT_ARCH_MSP430 is not set # CT_ARCH_NIOS2 is not set +# CT_ARCH_OPENRISC is not set # CT_ARCH_PARISC is not set # CT_ARCH_POWERPC is not set # CT_ARCH_PRU is not set @@ -155,6 +157,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_S390 is not set # CT_ARCH_SH is not set # CT_ARCH_SPARC is not set +# CT_ARCH_TRICORE is not set CT_ARCH_X86=y # CT_ARCH_XTENSA is not set CT_ARCH="x86" @@ -167,7 +170,7 @@ CT_ARCH_X86_SHOW=y # Options for x86 # CT_ARCH_X86_PKG_KSYM="" -CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 PARISC POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" +CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LM32 LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 OPENRISC PARISC POWERPC PRU RISCV S390 SH SPARC TRICORE X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -268,6 +271,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_6_13 is not set +# CT_LINUX_V_6_12 is not set +# CT_LINUX_V_6_11 is not set # CT_LINUX_V_6_10 is not set # CT_LINUX_V_6_9 is not set # CT_LINUX_V_6_8 is not set @@ -408,6 +414,8 @@ 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_41=y +CT_BINUTILS_2_41_or_later=y CT_BINUTILS_later_than_2_39=y CT_BINUTILS_2_39_or_later=y CT_BINUTILS_later_than_2_30=y @@ -464,6 +472,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_41 is not set # CT_GLIBC_V_2_40 is not set # CT_GLIBC_V_2_39 is not set # CT_GLIBC_V_2_38 is not set @@ -490,6 +499,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_41_or_older=y +CT_GLIBC_older_than_2_41=y CT_GLIBC_2_38_or_older=y CT_GLIBC_older_than_2_38=y CT_GLIBC_2_37_or_older=y @@ -667,6 +678,8 @@ CT_CC_GCC_LTO_ZSTD=m # CT_CC_GCC_ENABLE_DEFAULT_PIE=y # CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set +CT_CC_GCC_LIBSTDCXX=m +# CT_CC_GCC_LIBSTDCXX_HOSTED_DISABLE is not set # CT_CC_GCC_LIBMUDFLAP is not set CT_CC_GCC_LIBGOMP=y CT_CC_GCC_LIBSSP=m @@ -751,16 +764,19 @@ CT_GETTEXT_PATCH_GLOBAL=y # CT_GETTEXT_PATCH_LOCAL_BUNDLED is not set # CT_GETTEXT_PATCH_NONE is not set CT_GETTEXT_PATCH_ORDER="global" -CT_GETTEXT_V_0_22_5=y +CT_GETTEXT_V_0_23_1=y +# CT_GETTEXT_V_0_22_5 is not set # CT_GETTEXT_V_0_21 is not set # CT_GETTEXT_V_0_20_1 is not set # CT_GETTEXT_V_0_19_8_1 is not set -CT_GETTEXT_VERSION="0.22.5" +CT_GETTEXT_VERSION="0.23.1" 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_later_than_0_23=y +CT_GETTEXT_0_23_or_later=y CT_GETTEXT_later_than_0_21=y CT_GETTEXT_0_21_or_later=y CT_GETTEXT_INCOMPATIBLE_WITH_UCLIBC_NG=y @@ -790,9 +806,10 @@ CT_GMP_PATCH_GLOBAL=y # 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_3=y +# CT_GMP_V_6_2 is not set # CT_GMP_V_6_1 is not set -CT_GMP_VERSION="6.2.1" +CT_GMP_VERSION="6.3.0" 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}" @@ -824,6 +841,7 @@ CT_ISL_V_0_26=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.26" CT_ISL_MIRRORS="https://libisl.sourceforge.io" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" @@ -849,9 +867,10 @@ CT_LIBICONV_PATCH_GLOBAL=y # 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_18=y +# CT_LIBICONV_V_1_16 is not set # CT_LIBICONV_V_1_15 is not set -CT_LIBICONV_VERSION="1.16" +CT_LIBICONV_VERSION="1.18" CT_LIBICONV_MIRRORS="$(CT_Mirrors GNU libiconv)" CT_LIBICONV_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_LIBICONV_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -872,15 +891,12 @@ CT_MPC_PATCH_GLOBAL=y # CT_MPC_PATCH_NONE is not set CT_MPC_PATCH_ORDER="global" CT_MPC_V_1_3=y -# CT_MPC_V_1_2 is not set CT_MPC_VERSION="1.3.1" 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" 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" @@ -902,8 +918,6 @@ 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" @@ -918,11 +932,12 @@ CT_NCURSES_PATCH_GLOBAL=y # CT_NCURSES_PATCH_LOCAL_BUNDLED is not set # CT_NCURSES_PATCH_NONE is not set CT_NCURSES_PATCH_ORDER="global" -CT_NCURSES_V_6_4=y +CT_NCURSES_V_6_5=y +# CT_NCURSES_V_6_4 is not set # CT_NCURSES_V_6_2 is not set # CT_NCURSES_V_6_1 is not set # CT_NCURSES_V_6_0 is not set -CT_NCURSES_VERSION="6.4" +CT_NCURSES_VERSION="6.5" 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}" @@ -949,9 +964,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_3=y +CT_ZLIB_V_1_3_1=y # CT_ZLIB_V_1_2_13 is not set -CT_ZLIB_VERSION="1.3" +CT_ZLIB_VERSION="1.3.1" 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}" @@ -1026,7 +1041,6 @@ CT_MAKE_PATCH_GLOBAL=y # CT_MAKE_PATCH_NONE is not set CT_MAKE_PATCH_ORDER="global" CT_MAKE_V_4_3=y -# CT_MAKE_V_4_2 is not set CT_MAKE_VERSION="4.3" CT_MAKE_MIRRORS="$(CT_Mirrors GNU make)" CT_MAKE_ARCHIVE_FILENAME="@{pkg_name}-@{version}" diff --git a/images/base-linuxarm64/Dockerfile b/images/base-linuxarm64/Dockerfile index fe3c219da8..385c18dac7 100644 --- a/images/base-linuxarm64/Dockerfile +++ b/images/base-linuxarm64/Dockerfile @@ -47,7 +47,7 @@ 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=${FFBUILD_TOOLCHAIN}- --arch=aarch64 --target-os=linux" \ + FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=${FFBUILD_TOOLCHAIN}- --arch=aarch64 --cpu=armv8-a --target-os=linux" \ FFBUILD_CROSS_PREFIX="${FFBUILD_TOOLCHAIN}-" \ FFBUILD_PREFIX=/opt/ffbuild \ FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \ @@ -59,8 +59,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 -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" \ + CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -march=armv8-a -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection -pthread" \ + CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -march=armv8-a -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection -pthread" \ + LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -march=armv8-a -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/ct-ng-config b/images/base-linuxarm64/ct-ng-config index 57871f6238..6765e802e3 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.26.0.120_4d36f27 Configuration +# crosstool-NG 1.27.0.18_7458341 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y @@ -29,7 +29,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.26.0.120_4d36f27" +CT_VERSION="1.27.0.18_7458341" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -141,6 +141,7 @@ CT_ARCH_ARM=y # CT_ARCH_AVR is not set # CT_ARCH_BPF is not set # CT_ARCH_C6X is not set +# CT_ARCH_LM32 is not set # CT_ARCH_LOONGARCH is not set # CT_ARCH_M68K is not set # CT_ARCH_MICROBLAZE is not set @@ -148,6 +149,7 @@ CT_ARCH_ARM=y # CT_ARCH_MOXIE is not set # CT_ARCH_MSP430 is not set # CT_ARCH_NIOS2 is not set +# CT_ARCH_OPENRISC is not set # CT_ARCH_PARISC is not set # CT_ARCH_POWERPC is not set # CT_ARCH_PRU is not set @@ -155,6 +157,7 @@ CT_ARCH_ARM=y # CT_ARCH_S390 is not set # CT_ARCH_SH is not set # CT_ARCH_SPARC is not set +# CT_ARCH_TRICORE is not set # CT_ARCH_X86 is not set # CT_ARCH_XTENSA is not set CT_ARCH="arm" @@ -167,7 +170,7 @@ CT_ARCH_ARM_SHOW=y # Options for arm # CT_ARCH_ARM_PKG_KSYM="" -CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 PARISC POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" +CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LM32 LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 OPENRISC PARISC POWERPC PRU RISCV S390 SH SPARC TRICORE X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -275,6 +278,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_6_13 is not set +# CT_LINUX_V_6_12 is not set +# CT_LINUX_V_6_11 is not set # CT_LINUX_V_6_10 is not set # CT_LINUX_V_6_9 is not set # CT_LINUX_V_6_8 is not set @@ -414,6 +420,8 @@ 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_41=y +CT_BINUTILS_2_41_or_later=y CT_BINUTILS_later_than_2_39=y CT_BINUTILS_2_39_or_later=y CT_BINUTILS_later_than_2_30=y @@ -470,6 +478,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_41 is not set # CT_GLIBC_V_2_40 is not set # CT_GLIBC_V_2_39 is not set # CT_GLIBC_V_2_38 is not set @@ -496,6 +505,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_41_or_older=y +CT_GLIBC_older_than_2_41=y CT_GLIBC_2_38_or_older=y CT_GLIBC_older_than_2_38=y CT_GLIBC_2_37_or_older=y @@ -672,6 +683,8 @@ CT_CC_GCC_LTO_ZSTD=m # CT_CC_GCC_ENABLE_DEFAULT_PIE=y # CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set +CT_CC_GCC_LIBSTDCXX=m +# CT_CC_GCC_LIBSTDCXX_HOSTED_DISABLE is not set # CT_CC_GCC_LIBMUDFLAP is not set CT_CC_GCC_LIBGOMP=y CT_CC_GCC_LIBSSP=m @@ -755,16 +768,19 @@ CT_GETTEXT_PATCH_GLOBAL=y # CT_GETTEXT_PATCH_LOCAL_BUNDLED is not set # CT_GETTEXT_PATCH_NONE is not set CT_GETTEXT_PATCH_ORDER="global" -CT_GETTEXT_V_0_22_5=y +CT_GETTEXT_V_0_23_1=y +# CT_GETTEXT_V_0_22_5 is not set # CT_GETTEXT_V_0_21 is not set # CT_GETTEXT_V_0_20_1 is not set # CT_GETTEXT_V_0_19_8_1 is not set -CT_GETTEXT_VERSION="0.22.5" +CT_GETTEXT_VERSION="0.23.1" 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_later_than_0_23=y +CT_GETTEXT_0_23_or_later=y CT_GETTEXT_later_than_0_21=y CT_GETTEXT_0_21_or_later=y CT_GETTEXT_INCOMPATIBLE_WITH_UCLIBC_NG=y @@ -794,9 +810,10 @@ CT_GMP_PATCH_GLOBAL=y # 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_3=y +# CT_GMP_V_6_2 is not set # CT_GMP_V_6_1 is not set -CT_GMP_VERSION="6.2.1" +CT_GMP_VERSION="6.3.0" 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}" @@ -828,6 +845,7 @@ CT_ISL_V_0_26=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.26" CT_ISL_MIRRORS="https://libisl.sourceforge.io" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" @@ -853,9 +871,10 @@ CT_LIBICONV_PATCH_GLOBAL=y # 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_18=y +# CT_LIBICONV_V_1_16 is not set # CT_LIBICONV_V_1_15 is not set -CT_LIBICONV_VERSION="1.16" +CT_LIBICONV_VERSION="1.18" CT_LIBICONV_MIRRORS="$(CT_Mirrors GNU libiconv)" CT_LIBICONV_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_LIBICONV_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -876,15 +895,12 @@ CT_MPC_PATCH_GLOBAL=y # CT_MPC_PATCH_NONE is not set CT_MPC_PATCH_ORDER="global" CT_MPC_V_1_3=y -# CT_MPC_V_1_2 is not set CT_MPC_VERSION="1.3.1" 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" 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" @@ -906,8 +922,6 @@ 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" @@ -922,11 +936,12 @@ CT_NCURSES_PATCH_GLOBAL=y # CT_NCURSES_PATCH_LOCAL_BUNDLED is not set # CT_NCURSES_PATCH_NONE is not set CT_NCURSES_PATCH_ORDER="global" -CT_NCURSES_V_6_4=y +CT_NCURSES_V_6_5=y +# CT_NCURSES_V_6_4 is not set # CT_NCURSES_V_6_2 is not set # CT_NCURSES_V_6_1 is not set # CT_NCURSES_V_6_0 is not set -CT_NCURSES_VERSION="6.4" +CT_NCURSES_VERSION="6.5" 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}" @@ -953,9 +968,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_3=y +CT_ZLIB_V_1_3_1=y # CT_ZLIB_V_1_2_13 is not set -CT_ZLIB_VERSION="1.3" +CT_ZLIB_VERSION="1.3.1" 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}" @@ -1030,7 +1045,6 @@ CT_MAKE_PATCH_GLOBAL=y # CT_MAKE_PATCH_NONE is not set CT_MAKE_PATCH_ORDER="global" CT_MAKE_V_4_3=y -# CT_MAKE_V_4_2 is not set CT_MAKE_VERSION="4.3" CT_MAKE_MIRRORS="$(CT_Mirrors GNU make)" CT_MAKE_ARCHIVE_FILENAME="@{pkg_name}-@{version}" diff --git a/images/base-win32/ct-ng-config b/images/base-win32/ct-ng-config index 003d9d6294..386e59c456 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.26.0.120_4d36f27 Configuration +# crosstool-NG 1.27.0.18_7458341 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y @@ -29,7 +29,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.26.0.120_4d36f27" +CT_VERSION="1.27.0.18_7458341" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -141,6 +141,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_AVR is not set # CT_ARCH_BPF is not set # CT_ARCH_C6X is not set +# CT_ARCH_LM32 is not set # CT_ARCH_LOONGARCH is not set # CT_ARCH_M68K is not set # CT_ARCH_MICROBLAZE is not set @@ -148,6 +149,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_MOXIE is not set # CT_ARCH_MSP430 is not set # CT_ARCH_NIOS2 is not set +# CT_ARCH_OPENRISC is not set # CT_ARCH_PARISC is not set # CT_ARCH_POWERPC is not set # CT_ARCH_PRU is not set @@ -155,6 +157,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_S390 is not set # CT_ARCH_SH is not set # CT_ARCH_SPARC is not set +# CT_ARCH_TRICORE is not set CT_ARCH_X86=y # CT_ARCH_XTENSA is not set CT_ARCH="x86" @@ -167,7 +170,7 @@ CT_ARCH_X86_SHOW=y # Options for x86 # CT_ARCH_X86_PKG_KSYM="" -CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 PARISC POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" +CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LM32 LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 OPENRISC PARISC POWERPC PRU RISCV S390 SH SPARC TRICORE X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -321,6 +324,8 @@ 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_41=y +CT_BINUTILS_2_41_or_later=y CT_BINUTILS_later_than_2_39=y CT_BINUTILS_2_39_or_later=y CT_BINUTILS_later_than_2_30=y @@ -507,6 +512,8 @@ CT_CC_GCC_LTO_ZSTD=m # Settings for libraries running on target # # CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set +CT_CC_GCC_LIBSTDCXX=m +# CT_CC_GCC_LIBSTDCXX_HOSTED_DISABLE is not set # CT_CC_GCC_LIBMUDFLAP is not set CT_CC_GCC_LIBGOMP=y CT_CC_GCC_LIBSSP=m @@ -589,16 +596,19 @@ CT_GETTEXT_PATCH_GLOBAL=y # CT_GETTEXT_PATCH_LOCAL_BUNDLED is not set # CT_GETTEXT_PATCH_NONE is not set CT_GETTEXT_PATCH_ORDER="global" -CT_GETTEXT_V_0_22_5=y +CT_GETTEXT_V_0_23_1=y +# CT_GETTEXT_V_0_22_5 is not set # CT_GETTEXT_V_0_21 is not set # CT_GETTEXT_V_0_20_1 is not set # CT_GETTEXT_V_0_19_8_1 is not set -CT_GETTEXT_VERSION="0.22.5" +CT_GETTEXT_VERSION="0.23.1" 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_later_than_0_23=y +CT_GETTEXT_0_23_or_later=y CT_GETTEXT_later_than_0_21=y CT_GETTEXT_0_21_or_later=y CT_GETTEXT_INCOMPATIBLE_WITH_UCLIBC_NG=y @@ -628,9 +638,10 @@ CT_GMP_PATCH_GLOBAL=y # 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_3=y +# CT_GMP_V_6_2 is not set # CT_GMP_V_6_1 is not set -CT_GMP_VERSION="6.2.1" +CT_GMP_VERSION="6.3.0" 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}" @@ -695,8 +706,6 @@ 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" @@ -718,8 +727,6 @@ 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 is not set CT_COMP_LIBS_ZLIB=y CT_COMP_LIBS_ZLIB_PKG_KSYM="ZLIB" @@ -735,9 +742,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_3=y +CT_ZLIB_V_1_3_1=y # CT_ZLIB_V_1_2_13 is not set -CT_ZLIB_VERSION="1.3" +CT_ZLIB_VERSION="1.3.1" 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}" diff --git a/images/base-win64/ct-ng-config b/images/base-win64/ct-ng-config index f92fe4fc3e..5ffe816870 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.26.0.120_4d36f27 Configuration +# crosstool-NG 1.27.0.18_7458341 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y @@ -29,7 +29,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.26.0.120_4d36f27" +CT_VERSION="1.27.0.18_7458341" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -141,6 +141,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_AVR is not set # CT_ARCH_BPF is not set # CT_ARCH_C6X is not set +# CT_ARCH_LM32 is not set # CT_ARCH_LOONGARCH is not set # CT_ARCH_M68K is not set # CT_ARCH_MICROBLAZE is not set @@ -148,6 +149,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_MOXIE is not set # CT_ARCH_MSP430 is not set # CT_ARCH_NIOS2 is not set +# CT_ARCH_OPENRISC is not set # CT_ARCH_PARISC is not set # CT_ARCH_POWERPC is not set # CT_ARCH_PRU is not set @@ -155,6 +157,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_S390 is not set # CT_ARCH_SH is not set # CT_ARCH_SPARC is not set +# CT_ARCH_TRICORE is not set CT_ARCH_X86=y # CT_ARCH_XTENSA is not set CT_ARCH="x86" @@ -167,7 +170,7 @@ CT_ARCH_X86_SHOW=y # Options for x86 # CT_ARCH_X86_PKG_KSYM="" -CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 PARISC POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" +CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LM32 LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 OPENRISC PARISC POWERPC PRU RISCV S390 SH SPARC TRICORE X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -321,6 +324,8 @@ 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_41=y +CT_BINUTILS_2_41_or_later=y CT_BINUTILS_later_than_2_39=y CT_BINUTILS_2_39_or_later=y CT_BINUTILS_later_than_2_30=y @@ -507,6 +512,8 @@ CT_CC_GCC_LTO_ZSTD=m # Settings for libraries running on target # # CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set +CT_CC_GCC_LIBSTDCXX=m +# CT_CC_GCC_LIBSTDCXX_HOSTED_DISABLE is not set # CT_CC_GCC_LIBMUDFLAP is not set CT_CC_GCC_LIBGOMP=y CT_CC_GCC_LIBSSP=m @@ -589,16 +596,19 @@ CT_GETTEXT_PATCH_GLOBAL=y # CT_GETTEXT_PATCH_LOCAL_BUNDLED is not set # CT_GETTEXT_PATCH_NONE is not set CT_GETTEXT_PATCH_ORDER="global" -CT_GETTEXT_V_0_22_5=y +CT_GETTEXT_V_0_23_1=y +# CT_GETTEXT_V_0_22_5 is not set # CT_GETTEXT_V_0_21 is not set # CT_GETTEXT_V_0_20_1 is not set # CT_GETTEXT_V_0_19_8_1 is not set -CT_GETTEXT_VERSION="0.22.5" +CT_GETTEXT_VERSION="0.23.1" 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_later_than_0_23=y +CT_GETTEXT_0_23_or_later=y CT_GETTEXT_later_than_0_21=y CT_GETTEXT_0_21_or_later=y CT_GETTEXT_INCOMPATIBLE_WITH_UCLIBC_NG=y @@ -628,9 +638,10 @@ CT_GMP_PATCH_GLOBAL=y # 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_3=y +# CT_GMP_V_6_2 is not set # CT_GMP_V_6_1 is not set -CT_GMP_VERSION="6.2.1" +CT_GMP_VERSION="6.3.0" 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}" @@ -695,8 +706,6 @@ 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" @@ -718,8 +727,6 @@ 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 is not set CT_COMP_LIBS_ZLIB=y CT_COMP_LIBS_ZLIB_PKG_KSYM="ZLIB" @@ -735,9 +742,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_3=y +CT_ZLIB_V_1_3_1=y # CT_ZLIB_V_1_2_13 is not set -CT_ZLIB_VERSION="1.3" +CT_ZLIB_VERSION="1.3.1" 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}" diff --git a/images/base-winarm64/Dockerfile b/images/base-winarm64/Dockerfile index df30a50451..60bd856756 100644 --- a/images/base-winarm64/Dockerfile +++ b/images/base-winarm64/Dockerfile @@ -30,7 +30,7 @@ ADD toolchain.cmake /toolchain.cmake ADD cross.meson /cross.meson ENV PATH="/opt/llvm-mingw/bin:${PATH}" \ - FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=${FFBUILD_TOOLCHAIN}- --arch=aarch64 --target-os=mingw32" \ + FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=${FFBUILD_TOOLCHAIN}- --arch=aarch64 --cpu=armv8-a --target-os=mingw32" \ FFBUILD_CROSS_PREFIX=${FFBUILD_TOOLCHAIN}- \ FFBUILD_PREFIX=/opt/ffbuild \ FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \ @@ -44,8 +44,8 @@ ENV PATH="/opt/llvm-mingw/bin:${PATH}" \ RANLIB="${FFBUILD_TOOLCHAIN}-llvm-ranlib" \ NM="${FFBUILD_TOOLCHAIN}-nm" \ DLLTOOL="${FFBUILD_TOOLCHAIN}-dlltool" \ - CFLAGS="-I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \ - CXXFLAGS="-I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \ - LDFLAGS="-L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong" \ + CFLAGS="-I/opt/ffbuild/include -O2 -pipe -march=armv8-a -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \ + CXXFLAGS="-I/opt/ffbuild/include -O2 -pipe -march=armv8-a -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \ + LDFLAGS="-L/opt/ffbuild/lib -O2 -pipe -march=armv8-a -fstack-protector-strong" \ STAGE_CFLAGS="" \ STAGE_CXXFLAGS="" diff --git a/images/base/Dockerfile b/images/base/Dockerfile index ba8a2c6d43..59c7b7e781 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -12,7 +12,7 @@ RUN \ gtk-doc-tools gobject-introspection gawk \ ocaml ocamlbuild libnum-ocaml-dev indent p7zip-full \ python3-setuptools python3-jinja2 python3-jsonschema python3-apt python-is-python3 && \ - curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \ + curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \ apt-get -y install nodejs && \ apt-get -y clean && \ git config --global user.email "builder@localhost" && \ diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index b9163d2c06..b719e4826e 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="63f3f284635f4a1a09828acd2e6f6bea1eacb0e7" +SCRIPT_COMMIT="2a5024409b06a508b0ca85aa1d488f51a44ea3a3" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh index 0c347a62f2..13342deb6b 100755 --- a/scripts.d/20-libiconv.sh +++ b/scripts.d/20-libiconv.sh @@ -1,10 +1,10 @@ #!/bin/bash SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git" -SCRIPT_COMMIT="bc17565f9a4caca27161609c526b776287a8270e" +SCRIPT_COMMIT="d68ea07b28aa3c8d1959358b7da7e7f3ba148319" SCRIPT_REPO2="https://git.savannah.gnu.org/git/gnulib.git" -SCRIPT_COMMIT2="e9c1d94f58eaacee919bb2015da490b980a5eedf" +SCRIPT_COMMIT2="a150644bf4c571dc924852594381115dbffd2e1a" ffbuild_enabled() { return 0 diff --git a/scripts.d/20-zlib.sh b/scripts.d/20-zlib.sh index 0f3dc41d9b..923e13c6e9 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="ef24c4c7502169f016dcd2a26923dbaf3216748c" +SCRIPT_COMMIT="5a82f71ed1dfc0bec044d9702463dbdf84ea3b71" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh index 9c9f7d6f49..8ac5ea0f97 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="187045ea647ba19c55db5f503d11bd811ee6b56e" +SCRIPT_COMMIT="816722732224231e90e634b5839bb7808cddc6cd" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh index 9a33161219..dc2ff37a97 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="38272bf85341348eb0a5162ba4e1c95d370f9bce" +SCRIPT_COMMIT="5d4e649f740c675426fbe4cdaffc53ee2a4cb954" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-fribidi.sh b/scripts.d/25-fribidi.sh index 5ad1cfa97b..da296e87c3 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="cfc71cda065db859d8b4f1e3c6fe5da7ab02469a" +SCRIPT_COMMIT="b28f43bd3e8e31a5967830f721bab218c1aa114c" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh index 1248ff2345..68193950a5 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="b1ba93cec1d8474f3c6909ea2ba2baf5c3a9aa85" +SCRIPT_COMMIT="4d2b2f4360fcf79ca3f8dc3f71fc0f3b630ccf39" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-libxml2.sh b/scripts.d/25-libxml2.sh index 96b88e1048..efc13366f2 100755 --- a/scripts.d/25-libxml2.sh +++ b/scripts.d/25-libxml2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/GNOME/libxml2.git" -SCRIPT_COMMIT="71c37a565d3726440aa96d648db0426deb90157b" +SCRIPT_COMMIT="66fdf94c5518547c12311db1e4dc0485acf2a2f8" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh index 2fdf8a8ad3..2d2247c38a 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.2.3" +SCRIPT_COMMIT="openssl-3.2.4" SCRIPT_TAGFILTER="openssl-3.2.*" ffbuild_enabled() { diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh index 35ec689ed7..7cc3f8ac5a 100755 --- a/scripts.d/25-xz.sh +++ b/scripts.d/25-xz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/tukaani-project/xz.git" -SCRIPT_COMMIT="ea21c76aa2406ba06ac154fe57741734c04f260f" +SCRIPT_COMMIT="4941ea454c02cf15a64d6434a0778fc2a81282fc" ffbuild_enabled() { return 0 diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh index 68dc0ad5db..44fa737cef 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="cfef47622357564d804b99dbde2993ee221fa4c2" +SCRIPT_COMMIT="25f58a52b0b30efbba0ea27c98dc58e411a42b84" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index 443b8ae6e7..5c922027f9 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="b5a65e0f20c30a7f13b2f6619479a6d666e603e0" +SCRIPT_COMMIT="e9134c8ce3d54c7a38c90c0a33758fd8bfb3e280" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh index b44f1a58c8..ad41962d57 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="4ea6df132107e3b4b9407f903204b5522fdffcd6" +SCRIPT_COMMIT="1d31665ff03cdcf16ed96f29bb3d2194ebd48943" SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git" SCRIPT_COMMIT2="92280246c8e30795f08362425510d6acfc5c3f0d" diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index 0d0dc92f7c..5523ec1c34 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="8cde19dcb0f96e11a3cfb17809f10ae23623bca7" +SCRIPT_COMMIT="4db7c0c81f5403f897443f37d0967f68f0725a44" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh index 43836c771d..75d0411a27 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="e312ab76c4d93f2e637ac0c73987b22cd43420c7" +SCRIPT_COMMIT="9d5e1d1dc150e0eb3a562020f2069fad7ec9b3a9" 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 1653fab3a3..ad8abdd0a7 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="e58ae2d27f7baee28319faa02b77cdc344e2f0ca" +SCRIPT_COMMIT="c8c291390f4befb7d813d7fce6caeb6607561903" 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 6844e6f2e8..bfd580da40 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="a9c65683e68b3a4349afee5d7673b393fb924d2e" +SCRIPT_COMMIT="eb1d1d7f2dc9888609ed65df6348dc3a46bc207d" 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 3a566b2b72..99bed28e59 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="ebea71700ff10b0624ca31647f0b4e23f6ffbc68" +SCRIPT_COMMIT="daf2c5397607c32c3814f02831b9c1158fd1e52c" 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 a7b3a3479d..9f61491560 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="61175323a8a374aaedb139894987ddaf2bb2ba27" +SCRIPT_COMMIT="5f8077b257ea27a5fd6f114d2bc15284b2416b3c" 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 7299fc0c39..94ffb4dd20 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="c1cab28e27dd1c5a81394965248b57e490ccf2ca" +SCRIPT_COMMIT="f50dd4df16163da731ad9f251cc98b9ccd0e7455" 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 abb7e07175..87d29db9e3 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="51c28095951676a5896437c4c3aa40fb1972bad2" +SCRIPT_COMMIT="2344df8f821f9becc8aaa6af939b535b51d4a332" 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 d4515a24f5..613f87923b 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="46e12ff9e8e4d3f0313a2f097df93dbfdc14f92f" +SCRIPT_COMMIT="01c4bb5b30bbb09921ca4042da369a60a73faefa" 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 f20c892afb..c95cce98e2 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="9b4e000c6c4ae213a3e52345751d885543f17929" +SCRIPT_COMMIT="0d70de3201a000fe9b0d4a04d1c424df8e7e543f" 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 a01ba8c15f..ee27a6b988 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="4f7497ee3b0deb0418ce48dcd862fd6c23e20064" +SCRIPT_COMMIT="b7d0126604e74871844fcecda04d45bb25988a2c" 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 74b3e76859..0c3f416eac 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="8ae6cf61b18ecddf26f72a07bbfbd1ea9f022c36" +SCRIPT_COMMIT="61b84c2d424f363fb0983cb478937de87084ef54" 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 b582bccacc..cd537c6db9 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="512bf0b15b5597c721ff8c61083616ca9040fa72" +SCRIPT_COMMIT="8bf72e84e3cf0106532c5c7b8b30154ce48c70e0" 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 286e3cc204..e816de5865 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="e1cde54538060c4fd3a3d02e3d2e2b7e5da7bff9" +SCRIPT_COMMIT="f34c717e9af0b1618699f4cf2f9aed277085c880" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh index fd6d96e0e4..a2cddea4d2 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="8f5a645e89380549368eec68935b151b238aa17b" +SCRIPT_COMMIT="e1da8a58d4f4c7a706e36b3ad3baf8a2ffbb7d0f" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index c681d427a5..65b45b1592 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="433be28b4f4f899f533991e2d2829dde0ab68406" +SCRIPT_COMMIT="5f6ce718d903dca3e49c5c10db0859a394c9be84" ffbuild_enabled() { [[ $TARGET == winarm64 ]] && return -1 diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh index b6757e45f6..5091ee6940 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="c1cc0f3f4c3d4abd11ca68c59446a29ff6f95003" +SCRIPT_COMMIT="44f97f08d729fcc77ea5d08e02cd538523dd7157" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh index 5b0f6a780c..c47901f8a7 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="173cae2caa260f7d7ec5fe772086e6f83a96f7f6" +SCRIPT_COMMIT="7914404b0825672d2d3644c1caab79310bf39b0c" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index a030e1dd02..8499fb7fbb 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="cd5bfa124a8c3c4c41e033253a291c387aba0eb0" +SCRIPT_COMMIT="caef968117eb2d6d7224e8d29ec67ff79b0025f8" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-fdk-aac.sh b/scripts.d/50-fdk-aac.sh index 0396429983..56a5fd2006 100755 --- a/scripts.d/50-fdk-aac.sh +++ b/scripts.d/50-fdk-aac.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/mstorsjo/fdk-aac.git" -SCRIPT_COMMIT="716f4394641d53f0d79c9ddac3fa93b03a49f278" +SCRIPT_COMMIT="2ef9a141c40bf254bde7d22c197c615db5b265ed" ffbuild_enabled() { [[ $VARIANT == nonfree* ]] || return -1 diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh index f8d05e8b4b..ee8546161c 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="9934f17316b66ce6de12f3b82203a298bc9351d8" +SCRIPT_COMMIT="f2fb9b36d5e08d6211f7cf6377971c0570939e65" SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git" SCRIPT_COMMIT2="22441b505d9d9afc1e3002290820909846c24bdc" @@ -11,6 +11,10 @@ SCRIPT_REPO3="https://github.com/FFmpeg/nv-codec-headers.git" SCRIPT_COMMIT3="75f032b24263c2b684b9921755cafc1c08e41b9d" SCRIPT_BRANCH3="sdk/12.1" +SCRIPT_REPO4="https://github.com/FFmpeg/nv-codec-headers.git" +SCRIPT_COMMIT4="9934f17316b66ce6de12f3b82203a298bc9351d8" +SCRIPT_BRANCH4="sdk/12.2" + ffbuild_enabled() { [[ $TARGET == winarm64 ]] && return -1 return 0 @@ -20,6 +24,7 @@ ffbuild_dockerdl() { default_dl ffnvcodec echo "git-mini-clone \"$SCRIPT_REPO2\" \"$SCRIPT_COMMIT2\" ffnvcodec2" echo "git-mini-clone \"$SCRIPT_REPO3\" \"$SCRIPT_COMMIT3\" ffnvcodec3" + echo "git-mini-clone \"$SCRIPT_REPO4\" \"$SCRIPT_COMMIT4\" ffnvcodec4" } ffbuild_dockerbuild() { @@ -27,6 +32,8 @@ ffbuild_dockerbuild() { cd ffnvcodec2 elif [[ $ADDINS_STR == *7.0* ]]; then cd ffnvcodec3 + elif [[ $ADDINS_STR == *7.1* ]]; then + cd ffnvcodec4 else cd ffnvcodec fi diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh index 820b641b6c..0321d7d72b 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="9178c72e59112c40b6b45a54c03e47c245b80cdd" +SCRIPT_COMMIT="2328ce38020b48e0a0d653cd55fe918764ec7bb3" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh index 8d91fb73d9..abea702128 100755 --- a/scripts.d/50-gme.sh +++ b/scripts.d/50-gme.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libgme/game-music-emu.git" -SCRIPT_COMMIT="8a2a331d6da17de14a4656a6e6c6db9d2cdc3362" +SCRIPT_COMMIT="daaa7c67dcb21a08d984b2bfd3fc508d60c08bed" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-kvazaar.sh b/scripts.d/50-kvazaar.sh index c0e4f2c727..9cb55e0889 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="dd30dd2a7ad14e8702e1b5b12bd8e3b738373cec" +SCRIPT_COMMIT="b0ed0f97680776214ea668aad9e57978d1433e0e" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh index ecfb3fdea6..40866c94eb 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="4d6e9ef3077fb279cab051cc00b216c5f08efb34" +SCRIPT_COMMIT="1b699559025185e34d21a24cac477ca360cb917d" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh index 56a789cecf..2ef6d2f004 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="91d96d3d9353bcb47d5a6607859e51fb7e7a28f7" +SCRIPT_COMMIT="440e03642b891968a76b6d088d70f01f06e0c349" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/45-lcms2.sh b/scripts.d/50-libjxl/45-lcms2.sh index 41ce39a81c..8ba418001a 100755 --- a/scripts.d/50-libjxl/45-lcms2.sh +++ b/scripts.d/50-libjxl/45-lcms2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/mm2/Little-CMS.git" -SCRIPT_COMMIT="91abcceaffb0d0921f208381ab2b60fee59de79c" +SCRIPT_COMMIT="04ace9c100fc6850f09223dd6c7ad8fa634acd06" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index 1a11698b85..b077b6eb60 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="7e1d4f1770579f230625f19a2918bf9562a3d864" +SCRIPT_COMMIT="71fd6ef964d6933c4cd0d629bbbe1054493cf097" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh index c822d0bbed..822b3ace1a 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="7db26934e4156597cb0586bb4d2e44dccdde1a59" +SCRIPT_COMMIT="c79a9bd1dd2898cd57bb793e037d58c937555c2c" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh index 53dbcb8531..81de165b3c 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="fdd3d0c82f069406e74889e408930d179281e1e6" +SCRIPT_COMMIT="af5d2041fbc4da5faa5844d5ef8fba9d4b2a1864" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh index 821424f831..f1d715c30a 100755 --- a/scripts.d/50-libssh.sh +++ b/scripts.d/50-libssh.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.com/libssh/libssh-mirror.git" -SCRIPT_COMMIT="49b0c859f92bb9474412933e450da26d0410fe08" +SCRIPT_COMMIT="9613e9508dabd793900f6ee58fc20808ea55fcac" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index f513ad5c24..9bfae65bbf 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="8058a0b54991257a0e1a2fcf08d993a8b70c1d3a" +SCRIPT_COMMIT="95afae324986797afb19a606f3d95ecdf21e99a7" ffbuild_enabled() { [[ $TARGET == winarm64 ]] && return -1 diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index e38a02f596..c223d7bb17 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="2af6c034ac871c967e04c8c9f8bf2dbc2e271b18" +SCRIPT_COMMIT="73b728cbb9f6694a6fef0a470e6c23c5ecba2418" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh index 448fa5f6dd..464d1f4527 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="79c318c7efffeee46ed301d1fc4724ac90ff03a8" +SCRIPT_COMMIT="6ad6194f504d986f53d1e7f2ec8dbf8ad437824c" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh index 8423815512..38652826a7 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="abe9a7896f1f6e6a5158c0a1d4a3f39e4538c248" +SCRIPT_COMMIT="9766872b2ef28126a46f14f4c3d1070bc3116368" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-zix.sh b/scripts.d/50-lilv/96-zix.sh index daec31a05a..ce53381b60 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="8ab9795a4c0403a88cd01874caf5f58776ae24ca" +SCRIPT_COMMIT="8b9a97eff86a6f9e0c3b21e329e34d6a4ff2ffa7" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh index 6845c177e3..e56e4b1e07 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="e1671ccdda0b501e27dd5afdbe05bb31656409a3" +SCRIPT_COMMIT="306135c33c361dd15dc03e214728868f8490777d" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh index 64d0bde3ec..b2909dbfd5 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="2647831aa62c4b0cef27cec0eec42c5fc3ef412b" +SCRIPT_COMMIT="80e12926bbf5837daa2ad133d5f68901ca368aec" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh index 3e31eacbb4..ae0b883bb2 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="e1e0b34271d1b2c478509a5d6b37d15d774a7650" +SCRIPT_COMMIT="2026fced442f3bf2c486a0f267448a07cb0788b5" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh index 7257af6820..766e03c392 100755 --- a/scripts.d/50-onevpl.sh +++ b/scripts.d/50-onevpl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/intel/libvpl.git" -SCRIPT_COMMIT="025d43d086a3e663184cb49febe86152bf05409f" +SCRIPT_COMMIT="80ea0a5ebd25743c1cfe973e803245ba67d53b20" ffbuild_enabled() { [[ $TARGET == *arm64 ]] && return -1 @@ -24,6 +24,8 @@ ffbuild_dockerbuild() { ninja install rm -rf "$FFBUILD_PREFIX"/{etc,share} + + echo "Libs.private: -lstdc++" >> "$FFBUILD_PREFIX"/lib/pkgconfig/vpl.pc } ffbuild_configure() { diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh index 9b7674a5a2..7582a9e54d 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="6118ae73c241eb3a008bfe00d07dcb07d132dd2c" +SCRIPT_COMMIT="fd74b3d6908c5efc77d413acb58d5cd359bf9d4b" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh index 443dad0337..ec13f9d172 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="423eb2c3e47009f4e631b5e413123a003fdff1ed" +SCRIPT_COMMIT="a85e11871c748eae11d056d93df644e2dcb1e80c" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh index 089e40de38..14b04cd38c 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="eb25a5ec777ff6699f4bb1187740467dcfa64dd6" +SCRIPT_COMMIT="e7453e398b110891778d8da19209792c69ca7169" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh index 3697999616..6de0a0576d 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="22666" +SCRIPT_REV="22979" ffbuild_enabled() { [[ $TARGET == winarm64 ]] && return -1 diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index 2849f694e8..a7f8ba96bb 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="62b4888672aa5c1c8084a8114f999c0699e08080" +SCRIPT_COMMIT="38879ab5a5b1587264ae2cbba9df43dc9157da2d" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 @@ -10,7 +10,7 @@ ffbuild_enabled() { ffbuild_dockerbuild() { local myconf=( - --prefix="$FFBUILD_PREFIX" + --prefix="${FFBUILD_PREFIX}" --target="${FFBUILD_RUST_TARGET}" --library-type=staticlib --crt-static @@ -24,6 +24,18 @@ ffbuild_dockerbuild() { # The pinned version is broken, and upstream does not react cargo update cc + export "AR_${FFBUILD_RUST_TARGET//-/_}"="${AR}" + export "RANLIB_${FFBUILD_RUST_TARGET//-/_}"="${RANLIB}" + export "NM_${FFBUILD_RUST_TARGET//-/_}"="${NM}" + export "LD_${FFBUILD_RUST_TARGET//-/_}"="${LD}" + export "CC_${FFBUILD_RUST_TARGET//-/_}"="${CC}" + export "CXX_${FFBUILD_RUST_TARGET//-/_}"="${CXX}" + export "LD_${FFBUILD_RUST_TARGET//-/_}"="${LD}" + export "CFLAGS_${FFBUILD_RUST_TARGET//-/_}"="${CFLAGS}" + export "CXXFLAGS_${FFBUILD_RUST_TARGET//-/_}"="${CXXFLAGS}" + export "LDFLAGS_${FFBUILD_RUST_TARGET//-/_}"="${LDFLAGS}" + unset AR RANLIB NM CC CXX LD CFLAGS CXXFLAGS LDFLAGS + cargo cinstall -v "${myconf[@]}" chmod 644 "${FFBUILD_PREFIX}"/lib/*rav1e* diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh index da3c708036..b5659872a5 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="a19a891b3619ecea00f5c402006fe95b9c4d8a7f" +SCRIPT_COMMIT="e4296ac80b1170018a110bc326fd0d45a0eb27d6" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index f2a496993b..c5dfad5726 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="0efb7c78294b95d62bda35d4cd18945ee578b4d8" +SCRIPT_COMMIT="ab44451578ec6e449bd78b8f99ee0333dba69e3c" SCRIPT_BRANCH="SDL2" ffbuild_enabled() { diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index d054779076..7dab15c40e 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="8a89a3abbf4d3a2f7869d535349a474607ea0214" +SCRIPT_COMMIT="697dce0978c9e8c2f8fff4d1443f2cb69941bdc2" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index 67f61ca61b..09ce0110d8 100755 --- a/scripts.d/50-svtav1.sh +++ b/scripts.d/50-svtav1.sh @@ -1,10 +1,11 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git" -SCRIPT_COMMIT="39525fd6f1046f1d6400b291f5fb2a8c0ad054ad" +SCRIPT_COMMIT="af1ccfc1cb082dd5b861676627dcecf5595e62b0" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 + (( $(ffbuild_ffver) > 700 )) || return -1 return 0 } diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh index c6fe275330..dbabf01f00 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="e7d4b1df2d3f675b478897ab454d635e9b4eb915" +SCRIPT_COMMIT="a7eb2cfd53a70fcd9ba9dcfad80a3994642f362f" 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 1cd06eb299..8d75295266 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="e4dc66b240d6d21e6546c9a21dbcfe455c8a6bff" +SCRIPT_COMMIT="3da1ba7e3cac635c6dc4d5d4cd1234d386926b49" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* && $TARGET == win* ]] && return -1 diff --git a/scripts.d/50-vidstab.sh b/scripts.d/50-vidstab.sh index a828b9ee7b..2e1e24a59a 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="8dff7ad3c10ac663745f2263037f6e42b993519c" +SCRIPT_COMMIT="d2d55a8988c8ed34a9f373ef53481bfbadb9b9fb" 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 547167901b..fff04d5b5d 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.4.304" +SCRIPT_COMMIT="v1.4.309" SCRIPT_TAGFILTER="v?.*.*" ffbuild_enabled() { diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh index 3c357fff61..fa00e15112 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="690d259384193c90c01b52288e280b05a8481121" +SCRIPT_COMMIT="8be073a9ff0d07288b3d138fb7c586ac53465227" 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 bb9d3f0836..14973baf06 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="6173e24b31f09a0c3217103a130e74c4ddec14a6" +SCRIPT_COMMIT="2c32b6bf86f3c4a5539aa1f0bacbd59fe61759cf" 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 82006e336b..787ced48ef 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="056b852018db04aa2ebc0982e27713afcea8106b" +SCRIPT_COMMIT="02f4f9862395d0379a0ec654345f52daf81e1aee" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-vvenc.sh b/scripts.d/50-vvenc.sh index 324726115e..fd32d8091a 100755 --- a/scripts.d/50-vvenc.sh +++ b/scripts.d/50-vvenc.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/fraunhoferhhi/vvenc.git" -SCRIPT_COMMIT="81a3b6c06cfa186fa2eeccf1d8975c9ed027a214" +SCRIPT_COMMIT="bde56fd61d5d6fcd8fac4bab0faa4da813928bb3" ffbuild_enabled() { [[ $TARGET != *32 ]] || return -1 diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh index cba8ea76eb..e65d6e1635 100755 --- a/scripts.d/50-x264.sh +++ b/scripts.d/50-x264.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/x264.git" -SCRIPT_COMMIT="52f7694ddd35209cb95225e7acce91d8a30cb57d" +SCRIPT_COMMIT="373697b467f7cd0af88f1e9e32d4f10540df4687" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh index 6126fd9e6e..3a10f2d0a1 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="441e1e4614a187583a7f1bf3e1739366ff40df6c" +SCRIPT_COMMIT="bc608a559a730aa7e2d9490edc4ee0eab704f59c" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh index 598d40d139..0cb00fde30 100755 --- a/scripts.d/50-zimg.sh +++ b/scripts.d/50-zimg.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://bitbucket.org/the-sekrit-twc/zimg.git" -SCRIPT_COMMIT="034b7cf5339e576080e61fd53f566387687ff4d6" +SCRIPT_COMMIT="7240030a6fb73f5530695f0f5fc06565ca221fb7" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-zvbi.sh b/scripts.d/50-zvbi.sh index ec9e7dcc7f..c2a40a0d28 100755 --- a/scripts.d/50-zvbi.sh +++ b/scripts.d/50-zvbi.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/zapping-vbi/zvbi" -SCRIPT_COMMIT="7a76c67ac747c5f7ea0b9cd0a90b2e6688a305de" +SCRIPT_COMMIT="348a44219c9b097a60359f9821d4923bc0bbe047" ffbuild_enabled() { return 0 diff --git a/util/vars.sh b/util/vars.sh index ea538355f1..82a6d66ae2 100644 --- a/util/vars.sh +++ b/util/vars.sh @@ -57,6 +57,9 @@ ffbuild_ffver() { *7.0*) echo 700 ;; + *7.1*) + echo 701 + ;; *) echo 99999999 ;;