Update for 8.10.0-rc2

- Update Pango to 1.45.4. - Update Poppler to 20.08.0. - Update Rust to 1.45.1. - Update LLVM toolchain to 11.0.0-rc1. - Binaries are being built with GCC 10.2 (was GCC 10.1). MXE Updates: - Update HarfBuzz to 2.7.0.
libvips · Aug 3, 2020 · a20ce9a · a20ce9a
1 parent 408c8ba
commit a20ce9a
Show file tree

Hide file tree

Showing 33 changed files with 263 additions and 197 deletions.
diff --git a/README.md b/README.md
@@ -9,11 +9,11 @@ Experiment with building a libvips binary for Windows with [MXE](https://github.
 | [expat]         | 2.2.9     | MIT Licence                     |
 | [fontconfig]    | 2.13.92   | [fontconfig Licence] (BSD-like) |
 | [freetype]      | 2.10.2    | [freetype Licence] (BSD-like)   |
-| [fribidi]       | 1.0.10     | LGPLv3                          |
+| [fribidi]       | 1.0.10    | LGPLv3                          |
 | [gdk-pixbuf]    | 2.40.0    | LGPLv3                          |
 | [giflib]        | 5.1.4     | MIT Licence                     |
 | [glib]          | 2.65.0    | LGPLv3                          |
-| [harfbuzz]      | 2.6.8     | MIT Licence                     |
+| [harfbuzz]      | 2.7.0     | MIT Licence                     |
 | [lcms]          | 2.11      | MIT Licence                     |
 | [libexif]       | 0.6.22    | LGPLv3                          |
 | [libffi]        | 3.3       | MIT Licence                     |
@@ -27,12 +27,12 @@ Experiment with building a libvips binary for Windows with [MXE](https://github.
 | [libwebp]       | 1.1.0     | New BSD License                 |
 | [libxml2]       | 2.9.10    | MIT Licence                     |
 | [orc]           | 0.4.31    | [orc License] (BSD-like)        |
-| [pango]         | 1.45.3    | LGPLv3                          |
+| [pango]         | 1.45.4    | LGPLv3                          |
 | [pixman]        | 0.40.0    | MIT Licence                     |
 | [zlib]          | 1.2.11    | [zlib Licence]                  |
 
-¹ libvips is built from the [`v8.10.0-rc1`](https://github.com/libvips/libvips/tree/v8.10.0-rc1) tag, see:
-https://github.com/libvips/libvips/releases/tag/v8.10.0-rc1
+¹ libvips is built from the [`v8.10.0-rc2`](https://github.com/libvips/libvips/tree/v8.10.0-rc2) tag, see:
+https://github.com/libvips/libvips/releases/tag/v8.10.0-rc2
 
 [cairo]: https://gitlab.freedesktop.org/cairo/cairo
 [expat]: https://github.com/libexpat/libexpat
@@ -85,7 +85,7 @@ Same as libvips-web + these extra dependencies:
 | [openexr]       | 2.5.2     | BSD 3-Clause                     |
 | [openjpeg]      | 2.3.1     | BSD 2-Clause                     |
 | [openslide]     | 3.4.1     | LGPLv3                           |
-| [poppler]       | 0.90.1    | GPLv2                            |
+| [poppler]       | 20.08.0   | GPLv2                            |
 | [sqlite]        | 3.32.3    | Public domain                    |
 | [x265]          | 3.4       | GPLv2                            |
 

diff --git a/build.sh b/build.sh
@@ -33,10 +33,10 @@ TYPE:
 	    - shared
 	    - static
 EOF
-  exit 1
+  exit 0
 fi
 
-if [ x$(whoami) == x"root" ]; then
+if [ $EUID -eq 0 ]; then
   echo "Please don't run as root -- instead, add yourself to the docker group"
   exit 1
 fi

diff --git a/build/build.sh b/build/build.sh
@@ -35,7 +35,7 @@ TARGET:
 		- x86_64-w64-mingw32.static.posix
 		- x86_64-w64-mingw32.static.win32
 EOF
-  exit 1
+  exit 0
 fi
 
 . variables.sh
@@ -51,7 +51,7 @@ fi
 # Always checkout a particular revision which will successfully build.
 # This ensures that it will not suddenly break a build.
 # Note: Must be regularly updated.
-revision="885a03134121f7564bd49313a70e3d372a546192"
+revision="cce10aff094cc8de04866cc3d87f1e94ed2c7f96"
 initialize=false
 
 if [ -f "$mxe_dir/Makefile" ]; then

diff --git a/build/gendeflibs.sh b/build/gendeflibs.sh
@@ -35,7 +35,7 @@ TARGET:
 		- x86_64-w64-mingw32.static.posix
 		- x86_64-w64-mingw32.static.win32
 EOF
-  exit 1
+  exit 0
 fi
 
 . variables.sh

diff --git a/build/mingw-std-threads.mk b/build/mingw-std-threads.mk
@@ -2,7 +2,7 @@ PKG             := mingw-std-threads
 $(PKG)_WEBSITE  := https://github.com/meganz/mingw-std-threads
 $(PKG)_DESCR    := Standard threads implementation currently still missing on MinGW GCC on Windows
 $(PKG)_IGNORE   :=
-# https://api.github.com/repos/meganz/mingw-std-threads/tarball/bee085c0a6cb32c59f0b55c7bba976fe6dcfca7f
+# https://github.com/meganz/mingw-std-threads/tarball/bee085c0a6cb32c59f0b55c7bba976fe6dcfca7f
 $(PKG)_VERSION  := bee085c
 $(PKG)_CHECKSUM := eaa451e3db0b64b285ae2bc163e30f384ee933bb2765ed428b95686a94814dd7
 $(PKG)_GH_CONF  := meganz/mingw-std-threads/branches/master

diff --git a/build/overrides.mk b/build/overrides.mk
@@ -66,8 +66,8 @@ librsvg_FILE     := librsvg-$(librsvg_VERSION).tar.xz
 librsvg_URL      := https://download.gnome.org/sources/librsvg/$(call SHORT_PKG_VERSION,librsvg)/$(librsvg_FILE)
 
 # upstream version is 1.37.4
-pango_VERSION  := 1.45.3
-pango_CHECKSUM := 1f75c1ebab3d298bb0c18f420440b507a95ce4b98905274f4af80831ff7ee67d
+pango_VERSION  := 1.45.4
+pango_CHECKSUM := 3843c2eda760a4dfa998cc9c12db25da1da26ae01e8d847a9afeba684b7bde7b
 pango_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/pango-[0-9]*.patch)))
 pango_SUBDIR   := pango-$(pango_VERSION)
 pango_FILE     := pango-$(pango_VERSION).tar.xz
@@ -168,9 +168,9 @@ hdf5_SUBDIR   := hdf5-$(hdf5_VERSION)
 hdf5_FILE     := hdf5-$(hdf5_VERSION).tar.bz2
 hdf5_URL      := https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-$(call SHORT_PKG_VERSION,hdf5)/hdf5-$(hdf5_VERSION)/src/$(hdf5_FILE)
 
-# upstream version is 0.90.0
-poppler_VERSION  := 0.90.1
-poppler_CHECKSUM := 984d82e72e91418d280885298c8bdc855a2fd92665fd52a1345b27235e0c71c4
+# upstream version is 0.90.1
+poppler_VERSION  := 20.08.0
+poppler_CHECKSUM := ae65fef04bbf63259a6352e7b620719115d4fb97f5079b0b8b00a8eb0c86eca5
 poppler_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/poppler-[0-9]*.patch)))
 poppler_SUBDIR   := poppler-$(poppler_VERSION)
 poppler_FILE     := poppler-$(poppler_VERSION).tar.xz

