Dependency version bumps

kleisauke · kleisauke · commit 4ba87ed8c0ea · 2021-10-29T19:54:33.000+02:00
- Update aom to 3.2.0.
- Update GLib to 2.70.1.
- Update librsvg to 2.52.3.
- Update ImageMagick to 6.9.11-27.
- Update OpenEXR to 3.1.3.
diff --git a/README.md b/README.md
@@ -17,14 +17,14 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 
 | Dependency      | Version   | Used under the terms of                                      |
 |-----------------|-----------|--------------------------------------------------------------|
-| [aom]           | 3.1.3     | BSD 2-Clause + [Alliance for Open Media Patent License 1.0]  |
+| [aom]           | 3.2.0     | BSD 2-Clause + [Alliance for Open Media Patent License 1.0]  |
 | [cairo]         | 1.17.4    | Mozilla Public License 2.0                                   |
 | [expat]         | 2.4.1     | MIT Licence                                                  |
 | [fontconfig]    | 2.13.94   | [fontconfig Licence] (BSD-like)                              |
 | [freetype]      | 2.11.0    | [freetype Licence] (BSD-like)                                |
 | [fribidi]       | 1.0.11    | LGPLv3                                                       |
 | [gdk-pixbuf]    | 2.42.6    | LGPLv3                                                       |
-| [glib]          | 2.70.0    | LGPLv3                                                       |
+| [glib]          | 2.70.1    | LGPLv3                                                       |
 | [harfbuzz]      | 3.0.0     | MIT Licence                                                  |
 | [lcms]          | 2.12      | MIT Licence                                                  |
 | [libexif]       | 0.6.23    | LGPLv3                                                       |
@@ -33,7 +33,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [libheif]       | 1.12.0    | LGPLv3                                                       |
 | [libimagequant] | 2.4.1¹    | BSD 2-Clause                                                 |
 | [libpng]        | 1.6.37    | [libpng License version 2]                                   |
-| [librsvg]       | 2.52.1    | LGPLv3                                                       |
+| [librsvg]       | 2.52.3    | LGPLv3                                                       |
 | [libspng]       | 0.7.0     | BSD 2-Clause                                                 |
 | [libtiff]       | 4.3.0     | [libtiff License] (BSD-like)                                 |
 | [libvips]       | 8.11.4    | LGPLv3                                                       |
@@ -95,12 +95,12 @@ Same as libvips-web + these extra dependencies:
 | [cfitsio]       | 4.0.0     | BSD-like                                                     |
 | [fftw]          | 3.3.10    | GPLv2                                                        |
 | [highway]       | 0.14.2    | Apache-2.0 License                                           |
-| [imagemagick]   | 6.9.12-25 | [ImageMagick License] (Apache-2.0-like)                      |
+| [imagemagick]   | 6.9.12-27 | [ImageMagick License] (Apache-2.0-like)                      |
 | [imath]         | 3.1.3     | BSD 3-Clause                                                 |
 | [libjxl]        | 0.6       | BSD 3-Clause                                                 |
 | [matio]         | 1.5.21    | BSD 2-Clause                                                 |
 | [nifticlib]     | 2.0.0     | Public domain                                                |
-| [openexr]       | 3.1.2     | BSD 3-Clause                                                 |
+| [openexr]       | 3.1.3     | BSD 3-Clause                                                 |
 | [openjpeg]      | 2.4.0     | BSD 2-Clause                                                 |
 | [openslide]     | 3.4.1     | LGPLv3                                                       |
 | [poppler]       | 21.10.0   | GPLv2                                                        |
diff --git a/build/aom.mk b/build/aom.mk
@@ -2,8 +2,8 @@ PKG             := aom
 $(PKG)_WEBSITE  := https://aomedia.googlesource.com/aom/
 $(PKG)_DESCR    := AV1 Codec Library
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.1.3
-$(PKG)_CHECKSUM := 35b8892d1aea725ed337d48c6a21994574789ce0314d3956f7ad2f9b58639b6d
+$(PKG)_VERSION  := 3.2.0
+$(PKG)_CHECKSUM := 8fa7418bf4ea12ef6dcf0eeb21cba932b71c6079ffdf7b9d13cf907fa46c0568
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_FILE     := libaom-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://storage.googleapis.com/aom-releases/$($(PKG)_FILE)
diff --git a/build/overrides.mk b/build/overrides.mk
@@ -40,14 +40,14 @@ matio_FILE     := matio-$(matio_VERSION).tar.gz
 matio_URL      := https://github.com/tbeu/matio/releases/download/v$(matio_VERSION)/$(matio_FILE)
 
 # upstream version is 7, we want ImageMagick 6
