diff --git a/builder/images/base-linux64/ct-ng-config b/builder/images/base-linux64/ct-ng-config index 729df4891..958a54b58 100644 --- a/builder/images/base-linux64/ct-ng-config +++ b/builder/images/base-linux64/ct-ng-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.27.0.18_7458341 Configuration +# crosstool-NG 1.27.0.42_35c1e72 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.27.0.18_7458341" +CT_VERSION="1.27.0.42_35c1e72" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -154,6 +154,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_POWERPC is not set # CT_ARCH_PRU is not set # CT_ARCH_RISCV is not set +# CT_ARCH_RX is not set # CT_ARCH_S390 is not set # CT_ARCH_SH is not set # CT_ARCH_SPARC is not set @@ -170,7 +171,7 @@ CT_ARCH_X86_SHOW=y # Options for x86 # CT_ARCH_X86_PKG_KSYM="" -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_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LM32 LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 OPENRISC PARISC POWERPC PRU RISCV RX S390 SH SPARC TRICORE X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -390,7 +391,8 @@ CT_BINUTILS_PATCH_GLOBAL=y # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set # CT_BINUTILS_PATCH_NONE is not set CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_43=y +CT_BINUTILS_V_2_44=y +# CT_BINUTILS_V_2_43 is not set # CT_BINUTILS_V_2_42 is not set # CT_BINUTILS_V_2_41 is not set # CT_BINUTILS_V_2_40 is not set @@ -408,12 +410,14 @@ CT_BINUTILS_V_2_43=y # CT_BINUTILS_V_2_28 is not set # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set -CT_BINUTILS_VERSION="2.43.1" +CT_BINUTILS_VERSION="2.44" CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)" CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig" +CT_BINUTILS_2_44_or_later=y +CT_BINUTILS_2_44_or_older=y CT_BINUTILS_later_than_2_41=y CT_BINUTILS_2_41_or_later=y CT_BINUTILS_later_than_2_39=y @@ -429,10 +433,8 @@ CT_BINUTILS_2_26_or_later=y # GNU binutils # CT_BINUTILS_GOLD_SUPPORTS_ARCH=y -CT_BINUTILS_GOLD_SUPPORT=y CT_BINUTILS_FORCE_LD_BFD_DEFAULT=y CT_BINUTILS_LINKER_LD=y -# CT_BINUTILS_LINKER_LD_GOLD is not set CT_BINUTILS_LINKERS_LIST="ld" CT_BINUTILS_LINKER_DEFAULT="bfd" CT_BINUTILS_PLUGINS=y @@ -617,7 +619,8 @@ CT_GCC_PATCH_GLOBAL=y # CT_GCC_PATCH_LOCAL_BUNDLED is not set # CT_GCC_PATCH_NONE is not set CT_GCC_PATCH_ORDER="global" -CT_GCC_V_14=y +CT_GCC_V_15=y +# CT_GCC_V_14 is not set # CT_GCC_V_13 is not set # CT_GCC_V_12 is not set # CT_GCC_V_11 is not set @@ -628,12 +631,14 @@ CT_GCC_V_14=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="14.2.0" +CT_GCC_VERSION="15.1.0" CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})" CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz" CT_GCC_SIGNATURE_FORMAT="" +CT_GCC_later_than_15=y +CT_GCC_15_or_later=y CT_GCC_later_than_14=y CT_GCC_14_or_later=y CT_GCC_later_than_13=y @@ -680,6 +685,7 @@ 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_LIBSTDCXX_TARGET_CXXFLAGS="-O2 -pipe" # CT_CC_GCC_LIBMUDFLAP is not set CT_CC_GCC_LIBGOMP=y CT_CC_GCC_LIBSSP=m diff --git a/builder/images/base-linuxarm64/ct-ng-config b/builder/images/base-linuxarm64/ct-ng-config index 653ef3d25..b2ece68ce 100644 --- a/builder/images/base-linuxarm64/ct-ng-config +++ b/builder/images/base-linuxarm64/ct-ng-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.27.0.18_7458341 Configuration +# crosstool-NG 1.27.0.42_35c1e72 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.27.0.18_7458341" +CT_VERSION="1.27.0.42_35c1e72" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -154,6 +154,7 @@ CT_ARCH_ARM=y # CT_ARCH_POWERPC is not set # CT_ARCH_PRU is not set # CT_ARCH_RISCV is not set +# CT_ARCH_RX is not set # CT_ARCH_S390 is not set # CT_ARCH_SH is not set # CT_ARCH_SPARC is not set @@ -170,7 +171,7 @@ CT_ARCH_ARM_SHOW=y # Options for arm # CT_ARCH_ARM_PKG_KSYM="" -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_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LM32 LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 OPENRISC PARISC POWERPC PRU RISCV RX S390 SH SPARC TRICORE X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -396,7 +397,8 @@ CT_BINUTILS_PATCH_GLOBAL=y # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set # CT_BINUTILS_PATCH_NONE is not set CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_43=y +CT_BINUTILS_V_2_44=y +# CT_BINUTILS_V_2_43 is not set # CT_BINUTILS_V_2_42 is not set # CT_BINUTILS_V_2_41 is not set # CT_BINUTILS_V_2_40 is not set @@ -414,12 +416,14 @@ CT_BINUTILS_V_2_43=y # CT_BINUTILS_V_2_28 is not set # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set -CT_BINUTILS_VERSION="2.43.1" +CT_BINUTILS_VERSION="2.44" CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)" CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig" +CT_BINUTILS_2_44_or_later=y +CT_BINUTILS_2_44_or_older=y CT_BINUTILS_later_than_2_41=y CT_BINUTILS_2_41_or_later=y CT_BINUTILS_later_than_2_39=y @@ -435,10 +439,8 @@ CT_BINUTILS_2_26_or_later=y # GNU binutils # CT_BINUTILS_GOLD_SUPPORTS_ARCH=y -CT_BINUTILS_GOLD_SUPPORT=y CT_BINUTILS_FORCE_LD_BFD_DEFAULT=y CT_BINUTILS_LINKER_LD=y -# CT_BINUTILS_LINKER_LD_GOLD is not set CT_BINUTILS_LINKERS_LIST="ld" CT_BINUTILS_LINKER_DEFAULT="bfd" CT_BINUTILS_PLUGINS=y @@ -622,7 +624,8 @@ CT_GCC_PATCH_GLOBAL=y # CT_GCC_PATCH_LOCAL_BUNDLED is not set # CT_GCC_PATCH_NONE is not set CT_GCC_PATCH_ORDER="global" -CT_GCC_V_14=y +CT_GCC_V_15=y +# CT_GCC_V_14 is not set # CT_GCC_V_13 is not set # CT_GCC_V_12 is not set # CT_GCC_V_11 is not set @@ -633,12 +636,14 @@ CT_GCC_V_14=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="14.2.0" +CT_GCC_VERSION="15.1.0" CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})" CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz" CT_GCC_SIGNATURE_FORMAT="" +CT_GCC_later_than_15=y +CT_GCC_15_or_later=y CT_GCC_later_than_14=y CT_GCC_14_or_later=y CT_GCC_later_than_13=y @@ -685,6 +690,7 @@ 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_LIBSTDCXX_TARGET_CXXFLAGS="-O2 -pipe" # CT_CC_GCC_LIBMUDFLAP is not set CT_CC_GCC_LIBGOMP=y CT_CC_GCC_LIBSSP=m diff --git a/builder/images/base-win64/ct-ng-config b/builder/images/base-win64/ct-ng-config index 9cda4355a..7d8bab8a9 100644 --- a/builder/images/base-win64/ct-ng-config +++ b/builder/images/base-win64/ct-ng-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.27.0.18_7458341 Configuration +# crosstool-NG 1.27.0.42_35c1e72 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.27.0.18_7458341" +CT_VERSION="1.27.0.42_35c1e72" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -154,6 +154,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_POWERPC is not set # CT_ARCH_PRU is not set # CT_ARCH_RISCV is not set +# CT_ARCH_RX is not set # CT_ARCH_S390 is not set # CT_ARCH_SH is not set # CT_ARCH_SPARC is not set @@ -170,7 +171,7 @@ CT_ARCH_X86_SHOW=y # Options for x86 # CT_ARCH_X86_PKG_KSYM="" -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_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LM32 LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 OPENRISC PARISC POWERPC PRU RISCV RX S390 SH SPARC TRICORE X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -300,7 +301,8 @@ CT_BINUTILS_PATCH_GLOBAL=y # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set # CT_BINUTILS_PATCH_NONE is not set CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_43=y +CT_BINUTILS_V_2_44=y +# CT_BINUTILS_V_2_43 is not set # CT_BINUTILS_V_2_42 is not set # CT_BINUTILS_V_2_41 is not set # CT_BINUTILS_V_2_40 is not set @@ -318,12 +320,14 @@ CT_BINUTILS_V_2_43=y # CT_BINUTILS_V_2_28 is not set # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set -CT_BINUTILS_VERSION="2.43.1" +CT_BINUTILS_VERSION="2.44" CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)" CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig" +CT_BINUTILS_2_44_or_later=y +CT_BINUTILS_2_44_or_older=y CT_BINUTILS_later_than_2_41=y CT_BINUTILS_2_41_or_later=y CT_BINUTILS_later_than_2_39=y @@ -339,10 +343,8 @@ CT_BINUTILS_2_26_or_later=y # GNU binutils # CT_BINUTILS_GOLD_SUPPORTS_ARCH=y -CT_BINUTILS_GOLD_SUPPORT=y CT_BINUTILS_FORCE_LD_BFD_DEFAULT=y CT_BINUTILS_LINKER_LD=y -# CT_BINUTILS_LINKER_LD_GOLD is not set CT_BINUTILS_LINKERS_LIST="ld" CT_BINUTILS_LINKER_DEFAULT="bfd" CT_BINUTILS_PLUGINS=y @@ -453,7 +455,8 @@ CT_GCC_PATCH_GLOBAL=y # CT_GCC_PATCH_LOCAL_BUNDLED is not set # CT_GCC_PATCH_NONE is not set CT_GCC_PATCH_ORDER="global" -CT_GCC_V_14=y +CT_GCC_V_15=y +# CT_GCC_V_14 is not set # CT_GCC_V_13 is not set # CT_GCC_V_12 is not set # CT_GCC_V_11 is not set @@ -464,12 +467,14 @@ CT_GCC_V_14=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="14.2.0" +CT_GCC_VERSION="15.1.0" CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})" CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz" CT_GCC_SIGNATURE_FORMAT="" +CT_GCC_later_than_15=y +CT_GCC_15_or_later=y CT_GCC_later_than_14=y CT_GCC_14_or_later=y CT_GCC_later_than_13=y @@ -514,6 +519,7 @@ CT_CC_GCC_LTO_ZSTD=m # 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_LIBSTDCXX_TARGET_CXXFLAGS="-O2 -pipe" # CT_CC_GCC_LIBMUDFLAP is not set CT_CC_GCC_LIBGOMP=y CT_CC_GCC_LIBSSP=m diff --git a/builder/images/macos/00-dep.sh b/builder/images/macos/00-dep.sh index 904732189..d4829ba97 100755 --- a/builder/images/macos/00-dep.sh +++ b/builder/images/macos/00-dep.sh @@ -1,7 +1,7 @@ #!/bin/bash ffbuild_macbase() { - brew install wget subversion mercurial autoconf automake cmake meson ninja pkg-config coreutils gcc make python-setuptools pcre2 libtool gnu-sed gnu-tar nasm quilt + brew install wget subversion mercurial autoconf automake cmake meson ninja pkg-config coreutils gcc make python-setuptools pcre2 libtool gnu-sed gnu-tar nasm quilt texinfo mkdir /opt/ffbuild/bin cp "$BUILDER_ROOT"/images/base/git-mini-clone.sh /opt/ffbuild/bin/git-mini-clone chmod +x /opt/ffbuild/bin/git-mini-clone diff --git a/builder/patches/libplacebo/0001-vulkan-force-using-16bit-for-p01x-formats.patch b/builder/patches/libplacebo/0001-vulkan-force-using-16bit-for-p01x-formats.patch index d5d1b7b18..01b105386 100644 --- a/builder/patches/libplacebo/0001-vulkan-force-using-16bit-for-p01x-formats.patch +++ b/builder/patches/libplacebo/0001-vulkan-force-using-16bit-for-p01x-formats.patch @@ -19,13 +19,13 @@ index f0eb0fb7..7d1c6478 100644 .pNext = has_drm_mods ? &drm_props : NULL, }; -- vk->GetPhysicalDeviceFormatProperties2KHR(vk->physd, vk_fmt->tfmt, &prop2); +- vk->GetPhysicalDeviceFormatProperties2(vk->physd, vk_fmt->tfmt, &prop2); + VkFormat tfmt = vk_fmt->tfmt; + if (tfmt == VK_FORMAT_R10X6_UNORM_PACK16) + tfmt = VK_FORMAT_R16_UNORM; + else if (tfmt == VK_FORMAT_R10X6G10X6_UNORM_2PACK16) + tfmt = VK_FORMAT_R16G16_UNORM; -+ vk->GetPhysicalDeviceFormatProperties2KHR(vk->physd, tfmt, &prop2); ++ vk->GetPhysicalDeviceFormatProperties2(vk->physd, tfmt, &prop2); // If wholly unsupported, try falling back to the emulation formats // for texture operations diff --git a/builder/scripts.d/10-mingw.sh b/builder/scripts.d/10-mingw.sh index 405156ff0..8b7d70e40 100755 --- a/builder/scripts.d/10-mingw.sh +++ b/builder/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="b025331084febc41e108698bf3ac6c39c6ccfba2" +SCRIPT_REPO="https://github.com/mingw-w64/mingw-w64.git" +SCRIPT_COMMIT="4a3edb6f81ff685a07deef5891b3c9941646c9ec" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 @@ -9,12 +9,12 @@ ffbuild_enabled() { } ffbuild_dockerlayer() { - to_df "COPY --from=${SELFLAYER} /opt/mingw/. /" - to_df "COPY --from=${SELFLAYER} /opt/mingw/. /opt/mingw" + to_df "COPY --link --from=${SELFLAYER} /opt/mingw/. /" + to_df "COPY --link --from=${SELFLAYER} /opt/mingw/. /opt/mingw" } ffbuild_dockerfinal() { - to_df "COPY --from=${PREVLAYER} /opt/mingw/. /" + to_df "COPY --link --from=${PREVLAYER} /opt/mingw/. /" } ffbuild_dockerbuild() { @@ -22,40 +22,73 @@ ffbuild_dockerbuild() { cd mingw git checkout "$SCRIPT_COMMIT" - cd mingw-w64-headers - - unset CFLAGS - unset CXXFLAGS - unset LDFLAGS - unset PKG_CONFIG_LIBDIR - GCC_SYSROOT="$(${FFBUILD_CROSS_PREFIX}gcc -print-sysroot)" - local myconf=( - --prefix="$GCC_SYSROOT/usr/$FFBUILD_TOOLCHAIN" - --host="$FFBUILD_TOOLCHAIN" - --with-default-win32-winnt="0x0601" - --with-default-msvcrt="ucrt" - --enable-idl + unset CC CXX LD AR CPP LIBS CCAS + unset CFLAGS CXXFLAGS LDFLAGS CPPFLAGS CCASFLAGS + unset PKG_CONFIG_LIBDIR + + ### + ### mingw-w64-headers + ### + ( + cd mingw-w64-headers + + local myconf=( + --prefix="$GCC_SYSROOT/usr/$FFBUILD_TOOLCHAIN" + --host="$FFBUILD_TOOLCHAIN" + --with-default-win32-winnt="0x601" + --with-default-msvcrt="ucrt" + --enable-idl + --enable-sdk=all + --enable-secure-api + ) + + ./configure "${myconf[@]}" + make -j$(nproc) + make install DESTDIR="/opt/mingw" ) - ./configure "${myconf[@]}" - make -j$(nproc) - make install DESTDIR="/opt/mingw" + cp -a /opt/mingw/. / - cd ../mingw-w64-libraries/winpthreads + ### + ### mingw-w64-crt + ### + ( + cd mingw-w64-crt - local myconf=( - --prefix="$GCC_SYSROOT/usr/$FFBUILD_TOOLCHAIN" - --host="$FFBUILD_TOOLCHAIN" - --with-pic - --disable-shared - --enable-static + local myconf=( + --prefix="$GCC_SYSROOT/usr/$FFBUILD_TOOLCHAIN" + --host="$FFBUILD_TOOLCHAIN" + --with-default-msvcrt="ucrt" + --enable-wildcard + ) + + ./configure "${myconf[@]}" + make -j$(nproc) + make install DESTDIR="/opt/mingw" ) - ./configure "${myconf[@]}" - make -j$(nproc) - make install DESTDIR="/opt/mingw" + cp -a /opt/mingw/. / + + ### + ### mingw-w64-libraries/winpthreads + ### + ( + cd mingw-w64-libraries/winpthreads + + local myconf=( + --prefix="$GCC_SYSROOT/usr/$FFBUILD_TOOLCHAIN" + --host="$FFBUILD_TOOLCHAIN" + --with-pic + --disable-shared + --enable-static + ) + + ./configure "${myconf[@]}" + make -j$(nproc) + make install DESTDIR="/opt/mingw" + ) } ffbuild_configure() { diff --git a/builder/scripts.d/10-xorg-macros.sh b/builder/scripts.d/10-xorg-macros.sh index fda338c54..4a81126c1 100755 --- a/builder/scripts.d/10-xorg-macros.sh +++ b/builder/scripts.d/10-xorg-macros.sh @@ -9,8 +9,8 @@ ffbuild_enabled() { } ffbuild_dockerlayer() { - to_df "COPY --from=${SELFLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX" - to_df "COPY --from=${SELFLAYER} \$FFBUILD_PREFIX/share/aclocal/. /usr/share/aclocal" + to_df "COPY --link --from=${SELFLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX" + to_df "COPY --link --from=${SELFLAYER} \$FFBUILD_PREFIX/share/aclocal/. /usr/share/aclocal" } ffbuild_dockerbuild() { diff --git a/builder/scripts.d/25-gmp.sh b/builder/scripts.d/25-gmp.sh index 3b8914557..871921fe1 100755 --- a/builder/scripts.d/25-gmp.sh +++ b/builder/scripts.d/25-gmp.sh @@ -1,22 +1,17 @@ #!/bin/bash -SCRIPT_VERSION="6.3.0" -SCRIPT_SHA512="e85a0dab5195889948a3462189f0e0598d331d3457612e2d3350799dba2e244316d256f8161df5219538eb003e4b5343f989aaa00f96321559063ed8c8f29fd2" -SCRIPT_URL="https://mirrors.kernel.org/gnu/gmp/gmp-${SCRIPT_VERSION}.tar.xz" +SCRIPT_REPO="https://github.com/BtbN/gmplib.git" +SCRIPT_COMMIT="655b673c0c825a772b2596d9761ffc3dd953074e" ffbuild_enabled() { return 0 } ffbuild_dockerbuild() { - retry-tool check-wget "gmp.tar.xz" "$SCRIPT_URL" "$SCRIPT_SHA512" + git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" gmp + cd gmp - if [[ $TARGET == mac* ]]; then - gtar xaf "gmp.tar.xz" - else - tar xaf "gmp.tar.xz" - fi - cd "gmp-$SCRIPT_VERSION" + ./.bootstrap local myconf=( --prefix="$FFBUILD_PREFIX" diff --git a/builder/scripts.d/25-libxml2.sh b/builder/scripts.d/25-libxml2.sh index 9196b7465..fc62a339f 100755 --- a/builder/scripts.d/25-libxml2.sh +++ b/builder/scripts.d/25-libxml2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/GNOME/libxml2.git" -SCRIPT_COMMIT="66453240c94b5cbd3e9ae9b32016fdafb13cdf18" +SCRIPT_COMMIT="8d509f483dd5ce268b2fded9c738132c47d820d8" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-xz.sh b/builder/scripts.d/25-xz.sh index 673eae7dd..8d9d20c45 100755 --- a/builder/scripts.d/25-xz.sh +++ b/builder/scripts.d/25-xz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/tukaani-project/xz.git" -SCRIPT_COMMIT="v5.6.4" +SCRIPT_COMMIT="v5.8.1" SCRIPT_TAGFILTER="v?.*.*" ffbuild_enabled() { diff --git a/builder/scripts.d/45-libNE10.sh b/builder/scripts.d/45-libne10.sh similarity index 100% rename from builder/scripts.d/45-libNE10.sh rename to builder/scripts.d/45-libne10.sh diff --git a/builder/scripts.d/45-x11/99-finalize.sh b/builder/scripts.d/45-x11/99-finalize.sh index 1714e3935..ff52c8d89 100755 --- a/builder/scripts.d/45-x11/99-finalize.sh +++ b/builder/scripts.d/45-x11/99-finalize.sh @@ -8,8 +8,8 @@ ffbuild_enabled() { } ffbuild_dockerlayer() { - to_df "COPY --from=${SELFLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX" - to_df "COPY --from=${SELFLAYER} \$FFBUILD_PREFIX/share/aclocal/. /usr/share/aclocal" + to_df "COPY --link --from=${SELFLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX" + to_df "COPY --link --from=${SELFLAYER} \$FFBUILD_PREFIX/share/aclocal/. /usr/share/aclocal" } ffbuild_dockerbuild() { diff --git a/builder/scripts.d/50-rkmpp.sh b/builder/scripts.d/50-rkmpp.sh index dbfdfa190..449aab4bc 100755 --- a/builder/scripts.d/50-rkmpp.sh +++ b/builder/scripts.d/50-rkmpp.sh @@ -1,8 +1,8 @@ #!/bin/bash SCRIPT_REPO="https://github.com/nyanmisaka/mpp.git" -SCRIPT_COMMIT="fda5a02e8f88e79ef110e7912c20326a1fea51fb" -SCRIPT_BRANCH="jellyfin-mpp" +SCRIPT_COMMIT="48fb6aa79c8b48e1ca98ced18233fcd8a6ac68c5" +SCRIPT_BRANCH="jellyfin-mpp-next" ffbuild_enabled() { [[ $TARGET == linux* ]] && [[ $TARGET == *arm64 ]] && return 0 diff --git a/builder/scripts.d/50-rkrga.sh b/builder/scripts.d/50-rkrga.sh index 2960f891c..a43b9f030 100755 --- a/builder/scripts.d/50-rkrga.sh +++ b/builder/scripts.d/50-rkrga.sh @@ -1,8 +1,8 @@ #!/bin/bash SCRIPT_REPO="https://github.com/nyanmisaka/rk-mirrors.git" -SCRIPT_COMMIT="c30fdd20ed8bfae438d2b1ea9b8d1dd64c9481bc" -SCRIPT_BRANCH="jellyfin-rga" +SCRIPT_COMMIT="dce1e7cc787f8fc13a6e39600caac94369c5c229" +SCRIPT_BRANCH="jellyfin-rga-next" ffbuild_enabled() { [[ $TARGET == linux* ]] && [[ $TARGET == *arm64 ]] && return 0 diff --git a/builder/scripts.d/50-vulkan/45-vulkan.sh b/builder/scripts.d/50-vulkan/45-vulkan.sh index 06b747437..2c13ca6c3 100755 --- a/builder/scripts.d/50-vulkan/45-vulkan.sh +++ b/builder/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.311" +SCRIPT_COMMIT="v1.4.315" SCRIPT_TAGFILTER="v?.*.*" ffbuild_enabled() { diff --git a/builder/scripts.d/50-vulkan/50-shaderc.sh b/builder/scripts.d/50-vulkan/50-shaderc.sh index ebad2bad8..e3480df18 100755 --- a/builder/scripts.d/50-vulkan/50-shaderc.sh +++ b/builder/scripts.d/50-vulkan/50-shaderc.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/google/shaderc.git" -SCRIPT_COMMIT="3882b16417077aa8eaa7b5775920e7ba4b8a224d" +SCRIPT_COMMIT="3362e24c42ab5bf7ad32c0fec64b0a0ddeb2fda1" ffbuild_enabled() { [[ $TARGET == mac* ]] && return -1 diff --git a/builder/scripts.d/50-vulkan/60-libplacebo.sh b/builder/scripts.d/50-vulkan/60-libplacebo.sh index 0bb88b9f5..0c246594e 100755 --- a/builder/scripts.d/50-vulkan/60-libplacebo.sh +++ b/builder/scripts.d/50-vulkan/60-libplacebo.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git" -SCRIPT_COMMIT="1fd3c7bde7b943fe8985c893310b5269a09b46c5" +SCRIPT_COMMIT="3188549fba13bbdf3a5a98de2a38c2e71f04e21e" ffbuild_enabled() { [[ $TARGET == mac* ]] && return -1 diff --git a/builder/scripts.d/50-x265.sh b/builder/scripts.d/50-x265.sh index ea96dce51..503ef3fb1 100755 --- a/builder/scripts.d/50-x265.sh +++ b/builder/scripts.d/50-x265.sh @@ -13,6 +13,11 @@ ffbuild_dockerbuild() { cd x265 git checkout "$SCRIPT_COMMIT" + # Unbreak GCC 15 + if [[ $TARGET != mac* ]]; then + sed -i '1i#include ' source/dynamicHDR10/json11/json11.cpp + fi + # Unbreak build compat with CMake 4.0+ if [[ $TARGET == mac* ]]; then gsed -i 's/CMP0025 OLD/CMP0025 NEW/g' source/CMakeLists.txt diff --git a/builder/scripts.d/50-zimg.sh b/builder/scripts.d/50-zimg.sh index 94ef9f925..7d08b4e9f 100755 --- a/builder/scripts.d/50-zimg.sh +++ b/builder/scripts.d/50-zimg.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git" -SCRIPT_COMMIT="9a9a8eab3e29b3583a797d3a1feb6ce0efc05d65" +SCRIPT_COMMIT="39270722912e3953d8dc37a92c200b5158054ff1" ffbuild_enabled() { return 0 diff --git a/builder/util/vars.sh b/builder/util/vars.sh index 1511a525d..dd9a576d8 100755 --- a/builder/util/vars.sh +++ b/builder/util/vars.sh @@ -42,11 +42,11 @@ ffbuild_dockerstage() { } ffbuild_dockerlayer() { - to_df "COPY --from=${SELFLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX" + to_df "COPY --link --from=${SELFLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX" } ffbuild_dockerfinal() { - to_df "COPY --from=${PREVLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX" + to_df "COPY --link --from=${PREVLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX" } ffbuild_configure() { diff --git a/docker-build-win64.sh b/docker-build-win64.sh index e21618a4c..05ea842bd 100755 --- a/docker-build-win64.sh +++ b/docker-build-win64.sh @@ -6,8 +6,8 @@ set -o errexit set -o xtrace # Update mingw-w64 headers -mingw_commit="b025331084febc41e108698bf3ac6c39c6ccfba2" -git clone https://git.code.sf.net/p/mingw-w64/mingw-w64.git +mingw_commit="6b2176247a83644113aa209acbeeaf8cdc78a8fa" +git clone https://github.com/mingw-w64/mingw-w64.git pushd mingw-w64/mingw-w64-headers git checkout ${mingw_commit} ./configure \ @@ -47,7 +47,7 @@ popd popd # LIBXML2 -git clone -b v2.13.6 --depth=1 https://github.com/GNOME/libxml2.git +git clone -b v2.14.3 --depth=1 https://github.com/GNOME/libxml2.git pushd libxml2 ./autogen.sh \ --prefix=${FF_DEPS_PREFIX} \ @@ -156,7 +156,7 @@ popd popd # LZMA -git clone -b v5.6.4 --depth=1 https://github.com/tukaani-project/xz.git +git clone -b v5.8.1 --depth=1 https://github.com/tukaani-project/xz.git pushd xz ./autogen.sh --no-po4a --no-doxygen ./configure \ diff --git a/docker-build.sh b/docker-build.sh index a3729e4eb..99858a80e 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -61,7 +61,7 @@ prepare_extra_common() { # LIBXML2 pushd ${SOURCE_DIR} - libxml2_ver="v2.13.6" + libxml2_ver="v2.14.3" if [[ $( lsb_release -c -s ) == "focal" ]]; then # newer versions require automake 1.16.3+ libxml2_ver="v2.9.14" @@ -436,7 +436,7 @@ prepare_extra_amd64() { # VPL-GPU-RT (RT only) # Provides VPL runtime (libmfx-gen.so.1.2) for 11th Gen Tiger Lake and newer pushd ${SOURCE_DIR} - git clone -b intel-onevpl-25.2.2 --depth=1 https://github.com/intel/vpl-gpu-rt.git + git clone -b intel-onevpl-25.2.3 --depth=1 https://github.com/intel/vpl-gpu-rt.git pushd vpl-gpu-rt # Fix missing entries in PicStruct validation wget -q -O - https://github.com/intel/vpl-gpu-rt/commit/c7eb030.patch | git apply @@ -458,7 +458,7 @@ prepare_extra_amd64() { # Full Feature Build: ENABLE_KERNELS=ON(Default) ENABLE_NONFREE_KERNELS=ON(Default) # Free Kernel Build: ENABLE_KERNELS=ON ENABLE_NONFREE_KERNELS=OFF pushd ${SOURCE_DIR} - git clone -b intel-media-25.2.2 --depth=1 https://github.com/intel/media-driver.git + git clone -b intel-media-25.2.3 --depth=1 https://github.com/intel/media-driver.git pushd media-driver # Enable VC1 decode on DG2 (note that MTL+ is not supported) wget -q -O - https://github.com/intel/media-driver/commit/25fb926.patch | git apply @@ -479,7 +479,7 @@ prepare_extra_amd64() { # Vulkan Headers pushd ${SOURCE_DIR} - git clone -b v1.4.311 --depth=1 https://github.com/KhronosGroup/Vulkan-Headers.git + git clone -b v1.4.315 --depth=1 https://github.com/KhronosGroup/Vulkan-Headers.git pushd Vulkan-Headers mkdir build && pushd build cmake \ @@ -492,7 +492,7 @@ prepare_extra_amd64() { # Vulkan ICD Loader pushd ${SOURCE_DIR} - git clone -b v1.4.311 --depth=1 https://github.com/KhronosGroup/Vulkan-Loader.git + git clone -b v1.4.315 --depth=1 https://github.com/KhronosGroup/Vulkan-Loader.git pushd Vulkan-Loader mkdir build && pushd build cmake \ @@ -512,7 +512,7 @@ prepare_extra_amd64() { popd # SHADERC - shaderc_ver="v2024.4" + shaderc_ver="v2025.2" if [[ ${GCC_VER} -lt 9 ]]; then shaderc_ver="v2023.5" fi @@ -555,15 +555,12 @@ prepare_extra_amd64() { pushd ${SOURCE_DIR} mkdir mesa pushd mesa - mesa_ver="mesa-25.0.6" + mesa_ver="mesa-25.0.7" mesa_link="https://gitlab.freedesktop.org/mesa/mesa/-/archive/${mesa_ver}/mesa-${mesa_ver}.tar.gz" wget ${mesa_link} -O mesa.tar.gz tar xaf mesa.tar.gz # Cherry-pick fixes targeting mesa-stable wget -q -O - https://gitlab.freedesktop.org/mesa/mesa/-/commit/ee4d7e98.patch | git -C mesa-${mesa_ver} apply - wget -q -O - https://gitlab.freedesktop.org/mesa/mesa/-/commit/8aadce68.patch | git -C mesa-${mesa_ver} apply - wget -q -O - https://gitlab.freedesktop.org/mesa/mesa/-/commit/3db6eaad.patch | git -C mesa-${mesa_ver} apply - wget -q -O - https://gitlab.freedesktop.org/mesa/mesa/-/commit/8d9022b8.patch | git -C mesa-${mesa_ver} apply meson setup mesa-${mesa_ver} mesa_build \ --prefix=${TARGET_DIR} \ --libdir=lib \ @@ -617,7 +614,7 @@ prepare_extra_amd64() { # LIBPLACEBO pushd ${SOURCE_DIR} - git clone -b v7.349.0 --recursive --depth=1 https://github.com/haasn/libplacebo.git + git clone -b v7.351.0 --recursive --depth=1 https://github.com/haasn/libplacebo.git # Wa for the regression made in Mesa RADV git -C libplacebo apply ${SOURCE_DIR}/builder/patches/libplacebo/*.patch sed -i 's|env: python_env,||g' libplacebo/src/vulkan/meson.build @@ -643,7 +640,7 @@ prepare_extra_amd64() { prepare_extra_arm() { # RKMPP pushd ${SOURCE_DIR} - git clone -b jellyfin-mpp --depth=1 https://github.com/nyanmisaka/mpp.git rkmpp + git clone -b jellyfin-mpp-next --depth=1 https://github.com/nyanmisaka/mpp.git rkmpp pushd rkmpp mkdir rkmpp_build pushd rkmpp_build @@ -662,7 +659,7 @@ prepare_extra_arm() { # RKRGA pushd ${SOURCE_DIR} - git clone -b jellyfin-rga --depth=1 https://github.com/nyanmisaka/rk-mirrors.git rkrga + git clone -b jellyfin-rga-next --depth=1 https://github.com/nyanmisaka/rk-mirrors.git rkrga meson setup rkrga rkrga_build \ ${MESON_CROSS_OPT} \ --prefix=${TARGET_DIR} \ diff --git a/msys2/PKGBUILD/10-mingw-w64-xz/PKGBUILD b/msys2/PKGBUILD/10-mingw-w64-xz/PKGBUILD index 7f43b16b3..b4c6d31e0 100644 --- a/msys2/PKGBUILD/10-mingw-w64-xz/PKGBUILD +++ b/msys2/PKGBUILD/10-mingw-w64-xz/PKGBUILD @@ -4,7 +4,7 @@ _realname=xz pkgbase=mingw-w64-jellyfin-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}" -pkgver=5.6.4 +pkgver=5.8.1 pkgrel=1 pkgdesc="Library and command line tools for XZ and LZMA compressed files (mingw-w64)" arch=('any') @@ -25,7 +25,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-doxygen" "po4a") source=("https://github.com/tukaani-project/xz/releases/download/v${pkgver}/xz-${pkgver}.tar.xz") -sha256sums=('829ccfe79d769748f7557e7a4429a64d06858e27e1e362e25d01ab7b931d9c95') +sha256sums=('0b54f79df85912504de0b14aec7971e3f964491af1812d83447005807513cd9e') validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620') # Lasse Collin export FF_MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" diff --git a/msys2/PKGBUILD/20-mingw-w64-libxml2/0030-pkgconfig-add-Cflags-private.patch b/msys2/PKGBUILD/20-mingw-w64-libxml2/0030-pkgconfig-add-Cflags-private.patch deleted file mode 100644 index 29add4a86..000000000 --- a/msys2/PKGBUILD/20-mingw-w64-libxml2/0030-pkgconfig-add-Cflags-private.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/libxml-2.0.pc.in -+++ b/libxml-2.0.pc.in -@@ -11,3 +11,4 @@ - Libs: -L${libdir} -lxml2 - Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ - Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ -+Cflags.private: -DLIBXML_STATIC diff --git a/msys2/PKGBUILD/20-mingw-w64-libxml2/0031-apply-msvc-relocation.patch b/msys2/PKGBUILD/20-mingw-w64-libxml2/0031-apply-msvc-relocation.patch deleted file mode 100644 index 8ea654f02..000000000 --- a/msys2/PKGBUILD/20-mingw-w64-libxml2/0031-apply-msvc-relocation.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/catalog.c -+++ b/catalog.c -@@ -74,7 +74,7 @@ - #define XML_SGML_DEFAULT_CATALOG "file://" SYSCONFDIR "/sgml/catalog" - #endif - --#if defined(_WIN32) && defined(_MSC_VER) -+#if defined(_WIN32) - #undef XML_XML_DEFAULT_CATALOG - static char XML_XML_DEFAULT_CATALOG[256] = "file://" SYSCONFDIR "/xml/catalog"; - #if !defined(_WINDOWS_) -@@ -3117,10 +3117,14 @@ - - catalogs = (const char *) getenv("XML_CATALOG_FILES"); - if (catalogs == NULL) --#if defined(_WIN32) && defined(_MSC_VER) -+#if defined(_WIN32) - { - void* hmodule; -+#ifdef _MSC_VER - hmodule = GetModuleHandleA("libxml2.dll"); -+#else -+ hmodule = GetModuleHandleA("libxml2-2.dll"); -+#endif - if (hmodule == NULL) - hmodule = GetModuleHandleA(NULL); - if (hmodule != NULL) { -@@ -3136,7 +3136,11 @@ - p--; - if (p != buf) { - xmlChar* uri; -+#ifdef _MSC_VER - strncpy(p, "\\..\\etc\\catalog", 255 - (p - buf)); -+#else -+ strncpy(p, "\\..\\etc\\xml\\catalog", 255 - (p - buf)); -+#endif - uri = xmlCanonicPath((const xmlChar*)buf); - if (uri != NULL) { - strncpy(XML_XML_DEFAULT_CATALOG, uri, 255); diff --git a/msys2/PKGBUILD/20-mingw-w64-libxml2/PKGBUILD b/msys2/PKGBUILD/20-mingw-w64-libxml2/PKGBUILD index e13a63066..1a41a816a 100644 --- a/msys2/PKGBUILD/20-mingw-w64-libxml2/PKGBUILD +++ b/msys2/PKGBUILD/20-mingw-w64-libxml2/PKGBUILD @@ -5,7 +5,7 @@ _realname=libxml2 pkgbase=mingw-w64-jellyfin-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}" "${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}-docs") -pkgver=2.12.10 +pkgver=2.14.3 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -27,15 +27,11 @@ install=${_realname}-${MSYSTEM}.install source=("https://download.gnome.org/sources/libxml2/${pkgver%.*}/${_realname}-${pkgver}.tar.xz" https://www.w3.org/XML/Test/xmlts20130923.tar.gz 0027-decoding-segfault.patch - 0029-xml2-config-win-paths.patch - 0030-pkgconfig-add-Cflags-private.patch - 0031-apply-msvc-relocation.patch) -sha256sums=('c3d8c0c34aa39098f66576fe51969db12a5100b956233dc56506f7a8679be995' + 0029-xml2-config-win-paths.patch) +sha256sums=('6de55cacc8c2bc758f2ef6f93c313cb30e4dd5d84ac5d3c7ccbd9344d8cc6833' '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f' '0391a4b267ba7251ca74ff2e98bf4c0332a14b618e8147a9341ec5617e45d9d9' - '278b4531da3d2aabda080c412c5122b471202dd6df67768b38bb0c31c7a0e508' - '06c0afaf1b8dec10d6f23dec983026cddf992528ffbc1cc50418302fabf9dee0' - 'b4e3cf5faf0ba1100e2ae6b632dc429c0b25c8caca327e0888b41341d6ddbf9a') + '278b4531da3d2aabda080c412c5122b471202dd6df67768b38bb0c31c7a0e508') export FF_MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" @@ -52,10 +48,6 @@ apply_patch_with_msg() { prepare() { cd ${_realname}-${pkgver} - apply_patch_with_msg \ - 0030-pkgconfig-add-Cflags-private.patch \ - 0031-apply-msvc-relocation.patch - # https://gitlab.gnome.org/GNOME/libxml2/-/issues/64 # https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/15 # https://github.com/msys2/MINGW-packages/issues/7955