diff --git a/build/package-vipsdev.sh b/build/package-vipsdev.sh
@@ -32,7 +32,7 @@ TARGET:
 		- x86_64-w64-mingw32.static.posix
 		- x86_64-w64-mingw32.static.win32
 EOF
-  exit 1
+  exit 0
 fi
 
 . variables.sh

diff --git a/build/patches/libspng-0.6-fixes.patch b/build/patches/libspng-0.6-fixes.patch
@@ -0,0 +1,38 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Randy <randy408@protonmail.com>
+Date: Wed, 29 Jul 2020 15:31:50 +0200
+Subject: [PATCH 1/1] Ignore spec violation for tRNS chunks (fixes #118)
+
+
+diff --git a/spng/spng.c b/spng/spng.c
+index 1111111..2222222 100644
+--- a/spng/spng.c
++++ b/spng/spng.c
+@@ -208,6 +208,7 @@ struct spng_ctx
+     unsigned streaming: 1;
+
+     unsigned encode_only: 1;
++    unsigned strict : 1;
+
+     /* input file contains this chunk */
+     struct spng_chunk_bitfield file;
+@@ -1884,7 +1885,14 @@ static int read_non_idat_chunks(spng_ctx *ctx)
+                 }
+                 ctx->trns.n_type3_entries = chunk.length;
+             }
+-            else return SPNG_ETRNS_COLOR_TYPE;
++
++            /* The standard explicitly forbids tRNS chunks for grayscale alpha,
++                truecolor alpha images but libpng only emits a warning by default. */
++            if(ctx->ihdr.color_type == 4 || ctx->ihdr.color_type == 6)
++            {
++                if(ctx->strict) return SPNG_ETRNS_COLOR_TYPE;
++                else continue;
++            }
+
+             ctx->file.trns = 1;
+             ctx->stored.trns = 1;
diff --git a/build/plugins/llvm-mingw/clang.mk b/build/plugins/llvm-mingw/clang.mk
@@ -3,11 +3,10 @@
 PKG             := clang
 $(PKG)_WEBSITE  := https://clang.llvm.org/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 10.0.0