-imagemagick_VERSION  := 6.9.12-25
-imagemagick_CHECKSUM := a6de8acc96c48a3934b1389f051efbacc1536900362c22ad0c23d8756deaae9a
+imagemagick_VERSION  := 6.9.12-27
+imagemagick_CHECKSUM := 2dc8037c98e7cef54018bf12659a0a1602cb41c512e72763269fd4625361c069
 imagemagick_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
 imagemagick_GH_CONF  := ImageMagick/ImageMagick6/tags
 
 # upstream version is 2.40.5
-librsvg_VERSION  := 2.52.1
-librsvg_CHECKSUM := 949dffcb0414865409e17a6c89ae30bc8bb014a51fba5186f73d1a46c6c5ccde
+librsvg_VERSION  := 2.52.3
+librsvg_CHECKSUM := 36e7f5bc88d78608ea7f6c05e4afe4acc1606b9af13c2845d4385073d082b8a4
 librsvg_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/librsvg-[0-9]*.patch)))
 librsvg_SUBDIR   := librsvg-$(librsvg_VERSION)
 librsvg_FILE     := librsvg-$(librsvg_VERSION).tar.xz
@@ -72,8 +72,8 @@ fribidi_FILE     := fribidi-$(fribidi_VERSION).tar.xz
 fribidi_URL      := https://github.com/fribidi/fribidi/releases/download/v$(fribidi_VERSION)/$(fribidi_FILE)
 
 # upstream version is 2.50.2
-glib_VERSION  := 2.70.0
-glib_CHECKSUM := 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742
+glib_VERSION  := 2.70.1
+glib_CHECKSUM := f9b7bce7f51753a1f43853bbcaca8bf09e15e994268e29cfd7a76f65636263c0
 glib_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/glib-[0-9]*.patch)))
 glib_SUBDIR   := glib-$(glib_VERSION)
 glib_FILE     := glib-$(glib_VERSION).tar.xz
@@ -98,8 +98,8 @@ cairo_URL      := http://cairographics.org/snapshots/$(cairo_FILE)
 # upstream version is 2.2.0
 # cannot use GH_CONF:
 # openexr_GH_CONF  := AcademySoftwareFoundation/openexr/tags
-openexr_VERSION  := 3.1.2
-openexr_CHECKSUM := f5c8f148e8f972e76b47e802aada1c59ef1837f0a9259c6677756e7cd347640f
+openexr_VERSION  := 3.1.3
+openexr_CHECKSUM := 6f70a624d1321319d8269a911c4032f24950cde52e76f46e9ecbebfcb762f28c
 openexr_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/openexr-[0-9]*.patch)))
 openexr_SUBDIR   := openexr-$(openexr_VERSION)
 openexr_FILE     := openexr-$(openexr_VERSION).tar.gz
@@ -407,7 +407,7 @@ define lcms_BUILD
     cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
         $(MXE_CONFIGURE_OPTS) \
         --with-zlib \
-        CPPFLAGS="-DCMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT"
+        CPPFLAGS='-DCMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT'
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_PROGRAMS)
     $(MAKE) -C '$(BUILD_DIR)' -j 1 $(INSTALL_STRIP_LIB) $(MXE_DISABLE_PROGRAMS)
 endef
@@ -507,13 +507,16 @@ define librsvg_BUILD
     # armv7 -> thumbv7a
     $(eval ARCH_NAME := $(if $(findstring armv7,$(PROCESSOR)),thumbv7a,$(PROCESSOR)))
 
+    # Need to link against bcrypt after PR:
+    # https://github.com/rust-lang/rust/pull/84096
     cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
         $(MXE_CONFIGURE_OPTS) \
         --disable-pixbuf-loader \
         --disable-introspection \
         RUST_TARGET='$(ARCH_NAME)-pc-windows-gnu' \
         CARGO='$(TARGET)-cargo' \