-$(PKG)_CHECKSUM := 885b062b00e903df72631c5f98b9579ed1ed2790f74e5646b4234fa084eacb21
+$(PKG)_VERSION  := 11.0.0-rc1
+$(PKG)_CHECKSUM := 0eacdc50fdeef33472c864998723779059cfd81154e539f6fbe34cd681edcf49
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/clang-[0-9]*.patch)))
 $(PKG)_GH_CONF  := llvm/llvm-project/releases,llvmorg-,,,,.tar.xz
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION).src
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).src.tar.xz
+$(PKG)_SUBDIR   := $(PKG)-$(subst -,,$($(PKG)_VERSION)).src
 $(PKG)_TYPE     := source-only
 $(PKG)_TARGETS  := $(BUILD)
diff --git a/build/plugins/llvm-mingw/compiler-rt-builtins.mk b/build/plugins/llvm-mingw/compiler-rt-builtins.mk
@@ -2,8 +2,8 @@
 
 PKG             := compiler-rt-builtins
 $(PKG)_WEBSITE  := https://compiler-rt.llvm.org/
-$(PKG)_VERSION  := 10.0.0
-$(PKG)_DEPS     := llvm-mingw compiler-rt
+$(PKG)_VERSION  := 11.0.0-rc1
+$(PKG)_DEPS     := compiler-rt
 $(PKG)_TYPE     := meta
 
 define $(PKG)_BUILD
@@ -13,6 +13,9 @@ define $(PKG)_BUILD
     # armv7 -> arm
     $(eval LIB_ARCH_NAME := $(if $(findstring armv7,$(PROCESSOR)),arm,$(BUILD_ARCH_NAME)))
 
+    # [major].[minor].[patch]-[label] -> [major].[minor].[patch]
+    $(eval CLANG_VERSION := $(firstword $(subst -, ,$($(PKG)_VERSION))))
+
     $(call PREPARE_PKG_SOURCE,compiler-rt,$(BUILD_DIR))
 
     cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(BUILD_DIR)/$(compiler-rt_SUBDIR)/lib/builtins' \
@@ -24,7 +27,7 @@ define $(PKG)_BUILD
         -DCOMPILER_RT_DEFAULT_TARGET_ONLY=TRUE
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
 
-    $(INSTALL) -d '$(PREFIX)/$(BUILD)/lib/clang/$($(PKG)_VERSION)/lib/windows'
+    $(INSTALL) -d '$(PREFIX)/$(BUILD)/lib/clang/$(CLANG_VERSION)/lib/windows'
     cp '$(BUILD_DIR)/lib/windows/libclang_rt.builtins-$(BUILD_ARCH_NAME).a' \
-        '$(PREFIX)/$(BUILD)/lib/clang/$($(PKG)_VERSION)/lib/windows/libclang_rt.builtins-$(LIB_ARCH_NAME).a'
+        '$(PREFIX)/$(BUILD)/lib/clang/$(CLANG_VERSION)/lib/windows/libclang_rt.builtins-$(LIB_ARCH_NAME).a'
 endef
diff --git a/build/plugins/llvm-mingw/compiler-rt-sanitizers.mk b/build/plugins/llvm-mingw/compiler-rt-sanitizers.mk
@@ -2,8 +2,8 @@
 
 PKG             := compiler-rt-sanitizers
 $(PKG)_WEBSITE  := https://compiler-rt.llvm.org/
-$(PKG)_VERSION  := 10.0.0
-$(PKG)_DEPS     := llvm-mingw compiler-rt
+$(PKG)_VERSION  := 11.0.0-rc1
+$(PKG)_DEPS     := compiler-rt
 $(PKG)_TYPE     := meta
 
 # Note: Ubsan includes <typeinfo> from the C++ headers, so
@@ -12,6 +12,9 @@ define $(PKG)_BUILD
     # i686 -> i386
     $(eval BUILD_ARCH_NAME := $(if $(findstring i686,$(PROCESSOR)),i386,$(PROCESSOR)))
 
+    # [major].[minor].[patch]-[label] -> [major].[minor].[patch]
+    $(eval CLANG_VERSION := $(firstword $(subst -, ,$($(PKG)_VERSION))))
+
     $(call PREPARE_PKG_SOURCE,compiler-rt,$(BUILD_DIR))
 
     cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(BUILD_DIR)/$(compiler-rt_SUBDIR)' \
@@ -25,12 +28,12 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
     $(MAKE) -C '$(BUILD_DIR)' install-compiler-rt-headers -j 1
 
-    $(INSTALL) -d '$(PREFIX)/$(BUILD)/lib/clang/$($(PKG)_VERSION)/lib/windows'
+    $(INSTALL) -d '$(PREFIX)/$(BUILD)/lib/clang/$(CLANG_VERSION)/lib/windows'
 
     $(foreach FILE,asan-preinit asan asan_cxx asan_dll_thunk asan_dynamic_runtime_thunk ubsan_standalone ubsan_standalone_cxx, \
-        cp '$(BUILD_DIR)/lib/windows/libclang_rt.$(FILE)-$(BUILD_ARCH_NAME).a' '$(PREFIX)/$(BUILD)/lib/clang/$($(PKG)_VERSION)/lib/windows';)
+        cp '$(BUILD_DIR)/lib/windows/libclang_rt.$(FILE)-$(BUILD_ARCH_NAME).a' '$(PREFIX)/$(BUILD)/lib/clang/$(CLANG_VERSION)/lib/windows';)
 
-    cp '$(BUILD_DIR)/lib/windows/libclang_rt.asan_dynamic-$(BUILD_ARCH_NAME).dll.a' '$(PREFIX)/$(BUILD)/lib/clang/$($(PKG)_VERSION)/lib/windows'
+    cp '$(BUILD_DIR)/lib/windows/libclang_rt.asan_dynamic-$(BUILD_ARCH_NAME).dll.a' '$(PREFIX)/$(BUILD)/lib/clang/$(CLANG_VERSION)/lib/windows'
     cp '$(BUILD_DIR)/lib/windows/libclang_rt.asan_dynamic-$(BUILD_ARCH_NAME).dll' '$(PREFIX)/$(TARGET)/bin'
 endef
 

diff --git a/build/plugins/llvm-mingw/compiler-rt.mk b/build/plugins/llvm-mingw/compiler-rt.mk
@@ -3,10 +3,9 @@
 PKG             := compiler-rt
 $(PKG)_WEBSITE  := https://compiler-rt.llvm.org/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 10.0.0
-$(PKG)_CHECKSUM := 6a7da64d3a0a7320577b68b9ca4933bdcab676e898b759850e827333c3282c75
+$(PKG)_VERSION  := 11.0.0-rc1
+$(PKG)_CHECKSUM := c686ead7e72cfb74d6c899cdab413a22c6ed3c1dd84af83352e4b3339c211714
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/compiler-rt-[0-9]*.patch)))
 $(PKG)_GH_CONF  := llvm/llvm-project/releases,llvmorg-,,,,.tar.xz
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION).src
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).src.tar.xz
+$(PKG)_SUBDIR   := $(PKG)-$(subst -,,$($(PKG)_VERSION)).src
 $(PKG)_TYPE     := source-only
diff --git a/build/plugins/llvm-mingw/libcxx.mk b/build/plugins/llvm-mingw/libcxx.mk
@@ -3,74 +3,9 @@
 PKG             := libcxx
 $(PKG)_WEBSITE  := https://libcxx.llvm.org/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 10.0.0