-        RUSTC='$(TARGET)-rustc'
+        RUSTC='$(TARGET)-rustc' \
+        LIBS='-lbcrypt'
 
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' bin_SCRIPTS=
     $(MAKE) -C '$(BUILD_DIR)' -j 1 $(INSTALL_STRIP_LIB) bin_SCRIPTS=
diff --git a/build/patches/aom-2-fixes.patch b/build/patches/aom-2-fixes.patch
@@ -83,7 +83,7 @@ diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
 index 1111111..2222222 100644
 --- a/av1/decoder/decodeframe.c
 +++ b/av1/decoder/decodeframe.c
-@@ -5237,6 +5237,7 @@ static AOM_INLINE void setup_frame_info(AV1Decoder *pbi) {
+@@ -5194,6 +5194,7 @@ static AOM_INLINE void setup_frame_info(AV1Decoder *pbi) {
    }
  }
  
@@ -95,7 +95,7 @@ diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
 index 1111111..2222222 100644
 --- a/av1/encoder/encoder.c
 +++ b/av1/encoder/encoder.c
-@@ -3386,6 +3386,7 @@ static int encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size,
+@@ -3565,6 +3565,7 @@ static int encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size,
    return AOM_CODEC_OK;
  }
  
diff --git a/build/patches/glib-static.patch b/build/patches/glib-static.patch
@@ -45,7 +45,7 @@ diff --git a/gio/meson.build b/gio/meson.build
 index 1111111..2222222 100644
 --- a/gio/meson.build
 +++ b/gio/meson.build
-@@ -804,7 +804,7 @@ else
+@@ -804,13 +804,10 @@ else
    gio_dtrace_hdr = []
  endif
  
@@ -54,32 +54,46 @@ index 1111111..2222222 100644
    gioenumtypes_h, gioenumtypes_c, gnetworking_h, gio_sources,
    gio_dtrace_hdr, gio_dtrace_obj,
    objects : internal_objects,
+-  version : library_version,
+-  soversion : soversion,
+-  darwin_versions : darwin_versions,
+   install : true,
+   include_directories : [configinc, gioinc],
+   #  '$(gio_win32_res_ldflag)',
 diff --git a/gmodule/meson.build b/gmodule/meson.build
 index 1111111..2222222 100644
 --- a/gmodule/meson.build
 +++ b/gmodule/meson.build