-$(PKG)_CHECKSUM := 270f8a3f176f1981b0f6ab8aa556720988872ec2b48ed3b605d0ced8d09156c7
+$(PKG)_VERSION  := 11.0.0-rc1
+$(PKG)_CHECKSUM := c4d68d78d3e751f0c0c64fd143e25094880be192a367f750628ef357488fb867
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libcxx-[0-9]*.patch)))
 $(PKG)_GH_CONF  := llvm/llvm-project/releases,llvmorg-,,,,.tar.xz
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION).src
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).src.tar.xz
-$(PKG)_DEPS     := llvm-mingw compiler-rt-builtins libunwind libcxxabi
-
-define $(PKG)_BUILD
-    $(call PREPARE_PKG_SOURCE,libcxxabi,$(BUILD_DIR))
-
-    mkdir '$(BUILD_DIR).libcxxabi'
-    cd '$(BUILD_DIR).libcxxabi' && $(TARGET)-cmake '$(BUILD_DIR)/$(libcxxabi_SUBDIR)' \
-        -DCMAKE_CROSSCOMPILING=TRUE \
-        -DCMAKE_C_COMPILER_WORKS=TRUE \
-        -DCMAKE_CXX_COMPILER_WORKS=TRUE \
-        -DLLVM_COMPILER_CHECKED=TRUE \
-        -DCMAKE_AR='$(PREFIX)/$(BUILD)/bin/llvm-ar' \
-        -DCMAKE_RANLIB='$(PREFIX)/$(BUILD)/bin/llvm-ranlib' \
-        -DLIBCXXABI_USE_COMPILER_RT=ON \
-        -DLIBCXXABI_ENABLE_EXCEPTIONS=ON \
-        -DLIBCXXABI_ENABLE_THREADS=ON \
-        -DLIBCXXABI_TARGET_TRIPLE=$(TARGET) \
-        -DLIBCXXABI_ENABLE_SHARED=OFF \
-        -DLIBCXXABI_LIBCXX_INCLUDES='$(SOURCE_DIR)/include' \
-        -DLIBCXXABI_LIBDIR_SUFFIX='' \
-        -DLIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS=OFF \
-        -DCXX_SUPPORTS_CXX_STD=TRUE \
-        -DCMAKE_CXX_FLAGS='$(CXXFLAGS) $(if $(BUILD_SHARED),-D_LIBCPP_BUILDING_LIBRARY= -U_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS,-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) -D_LIBCPP_HAS_THREAD_API_WIN32'
-    $(MAKE) -C '$(BUILD_DIR).libcxxabi' -j '$(JOBS)'
-
-    cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \
-        -DCMAKE_CROSSCOMPILING=TRUE \
-        -DCMAKE_C_COMPILER_WORKS=TRUE \
-        -DCMAKE_CXX_COMPILER_WORKS=TRUE \
-        -DLLVM_COMPILER_CHECKED=TRUE \
-        -DCMAKE_AR='$(PREFIX)/$(BUILD)/bin/llvm-ar' \
-        -DCMAKE_RANLIB='$(PREFIX)/$(BUILD)/bin/llvm-ranlib' \
-        -DLIBCXX_USE_COMPILER_RT=ON \
-        -DLIBCXX_INSTALL_HEADERS=ON \
-        -DLIBCXX_ENABLE_EXCEPTIONS=ON \
-        -DLIBCXX_ENABLE_THREADS=ON \
-        -DLIBCXX_HAS_WIN32_THREAD_API=ON \
-        -DLIBCXX_ENABLE_MONOTONIC_CLOCK=ON \
-        -DLIBCXX_ENABLE_SHARED=$(CMAKE_SHARED_BOOL) \
-        -DLIBCXX_ENABLE_STATIC=$(CMAKE_STATIC_BOOL) \
-        -DLIBCXX_SUPPORTS_STD_EQ_CXX11_FLAG=TRUE \
-        -DLIBCXX_HAVE_CXX_ATOMICS_WITHOUT_LIB=TRUE \
-        -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF \
-        -DLIBCXX_ENABLE_FILESYSTEM=OFF \
-        -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=TRUE \
-        -DLIBCXX_CXX_ABI=libcxxabi \
-        -DLIBCXX_CXX_ABI_INCLUDE_PATHS='$(BUILD_DIR)/$(libcxxabi_SUBDIR)/include' \
-        -DLIBCXX_CXX_ABI_LIBRARY_PATH='$(BUILD_DIR).libcxxabi/lib' \
-        -DLIBCXX_LIBDIR_SUFFIX='' \
-        -DLIBCXX_INCLUDE_TESTS=FALSE \
-        -DCMAKE_CXX_FLAGS='$(CXXFLAGS) $(if $(BUILD_SHARED),-D_LIBCXXABI_BUILDING_LIBRARY,-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS)' \
-        -DCMAKE_SHARED_LINKER_FLAGS='-lunwind' \
-        -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=FALSE
-    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
-    $(MAKE) -C '$(BUILD_DIR)' -j 1 install/strip
-
-    $(if $(BUILD_STATIC), \
-        $(TARGET)-ar qcsL \
-            '$(PREFIX)/$(TARGET)/lib/libc++.a' \
-            '$(PREFIX)/$(TARGET)/lib/libunwind.a' \
-    $(else), \
-        $(TARGET)-ar qcsL \
-            '$(PREFIX)/$(TARGET)/lib/libc++.dll.a' \
-            '$(PREFIX)/$(TARGET)/lib/libunwind.dll.a')
-endef
+$(PKG)_SUBDIR   := $(PKG)-$(subst -,,$($(PKG)_VERSION)).src
+$(PKG)_TYPE     := source-only
diff --git a/build/plugins/llvm-mingw/libcxxabi.mk b/build/plugins/llvm-mingw/libcxxabi.mk
@@ -3,10 +3,9 @@
 PKG             := libcxxabi
 $(PKG)_WEBSITE  := https://libcxxabi.llvm.org/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 10.0.0