-@@ -72,7 +72,7 @@ if host_system == 'windows'
+@@ -72,11 +72,8 @@ if host_system == 'windows'
    gmodule_sources += [gmodule_win_res]
  endif
  
 -libgmodule = library('gmodule-2.0',
 +libgmodule = static_library('gmodule-2.0',
    sources : gmodule_sources,
-   version : library_version,
-   soversion : soversion,
+-  version : library_version,
+-  soversion : soversion,
+-  darwin_versions : darwin_versions,
+   install : true,
+   include_directories : [configinc, gmoduleinc],
+   dependencies : [libdl_dep, libglib_dep],
 diff --git a/gthread/meson.build b/gthread/meson.build
 index 1111111..2222222 100644
 --- a/gthread/meson.build
 +++ b/gthread/meson.build
-@@ -12,7 +12,7 @@ if host_system == 'windows'
+@@ -12,11 +12,8 @@ if host_system == 'windows'
    gthread_sources += [gthread_win_res]
  endif
  
 -libgthread = library('gthread-2.0',
 +libgthread = static_library('gthread-2.0',
    sources : gthread_sources,
-   version : library_version,
-   soversion : soversion,
+-  version : library_version,
+-  soversion : soversion,
+-  darwin_versions : darwin_versions,
+   install : true,
+   dependencies : [libglib_dep],
+   c_args : ['-DG_LOG_DOMAIN="GThread"' ] + glib_hidden_visibility_args,
 
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kleis Auke Wolthuizen <github@kleisauke.nl>
diff --git a/build/patches/libjxl-0.6-fixes.patch b/build/patches/libjxl-0.6-fixes.patch
@@ -343,15 +343,17 @@ Subject: [PATCH 5/6] tsc_timer: sync with highway
 
 Fixes compilation with llvm-mingw targeting i686.
 
+See: https://github.com/libjxl/libjxl/pull/797
+
 diff --git a/lib/profiler/tsc_timer.h b/lib/profiler/tsc_timer.h
 index 1111111..2222222 100644
 --- a/lib/profiler/tsc_timer.h
 +++ b/lib/profiler/tsc_timer.h
-@@ -10,6 +10,29 @@
+@@ -10,20 +10,43 @@
  // ensure exactly the desired regions are measured.
  
  #include <stdint.h>
-+#include <time.h>    // clock_gettime
++#include <time.h>  // clock_gettime
 +
 +#if defined(_WIN32) || defined(_WIN64)
 +#ifndef WIN32_LEAN_AND_MEAN
@@ -377,8 +379,12 @@ index 1111111..2222222 100644
  
  #include <ctime>
  #include <hwy/base.h>
-@@ -21,9 +44,13 @@
+ #include <hwy/cache_control.h>  // LoadFence
  
+-#if HWY_COMPILER_MSVC
+-#include <chrono>
+-#endif  // HWY_COMPILER_MSVC
+-
  namespace profiler {
  
 +// Ticks := platform-specific timer values (CPU cycles on x86). Must be
@@ -393,7 +399,7 @@ index 1111111..2222222 100644
  //
  // Background: RDTSC is not 'serializing'; earlier instructions may complete
  // after it, and/or later instructions may complete before it. 'Fences' ensure
-@@ -59,7 +86,7 @@ namespace profiler {
+@@ -59,7 +82,7 @@ namespace profiler {
  // Using Before+Before leads to higher variance and overhead than After+After.
  // However, After+After includes an LFENCE in the region measurements, which
  // adds a delay dependent on earlier loads. The combination of Before+After
@@ -402,7 +408,7 @@ index 1111111..2222222 100644
  // the first LFENCE already delayed subsequent loads before the measured
  // region. This combination seems not to have been considered in prior work:
  // http://akaros.cs.berkeley.edu/lxr/akaros/kern/arch/x86/rdtsc_test.c
-@@ -71,19 +98,18 @@ namespace profiler {
+@@ -71,19 +94,18 @@ namespace profiler {
  // by several under/over-count errata, so we use the TSC instead.
  
  // Returns a 64-bit timestamp in unit of 'ticks'; to convert to seconds,
@@ -428,7 +434,7 @@ index 1111111..2222222 100644
    asm volatile(
        "lfence\n\t"
        "rdtsc\n\t"
-@@ -95,30 +121,36 @@ static HWY_INLINE HWY_MAYBE_UNUSED uint64_t TicksBefore() {
+@@ -95,30 +117,35 @@ static HWY_INLINE HWY_MAYBE_UNUSED uint64_t TicksBefore() {
        // "memory" avoids reordering. rdx = TSC >> 32.
        // "cc" = flags modified by SHL.
        : "rdx", "memory", "cc");
@@ -439,6 +445,7 @@ index 1111111..2222222 100644
 -          .time_since_epoch()
 -          .count();
 -#else
+-  // Fall back to OS - unsure how to reliably query cntvct_el0 frequency.
 +#elif HWY_ARCH_RVV
 +  asm volatile("rdcycle %0" : "=r"(t));
 +#elif defined(_WIN32) || defined(_WIN64)
@@ -450,7 +457,6 @@ index 1111111..2222222 100644
 +#elif defined(__HAIKU__)
 +  t = system_time_nsecs();  // since boot
 +#else  // POSIX
-   // Fall back to OS - unsure how to reliably query cntvct_el0 frequency.
    timespec ts;
    clock_gettime(CLOCK_MONOTONIC, &ts);
 -  t = ts.tv_sec * 1000000000LL + ts.tv_nsec;
diff --git a/build/patches/librsvg-2-fixes.patch b/build/patches/librsvg-2-fixes.patch
@@ -19,7 +19,8 @@ index 1111111..2222222 100644
 -Requires: glib-2.0 gio-2.0 gdk-pixbuf-2.0 cairo
 +Requires: glib-2.0 gio-2.0 gdk-pixbuf-2.0 cairo cairo-gobject pangocairo
  Requires.private:
- Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm
+-Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm
++Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm @LIBS@
  Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@
 
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
diff --git a/build/patches/openexr-2-fixes.patch b/build/patches/openexr-2-fixes.patch
@@ -170,10 +170,10 @@ index 1111111..2222222 100644
  #        include <cpuid.h>
  #    endif
  #endif
-@@ -144,7 +144,7 @@ static void (*half_to_float_buffer) (float*, const uint16_t*, int) =
- static void
+@@ -145,7 +145,7 @@ static void (*half_to_float_buffer) (float*, const uint16_t*, int) =
  choose_half_to_float_impl ()
  {
+     // regs[2] in the extended block is ECX, where f16c indicator lives
 -#        ifdef _WIN32
 +#        if defined(_MSC_VER) && !defined(__clang__)
      int regs[4];
diff --git a/build/plugins/llvm-mingw/llvm-mingw.mk b/build/plugins/llvm-mingw/llvm-mingw.mk
@@ -4,9 +4,9 @@ PKG             := llvm-mingw
 $(PKG)_WEBSITE  := https://github.com/mstorsjo/llvm-mingw
 $(PKG)_DESCR    := An LLVM/Clang/LLD based mingw-w64 toolchain
 $(PKG)_IGNORE   :=
-# https://github.com/mstorsjo/llvm-mingw/tarball/378525eb9b72a7deacdde084356926724238e231
-$(PKG)_VERSION  := 378525e
-$(PKG)_CHECKSUM := cec030df56fa8cfa1aa960af4eaf5e5010b7eb392101d7b753f4530d43a706b0
+# https://github.com/mstorsjo/llvm-mingw/tarball/fe57d608deef017c4ac15ab2b9cb156ae4050604
+$(PKG)_VERSION  := fe57d60
+$(PKG)_CHECKSUM := fdfdf95c5a2a5f39cfdb5ab6663c7780074087ba03eb93ef1c23ccf1aa24e04e
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/llvm-mingw-[0-9]*.patch)))
 $(PKG)_GH_CONF  := mstorsjo/llvm-mingw/branches/master
 $(PKG)_DEPS     := mingw-w64
diff --git a/build/plugins/llvm-mingw/llvm.mk b/build/plugins/llvm-mingw/llvm.mk
@@ -80,10 +80,8 @@ define $(PKG)_BUILD_LIBUNWIND
         -DCMAKE_AR='$(PREFIX)/$(BUILD)/bin/llvm-ar' \
         -DCMAKE_RANLIB='$(PREFIX)/$(BUILD)/bin/llvm-ranlib' \
         -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
+        -DLIBUNWIND_ENABLE_STATIC=$(CMAKE_STATIC_BOOL)
     $(MAKE) -C '$(BUILD_DIR).libunwind' -j '$(JOBS)'
     $(MAKE) -C '$(BUILD_DIR).libunwind' -j 1 $(subst -,/,$(INSTALL_STRIP_TOOLCHAIN))
 
@@ -104,15 +102,11 @@ define $(PKG)_BUILD_LIBCXX
         -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_SHARED=$(CMAKE_SHARED_BOOL) \
         -DLIBCXX_ENABLE_STATIC=$(CMAKE_STATIC_BOOL) \
         -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF \
         -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=TRUE \
-        -DLIBCXX_ENABLE_NEW_DELETE_DEFINITIONS=OFF \
         -DLIBCXX_CXX_ABI=libcxxabi \
         -DLIBCXX_CXX_ABI_INCLUDE_PATHS='$(SOURCE_DIR)/libcxxabi/include' \
         -DLIBCXX_CXX_ABI_LIBRARY_PATH='$(BUILD_DIR).libcxxabi/lib' \
@@ -130,12 +124,9 @@ define $(PKG)_BUILD_LIBCXX
         -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_ENABLE_SHARED=OFF \
         -DLIBCXXABI_LIBCXX_INCLUDES='$(BUILD_DIR).libcxx/include/c++/v1' \
         -DLIBCXXABI_LIBDIR_SUFFIX='' \
-        -DLIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS=ON \
         -DLIBCXX_ENABLE_SHARED=$(CMAKE_SHARED_BOOL) \
         -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=TRUE
     $(MAKE) -C '$(BUILD_DIR).libcxxabi' -j '$(JOBS)'
diff --git a/build/plugins/llvm-mingw/patches/rust-1-fixes.patch b/build/plugins/llvm-mingw/patches/rust-1-fixes.patch
@@ -38,7 +38,7 @@ diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/s
 index 1111111..2222222 100644
 --- a/compiler/rustc_target/src/spec/mod.rs
 +++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -867,10 +867,12 @@ supported_targets! {
+@@ -870,10 +870,12 @@ supported_targets! {
  
      ("x86_64-unknown-illumos", x86_64_unknown_illumos),
  
diff --git a/build/plugins/llvm-mingw/rust.mk b/build/plugins/llvm-mingw/rust.mk
@@ -2,13 +2,13 @@ PKG             := rust
 $(PKG)_WEBSITE  := https://www.rust-lang.org/
 $(PKG)_DESCR    := A systems programming language focused on safety, speed and concurrency.
 $(PKG)_IGNORE   :=
-# https://static.rust-lang.org/dist/2021-10-10/rustc-nightly-src.tar.gz.sha256
+# https://static.rust-lang.org/dist/2021-10-29/rustc-nightly-src.tar.gz.sha256
 $(PKG)_VERSION  := nightly
-$(PKG)_CHECKSUM := e97eb92a55f5e9262b9ee3557a4663bedb444d7bda613a05bbcc6f5fdcaa374b
+$(PKG)_CHECKSUM := 85bd26e8e15e21d02f249a433ce647f0e7534e3952c92876827f1fa6d0d9e6d4
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_SUBDIR   := $(PKG)c-$($(PKG)_VERSION)-src
 $(PKG)_FILE     := $(PKG)c-$($(PKG)_VERSION)-src.tar.gz
-$(PKG)_URL      := https://static.rust-lang.org/dist/2021-10-10/$($(PKG)_FILE)
+$(PKG)_URL      := https://static.rust-lang.org/dist/2021-10-29/$($(PKG)_FILE)
 $(PKG)_DEPS     := $(BUILD)~$(PKG)
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 
diff --git a/container/Dockerfile b/container/Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update \
 
 # TODO: This patch needs to be incorporated upstream
 RUN cd $(dirname `python3 -c "import mesonbuild as _; print(_.__path__[0])"`) \
-  && curl -L https://gist.github.com/kleisauke/a2370bf67d1d8813cf8257c039488a79/raw/eb3b9823c2fb6f381ab304d0d4b17ea9b801f838/meson-llvm-mingw.patch | git apply -v
+  && curl -L https://gist.github.com/kleisauke/a2370bf67d1d8813cf8257c039488a79/raw/fadfa1aefe38ab9d4b3ff5811b8eb7663b375aae/meson-llvm-mingw.patch | git apply -v
 
 # gas-preprocessor.pl is required for the ARM/ARM64 builds of libjpeg-turbo
 # TODO(kleisauke): This is no longer necessary once mozjpeg merges libjpeg-turbo 2.1.0.

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c`
`83`	`83`	`index 1111111..2222222 100644`
`84`	`84`	`--- a/av1/decoder/decodeframe.c`
`85`	`85`	`+++ b/av1/decoder/decodeframe.c`
`86`		`-@@ -5237,6 +5237,7 @@ static AOM_INLINE void setup_frame_info(AV1Decoder *pbi) {`
	`86`	`+@@ -5194,6 +5194,7 @@ static AOM_INLINE void setup_frame_info(AV1Decoder *pbi) {`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`@@ -95,7 +95,7 @@ diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c`
`95`	`95`	`index 1111111..2222222 100644`
`96`	`96`	`--- a/av1/encoder/encoder.c`
`97`	`97`	`+++ b/av1/encoder/encoder.c`
`98`		`-@@ -3386,6 +3386,7 @@ static int encode_frame_to_data_rate(AV1_COMP cpi, size_t size,`
	`98`	`+@@ -3565,6 +3565,7 @@ static int encode_frame_to_data_rate(AV1_COMP cpi, size_t size,`
`99`	`99`	`return AOM_CODEC_OK;`
`100`	`100`	`}`
`101`	`101`