-$(PKG)_CHECKSUM := e71bac75a88c9dde455ad3f2a2b449bf745eafd41d2d8432253b2964e0ca14e1
+$(PKG)_VERSION  := 11.0.0-rc1
+$(PKG)_CHECKSUM := 1d52447a9f3c4bde7d2a877f395902269f2815403b14275df9728ed8ab4de1c3
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libcxxabi-[0-9]*.patch)))
 $(PKG)_GH_CONF  := llvm/llvm-project/releases,llvmorg-,,,,.tar.xz
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION).src
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).src.tar.xz
+$(PKG)_SUBDIR   := $(PKG)-$(subst -,,$($(PKG)_VERSION)).src
 $(PKG)_TYPE     := source-only
diff --git a/build/plugins/llvm-mingw/libunwind.mk b/build/plugins/llvm-mingw/libunwind.mk
@@ -3,34 +3,9 @@
 PKG             := libunwind
 $(PKG)_WEBSITE  := https://clang.llvm.org/docs/Toolchain.html
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 10.0.0
-$(PKG)_CHECKSUM := 09dc5ecc4714809ecf62908ae8fe8635ab476880455287036a2730966833c626
+$(PKG)_VERSION  := 11.0.0-rc1
+$(PKG)_CHECKSUM := c974b26d6d2031bbdc4d3a2051627133abb901bf13935a3f6277a4a1e9d12a63
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libunwind-[0-9]*.patch)))
 $(PKG)_GH_CONF  := llvm/llvm-project/releases,llvmorg-,,,,.tar.xz
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION).src
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).src.tar.xz
-$(PKG)_DEPS     := llvm-mingw compiler-rt-builtins
-
-define $(PKG)_BUILD
-    cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \
-        -DCMAKE_CROSSCOMPILING=TRUE \
-        -DCMAKE_C_COMPILER_WORKS=TRUE \
-        -DCMAKE_CXX_COMPILER_WORKS=TRUE \
-        -DLLVM_COMPILER_CHECKED=TRUE \
-        -DCMAKE_AR='$(PREFIX)/$(BUILD)/bin/llvm-ar' \
-        -DCMAKE_RANLIB='$(PREFIX)/$(BUILD)/bin/llvm-ranlib' \
-        -DCXX_SUPPORTS_CXX11=TRUE \
-        -DCXX_SUPPORTS_CXX_STD=TRUE \
-        -DLIBUNWIND_USE_COMPILER_RT=TRUE \
-        -DLIBUNWIND_ENABLE_THREADS=TRUE \
-        -DLIBUNWIND_ENABLE_SHARED=$(CMAKE_SHARED_BOOL) \
-        -DLIBUNWIND_ENABLE_STATIC=$(CMAKE_STATIC_BOOL) \
-        -DLIBUNWIND_ENABLE_CROSS_UNWINDING=FALSE \
-        -DCMAKE_CXX_FLAGS='$(CXXFLAGS) -Wno-dll-attribute-on-redeclaration' \
-        -DCMAKE_C_FLAGS='$(CFLAGS) -Wno-dll-attribute-on-redeclaration'
-    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
-    $(MAKE) -C '$(BUILD_DIR)' -j 1 install/strip
-
-    $(if $(BUILD_SHARED),\
-        cp '$(BUILD_DIR)/lib/libunwind.dll' '$(PREFIX)/$(TARGET)/bin')
-endef
+$(PKG)_SUBDIR   := $(PKG)-$(subst -,,$($(PKG)_VERSION)).src
+$(PKG)_TYPE     := source-only