# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1653648883 -7200
# Node ID 3d86598a6b7f134781e9e1a3230c696cc1a5e171
# Parent  bdbcf2e12cf6d7c23817dc78ef2c12bc33afed24# Parent  97c5f8da503698fec6a71e035a52ea2ad5f796f3
maint: Merge release to default.

diff -r 97c5f8da5036 -r 3d86598a6b7f dist-files.mk
--- a/dist-files.mk	Fri May 27 12:24:32 2022 +0200
+++ b/dist-files.mk	Fri May 27 12:54:43 2022 +0200
@@ -85,12 +85,11 @@
   dri2proto.mk \
   eigen.mk \
   epstool.mk \
-  exiv2-issue847.patch \
-  exiv2-r2796.patch \
   exiv2.mk \
   expat.mk \
   faad2-1-fixes.patch \
   faad2.mk \
+  ffmpeg-1-fixes.patch \
   ffmpeg.mk \
   fftw.mk \
   file-test.c \
@@ -122,7 +121,6 @@
   gd-1-libpng15.patch \
   gd-test.c \
   gd.mk \
-  gdal-1-gcc11.patch \
   gdal-2-ucrt.patch \
   gdal.mk \
   gdb.mk \
@@ -209,8 +207,6 @@
   jasper.mk \
   jpeg-test.c \
   jpeg.mk \
-  json-c-1-patch-missingfile.patch \
-  json-c-2-patch-remove-rpl.patch \
   json-c-test.c \
   json-c.mk \
   kbproto.mk \
@@ -255,7 +251,6 @@
   libgomp.mk \
   libgpg_error-1-fixes.patch \
   libgpg_error.mk \
-  libgsasl-1-fixes.patch \
   libgsasl-test.c \
   libgsasl.mk \
   libgsf-1-fixes.patch \
@@ -338,7 +333,6 @@
   lzo.mk \
   matio.mk \
   mdbtools.mk \
-  mesa-1-meson.patch \
   mesa-2-ucrt.patch \
   mesa-proto.mk \
   mesa.mk \
@@ -366,6 +360,7 @@
   mman-win32.mk \
   mpc.mk \
   mpfr.mk \
+  mpg123.mk \
   msitools.mk \
   msvc-atk-1.patch \
   msvc-build-cmake-1.patch \
@@ -453,7 +448,6 @@
   mxml-test.c \
   mxml.mk \
   native-binutils.mk \
-  native-gcc-1-canadian-cross.patch \
   native-gcc.mk \
   ncurses-1-gcc-5-fix.patch \
   ncurses.mk \
@@ -506,6 +500,7 @@
   of-lssa.mk \
   of-ltfat-1-cross-fixes.patch \
   of-ltfat-2-LDFLAGS.patch \
+  of-ltfat-3-no-cxx11.patch \
   of-ltfat.mk \
   of-matgeom.mk \
   of-mapping.mk \
@@ -537,6 +532,7 @@
   of-signal.mk \
   of-sockets.mk \
   of-sparsersb-1-no-internal-mex-fcns.patch \
+  of-sparsersb-2-no-cxx11.patch \
   of-sparsersb.mk \
   of-specfun-1-deprecated.patch \
   of-specfun.mk \
@@ -570,6 +566,7 @@
   opencv.mk \
   openexr.mk \
   openjpeg.mk \
+  openlibm.mk \
   openscenegraph-1-fixes.patch \
   openscenegraph.mk \
   openssl-1-fixes.patch \
@@ -577,6 +574,7 @@
   opkg-biosig-1-skip-test.patch \
   opkg-biosig.mk \
   opus.mk \
+  opusfile.mk \
   pango-1-fixes.patch \
   pango.mk \
   pangomm.mk \
@@ -653,6 +651,7 @@
   rapidjson-1-prettywriter.patch \
   rapidjson.mk \
   readline-0-001-upstream.patch \
+  readline-0-002-upstream.patch \
   readline-1-display.patch \
   readline-1-fixes.patch \
   readline-1-input.patch \
@@ -664,7 +663,11 @@
   renderproto.mk \
   rtmidi.mk \
   s2tc.mk \
-  sdl2.k \
+  sdl2.mk \
+  sdl2_image.mk \
+  sdl2_mixer.mk \
+  sdl2_net.mk \
+  sdl2_ttf.mk \
   sdl-1-xdata.patch \
   sdl-test.c \
   sdl.mk \
@@ -812,6 +815,7 @@
   xz.mk \
   yasm.mk \
   zenity.mk \
+  zeromq-1.patch \
   zeromq.mk \
   zlib-1-win32-static.patch \
   zlib.mk \
diff -r 97c5f8da5036 -r 3d86598a6b7f index.html
--- a/index.html	Fri May 27 12:24:32 2022 +0200
+++ b/index.html	Fri May 27 12:54:43 2022 +0200
@@ -1742,6 +1742,10 @@
         <td class="website"><a href="http://code.google.com/p/webm/">vpx</a></td>
     </tr>
     <tr>
+        <td class="package">libwebp</td>
+        <td class="website"><a href="https://developers.google.com/speed/webp/">libwebp</a></td>
+    </tr>
+    <tr>
         <td class="package">libxml++</td>
         <td class="website"><a href="http://libxmlplusplus.sourceforge.net/">libxml2</a></td>
     </tr>
@@ -1802,6 +1806,10 @@
         <td class="website"><a href="http://www.mpfr.org/">mpfr</a></td>
     </tr>
     <tr>
+        <td class="package">mpg123</td>
+        <td class="website"><a href="https://www.mpg123.de/">mpg123</a></td>
+    </tr>
+    <tr>
         <td class="package">msitools</td>
         <td class="website"><a href="https://wiki.gnome.org/msitools">msitools</a></td>
     </tr>
@@ -2486,6 +2494,10 @@
         <td class="website"><a href="https://www.openjpeg.org/">OpenJPEG</a></td>
     </tr>
     <tr>
+        <td class="package">openlibm</td>
+        <td class="website"><a href="https://openlibm.org/">OpenLibm</a></td>
+    </tr>
+    <tr>
         <td class="package">openscenegraph</td>
         <td class="website"><a href="http://www.openscenegraph.org/">OpenSceneGraph</a></td>
     </tr>
@@ -2502,6 +2514,10 @@
         <td class="website"><a href="https://opus-codec.org/">opus</a></td>
     </tr>
     <tr>
+        <td class="package">opusfile</td>
+        <td class="website"><a href="https://opus-codec.org/">opusfile</a></td>
+    </tr>
+    <tr>
         <td class="package">mesa</td>
         <td class="website"><a href="http://www.mesa3d.org/osmesa.html">Mesa</a></td>
     </tr>
@@ -2726,6 +2742,22 @@
         <td class="website"><a href="http://www.libsdl.org/">SDL2</a></td>
     </tr>
     <tr>
+        <td class="package">sdl2_image</td>
+        <td class="website"><a href="http://www.libsdl.org/projects/SDL_image/">SDL2_image</a></td>
+    </tr>
+    <tr>
+        <td class="package">sdl2_net</td>
+        <td class="website"><a href="http://www.libsdl.org/projects/SDL_net/">SDL2_net</a></td>
+    </tr>
+    <tr>
+        <td class="package">sdl2_mixer</td>
+        <td class="website"><a href="http://www.libsdl.org/projects/SDL_mixer/">SDL2_mixer</a></td>
+    </tr>
+    <tr>
+        <td class="package">sdl2_ttf</td>
+        <td class="website"><a href="http://www.libsdl.org/projects/SDL_ttf/">SDL2_ttf</a></td>
+    </tr>
+    <tr>
         <td class="package">sm</td>
         <td class="website"><a href="http://xorg.freedesktop.org/">sm</a></td>
     </tr>
diff -r 97c5f8da5036 -r 3d86598a6b7f src/blas.mk
--- a/src/blas.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/blas.mk	Fri May 27 12:54:43 2022 +0200
@@ -16,7 +16,7 @@
 endif
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- ftp://ftp.eq.uc.pt/pub/software/math/netlib/blas/ | \
+    $(WGET) -q -O- 'https://www.netlib.org/blas/' | \
     $(SED) -n 's|.*>blas-\([0-9\.]*\).tgz<.*|\1|p' | $(SORT) -V | \
     tail -1
 endef
diff -r 97c5f8da5036 -r 3d86598a6b7f src/build-binutils.mk
--- a/src/build-binutils.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/build-binutils.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := build-binutils
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.35.1
-$(PKG)_CHECKSUM := 45f7a96a2580a422f44b78317f0abf13935fecb6
+$(PKG)_VERSION  := 2.38
+$(PKG)_CHECKSUM := 15d42de8f15404a4a43a912440cf367f994779d7
 $(PKG)_SUBDIR   := binutils-$($(PKG)_VERSION)
 $(PKG)_FILE     := binutils-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/binutils/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/build-cmake.mk
--- a/src/build-cmake.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/build-cmake.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := build-cmake
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.22.1
-$(PKG)_CHECKSUM := 71861ee1c487edf05061ab5f7dc4f13a74bfbcdb
+$(PKG)_VERSION  := 3.23.1
+$(PKG)_CHECKSUM := 0a7c642e64d1d8cb0041d2aa2904cd7010391242
 $(PKG)_SUBDIR   := cmake-$($(PKG)_VERSION)
 $(PKG)_FILE     := cmake-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/build-gawk.mk
--- a/src/build-gawk.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/build-gawk.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := build-gawk
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.0.1
-$(PKG)_CHECKSUM := 4ad1a3e5d016b5484bcbcbf866d73967c4af1b5e
+$(PKG)_VERSION  := 5.1.1
+$(PKG)_CHECKSUM := f60061b612504bd7d2d72fd2d303117cf2ffb1aa
 $(PKG)_SUBDIR   := gawk-$($(PKG)_VERSION)
 $(PKG)_FILE     := gawk-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/gawk/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/build-gcc.mk
--- a/src/build-gcc.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/build-gcc.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := build-gcc
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 11.2.0
-$(PKG)_CHECKSUM := f902ccacecf8949978d6261e9f1d034cff73ffdb
+$(PKG)_VERSION  := 12.1.0
+$(PKG)_CHECKSUM := 81614dacd8625a3896a57df375b695dba0c75f36
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/build-lzip.mk
--- a/src/build-lzip.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/build-lzip.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := build-lzip
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.21
-$(PKG)_CHECKSUM := 08bea2f275d639bfe85fe30887d269b96eac34e1
+$(PKG)_VERSION  := 1.23
+$(PKG)_CHECKSUM := 9793edc5e4acda46b3ea16a47ea0dca02a6f6e3d
 $(PKG)_SUBDIR   := lzip-$($(PKG)_VERSION)
 $(PKG)_FILE     := lzip-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://download.savannah.gnu.org/releases/lzip/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/build-python.mk
--- a/src/build-python.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/build-python.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := build-python
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.8.12
-$(PKG)_CHECKSUM := 7643eccc15f5606bd0dc04affc7ea901e417165d
+$(PKG)_VERSION  := 3.8.13
+$(PKG)_CHECKSUM := fb46587353f092d91caeddb07f82bb66a5115468
 $(PKG)_SUBDIR   := Python-$($(PKG)_VERSION)
 $(PKG)_FILE     := Python-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://www.python.org/ftp/python/$($(PKG)_VERSION)/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/build-zstd.mk
--- a/src/build-zstd.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/build-zstd.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := build-zstd
 $(PKG)_IGNORE   := 
-$(PKG)_VERSION  := 1.5.0
-$(PKG)_CHECKSUM := c53019729e3a595f0104facab6533d78296a2945
+$(PKG)_VERSION  := 1.5.2
+$(PKG)_CHECKSUM := c56c8e6d703d14029464b2a1a66164dc5cf80855
 $(PKG)_SUBDIR   := zstd-$($(PKG)_VERSION)
 $(PKG)_FILE     := zstd-$($(PKG)_VERSION).tar.lz
 $(PKG)_URL      := https://github.com/facebook/zstd/releases/download/v$($(PKG)_VERSION)/zstd-$($(PKG)_VERSION).tar.gz
diff -r 97c5f8da5036 -r 3d86598a6b7f src/cmake.mk
--- a/src/cmake.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/cmake.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := cmake
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.22.1
-$(PKG)_CHECKSUM := 71861ee1c487edf05061ab5f7dc4f13a74bfbcdb
+$(PKG)_VERSION  := 3.23.1
+$(PKG)_CHECKSUM := 0a7c642e64d1d8cb0041d2aa2904cd7010391242
 $(PKG)_SUBDIR   := cmake-$($(PKG)_VERSION)
 $(PKG)_FILE     := cmake-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/curl.mk
--- a/src/curl.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/curl.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,12 +3,12 @@
 
 PKG             := curl
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 7.80.0
-$(PKG)_CHECKSUM := 5bc5332d0a7f68747d685b3c8681f69447c3498d
+$(PKG)_VERSION  := 7.83.1
+$(PKG)_CHECKSUM := 4adc266ba0901a3f244b54260cf1ee391fea479a
 $(PKG)_SUBDIR   := curl-$($(PKG)_VERSION)
 $(PKG)_FILE     := curl-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://curl.haxx.se/download/$($(PKG)_FILE)
-$(PKG)_DEPS     := gnutls libidn2 libssh2 pthreads
+$(PKG)_DEPS     := gnutls libgsasl libidn2 libssh2 pthreads
 
 $(PKG)_CONFIGURE_OPTS :=
 ifeq ($(MXE_WINDOWS_BUILD),yes)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/dbus.mk
--- a/src/dbus.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/dbus.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := dbus
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.13.20
-$(PKG)_CHECKSUM := 721389d265da7eaa644789efac4bcd848b11e313
+$(PKG)_VERSION  := 1.13.22
+$(PKG)_CHECKSUM := 9f6bf1922a550281481ee67fdff7212dc95c5562
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/default-octave.mk
--- a/src/default-octave.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/default-octave.mk	Fri May 27 12:54:43 2022 +0200
@@ -201,6 +201,7 @@
         --disable-silent-rules \
         --enable-install-build-logs \
         --enable-relocate-all \
+        --enable-std-pmr-polymorphic-allocator \
         $($(PKG)_CROSS_CONFIG_OPTIONS) \
         $($(PKG)_WITH_BLAS_CONFIGURE_OPTIONS) \
         $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \
diff -r 97c5f8da5036 -r 3d86598a6b7f src/double-conversion.mk
--- a/src/double-conversion.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/double-conversion.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := double-conversion
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.1.7
-$(PKG)_CHECKSUM := 55732a036a077624b0e6bab48652a1d98d472750
+$(PKG)_VERSION  := 3.2.0
+$(PKG)_CHECKSUM := 7234b7450daf4266eaf5459c084afed7cfd57b52
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL      := https://github.com/google/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
diff -r 97c5f8da5036 -r 3d86598a6b7f src/exiv2-issue847.patch
--- a/src/exiv2-issue847.patch	Fri May 27 12:24:32 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,268 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-These patches have been taken from:
-http://dev.exiv2.org/issues/847
-
-From ffb5b66c5b1aeb77c1f95ef69a573030c6370e0c Mon Sep 17 00:00:00 2001
-From: vog <vog@b7c8b350-86e7-0310-a4b4-de8f6a8f16a3>
-Date: Fri, 14 Sep 2012 16:06:23 +0000
-Subject: [PATCH 1/4] Issue #847: Add recognition of explicit and implicit
- BeginPageSetup
-
-git-svn-id: svn://dev.exiv2.org/svn/trunk@2869 b7c8b350-86e7-0310-a4b4-de8f6a8f16a3
----
- src/epsimage.cpp |   28 ++++++++++++++++++++++------
- 1 file changed, 22 insertions(+), 6 deletions(-)
-
-diff --git a/src/epsimage.cpp b/src/epsimage.cpp
-index c937942..51e5bb4 100644
---- a/src/epsimage.cpp
-+++ b/src/epsimage.cpp
-@@ -386,6 +386,7 @@ namespace {
-         size_t posBeginPhotoshop = posEndEps;
-         size_t posEndPhotoshop = posEndEps;
-         size_t posPage = posEndEps;
-+        size_t posBeginPageSetup = posEndEps;
-         size_t posEndPageSetup = posEndEps;
-         size_t posPageTrailer = posEndEps;
-         size_t posEof = posEndEps;
-@@ -397,7 +398,6 @@ namespace {
-         bool implicitPage = false;
-         bool implicitPageTrailer = false;
-         bool inDefaultsPreviewPrologSetup = false;
--        bool inPageSetup = false;
-         bool inRemovableEmbedding = false;
-         std::string removableEmbeddingEndLine;
-         unsigned int removableEmbeddingsWithUnmarkedTrailer = 0;
-@@ -465,7 +465,7 @@ namespace {
-                 #endif
-                 throw Error(write ? 21 : 14);
-             } else if (line == "%%BeginPageSetup") {
--                inPageSetup = true;
-+                posBeginPageSetup = startPos;
-             } else if (!inRemovableEmbedding && line == "%Exiv2BeginXMP: Before %%EndPageSetup") {
-                 inRemovableEmbedding = true;
-                 removableEmbeddings.push_back(std::make_pair(startPos, startPos));
-@@ -510,18 +510,34 @@ namespace {
-             if (posPage == posEndEps && posEndComments != posEndEps && !inDefaultsPreviewPrologSetup && !inRemovableEmbedding && !onlyWhitespaces(line)) {
-                 posPage = startPos;
-                 implicitPage = true;
-+                posBeginPageSetup = startPos;
-                 posEndPageSetup = startPos;
-                 #ifdef DEBUG
--                EXV_DEBUG << "readWriteEpsMetadata: Found implicit Page and EndPageSetup at position: " << startPos << "\n";
-+                EXV_DEBUG << "readWriteEpsMetadata: Found implicit Page, BeginPageSetup and EndPageSetup at position: " << startPos << "\n";
-                 #endif
-             }
--            if (posEndPageSetup == posEndEps && posPage != posEndEps && !inPageSetup && !inRemovableEmbedding && line.size() >= 1 && line[0] != '%') {
-+            if (posBeginPageSetup == posEndEps && posPage != posEndEps && !inRemovableEmbedding && line.size() >= 1 && line[0] != '%') {
-+                posBeginPageSetup = startPos;
-                 posEndPageSetup = startPos;
-                 #ifdef DEBUG
--                EXV_DEBUG << "readWriteEpsMetadata: Found implicit EndPageSetup at position: " << startPos << "\n";
-+                EXV_DEBUG << "readWriteEpsMetadata: Found implicit BeginPageSetup and EndPageSetup at position: " << startPos << "\n";
-                 #endif
-             }
-             if (line.size() >= 1 && line[0] != '%') continue; // performance optimization
-+            if (line == "%%EOF" || line == "%%Trailer" || line == "%%PageTrailer") {
-+                if (posBeginPageSetup == posEndEps) {
-+                    posBeginPageSetup = startPos;
-+                    #ifdef DEBUG
-+                    EXV_DEBUG << "readWriteEpsMetadata: Found implicit BeginPageSetup at position: " << startPos << "\n";
-+                    #endif
-+                }
-+                if (posEndPageSetup == posEndEps) {
-+                    posEndPageSetup = startPos;
-+                    #ifdef DEBUG
-+                    EXV_DEBUG << "readWriteEpsMetadata: Found implicit EndPageSetup at position: " << startPos << "\n";
-+                    #endif
-+                }
-+            }
-             if (line == "%%EOF" || line == "%%Trailer") {
-                 if (posPageTrailer == posEndEps) {
-                     posPageTrailer = startPos;
-@@ -561,7 +577,6 @@ namespace {
-             } else if (line == "%%EndSetup") {
-                 inDefaultsPreviewPrologSetup = false;
-             } else if (posEndPageSetup == posEndEps && line == "%%EndPageSetup") {
--                inPageSetup = false;
-                 posEndPageSetup = startPos;
-             } else if (posPageTrailer == posEndEps && line == "%%PageTrailer") {
-                 posPageTrailer = startPos;
-@@ -815,6 +830,7 @@ namespace {
-             positions.push_back(posExiv2Website);
-             positions.push_back(posEndComments);
-             positions.push_back(posPage);
-+            positions.push_back(posBeginPageSetup);
-             positions.push_back(posEndPageSetup);
-             positions.push_back(posPageTrailer);
-             positions.push_back(posEof);
--- 
-1.7.10.4
-
-From f8c9c6114bf7631bb0dba67582c2666b05b2ff9f Mon Sep 17 00:00:00 2001
-From: vog <vog@b7c8b350-86e7-0310-a4b4-de8f6a8f16a3>
-Date: Fri, 14 Sep 2012 16:06:26 +0000
-Subject: [PATCH 2/4] Issue #847: Always insert BeginPageSetup/EndPageSetup
- when missing
-
-git-svn-id: svn://dev.exiv2.org/svn/trunk@2870 b7c8b350-86e7-0310-a4b4-de8f6a8f16a3
----
- src/epsimage.cpp |   21 ++++++++++++++-------
- 1 file changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/src/epsimage.cpp b/src/epsimage.cpp
-index 51e5bb4..9276eb5 100644
---- a/src/epsimage.cpp
-+++ b/src/epsimage.cpp
-@@ -935,6 +935,11 @@ namespace {
-                         writeTemp(*tempIo, "%%EndPageComments" + lineEnding);
-                     }
-                 }
-+                if (pos == posBeginPageSetup) {
-+                    if (line != "%%BeginPageSetup") {
-+                        writeTemp(*tempIo, "%%BeginPageSetup" + lineEnding);
-+                    }
-+                }
-                 if (useFlexibleEmbedding) {
-                     // insert XMP metadata into existing flexible embedding
-                     if (pos == xmpPos) {
-@@ -947,7 +952,8 @@ namespace {
-                         EXV_DEBUG << "readWriteEpsMetadata: Skipping to " << skipPos << " at " << __FILE__ << ":" << __LINE__ << "\n";
-                         #endif
-                     }
--                } else {
-+                }
-+                if (!useFlexibleEmbedding) {
-                     // remove preceding embedding(s)
-                     for (std::vector<std::pair<size_t, size_t> >::const_iterator e = removableEmbeddings.begin(); e != removableEmbeddings.end(); e++) {
-                         if (pos == e->first) {
-@@ -960,9 +966,6 @@ namespace {
-                     }
-                     // insert XMP metadata with new flexible embedding, if necessary
-                     if (pos == posEndPageSetup && !deleteXmp) {
--                        if (line != "%%EndPageSetup") {
--                            writeTemp(*tempIo, "%%BeginPageSetup" + lineEnding);
--                        }
-                         writeTemp(*tempIo, "%Exiv2BeginXMP: Before %%EndPageSetup" + lineEnding);
-                         if (corelDraw) {
-                             writeTemp(*tempIo, "%Exiv2Notice: The following line is needed by CorelDRAW." + lineEnding);
-@@ -1004,10 +1007,14 @@ namespace {
-                             writeTemp(*tempIo, "@sv" + lineEnding);
-                         }
-                         writeTemp(*tempIo, "%Exiv2EndXMP" + lineEnding);
--                        if (line != "%%EndPageSetup") {
--                            writeTemp(*tempIo, "%%EndPageSetup" + lineEnding);
--                        }
-                     }
-+                }
-+                if (pos == posEndPageSetup) {
-+                    if (line != "%%EndPageSetup") {
-+                        writeTemp(*tempIo, "%%EndPageSetup" + lineEnding);
-+                    }
-+                }
-+                if (!useFlexibleEmbedding) {
-                     if (pos == posPageTrailer && !deleteXmp) {
-                         if (!implicitPageTrailer) {
-                             skipPos = posLineEnd;
--- 
-1.7.10.4
-
-From b22ff432f0205d77d1b9e0ad2cd314ab6cdf20b0 Mon Sep 17 00:00:00 2001
-From: vog <vog@b7c8b350-86e7-0310-a4b4-de8f6a8f16a3>
-Date: Fri, 14 Sep 2012 16:06:29 +0000
-Subject: [PATCH 3/4] Issue #847: Split recognition of implicit Page,
- BeginPageSetup and EndPageSetup
-
-git-svn-id: svn://dev.exiv2.org/svn/trunk@2871 b7c8b350-86e7-0310-a4b4-de8f6a8f16a3
----
- src/epsimage.cpp |   17 ++++++++++++-----
- 1 file changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/src/epsimage.cpp b/src/epsimage.cpp
-index 9276eb5..57051a1 100644
---- a/src/epsimage.cpp
-+++ b/src/epsimage.cpp
-@@ -396,6 +396,7 @@ namespace {
-         bool illustrator8 = false;
-         bool corelDraw = false;
-         bool implicitPage = false;
-+        bool implicitPageSetup = false;
-         bool implicitPageTrailer = false;
-         bool inDefaultsPreviewPrologSetup = false;
-         bool inRemovableEmbedding = false;
-@@ -510,29 +511,35 @@ namespace {
-             if (posPage == posEndEps && posEndComments != posEndEps && !inDefaultsPreviewPrologSetup && !inRemovableEmbedding && !onlyWhitespaces(line)) {
-                 posPage = startPos;
-                 implicitPage = true;
--                posBeginPageSetup = startPos;
--                posEndPageSetup = startPos;
-                 #ifdef DEBUG
--                EXV_DEBUG << "readWriteEpsMetadata: Found implicit Page, BeginPageSetup and EndPageSetup at position: " << startPos << "\n";
-+                EXV_DEBUG << "readWriteEpsMetadata: Found implicit Page at position: " << startPos << "\n";
-                 #endif
-             }
--            if (posBeginPageSetup == posEndEps && posPage != posEndEps && !inRemovableEmbedding && line.size() >= 1 && line[0] != '%') {
-+            if (posBeginPageSetup == posEndEps && (implicitPage || (posPage != posEndEps && !inRemovableEmbedding && line.size() >= 1 && line[0] != '%'))) {
-                 posBeginPageSetup = startPos;
-+                implicitPageSetup = true;
-+                #ifdef DEBUG
-+                EXV_DEBUG << "readWriteEpsMetadata: Found implicit BeginPageSetup at position: " << startPos << "\n";
-+                #endif
-+            }
-+            if (posEndPageSetup == posEndEps && implicitPageSetup) {
-                 posEndPageSetup = startPos;
-                 #ifdef DEBUG
--                EXV_DEBUG << "readWriteEpsMetadata: Found implicit BeginPageSetup and EndPageSetup at position: " << startPos << "\n";
-+                EXV_DEBUG << "readWriteEpsMetadata: Found implicit EndPageSetup at position: " << startPos << "\n";
-                 #endif
-             }
-             if (line.size() >= 1 && line[0] != '%') continue; // performance optimization
-             if (line == "%%EOF" || line == "%%Trailer" || line == "%%PageTrailer") {
-                 if (posBeginPageSetup == posEndEps) {
-                     posBeginPageSetup = startPos;
-+                    implicitPageSetup = true;
-                     #ifdef DEBUG
-                     EXV_DEBUG << "readWriteEpsMetadata: Found implicit BeginPageSetup at position: " << startPos << "\n";
-                     #endif
-                 }
-                 if (posEndPageSetup == posEndEps) {
-                     posEndPageSetup = startPos;
-+                    implicitPageSetup = true;
-                     #ifdef DEBUG
-                     EXV_DEBUG << "readWriteEpsMetadata: Found implicit EndPageSetup at position: " << startPos << "\n";
-                     #endif
--- 
-1.7.10.4
-
-From 41fb1a2ff54a9377763e4a66544c2234f9b055c8 Mon Sep 17 00:00:00 2001
-From: vog <vog@b7c8b350-86e7-0310-a4b4-de8f6a8f16a3>
-Date: Fri, 14 Sep 2012 17:01:36 +0000
-Subject: [PATCH 4/4] Issue #847: Ensure that Photoshop will always recognize
- modified Photoshop EPS files
-
-For a full description of this issue, see:
-http://dev.exiv2.org/issues/847
-
-git-svn-id: svn://dev.exiv2.org/svn/trunk@2873 b7c8b350-86e7-0310-a4b4-de8f6a8f16a3
----
- src/epsimage.cpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/epsimage.cpp b/src/epsimage.cpp
-index 57051a1..4a0ca3a 100644
---- a/src/epsimage.cpp
-+++ b/src/epsimage.cpp
-@@ -522,7 +522,7 @@ namespace {
-                 EXV_DEBUG << "readWriteEpsMetadata: Found implicit BeginPageSetup at position: " << startPos << "\n";
-                 #endif
-             }
--            if (posEndPageSetup == posEndEps && implicitPageSetup) {
-+            if (posEndPageSetup == posEndEps && implicitPageSetup && !inRemovableEmbedding && line.size() >= 1 && line[0] != '%') {
-                 posEndPageSetup = startPos;
-                 #ifdef DEBUG
-                 EXV_DEBUG << "readWriteEpsMetadata: Found implicit EndPageSetup at position: " << startPos << "\n";
--- 
-1.7.10.4
-
diff -r 97c5f8da5036 -r 3d86598a6b7f src/exiv2-r2796.patch
--- a/src/exiv2-r2796.patch	Fri May 27 12:24:32 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-This patch has been taken from:
-http://dev.exiv2.org/projects/exiv2/repository/revisions/2796
-
-Index: trunk/src/basicio.cpp
-===================================================================
---- trunk/src/basicio.cpp	(revision 2795)
-+++ trunk/src/basicio.cpp	(revision 2796)
-@@ -61,6 +61,11 @@
- # include <unistd.h>                    // for getpid, stat
- #endif
- 
-+// Platform specific headers for handling extended attributes (xattr)
-+#if defined(__APPLE__)
-+# include <sys/xattr.h>
-+#endif
-+
- #if defined WIN32 && !defined __CYGWIN__
- // Windows doesn't provide mode_t, nlink_t
- typedef unsigned short mode_t;
-@@ -131,6 +136,8 @@
-         int switchMode(OpMode opMode);
-         //! stat wrapper for internal use
-         int stat(StructStat& buf) const;
-+        //! copy extended attributes (xattr) from another file
-+        void copyXattrFrom(const FileIo& src);
- #if defined WIN32 && !defined __CYGWIN__
-         // Windows function to determine the number of hardlinks (on NTFS)
-         DWORD winNumberOfLinks() const;
-@@ -252,6 +259,47 @@
-         return ret;
-     } // FileIo::Impl::stat
- 
-+    void FileIo::Impl::copyXattrFrom(const FileIo& src)
-+    {
-+#if defined(__APPLE__)
-+# if defined(EXV_UNICODE_PATH)
-+#  error No xattr API for MacOS X with unicode support
-+# endif
-+        const ssize_t namebufSize = ::listxattr(src.p_->path_.c_str(), 0, 0, 0);
-+        if (namebufSize < 0) {
-+            throw Error(2, src.p_->path_, strError(), "listxattr");
-+        }
-+        if (namebufSize == 0) {
-+            // No extended attributes in source file
-+            return;
-+        }
-+        char namebuf[namebufSize];
-+        if (::listxattr(src.p_->path_.c_str(), namebuf, sizeof(namebuf), 0) != namebufSize) {
-+            throw Error(2, src.p_->path_, strError(), "listxattr");
-+        }
-+        for (ssize_t namebufPos = 0; namebufPos < namebufSize;) {
-+            const char *name = namebuf + namebufPos;
-+            namebufPos += strlen(name) + 1;
-+            const ssize_t valueSize = ::getxattr(src.p_->path_.c_str(), name, 0, 0, 0, 0);
-+            if (valueSize < 0) {
-+                throw Error(2, src.p_->path_, strError(), "getxattr");
-+            }
-+            char value[valueSize];
-+            if (::getxattr(src.p_->path_.c_str(), name, value, sizeof(value), 0, 0) != valueSize) {
-+                throw Error(2, src.p_->path_, strError(), "getxattr");
-+            }
-+#ifdef DEBUG
-+            EXV_DEBUG << "Copying xattr \"" << name << "\" with value size " << valueSize << "\n";
-+#endif
-+            if (::setxattr(path_.c_str(), name, value, valueSize, 0, 0) != 0) {
-+                throw Error(2, path_, strError(), "setxattr");
-+            }
-+        }
-+#else
-+        // No xattr support for this platform.
-+#endif
-+    } // FileIo::Impl::copyXattrFrom
-+
- #if defined WIN32 && !defined __CYGWIN__
-     DWORD FileIo::Impl::winNumberOfLinks() const
-     {
-@@ -521,6 +569,7 @@
-                     throw Error(10, path(), "w+b", strError());
-                 }
-             }
-+            fileIo->p_->copyXattrFrom(*this);
-             basicIo = fileIo;
-         }
-         else {
diff -r 97c5f8da5036 -r 3d86598a6b7f src/exiv2.mk
--- a/src/exiv2.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/exiv2.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,28 +3,29 @@
 
 PKG             := exiv2
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.23
-$(PKG)_CHECKSUM := 5f342bf642477526f41add11d6ee7787cdcd639f
-$(PKG)_SUBDIR   := exiv2-$($(PKG)_VERSION)
-$(PKG)_FILE     := exiv2-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://www.exiv2.org/$($(PKG)_FILE)
-$(PKG)_DEPS     := libiconv zlib expat
+$(PKG)_VERSION  := 0.27.5
+$(PKG)_CHECKSUM := 775f9c5ddeb92b682da8b7737f9811009595dc6a
+$(PKG)_SUBDIR   := exiv2-$($(PKG)_VERSION)-Source
+$(PKG)_FILE     := exiv2-$($(PKG)_VERSION)-Source.tar.gz
+$(PKG)_URL      := https://github.com/Exiv2/exiv2/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_DEPS     := gettext libiconv zlib expat
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://www.exiv2.org/archive.html' | \
-    grep 'href="/releases/exiv2-' | \
-    $(SED) -n 's,.*exiv2-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    $(WGET) -q -O- 'https://www.exiv2.org/download.html' | \
+    $(SED) -n 's,.*exiv2-\([0-9][^>]*\)-Source\.tar.*,\1,p' | \
     head -1
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
-        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
-        $(ENABLE_SHARED_OR_STATIC) \
-        --prefix='$(HOST_PREFIX)' \
-        --disable-visibility \
-        --disable-nls \
-        --with-expat
-    $(MAKE) -C '$(1)/xmpsdk/src' -j '$(JOBS)'
-    $(MAKE) -C '$(1)/src'        -j '$(JOBS)' install-lib
+    cd '$(1)' && cmake \
+        $($(PKG)_CMAKE_FLAGS) \
+        -DBUILD_TESTING=no \
+        -DEXIV2_BUILD_SAMPLES=OFF \
+        $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
+        -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
+        .
+
+    $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1
+    $(MAKE) -C '$(1)' -j '1' VERBOSE=1 DESTDIR='$(3)' install
 endef
diff -r 97c5f8da5036 -r 3d86598a6b7f src/expat.mk
--- a/src/expat.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/expat.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := expat
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.4.1
-$(PKG)_CHECKSUM := b677b9a1cf3a1424fda183223fae2c58f50151af
+$(PKG)_VERSION  := 2.4.8
+$(PKG)_CHECKSUM := 5bc8aed3107a04ba2a35d45646eb079e6abbfe1d
 $(PKG)_SUBDIR   := expat-$($(PKG)_VERSION)
 $(PKG)_FILE     := expat-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/expat/expat/$($(PKG)_VERSION)/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/ffmpeg-1-fixes.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ffmpeg-1-fixes.patch	Fri May 27 12:54:43 2022 +0200
@@ -0,0 +1,45 @@
+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: Tony Theodore <tonyt@logyst.com>
+Date: Sun, 25 Apr 2021 19:23:19 +1000
+Subject: [PATCH 1/2] fix windres whitespace handling
+
+
+diff --git a/ffbuild/common.mak b/ffbuild/common.mak
+index 1111111..2222222 100644
+--- a/ffbuild/common.mak
++++ b/ffbuild/common.mak
+@@ -82,7 +82,7 @@ COMPILE_NVCC = $(call COMPILE,NVCC)
+ 	-$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@)
+ 
+ %.o: %.rc
+-	$(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $<
++	$(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES)" $(addprefix --preprocessor-arg ,-E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)) -o $@ $<
+ 
+ %.i: %.c
+ 	$(CC) $(CCFLAGS) $(CC_E) $<
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Mon, 4 Apr 2022 00:33:50 +0200
+Subject: [PATCH 2/2] avoid warning: cast from pointer to integer of different
+ size [-Wpointer-to-int-cast]
+
+when checking opus
+
+diff --git a/configure b/configure
+index 1111111..2222222 100755
+--- a/configure
++++ b/configure
+@@ -1336,7 +1336,7 @@ check_func_headers(){
+         done
+         echo "#include <stdint.h>"
+         for func in $funcs; do
+-            echo "long check_$func(void) { return (long) $func; }"
++            echo "intptr_t check_$func(void) { return (intptr_t) $func; }"
+         done
+         echo "int main(void) { int ret = 0;"
+         # LTO could optimize out the test functions without this
diff -r 97c5f8da5036 -r 3d86598a6b7f src/ffmpeg.mk
--- a/src/ffmpeg.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/ffmpeg.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := ffmpeg
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.2.3
-$(PKG)_CHECKSUM := 7be5114d169e5a1ba73ad1e844e7fb4d0fb93cc6
+$(PKG)_VERSION  := 4.2.6
+$(PKG)_CHECKSUM := 94fc4d979d7efd5fc85869300fe93fa7a275b365
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://www.ffmpeg.org/releases/$($(PKG)_FILE)
@@ -19,7 +19,12 @@
     head -1
 endef
 
+ifeq ($(TARGET),i686-w64-mingw32)
+  $(PKG)_CONFIG_OPTS += --disable-optimizations
+endif
+
 ifeq ($(MXE_NATIVE_BUILD),no)
+
 define $(PKG)_BUILD
     '$(SED)' -i "s^[-]lvpx^`'$(MXE_PKG_CONFIG)' --libs-only-l vpx`^g;" $(1)/configure
     cd '$(1)' && ./configure \
@@ -48,8 +53,9 @@
         --enable-libopencore-amrnb \
         --enable-libopencore-amrwb \
         --enable-libx264 \
-        --enable-libvpx
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
+        --enable-libvpx \
+	$($(PKG)_CONFIG_OPTS)
+    $(MAKE) -C '$(1)' -j '$(JOBS)' V=1
     $(MAKE) -C '$(1)' -j 1 install
 endef
 else
diff -r 97c5f8da5036 -r 3d86598a6b7f src/flac.mk
--- a/src/flac.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/flac.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := flac
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.3.3
-$(PKG)_CHECKSUM := 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe
+$(PKG)_VERSION  := 1.3.4
+$(PKG)_CHECKSUM := 99c28482a8b2d81deaf740639e4cb55658427420
 $(PKG)_SUBDIR   := flac-$($(PKG)_VERSION)
 $(PKG)_FILE     := flac-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://downloads.xiph.org/releases/flac/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/fontconfig.mk
--- a/src/fontconfig.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/fontconfig.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,18 +3,18 @@
 
 PKG             := fontconfig
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.13.1
-$(PKG)_CHECKSUM := 75612356ef4f801735b49baf987f8942b4a7a5e1
+$(PKG)_VERSION  := 2.14.0
+$(PKG)_CHECKSUM := 9b1d4c5a61b4d25140db444e9cf56f09fb843fce
 $(PKG)_SUBDIR   := fontconfig-$($(PKG)_VERSION)
-$(PKG)_FILE     := fontconfig-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL      := http://fontconfig.org/release/$($(PKG)_FILE)
+$(PKG)_FILE     := fontconfig-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := https://fontconfig.org/release/$($(PKG)_FILE)
 $(PKG)_DEPS     := freetype expat gettext libiconv
 ifeq ($(MXE_WINDOWS_BUILD),no)
   $(PKG)_DEPS += util-linux
 endif
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://fontconfig.org/release/' | \
+    $(WGET) -q -O- 'https://fontconfig.org/release/' | \
     $(SED) -n 's,.*fontconfig-\([0-9][^>]*\)\.tar.*,\1,p' | \
     tail -1
 endef
diff -r 97c5f8da5036 -r 3d86598a6b7f src/freeglut-1-fixes.patch
--- a/src/freeglut-1-fixes.patch	Fri May 27 12:24:32 2022 +0200
+++ b/src/freeglut-1-fixes.patch	Fri May 27 12:54:43 2022 +0200
@@ -1,65 +1,48 @@
-This file is part of MXE.
-See index.html for further information.
-
-Contains ad hoc patches for cross building.
-
-From 87a791a05687c7737d1c50381a0de30ba1acf96e Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Mon, 24 Oct 2011 09:40:10 +0200
-Subject: [PATCH] add pkg-config support
-
-based on
-http://old.nabble.com/-PATCH--Add-pkgconfig-file-td23312302.html
-
-proposed to upstream
-https://sourceforge.net/tracker/?func=detail&aid=3511842&group_id=1032&atid=101032
----
- Makefile.am  |    3 +++
- configure.ac |    1 +
- glut.pc.in   |   12 ++++++++++++
- 3 files changed, 16 insertions(+), 0 deletions(-)
- create mode 100644 glut.pc.in
-
-diff --git a/Makefile.am b/Makefile.am
-index 39c5628..b504bc6 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -68,3 +68,6 @@ dist-hook:
+diff --git a/freeglut/freeglut/src/fg_gl2.c b/freeglut/freeglut/src/fg_gl2.c
+index 38b0acbb..f79c432a 100644
+--- a/src/fg_gl2.c
++++ b/src/fg_gl2.c
+@@ -27,6 +27,18 @@
+ #include "fg_internal.h"
+ #include "fg_gl2.h"
  
- libtool: $(LIBTOOL_DEPS)
- 	$(SHELL) ./config.status --recheck
++#ifdef GL_ES_VERSION_2_0
++/* Use existing functions on GLES 2.0 */
++#else
++FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
++FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
++FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
++FGH_PFNGLBUFFERDATAPROC fghBufferData;
++FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
++FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
++FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
++#endif
 +
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = glut.pc
-diff --git a/configure.ac b/configure.ac
-index 15dc997..2f25bcb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -119,5 +119,6 @@ AC_CONFIG_FILES([
- 	progs/demos/spaceball/Makefile
- 	progs/demos/subwin/Makefile
- 	src/Makefile
-+	glut.pc
- ])
- AC_OUTPUT
-diff --git a/glut.pc.in b/glut.pc.in
-new file mode 100644
-index 0000000..ea57c4a
---- /dev/null
-+++ b/glut.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@/@PACKAGE@
-+
-+Name: glut
-+Description: A freely licensed alternative to the GLUT library
-+Version: @VERSION@
-+Libs: -L${libdir} -lglut
-+Libs.private: -lglu32 -lopengl32 -lwinmm -lgdi32 -mwindows
-+Cflags: -DFREEGLUT_STATIC -I${includedir}
-+
--- 
-1.7.8
-
+ void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
+   if (fgStructure.CurrentWindow != NULL)
+     fgStructure.CurrentWindow->Window.attribute_v_coord = attrib;
+diff --git a/freeglut/freeglut/src/fg_gl2.h b/freeglut/freeglut/src/fg_gl2.h
+index ab8ba5c7..fb3d4676 100644
+--- a/src/fg_gl2.h
++++ b/src/fg_gl2.h
+@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+ typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
+ typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+ 
+-FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
+-FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
+-FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
+-FGH_PFNGLBUFFERDATAPROC fghBufferData;
+-FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
+-FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
+-FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
++extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
++extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
++extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
++extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
++extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
++extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
++extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
+ 
+ #    endif
+ 
diff -r 97c5f8da5036 -r 3d86598a6b7f src/freeglut.mk
--- a/src/freeglut.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/freeglut.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,12 +3,17 @@
 
 PKG             := freeglut
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.8.0
-$(PKG)_CHECKSUM := 4debbe559c6c9841ce1abaddc9d461d17c6083b1
+$(PKG)_VERSION  := 3.2.1
+$(PKG)_CHECKSUM := 7a62e0d2caad92ff745bc5037592b2753f0b2f20
 $(PKG)_SUBDIR   := freeglut-$(word 1,$(subst -, ,$($(PKG)_VERSION)))
 $(PKG)_FILE     := freeglut-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/freeglut/freeglut/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
+$(PKG)_DEPS     := mesa
+ifeq ($(USE_SYSTEM_X11_LIBS),no)
+  $(PKG)_DEPS += xi
+endif
+
+$(PKG)_CMAKE_FLAGS :=
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://sourceforge.net/projects/freeglut/files/freeglut/' | \
@@ -17,19 +22,16 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && ./autogen.sh
-    cd '$(1)' && ./configure \
-        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
-        $(ENABLE_SHARED_OR_STATIC) \
-        --prefix='$(HOST_PREFIX)' \
-        --enable-replace-glut \
-        --disable-debug \
-        --without-progs \
-        --without-x
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= EXPORT_FLAGS='-DFREEGLUT_STATIC'
+    mkdir '$(1)/build'
+    cd '$(1)/build' && cmake \
+        $($(PKG)_CMAKE_FLAGS) \
+        $(CMAKE_CCACHE_FLAGS) \
+        -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
+	-DFREEGLUT_REPLACE_GLUT=ON \
+	-DFREEGLUT_BUILD_DEMOS=OFF \
+	$(if $(filter $(BUILD_STATIC),no),-DFREEGLUT_BUILD_STATIC_LIBS=OFF) \
+        $(1)
 
-    '$(MXE_CC)' \
-        -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(HOST_BINDIR)/test-freeglut.exe' \
-        `'$(MXE_PKG_CONFIG)' glut --cflags --libs`
+    cmake --build  '$(1)/build'
+    DESTDIR='$(3)' cmake --install '$(1)/build'
 endef
diff -r 97c5f8da5036 -r 3d86598a6b7f src/freetds.mk
--- a/src/freetds.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/freetds.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := freetds
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.3.6
-$(PKG)_CHECKSUM := 607006f673573bc26b59e2a63492ffe630023655
+$(PKG)_VERSION  := 1.3.10
+$(PKG)_CHECKSUM := d469b5a809e5c0caa867ae4fd84edafdfb7c4141
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/freetype.mk
--- a/src/freetype.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/freetype.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := freetype
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.11.1
-$(PKG)_CHECKSUM := 86bdc98b37efe447cf53420bf2c18402ff905112
+$(PKG)_VERSION  := 2.12.1
+$(PKG)_CHECKSUM := 5133eed28a7624ffabbf6d00aa3f68b841d62d80
 $(PKG)_SUBDIR   := freetype-$($(PKG)_VERSION)
 $(PKG)_FILE     := freetype-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$($(PKG)_VERSION)/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/fribidi.mk
--- a/src/fribidi.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/fribidi.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := fribidi
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.11
-$(PKG)_CHECKSUM := 326d3f89431b9553f1942ca6814433e4b34611a3
+$(PKG)_VERSION  := 1.0.12
+$(PKG)_CHECKSUM := c042d9a6e42d9871ea485bb734df049cc57a7185
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://github.com/fribidi/fribidi/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/gcc-isl.mk
--- a/src/gcc-isl.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/gcc-isl.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,11 +3,11 @@
 
 PKG             := gcc-isl
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.22.1
-$(PKG)_CHECKSUM := ce66c4415906bf2c16a8f09f31383f4fe0991531
-$(PKG)_SUBDIR   := isl-isl-$($(PKG)_VERSION)-788faca
+$(PKG)_VERSION  := 0.24
+$(PKG)_CHECKSUM := b0c46cc1c4fb1658def8d3c4c702a01049ea795e
+$(PKG)_SUBDIR   := isl-$($(PKG)_VERSION)
 $(PKG)_FILE     := isl-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://repo.or.cz/isl.git/snapshot/$($(PKG)_FILE)
+$(PKG)_URL      := https://libisl.sourceforge.io/$($(PKG)_FILE)
 $(PKG)_DEPS     := build-libtool gcc-gmp
 
 define $(PKG)_UPDATE
@@ -16,12 +16,11 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && ./autogen.sh
-    mkdir '$(1).build'
-    cd    '$(1).build' && '$(1)/configure' \
+    cd '$(1)' && mkdir '$(1)/.build'
+    cd '$(1)/.build' && '$(1)/configure' \
         --prefix='$(BUILD_TOOLS_PREFIX)' \
         --disable-shared \
         --with-gmp-prefix='$(BUILD_TOOLS_PREFIX)'
-    $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 install
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)'
+    $(MAKE) -C '$(1)/.build' -j 1 install
 endef
diff -r 97c5f8da5036 -r 3d86598a6b7f src/gcc-mpc.mk
--- a/src/gcc-mpc.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/gcc-mpc.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := gcc-mpc
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.1.0
-$(PKG)_CHECKSUM := b019d9e1d27ec5fb99497159d43a3164995de2d0
+$(PKG)_VERSION  := 1.2.1
+$(PKG)_CHECKSUM := 2a4919abf445c6eda4e120cd669b8733ce337227
 $(PKG)_SUBDIR   := mpc-$($(PKG)_VERSION)
 $(PKG)_FILE     := mpc-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://ftp.gnu.org/gnu/mpc/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/gdal-1-gcc11.patch
--- a/src/gdal-1-gcc11.patch	Fri May 27 12:24:32 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- ./ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp.orig	2020-01-28 11:13:43.000000000 +0100
-+++ ./ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp	2021-08-09 21:20:52.610437353 +0200
-@@ -36,6 +36,7 @@
- #include <cassert>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <memory>
- #include <string>
- 
diff -r 97c5f8da5036 -r 3d86598a6b7f src/gdal.mk
--- a/src/gdal.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/gdal.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,18 +3,18 @@
 
 PKG             := gdal
 $(PKG)_IGNORE   :
-$(PKG)_VERSION  := 3.0.4
-$(PKG)_CHECKSUM := 5362ecafb9d06fa9d86beb1ab07b974256b13542
+$(PKG)_VERSION  := 3.4.3
+$(PKG)_CHECKSUM := dfa4d6a3046b3ce90e1186ed4744c55ee9a4aec8
 $(PKG)_SUBDIR   := gdal-$($(PKG)_VERSION)
-$(PKG)_FILE     := gdal-$($(PKG)_VERSION).tar.gz
+$(PKG)_FILE     := gdal-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://download.osgeo.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_URL_2    := ftp://ftp.remotesensing.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := zlib libpng tiff libgeotiff libiconv jpeg jasper giflib expat sqlite curl geos postgresql gta proj pcre qhull
+$(PKG)_DEPS     := zlib libpng tiff libgeotiff libiconv jpeg jasper giflib expat sqlite curl postgresql gta proj pcre qhull
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://trac.osgeo.org/gdal/wiki/DownloadSource' | \
-    $(SED) -n 's,.*gdal-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    head -1
+    $(WGET) -q -O- 'https://github.com/OSGeo/gdal/tags' | \
+    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(GREP) -v "RC" | $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
@@ -23,10 +23,7 @@
 	$(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
-        --with-bsb \
-        --with-grib \
-        --with-ogr \
-        --with-vfk \
+        --with-cpp14 \
         --with-pam \
         --with-libz='$(HOST_PREFIX)' \
         --with-png='$(HOST_PREFIX)' \
@@ -38,12 +35,11 @@
         --with-expat='$(HOST_PREFIX)' \
         --with-sqlite3='$(HOST_PREFIX)' \
         --with-curl='$(HOST_BINDIR)/curl-config' \
-        --with-geos='$(HOST_BINDIR)/geos-config' \
-        --with-pg='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pg_config' \
+        --without-geos \
+        --with-pg \
         --with-gta='$(HOST_PREFIX)' \
-        --with-xml2='$(HOST_BINDIR)/xml2-config' \
+        --with-xml2 \
         --without-odbc \
-        --without-static-proj4 \
         --without-xerces \
         --without-grass \
         --without-libgrass \
@@ -65,13 +61,9 @@
         --without-mysql \
         --without-ingres \
         --without-dods-root \
-        --without-dwgdirect \
         --without-idb \
-        --without-sde \
         --without-epsilon \
         --without-perl \
-        --without-php \
-        --without-ruby \
         --without-python \
         LIBS="-ljpeg `'$(MXE_PKG_CONFIG)' --libs libtiff-4`"
     $(MAKE) -C '$(1)'       -j '$(JOBS)' lib-target
diff -r 97c5f8da5036 -r 3d86598a6b7f src/gdb.mk
--- a/src/gdb.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/gdb.mk	Fri May 27 12:54:43 2022 +0200
@@ -2,8 +2,8 @@
 # See index.html for further information.
 
 PKG             := gdb
-$(PKG)_VERSION  := 11.1
-$(PKG)_CHECKSUM := 6cb3361c7f2b22d6d2c25ab4992264aa41bc2471
+$(PKG)_VERSION  := 12.1
+$(PKG)_CHECKSUM := 2edabd9f5766b84889b07b366b4438e93e994005
 $(PKG)_SUBDIR   := gdb-$($(PKG)_VERSION)
 $(PKG)_FILE     := gdb-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/gdcm.mk
--- a/src/gdcm.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/gdcm.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,19 +3,12 @@
 
 PKG             := gdcm
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.0.10
-$(PKG)_CHECKSUM := dd3543fde27351744cd31b2a80b6800d7810047d
+$(PKG)_VERSION  := 3.0.12
+$(PKG)_CHECKSUM := 31b7d961201c5e7d0283611307f918ee4a16d024
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG) 3.x/GDCM $($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := expat zlib
-
-$(PKG)_CMAKE_OPTS :=
-ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
-  ifeq ($(MXE_SYSTEM),mingw)
-    $(PKG)_CMAKE_OPTS := -G "MSYS Makefiles" 
-  endif
-endif
+$(PKG)_DEPS     := expat zlib build-ninja
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://sourceforge.net/projects/gdcm/files/gdcm 3.x/' | \
@@ -48,7 +41,7 @@
     define $(PKG)_BUILD
         mkdir '$(1)/../.build'
         cd '$(1)/../.build' && cmake \
-            $($(PKG)_CMAKE_OPTS) \
+            -GNinja \
             $(CMAKE_CCACHE_FLAGS) \
             $(CMAKE_BUILD_SHARED_OR_STATIC) \
             -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'  \
@@ -58,8 +51,8 @@
             -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=FALSE \
             ../$($(PKG)_SUBDIR)
 
-        make -C $(1)/../.build -j $(JOBS) 
-        make -C $(1)/../.build -j 1 install DESTDIR=$(3)
+        cmake --build $(1)/../.build -j $(JOBS) 
+        DESTDIR=$(3) cmake --install $(1)/../.build
     endef
 
 endif
diff -r 97c5f8da5036 -r 3d86598a6b7f src/geos.mk
--- a/src/geos.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/geos.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := geos
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.10.1
-$(PKG)_CHECKSUM := 076fda159b29c2c3a04c1674f5cb458dae51eb32
+$(PKG)_VERSION  := 3.10.2
+$(PKG)_CHECKSUM := 151cc0baa09639fd278eca5b4fc06cd27a28a4c8
 $(PKG)_SUBDIR   := geos-$($(PKG)_VERSION)
 $(PKG)_FILE     := geos-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://download.osgeo.org/geos/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/gl2ps-2-docpath.patch
--- a/src/gl2ps-2-docpath.patch	Fri May 27 12:24:32 2022 +0200
+++ b/src/gl2ps-2-docpath.patch	Fri May 27 12:54:43 2022 +0200
@@ -6,7 +6,7 @@
  endif()
  
 -if(WIN32)
-+if(WIN32 AND NOT DEFINED ENV{MSYSTEM})
++if(WIN32 AND NOT DEFINED ENV{MSYSTEM} AND NOT CMAKE_CROSSCOMPILING)
    set(GL2PS_DOC .)
  else()
    set(GL2PS_DOC share/doc/gl2ps)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/gl2ps.mk
--- a/src/gl2ps.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/gl2ps.mk	Fri May 27 12:54:43 2022 +0200
@@ -9,7 +9,7 @@
 $(PKG)_URL      := http://geuz.org/$(PKG)/src/$($(PKG)_FILE)
 $(PKG)_DEPS     := libpng zlib
 ifeq ($(USE_SYSTEM_OPENGL),no)
-  $(PKG)_DEPS += mesa glu
+  $(PKG)_DEPS += mesa glu freeglut
 endif
 
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
@@ -73,12 +73,6 @@
                 $(INSTALL) -m644 '$(1)/gl2ps.h' '$(3)$(HOST_INCDIR)'; \
             else \
                 $(MAKE) -C '$(1)' -j 1 VERBOSE=1 DESTDIR='$(3)' install; \
-                if [ $(MXE_SYSTEM) = mingw ]; then \
-                    echo "Install dll"; \
-                    $(INSTALL) -d '$(3)$(HOST_BINDIR)'; \
-                    $(INSTALL) '$(3)$(HOST_LIBDIR)/libgl2ps.dll' '$(3)$(HOST_BINDIR)/'; \
-                    rm -f '$(3)$(HOST_LIBDIR)/libgl2ps.dll'; \
-                fi; \
             fi
         endef
     else
diff -r 97c5f8da5036 -r 3d86598a6b7f src/glu.mk
--- a/src/glu.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/glu.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := glu
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 9.0.1
-$(PKG)_CHECKSUM := b6ffef562ba55d3f80146d4238589cb9b1de66f5
+$(PKG)_VERSION  := 9.0.2
+$(PKG)_CHECKSUM := d56833045bf49218fbaf6047371c14ff852cecfe
 $(PKG)_SUBDIR   := glu-$($(PKG)_VERSION)
 $(PKG)_FILE     := glu-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.freedesktop.org/pub/mesa/glu/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/graphicsmagick.mk
--- a/src/graphicsmagick.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/graphicsmagick.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := graphicsmagick
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.3.37
-$(PKG)_CHECKSUM := 94e0103f7d2286d1ba46c633d68ab0e1bfa2b2d3
+$(PKG)_VERSION  := 1.3.38
+$(PKG)_CHECKSUM := 9494a31b057a79db27cc909f9ba332cf7aa578f5
 $(PKG)_SUBDIR   := GraphicsMagick-$($(PKG)_VERSION)
 $(PKG)_FILE     := GraphicsMagick-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/icu4c.mk
--- a/src/icu4c.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/icu4c.mk	Fri May 27 12:54:43 2022 +0200
@@ -1,7 +1,7 @@
 PKG             := icu4c
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 70.1
-$(PKG)_CHECKSUM := f7c1363edee6be7de8b624ffbb801892b3417d4e
+$(PKG)_VERSION  := 71.1
+$(PKG)_CHECKSUM := 406b0c8635288b772913b6ff646451e69748878a
 $(PKG)_SUBDIR   := icu
 $(PKG)_FILE     := $(PKG)-$(subst .,_,$($(PKG)_VERSION))-src.tgz
 $(PKG)_URL      := https://github.com/unicode-org/icu/releases/download/release-$(subst .,-,$($(PKG)_VERSION))/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/isl.mk
--- a/src/isl.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/isl.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,11 +3,11 @@
 
 PKG             := isl
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.22.1
-$(PKG)_CHECKSUM := ce66c4415906bf2c16a8f09f31383f4fe0991531
-$(PKG)_SUBDIR   := isl-$(PKG)-$($(PKG)_VERSION)-788faca
+$(PKG)_VERSION  := 0.24
+$(PKG)_CHECKSUM := b0c46cc1c4fb1658def8d3c4c702a01049ea795e
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://repo.or.cz/isl.git/snapshot/$($(PKG)_FILE)
+$(PKG)_URL      := https://libisl.sourceforge.io/$($(PKG)_FILE)
 $(PKG)_DEPS     := build-gcc gmp
 
 $(PKG)_EXTRA_MAKE_FLAGS := LDFLAGS='-no-undefined'
@@ -21,11 +21,12 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && ./autogen.sh && ./configure \
+    cd '$(1)' && mkdir '$(1)/.build'
+    cd '$(1)/.build' && '$(1)/configure' \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --with-gmp-prefix='$(HOST_PREFIX)'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' $($(PKG)_EXTRA_MAKE_FLAGS)
-    $(MAKE) -C '$(1)' -j '$(JOBS)' $($(PKG)_EXTRA_MAKE_FLAGS) install
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' $($(PKG)_EXTRA_MAKE_FLAGS)
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' $($(PKG)_EXTRA_MAKE_FLAGS) install
 endef
diff -r 97c5f8da5036 -r 3d86598a6b7f src/jpeg.mk
--- a/src/jpeg.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/jpeg.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := jpeg
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 9d
-$(PKG)_CHECKSUM := 0bf0fbc3f6f1b5f7d5ad4734eae8cbb148517d6f
+$(PKG)_VERSION  := 9e
+$(PKG)_CHECKSUM := ed959b5f3551bc965fe6d0aff6ca48a26f8ce346
 $(PKG)_SUBDIR   := jpeg-$($(PKG)_VERSION)
 $(PKG)_FILE     := jpegsrc.v$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.ijg.org/files/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/json-c-1-patch-missingfile.patch
--- a/src/json-c-1-patch-missingfile.patch	Fri May 27 12:24:32 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Contains a fix for issue 35 on json-c (https://github.com/json-c/json-c/issues/35)
-
---- a/Makefile.am	2012-07-17 22:52:19.000000000 +0200
-+++ b/Makefile.am	2012-07-17 22:54:09.000000000 +0200
-@@ -17,6 +17,7 @@
- 	json_config.h \
- 	json_inttypes.h \
- 	json_object.h \
-+	json_object_iterator.h \
- 	json_object_private.h \
- 	json_tokener.h \
- 	json_util.h \
diff -r 97c5f8da5036 -r 3d86598a6b7f src/json-c-2-patch-remove-rpl.patch
--- a/src/json-c-2-patch-remove-rpl.patch	Fri May 27 12:24:32 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-see http://lists.fedoraproject.org/pipermail/mingw/2009-May/001567.html
-
---- a/configure.in	2012-07-12 01:57:09.000000000 +0200
-+++ b/configure.in	2012-07-12 01:59:06.000000000 +0200
-@@ -25,8 +25,6 @@
- # Checks for library functions.
- AC_FUNC_VPRINTF
- AC_FUNC_MEMCMP
--AC_FUNC_MALLOC
--AC_FUNC_REALLOC
- AC_CHECK_FUNCS(strndup strerror vsnprintf vasprintf open vsyslog strncasecmp)
- 
- AM_PROG_LIBTOOL
diff -r 97c5f8da5036 -r 3d86598a6b7f src/json-c.mk
--- a/src/json-c.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/json-c.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,17 +3,19 @@
 
 PKG             := json-c
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.10
-$(PKG)_CHECKSUM := f90f643c8455da21d57b3e8866868a944a93c596
+$(PKG)_VERSION  := 0.13.1
+$(PKG)_CHECKSUM := a339bae346e58d1737a7909794f432b097dd31cf
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/downloads/$(PKG)/$(PKG)/$($(PKG)_FILE)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION)-nodoc.tar.gz
+$(PKG)_URL      := https://$(PKG)_releases.s3.amazonaws.com/releases/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/json-c/json-c/downloads' | \
-    $(SED) -n 's,.*href="/downloads/json-c/json-c/json-c-\([0-9.]*\).tar.gz.*,\1,p' | \
-    head -1
+    $(WGET) -q -O- 'https://json-c_releases.s3.amazonaws.com' | \
+    $(SED) -r 's,<Key>,\n<Key>,g' | \
+    $(SED) -n 's,.*releases/json-c-\([0-9.]*\).tar.gz.*,\1,p' | \
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
@@ -23,10 +25,5 @@
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC)
         CFLAGS=-Wno-error
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install
-
-    '$(MXE_CC)' \
-        -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(HOST_BINDIR)/test-json-c.exe' \
-        `'$(MXE_PKG_CONFIG)' json --cflags --libs`
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install DEST='$(3)'
 endef
diff -r 97c5f8da5036 -r 3d86598a6b7f src/lapack.mk
--- a/src/lapack.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/lapack.mk	Fri May 27 12:54:43 2022 +0200
@@ -2,8 +2,8 @@
 # See index.html for further information.
 
 PKG             := lapack
-$(PKG)_VERSION  := 3.10.0
-$(PKG)_CHECKSUM := 4a9384523bf236c83568884e8c62d9517e41ac42
+$(PKG)_VERSION  := 3.10.1
+$(PKG)_CHECKSUM := c1a566cb91bf1170fb442eb2be9e1fd4005d4640
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/Reference-LAPACK/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
@@ -30,7 +30,7 @@
 endif
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://www.netlib.org/lapack/' | \
+    $(WGET) -q -O- 'https://www.netlib.org/lapack/' | \
     $(SED) -n 's_.*>lapack-\([0-9.]*\).tar.gz<.*_\1_p' | \
     head -1
 endef
@@ -39,8 +39,7 @@
     define $(PKG)_BUILD
         cd '$(1)' && \
             cp INSTALL/make.inc.gfortran make.inc && \
-            sed -i -e 's/\(FORTRAN[ ]*\)=.*/\1= $(MXE_F77)/' \
-                   -e 's/\(LOADER[ ]*\)=.*/\1= $(MXE_F77)/' \
+            sed -i -e 's/\(FC[ ]*\)=.*/\1= $(MXE_F77)/' \
                    -e 's/\(CC[ ]*\)=.*/\1= $(MXE_CC)/' \
                    -e 's/\(CFLAGS[ ]*\)=.*/\1= -O2/' make.inc
 
@@ -64,13 +63,15 @@
             $(CMAKE_CCACHE_FLAGS) \
             $(CMAKE_BUILD_SHARED_OR_STATIC) \
             -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-            -DCMAKE_AR='$(MXE_AR)' \
-            -DCMAKE_RANLIB='$(MXE_RANLIB)' \
+            -DCMAKE_AR='$(shell which $(MXE_AR))' \
+            -DCMAKE_RANLIB='$(shell which $(MXE_RANLIB))' \
             -DCMAKE_Fortran_FLAGS='$($(PKG)_DEFAULT_INTEGER_8_FLAG)' \
             -DBUILD_DEPRECATED=ON \
             -DBUILD_SHARED_LIBS=$(if $(findstring yes,$(BUILD_SHARED)),ON,OFF) \
             $($(PKG)_BLAS_CONFIG_OPTS) \
             $(1)
-        $(MAKE) -C '$(1)/build/SRC' -j '$(JOBS)' VERBOSE=1 install DESTDIR='$(3)'
+
+        cmake --build '$(1)/build'
+        DESTDIR='$(3)' cmake --install '$(1)/build'
     endef
 endif
diff -r 97c5f8da5036 -r 3d86598a6b7f src/lcms.mk
--- a/src/lcms.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/lcms.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := lcms
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.12
-$(PKG)_CHECKSUM := 3d0c0276fcd3930b80c424512ec0b1ed54ec1497
+$(PKG)_VERSION  := 2.13
+$(PKG)_CHECKSUM := 1676097fb18fce83c9c876d56828c83a6ad829dd
 $(PKG)_SUBDIR   := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION))
 $(PKG)_FILE     := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION)).tar.gz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(subst a,,$($(PKG)_VERSION))/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/levmar.mk
--- a/src/levmar.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/levmar.mk	Fri May 27 12:54:43 2022 +0200
@@ -11,7 +11,7 @@
 $(PKG)_DEPS     := lapack blas libf2c
 
 define $(PKG)_UPDATE
-    $(WGET) --user-agent=MXE -q -O- "http://www.ics.forth.gr/~lourakis/levmar/"  | \
+    $(WGET) --user-agent=MXE -q -O- "https://www.ics.forth.gr/~lourakis/levmar/"  | \
     $(SED) -n 's_.*Latest:.*levmar-\([0-9]\.[0-9]\).*_\1_ip' | \
     head -1;
 endef
diff -r 97c5f8da5036 -r 3d86598a6b7f src/libgcrypt.mk
--- a/src/libgcrypt.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/libgcrypt.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,17 +3,17 @@
 
 PKG             := libgcrypt
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.9.4
-$(PKG)_CHECKSUM := 1bccc8393482fa1953323ff429c6b5ba5676eb1a
+$(PKG)_VERSION  := 1.10.1
+$(PKG)_CHECKSUM := de2cc32e7538efa376de7bf5d3eafa85626fb95f
 $(PKG)_SUBDIR   := libgcrypt-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgcrypt-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnupg.org/gcrypt/libgcrypt/$($(PKG)_FILE)
 $(PKG)_DEPS     := libgpg_error zlib
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'ftp://ftp.gnupg.org/gcrypt/libgcrypt/' | \
+    $(WGET) -q -O- 'https://gnupg.org/ftp/gcrypt/libgcrypt/' | \
     $(SED) -n 's,.*libgcrypt-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    grep -v '^1\.4\.' | \
+    $(SORT) -V | \
     tail -1
 endef
 
diff -r 97c5f8da5036 -r 3d86598a6b7f src/libgpg_error-1-fixes.patch
--- a/src/libgpg_error-1-fixes.patch	Fri May 27 12:24:32 2022 +0200
+++ b/src/libgpg_error-1-fixes.patch	Fri May 27 12:54:43 2022 +0200
@@ -80,6 +80,6 @@
 +AM_INIT_AUTOMAKE(serial_tests dist-bzip2)
 +
 +
- AC_CONFIG_HEADER([config.h])
+ AC_CONFIG_HEADERS([config.h])
  AC_CONFIG_MACRO_DIR([m4])
  AM_SILENT_RULES
diff -r 97c5f8da5036 -r 3d86598a6b7f src/libgpg_error.mk
--- a/src/libgpg_error.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/libgpg_error.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := libgpg_error
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.43
-$(PKG)_CHECKSUM := e71b77e8e32023dfd9cb06504942aa8e028c8795
+$(PKG)_VERSION  := 1.45
+$(PKG)_CHECKSUM := fe724ed37b4935964059a47b7c64d5f8246659d8
 $(PKG)_SUBDIR   := libgpg-error-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgpg-error-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnupg.org/gcrypt/libgpg-error/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/libgsasl-1-fixes.patch
--- a/src/libgsasl-1-fixes.patch	Fri May 27 12:24:32 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Contains ad hoc patches for cross building.
-
-From 1f0955db1bf81de15e1dd04f1fe29f73ef3983c8 Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Mon, 7 Nov 2011 18:01:56 +0100
-Subject: [PATCH] use memxor from nettle
-
-
-diff --git a/gl/memxor.c b/gl/memxor.c
-index 7fec454..d9b62cd 100644
---- a/gl/memxor.c
-+++ b/gl/memxor.c
-@@ -22,7 +22,7 @@
- #include "memxor.h"
- 
- void *
--memxor (void *restrict dest, const void *restrict src, size_t n)
-+gsasl_memxor (void *restrict dest, const void *restrict src, size_t n)
- {
-   char const *s = src;
-   char *d = dest;
-diff --git a/libgsasl.pc.in b/libgsasl.pc.in
-index b0c477d..d8d8ccc 100644
---- a/libgsasl.pc.in
-+++ b/libgsasl.pc.in
-@@ -16,4 +16,5 @@ URL: http://www.gnu.org/software/gsasl/
- Version: @VERSION@
- Libs: -L${libdir} -lgsasl
- Libs.private: @LTLIBGCRYPT@ @LTLIBIDN@ @LTLIBNTLM@
-+Requires.private: nettle
- Cflags: -I${includedir}
--- 
-1.7.7
-
diff -r 97c5f8da5036 -r 3d86598a6b7f src/libgsasl.mk
--- a/src/libgsasl.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/libgsasl.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := libgsasl
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.8.0
-$(PKG)_CHECKSUM := 08fd5dfdd3d88154cf06cb0759a732790c47b4f7
+$(PKG)_VERSION  := 1.10.0
+$(PKG)_CHECKSUM := a16ff428bbf28fcfa681c7edd2cd2bb087bcc4e7
 $(PKG)_SUBDIR   := libgsasl-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgsasl-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://ftp.gnu.org/gnu/gsasl/$($(PKG)_FILE)
@@ -24,13 +24,11 @@
         --prefix='$(HOST_PREFIX)' \
         --disable-nls \
         --with-libgcrypt \
+        --with-libgcrypt-prefix='$(HOST_PREFIX)' \
         --with-libiconv-prefix='$(HOST_PREFIX)' \
         --with-libidn-prefix='$(HOST_PREFIX)' \
         --with-libntlm-prefix='$(HOST_PREFIX)'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 
-    '$(MXE_CC)' \
-        -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(HOST_BINDIR)/test-libgsasl.exe' \
-        `'$(MXE_PKG_CONFIG)' libgsasl --cflags --libs`
+    $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS)
+    $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)'
 endef
diff -r 97c5f8da5036 -r 3d86598a6b7f src/libiconv.mk
--- a/src/libiconv.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/libiconv.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := libiconv
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.16
-$(PKG)_CHECKSUM := 2d9d1d8fa9f7859b181de984d60eacd2499a5701
+$(PKG)_VERSION  := 1.17
+$(PKG)_CHECKSUM := 409a6a8c07280e02cc33b65ae871311f4b33077b
 $(PKG)_SUBDIR   := libiconv-$($(PKG)_VERSION)
 $(PKG)_FILE     := libiconv-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://ftp.gnu.org/pub/gnu/libiconv/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/libsamplerate.mk
--- a/src/libsamplerate.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/libsamplerate.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := libsamplerate
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.1.8
-$(PKG)_CHECKSUM := e5fe82c4786be2fa33ca6bd4897db4868347fe70
+$(PKG)_VERSION  := 0.1.9
+$(PKG)_CHECKSUM := ed60f957a4ff87aa15cbb1f3dbd886fa7e5e9566
 $(PKG)_SUBDIR   := libsamplerate-$($(PKG)_VERSION)
 $(PKG)_FILE     := libsamplerate-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.mega-nerd.com/SRC/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/libsndfile.mk
--- a/src/libsndfile.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/libsndfile.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,17 +3,17 @@
 
 PKG             := libsndfile
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.31
-$(PKG)_CHECKSUM := 4ada136ae38b08a7f17160f44ca9f0d85d53da50
+$(PKG)_VERSION  := 1.1.0
+$(PKG)_CHECKSUM := dd98ff27fb66fbf1ab1e291bc8938449e90778a2
 $(PKG)_SUBDIR   := libsndfile-$($(PKG)_VERSION)
 $(PKG)_FILE     := libsndfile-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/$(PKG)/$(PKG)/archive/$($(PKG)_VERSION).tar.gz
-$(PKG)_DEPS     := sqlite flac ogg opus vorbis
+$(PKG)_DEPS     := sqlite flac mpg123 ogg opus vorbis
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://github.com/libsndfile/libsndfile/tags' | \
-    $(SED) -n 's|.*releases/tag/[v]*\([^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(SED) -n 's|.*releases/tag/[v]*\([^"]*\).*|\1|p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff -r 97c5f8da5036 -r 3d86598a6b7f src/libunistring.mk
--- a/src/libunistring.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/libunistring.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := libunistring
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.9.10
-$(PKG)_CHECKSUM := 1e7493a3ad8c4a1e514600b768c7229576fe5125
+$(PKG)_VERSION  := 1.0
+$(PKG)_CHECKSUM := cd38e3850b2d08a55cce0380d3510e7df83c6306
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/libvpx.mk
--- a/src/libvpx.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/libvpx.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := libvpx
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.8.2
-$(PKG)_CHECKSUM := 7fbc7de47f59431fa2c5b76660f115963e83193d
+$(PKG)_VERSION  := 1.11.0
+$(PKG)_CHECKSUM := 865737462d11b36f6ee1153e8b9fe90e160d4d35
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/webmproject/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
@@ -25,7 +25,6 @@
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://github.com/webmproject/libvpx/tags' | \
     $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | \
-    $(SORT) -Vr | \
     head -1
 endef
 
diff -r 97c5f8da5036 -r 3d86598a6b7f src/libwebp.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libwebp.mk	Fri May 27 12:54:43 2022 +0200
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := libwebp
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.2.2
+$(PKG)_CHECKSUM := 4e5e570b1ece450ec38233c52adbae253f81127e
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://storage.googleapis.com/downloads.webmproject.org/releases/webp/$($(PKG)_FILE)
+$(PKG)_DEPS     :=
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'https://developers.google.com/speed/webp/download' | \
+    $(SED) -n 's,.*<a href="//storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-\([0-9][^"]*\)\.tar.gz">Download</a> |,\1,p' | \
+    $(SORT) -V | \
+    tail -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        $(ENABLE_SHARED_OR_STATIC) \
+        --prefix='$(HOST_PREFIX)' \
+	--enable-everything
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man=MANS=
+endef
diff -r 97c5f8da5036 -r 3d86598a6b7f src/libxml2-1-fixes.patch
--- a/src/libxml2-1-fixes.patch	Fri May 27 12:24:32 2022 +0200
+++ b/src/libxml2-1-fixes.patch	Fri May 27 12:54:43 2022 +0200
@@ -1,24 +1,11 @@
-This file is part of MXE.
-See index.html for further information.
-
-From 91a883b212d0ea5f1d36618362baeca2f35abb29 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Sat, 16 Jun 2012 19:44:21 +0200
-Subject: [PATCH] .pc requires.private liblzma
-
-
-diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in
-index f5f5f03..21b14d1 100644
---- a/libxml-2.0.pc.in
-+++ b/libxml-2.0.pc.in
-@@ -8,6 +8,7 @@ Name: libXML
+diff -ur libxml2-v2.9.13.orig/libxml-2.0.pc.in libxml2-v2.9.13/libxml-2.0.pc.in
+--- libxml2-v2.9.13.orig/libxml-2.0.pc.in	2022-02-23 13:29:48.119724801 -0500
++++ libxml2-v2.9.13/libxml-2.0.pc.in	2022-02-23 13:42:19.580206424 -0500
+@@ -8,6 +8,7 @@
  Version: @VERSION@
  Description: libXML library version2.
  Requires:
 +Requires.private: liblzma
  Libs: -L${libdir} -lxml2
- Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
+ Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
  Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
--- 
-1.7.10.4
-
diff -r 97c5f8da5036 -r 3d86598a6b7f src/libxml2.mk
--- a/src/libxml2.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/libxml2.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,11 +3,11 @@
 
 PKG             := libxml2
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.9.12
-$(PKG)_CHECKSUM := 339fe5bb2a7d0c13f068c26d8f7cd194c13f9a2a
-$(PKG)_SUBDIR   := libxml2-$($(PKG)_VERSION)
-$(PKG)_FILE     := libxml2-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := ftp://xmlsoft.org/libxml2/$($(PKG)_FILE)
+$(PKG)_VERSION  := 2.9.14
+$(PKG)_CHECKSUM := 2448a3fb2fa0ad27147a88b6b97b88162ba777bc
+$(PKG)_SUBDIR   := libxml2-v$($(PKG)_VERSION)
+$(PKG)_FILE     := libxml2-v$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://gitlab.gnome.org/GNOME/$(PKG)/-/archive/v$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := zlib libiconv
 
 ifneq ($(MXE_SYSTEM),msvc)
@@ -21,8 +21,8 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) -i 's,`uname`,MinGW,g' '$(1)/xml2-config.in'
-    cd '$(1)' && ./configure \
+    #$(SED) -i 's,`uname`,MinGW,g' '$(1)/xml2-config.in'
+    cd '$(1)' && ./autogen.sh \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
diff -r 97c5f8da5036 -r 3d86598a6b7f src/lua.mk
--- a/src/lua.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/lua.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := lua
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.4.3
-$(PKG)_CHECKSUM := 1dda2ef23a9828492b4595c0197766de6e784bc7
+$(PKG)_VERSION  := 5.4.4
+$(PKG)_CHECKSUM := 03c27684b9d5d9783fb79a7c836ba1cdc5f309cd
 $(PKG)_SUBDIR   := lua-$($(PKG)_VERSION)
 $(PKG)_FILE     := lua-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.lua.org/ftp/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/mesa-1-meson.patch
--- a/src/mesa-1-meson.patch	Fri May 27 12:24:32 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-Don't link to Win32 library libstdc++
-
-diff --git "a/meson.build" "b/meson.build"
-index eaaca7f..9b9d2d3 100644
---- "a/meson.build"	
-+++ "b/meson.build"
-@@ -1030,8 +1030,7 @@ if host_machine.system() == 'windows'
-     add_project_link_arguments(
-       '-Wl,--nxcompat',
-       '-Wl,--dynamicbase',
-       '-static-libgcc',
--      '-static-libstdc++',
-       language : ['c', 'cpp'],
-     )
-   endif
diff -r 97c5f8da5036 -r 3d86598a6b7f src/mesa.mk
--- a/src/mesa.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/mesa.mk	Fri May 27 12:54:43 2022 +0200
@@ -2,8 +2,8 @@
 # See index.html for further information.
 
 PKG             := mesa
-$(PKG)_VERSION  := 21.2.6
-$(PKG)_CHECKSUM := b7057fa4e57ae4155248b38b5085d083689ac94c
+$(PKG)_VERSION  := 21.3.8
+$(PKG)_CHECKSUM := a891cab170a5914cec3e8aa0a6f3ec0f490ab0e9
 $(PKG)_SUBDIR   := mesa-$($(PKG)_VERSION)
 $(PKG)_FILE     := mesa-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/mingw-libgcrypt-1-fixes.patch
--- a/src/mingw-libgcrypt-1-fixes.patch	Fri May 27 12:24:32 2022 +0200
+++ b/src/mingw-libgcrypt-1-fixes.patch	Fri May 27 12:54:43 2022 +0200
@@ -5,7 +5,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 4 Dec 2014 15:07:43 +1100
-Subject: [PATCH 1/3] fix for mingw cross building
+Subject: [PATCH 1/1] fix for mingw cross building
 
 Taken from:
 https://aur.archlinux.org/packages/mingw-w64-libgcrypt/
@@ -56,49 +56,3 @@
        gcry_check_version  @1
        gcry_control  @2
  
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Sun, 28 Jun 2015 17:17:25 +0200
-Subject: [PATCH 3/3] configure.ac: no serial-tests if automake < 1.12
-
-Earlier versions of automake complain if they get a configuration
-parameter which they don't understand.  The error is:
-
-configure.ac:27: error: option 'serial-tests' not recognized
-
-Use some m4 hackery to work around this.
-
-Fix libgcrypt build under x86_64
-See https://www.redhat.com/archives/libguestfs/2013-February/msg00102.html
-
-diff --git a/configure.ac b/configure.ac
-index 1111111..2222222 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -71,7 +71,24 @@ VERSION=$PACKAGE_VERSION
- 
- AC_CONFIG_AUX_DIR([build-aux])
- AC_CONFIG_SRCDIR([src/libgcrypt.vers])
--AM_INIT_AUTOMAKE([serial-tests dist-bzip2])
-+
-+dnl Initialize automake.  automake < 1.12 didn't have serial-tests and
-+dnl gives an error if it sees this, but for automake >= 1.13
-+dnl serial-tests is required so we have to include it.  Solution is to
-+dnl test for the version of automake (by running an external command)
-+dnl and provide it if necessary.  Note we have to do this entirely using
-+dnl m4 macros since automake queries this macro by running
-+dnl 'autoconf --trace ...'.
-+m4_define([serial_tests], [
-+    m4_esyscmd([automake --version |
-+                head -1 |
-+                awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { '\
-+                    'print "serial-tests" }}'
-+    ])
-+])
-+dnl NB: Do not [quote] this parameter.
-+AM_INIT_AUTOMAKE(serial_tests dist-bzip2)
-+
- AC_CONFIG_HEADER(config.h)
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_LIBOBJ_DIR([compat])
diff -r 97c5f8da5036 -r 3d86598a6b7f src/mingw-w64.mk
--- a/src/mingw-w64.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/mingw-w64.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := mingw-w64
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 9.0.0
-$(PKG)_CHECKSUM := 9c496ed063e085888d250cc461ec4d31d97b72f1
+$(PKG)_VERSION  := 10.0.0
+$(PKG)_CHECKSUM := 56143558d81dae7628a232ca7582b947e65392b1
 $(PKG)_SUBDIR   := $(PKG)-v$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-v$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/mpc.mk
--- a/src/mpc.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/mpc.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := mpc
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.1.0
-$(PKG)_CHECKSUM := b019d9e1d27ec5fb99497159d43a3164995de2d0
+$(PKG)_VERSION  := 1.2.1
+$(PKG)_CHECKSUM := 2a4919abf445c6eda4e120cd669b8733ce337227
 $(PKG)_SUBDIR   := mpc-$($(PKG)_VERSION)
 $(PKG)_FILE     := mpc-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://ftp.gnu.org/gnu/mpc/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/mpg123.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mpg123.mk	Fri May 27 12:54:43 2022 +0200
@@ -0,0 +1,36 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := mpg123
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.29.3
+$(PKG)_CHECKSUM := ad4e03830d3fc960cbf87641caff4042cc62cea4
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/mpg123/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_DEPS     := sdl2 
+
+$(PKG)_CONFIGURE_OPTIONS :=
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+    $(PKG)_CONFIGURE_OPTIONS += \
+        --with-default-audio=win32 \
+        --with-audio=win32,sdl,dummy \
+        --enable-modules=no
+endif
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'https://sourceforge.net/projects/mpg123/files/mpg123/' | \
+    $(SED) -n 's,.*/projects/.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        $(ENABLE_SHARED_OR_STATIC) \
+        --prefix='$(HOST_PREFIX)' \
+	$($(PKG)_CONFIGURE_OPTIONS)
+
+    $(MAKE) -C '$(1)' -j '$(JOBS)'
+    $(MAKE) -C '$(1)' -j 1 install
+endef
diff -r 97c5f8da5036 -r 3d86598a6b7f src/native-binutils.mk
--- a/src/native-binutils.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/native-binutils.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := native-binutils
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.35.1
-$(PKG)_CHECKSUM := 45f7a96a2580a422f44b78317f0abf13935fecb6
+$(PKG)_VERSION  := 2.38
+$(PKG)_CHECKSUM := 15d42de8f15404a4a43a912440cf367f994779d7
 $(PKG)_SUBDIR   := binutils-$($(PKG)_VERSION)
 $(PKG)_FILE     := binutils-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/binutils/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/native-gcc-1-canadian-cross.patch
--- a/src/native-gcc-1-canadian-cross.patch	Fri May 27 12:24:32 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-From 01a70ccd723eb9a479186fe37c972b0d0f8676cf Mon Sep 17 00:00:00 2001
-From: Jonathan Wakely <jwakely@redhat.com>
-Date: Fri, 7 Jan 2022 15:21:03 +0000
-Subject: [PATCH 1/1] libstdc++: Add -nostdinc++ for c++17 sources [PR100017]
-
-When building a build!=host compiler, the just-built gcc can't be used
-to build the target libstdc++ (because it is built for the host triplet,
-not the build triplet). The top-level configure.ac sets up the build
-flags for libstdc++ (and other "raw_cxx" libs) like this:
-
-GCC_TARGET_TOOL(c++ for libstdc++, RAW_CXX_FOR_TARGET, CXX,
-		[gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs],
-		c++)
-
-The -nostdinc++ flag is only used for the IN-TREE-TOOL, i.e. when using
-the just-built gcc/xgcc compiler. This means that the cross-compiler
-used to build libstdc++ will add its own libstdc++ headers to the
-include path. That results in the #include <cfenv> in
-src/c++17/floating_to_chars.cc and src/c++17/floating_from_chars.cc
-doing #include_next <fenv.h> and finding the libstdc++ fenv.h wrapper
-from the host compiler. Because that has the same include guard as the
-<fenv.h> in the libstdc++ we're trying to build, we never reach the
-underlying <fenv.h> from libc. That results in several errors of the
-form:
-
-error: 'fenv_t' has not been declared in '::'
-
-The most correct fix would be to add -nostdinc++ to the
-RAW_CXX_FOR_TARGET variable in configure.ac, or the
-RAW_CXX_TARGET_EXPORTS variable in Makefile.tpl.
-
-Another solution would be to make the libstdc++ <fenv.h> wrapper use
-_GLIBCXX_INCLUDE_NEXT_C_HEADERS like our <stdlib.h> and other C header
-wrappers.
-
-For now though, the simplest and safest solution is to just add
--nostdinc++ to the CXXFLAGS used for src/c++17/*.cc, which is what this
-does.
-
-libstdc++-v3/ChangeLog:
-
-	PR libstdc++/100017
-	* src/c++17/Makefile.am (AM_CXXFLAGS): Add -nostdinc++.
-	* src/c++17/Makefile.in: Regenerate.
-
-(cherry picked from commit 4fde88e5dd152fe866a97b12e0f8229970d15cb3)
----
- libstdc++-v3/src/c++17/Makefile.am | 2 +-
- libstdc++-v3/src/c++17/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libstdc++-v3/src/c++17/Makefile.am b/libstdc++-v3/src/c++17/Makefile.am
-index cb94aff5f1a..2aebc6d5251 100644
---- a/libstdc++-v3/src/c++17/Makefile.am
-+++ b/libstdc++-v3/src/c++17/Makefile.am
-@@ -79,7 +79,7 @@ endif
- # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
- # as the occasion calls for it.
- AM_CXXFLAGS = \
--	-std=gnu++17 \
-+	-std=gnu++17 -nostdinc++ \
- 	$(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \
- 	$(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \
- 	$(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) \
-diff --git a/libstdc++-v3/src/c++17/Makefile.in b/libstdc++-v3/src/c++17/Makefile.in
-index 63984ecd52a..8c02be6514f 100644
---- a/libstdc++-v3/src/c++17/Makefile.in
-+++ b/libstdc++-v3/src/c++17/Makefile.in
-@@ -455,7 +455,7 @@ libc__17convenience_la_SOURCES = $(sources)  $(inst_sources)
- # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
- # as the occasion calls for it.
- AM_CXXFLAGS = \
--	-std=gnu++17 \
-+	-std=gnu++17 -nostdinc++ \
- 	$(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \
- 	$(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \
- 	$(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) \
--- 
-2.27.0
-
-
diff -r 97c5f8da5036 -r 3d86598a6b7f src/native-gcc.mk
--- a/src/native-gcc.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/native-gcc.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := native-gcc
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 11.2.0
-$(PKG)_CHECKSUM := f902ccacecf8949978d6261e9f1d034cff73ffdb
+$(PKG)_VERSION  := 12.1.0
+$(PKG)_CHECKSUM := 81614dacd8625a3896a57df375b695dba0c75f36
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/npp.mk
--- a/src/npp.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/npp.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := npp
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 8.1.9.3
-$(PKG)_CHECKSUM := c864455e096ba9e549eeb16c992bcd3f1f58a047
+$(PKG)_VERSION  := 8.4.1
+$(PKG)_CHECKSUM := 45ba7347dd58d44ec07e0dc513f4434e95246e9c
 $(PKG)_SUBDIR   := 
 $(PKG)_FILE     := $(PKG).$($(PKG)_VERSION).portable.zip
 $(PKG)_URL      := https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/of-ltfat-3-no-cxx11.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-ltfat-3-no-cxx11.patch	Fri May 27 12:54:43 2022 +0200
@@ -0,0 +1,27 @@
+From 0b0d59759fd3ef0f3c631047f85a2b87c687d272 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de>
+Date: Wed, 26 Jan 2022 18:58:46 +0100
+Subject: [PATCH] Don't force std=gnu++11. We prefer a newer standard now.
+ Ideally, this would check if some switch is necessary to enable C++11 feature
+ support in the compiler.
+
+---
+ oct/Makefile_unix | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/oct/Makefile_unix b/oct/Makefile_unix
+index 8f497297..4ecad22a 100644
+--- a/oct/Makefile_unix
++++ b/oct/Makefile_unix
+@@ -33,7 +33,7 @@ ifndef FFTW_LIBS
+ FFTW_LIBS := $(shell $(MKOCTFILE) -p FFTW_LIBS)
+ endif
+ 
+-export CXXFLAGS := $(shell $(MKOCTFILE) -p CXXFLAGS) -std=gnu++11 -Wall -DLTFAT_LARGEARRAYS $(OPTCXXFLAGS)
++export CXXFLAGS := $(shell $(MKOCTFILE) -p CXXFLAGS) -Wall -DLTFAT_LARGEARRAYS $(OPTCXXFLAGS)
+ # export is necessary, otherwise LDFLAGS won't have any effect
+ # at least on Windows and on Mac
+ export LDFLAGS := $(shell $(MKOCTFILE) -p LDFLAGS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FFTW_LIBS)
+-- 
+2.34.1.windows.1
+
diff -r 97c5f8da5036 -r 3d86598a6b7f src/of-sparsersb-2-no-cxx11.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-sparsersb-2-no-cxx11.patch	Fri May 27 12:54:43 2022 +0200
@@ -0,0 +1,22 @@
+# HG changeset patch
+# User Markus Mützel <markus.muetzel@gmx.de>
+# Date 1643220705 -3600
+#      Wed Jan 26 19:11:45 2022 +0100
+# Node ID 47e601506819386cc03e9e412c0615cbac02aa8f
+# Parent  67a14d968d2db3ffe34474e6be1c7a2d164ad416
+Don't force std=gnu++11. We prefer a newer standard now.
+Ideally, this would check if some switch is necessary to enable C++11 feature
+support in the compiler.
+
+diff -r 67a14d968d2d -r 47e601506819 src/configure.ac
+--- a/src/configure.ac	Tue Sep 21 11:09:59 2021 +0200
++++ b/src/configure.ac	Wed Jan 26 19:11:45 2022 +0100
+@@ -225,7 +225,7 @@
+ AC_SUBST(OCTAVE)
+ AC_SUBST(TARGETS)
+ AC_SUBST(SPARSERSB_CXXFLAGS)
+-AC_SUBST(SPARSERSB_CXX11, ["-std=gnu++11"])
++AC_SUBST(SPARSERSB_CXX11)
+ AC_SUBST(SPARSERSB_LDFLAGS)
+ 
+ AC_CONFIG_FILES([Makeconf])
diff -r 97c5f8da5036 -r 3d86598a6b7f src/openblas.mk
--- a/src/openblas.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/openblas.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := openblas
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.3.18
-$(PKG)_CHECKSUM := a9d5ce86908657f002c6566cd8f35fe882709be4
+$(PKG)_VERSION  := 0.3.20
+$(PKG)_CHECKSUM := 45ec54b75f53f5b704250e60bd8e82a49b430619
 $(PKG)_SUBDIR   := OpenBLAS-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL      := https://github.com/xianyi/OpenBLAS/archive/v$($(PKG)_VERSION).tar.gz
diff -r 97c5f8da5036 -r 3d86598a6b7f src/openlibm.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/openlibm.mk	Fri May 27 12:54:43 2022 +0200
@@ -0,0 +1,35 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := openlibm
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.8.1
+$(PKG)_CHECKSUM := 4b1dffada65215942a31f3266b65b27eadd363cc
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_URL      := https://github.com/JuliaMath/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
+$(PKG)_DEPS     :=
+
+$(PKG)_TARGET_OPTS := 
+
+ifeq ($(MXE_NATIVE_BUILD),no)
+  ifeq ($(ENABLE_WINDOWS_64),yes)
+    $(PKG)_TARGET_OPTS := ARCH=x86_64
+  else
+    $(PKG)_TARGET_OPTS := ARCH=i686 
+  endif
+  $(PKG)_TARGET_OPTS += OS=WINNT TOOLPREFIX=$(MXE_TOOL_PREFIX)
+  $(PKG)_TARGET_OPTS += CC=$(MXE_CC) AR=$(MXE_AR)
+  $(PKG)_TARGET_OPTS += prefix=$(HOST_PREFIX)
+endif
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'https://github.com/JuliaMath/openlibm/tags' | \
+    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \
+    tail -1
+endef
+
+define $(PKG)_BUILD
+    $(MAKE) -C '$(1)' -j '$(JOBS)' $($(PKG)_TARGET_OPTS)
+    $(MAKE) -C '$(1)' -j '1' $($(PKG)_TARGET_OPTS) DESTDIR='$(3)' install
+endef
diff -r 97c5f8da5036 -r 3d86598a6b7f src/opusfile.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/opusfile.mk	Fri May 27 12:54:43 2022 +0200
@@ -0,0 +1,35 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+PKG             := opusfile
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.11
+$(PKG)_CHECKSUM := fc3bf2a73be16836a16d9e55ff1097de3835dce3
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://archive.mozilla.org/pub/opus/$($(PKG)_FILE)
+$(PKG)_DEPS     := ogg opus
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'https://archive.mozilla.org/pub/opus/?C=M;O=D' | \
+    $(SED) -n 's,.*opusfile-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    grep -v 'alpha' | \
+    grep -v 'beta' | \
+    $(SORT) -Vr | \
+    head -1
+endef
+
+$(PKG)_EXTRA_CONFIGURE_OPTIONS :=
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        $(ENABLE_SHARED_OR_STATIC) \
+	--prefix='$(HOST_PREFIX)' \
+	--disable-doc \
+	--disable-http \
+	&& $(CONFIGURE_POST_HOOK)
+    $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS)
+    $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)'
+endef
diff -r 97c5f8da5036 -r 3d86598a6b7f src/pcre2.mk
--- a/src/pcre2.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/pcre2.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := pcre2
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 10.39
-$(PKG)_CHECKSUM := 9cf3ec88cd68dc76354eb0568738c47b57377042
+$(PKG)_VERSION  := 10.40
+$(PKG)_CHECKSUM := 5a433f92b29083d0d8ccd4ec56e3afbe1fa09863
 $(PKG)_SUBDIR   := pcre2-$($(PKG)_VERSION)
 $(PKG)_FILE     := pcre2-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := https://github.com/PhilipHazel/$(PKG)/releases/download/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/qscintilla.mk
--- a/src/qscintilla.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/qscintilla.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := qscintilla
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.13.1
-$(PKG)_CHECKSUM := 082cbaa8419ff1911cd9d7fec79ce21ca621eeb6
+$(PKG)_VERSION  := 2.13.3
+$(PKG)_CHECKSUM := 336c069d56dc9573ac2c68fd5690b2dffe02daaa
 $(PKG)_SUBDIR   := QScintilla_src-$($(PKG)_VERSION)
 $(PKG)_FILE     := QScintilla_src-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://www.riverbankcomputing.com/static/Downloads/QScintilla/$($(PKG)_VERSION)/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/qtbase-2-gcc11.patch
--- a/src/qtbase-2-gcc11.patch	Fri May 27 12:24:32 2022 +0200
+++ b/src/qtbase-2-gcc11.patch	Fri May 27 12:54:43 2022 +0200
@@ -4,27 +4,6 @@
  https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8
 Last-Update: 2021-01-26
 
---- a/src/corelib/global/qendian.h
-+++ b/src/corelib/global/qendian.h
-@@ -44,6 +44,8 @@
- #include <QtCore/qfloat16.h>
- #include <QtCore/qglobal.h>
- 
-+#include <limits>
-+
- // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
- #include <stdlib.h>
- #include <string.h>
---- a/src/corelib/global/qfloat16.h
-+++ b/src/corelib/global/qfloat16.h
-@@ -43,6 +43,7 @@
- 
- #include <QtCore/qglobal.h>
- #include <QtCore/qmetatype.h>
-+#include <limits>
- #include <string.h>
- 
- #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
 --- a/src/corelib/text/qbytearraymatcher.h
 +++ b/src/corelib/text/qbytearraymatcher.h
 @@ -42,6 +42,8 @@
diff -r 97c5f8da5036 -r 3d86598a6b7f src/qtbase.mk
--- a/src/qtbase.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/qtbase.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,11 +3,11 @@
 
 PKG             := qtbase
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.15.2
-$(PKG)_CHECKSUM := b5ad67fc6381ad7fae0296944734198488d096a3
+$(PKG)_VERSION  := 5.15.4
+$(PKG)_CHECKSUM := c3d655dc1d29599b5545ca206922275ec4ba9ae9
 $(PKG)_SUBDIR   := $(PKG)-everywhere-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_FILE     := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := https://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
   $(PKG)_FONTCONFIG := fontconfig
 endif
diff -r 97c5f8da5036 -r 3d86598a6b7f src/qtimageformats.mk
--- a/src/qtimageformats.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/qtimageformats.mk	Fri May 27 12:54:43 2022 +0200
@@ -4,7 +4,7 @@
 PKG             := qtimageformats
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION   = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := c17b57cec197d721b3c844ff1dd68ab9996f4603
+$(PKG)_CHECKSUM := 1fc4f7a88fcbb211250bf416619737f6c00cc47d
 $(PKG)_SUBDIR    = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtimageformats,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtimageformats,$(qtbase_URL))
diff -r 97c5f8da5036 -r 3d86598a6b7f src/qtsvg.mk
--- a/src/qtsvg.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/qtsvg.mk	Fri May 27 12:54:43 2022 +0200
@@ -4,7 +4,7 @@
 PKG             := qtsvg
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION   = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 08531b47924078cbde6dfbf56da83651d58f6a13
+$(PKG)_CHECKSUM := e5931f7cd1efef3401d27dbb8aa53d0c52d4b7d6
 $(PKG)_SUBDIR    = $(subst qtbase,qtsvg,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtsvg,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtsvg,$(qtbase_URL))
diff -r 97c5f8da5036 -r 3d86598a6b7f src/qttools.mk
--- a/src/qttools.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/qttools.mk	Fri May 27 12:54:43 2022 +0200
@@ -4,7 +4,7 @@
 PKG             := qttools
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION   = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := ae92f651b1b029bd6f55fc8888134d73d8ad19be
+$(PKG)_CHECKSUM := 877bfb4c8c8ee6d826d11d55ccfb6c43efd6ab28
 $(PKG)_SUBDIR    = $(subst qtbase,qttools,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qttools,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qttools,$(qtbase_URL))
diff -r 97c5f8da5036 -r 3d86598a6b7f src/qttranslations.mk
--- a/src/qttranslations.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/qttranslations.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,7 +3,7 @@
 PKG             := qttranslations
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION   = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 980350bcbf680697bb2903955e2568ee9b5b365f
+$(PKG)_CHECKSUM := 5fc78095f0ebc673ace7626eda516367ef1f86b8
 $(PKG)_SUBDIR    = $(subst qtbase,qttranslations,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qttranslations,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qttranslations,$(qtbase_URL))
diff -r 97c5f8da5036 -r 3d86598a6b7f src/readline-0-002-upstream.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/readline-0-002-upstream.patch	Fri May 27 12:54:43 2022 +0200
@@ -0,0 +1,38 @@
+			   READLINE PATCH REPORT
+			   =====================
+
+Readline-Release: 8.1
+Patch-ID: readline81-002
+
+Bug-Reported-by:	Volodymyr Prodan <vovcat@gmail.com>
+Bug-Reference-ID:
+Bug-Reference-URL:	https://savannah.gnu.org/patch/?10076
+
+Bug-Description:
+
+There are some characters (e.g., cyrillic) that can't be displayed using
+certain single-byte encodings (e.g., cp1251) because the negative signed
+int is interpreted as EOF and not displayed.
+
+diff -urN readline-8.1/display.c.orig readline-8.1/display.c
+--- readline-8.1/display.c	2021-03-16 18:12:20.000000000 -0400
++++ readline-8.1/display.c	2021-06-07 16:53:08.000000000 -0400
+@@ -1598,7 +1598,7 @@
+   char cur_face;
+ 
+   for (cur_face = FACE_NORMAL, i = 0; i < n; i++)
+-    putc_face (str[i], face[i], &cur_face);
++    putc_face ((unsigned char) str[i], face[i], &cur_face);
+   putc_face (EOF, FACE_NORMAL, &cur_face);
+ }
+ 
+
+diff -ur a/patchlevel b/patchlevel
+--- a/patchlevel	2013-11-15 08:11:11.000000000 -0500
++++ b/patchlevel	2014-03-21 08:28:40.000000000 -0400
+@@ -1,3 +1,3 @@
+ # Do not edit -- exists only for use by patch
+ 
+-1
++2
+
diff -r 97c5f8da5036 -r 3d86598a6b7f src/sdl2.mk
--- a/src/sdl2.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/sdl2.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := sdl2
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.0.18
-$(PKG)_CHECKSUM := 419c62567d197a52a2136865c158f894939c1adf
+$(PKG)_VERSION  := 2.0.22
+$(PKG)_CHECKSUM := 66dd460befa7f4c4664b7591228a3951bbbb19a7
 $(PKG)_SUBDIR   := SDL2-$($(PKG)_VERSION)
 $(PKG)_FILE     := SDL2-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.libsdl.org/release/$($(PKG)_FILE)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/sdl2_image.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sdl2_image.mk	Fri May 27 12:54:43 2022 +0200
@@ -0,0 +1,32 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := sdl2_image
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.0.5
+$(PKG)_CHECKSUM := c0aed07994f670a3758f6b8b93d9034a58df5781
+$(PKG)_SUBDIR   := SDL2_image-$($(PKG)_VERSION)
+$(PKG)_FILE     := SDL2_image-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://www.libsdl.org/projects/SDL_image/release/$($(PKG)_FILE)
+$(PKG)_DEPS     := sdl2 jpeg libpng libwebp tiff
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'http://hg.libsdl.org/SDL_image/tags' | \
+    $(SED) -n 's,.*release-\([0-9][^<"]*\).*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    $(SED) -i 's,^\(Requires:.*\),\1\nRequires.private: libtiff-4 libpng libwebp,' '$(1)/SDL2_image.pc.in'
+    cd '$(1)' && ./configure \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        $(ENABLE_SHARED_OR_STATIC) \
+        --prefix='$(HOST_PREFIX)' \
+        --with-sdl-prefix='$(HOST_PREFIX)' \
+        --disable-sdltest \
+        --disable-jpg-shared \
+        --disable-png-shared \
+        --disable-tif-shared \
+        --disable-webp-shared
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)'
+endef
diff -r 97c5f8da5036 -r 3d86598a6b7f src/sdl2_mixer.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sdl2_mixer.mk	Fri May 27 12:54:43 2022 +0200
@@ -0,0 +1,46 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := sdl2_mixer
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.0.4
+$(PKG)_CHECKSUM := 242a63b1c7f38e358e94b1e0dc5120a6c1f3763b
+$(PKG)_SUBDIR   := SDL2_mixer-$($(PKG)_VERSION)
+$(PKG)_FILE     := SDL2_mixer-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://www.libsdl.org/projects/SDL_mixer/release/$($(PKG)_FILE)
+$(PKG)_DEPS     := sdl2 mpg123 ogg opusfile vorbis
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'http://hg.libsdl.org/SDL_mixer/tags' | \
+    $(SED) -n 's,.*release-\([0-9][^<"]*\).*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    $(SED) -i 's,^\(Requires:.*\),\1 opusfile vorbisfile,' '$(1)/SDL2_mixer.pc.in'
+    echo \
+        'Libs.private:' \
+        "`$(TARGET)-pkg-config libmodplug libmpg123 --libs`" \
+        "`$(PREFIX)/$(TARGET)/bin/smpeg2-config --libs`" \
+        >> '$(1)/SDL2_mixer.pc.in'
+    $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure'
+    cd '$(1)' && ./configure \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        $(ENABLE_SHARED_OR_STATIC) \
+        --prefix='$(HOST_PREFIX)' \
+        --with-sdl-prefix='$(HOST_PREFIX)' \
+        --disable-sdltest \
+        --disable-music-mod \
+        --enable-music-mod-modplug \
+        --enable-music-ogg \
+        --disable-music-ogg-shared \
+        --disable-music-flac \
+        --disable-music-flac-shared \
+        --enable-music-mp3 \
+        --disable-smpegtest \
+        SMPEG_CONFIG='$(HOST_BINDIR)/smpeg2-config' \
+        WINDRES='$(TARGET)-windres' \
+        LIBS="`$(TARGET)-pkg-config libmodplug libmpg123 opusfile vorbisfile --libs-only-l`"
+
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)'
+endef
diff -r 97c5f8da5036 -r 3d86598a6b7f src/sdl2_net.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sdl2_net.mk	Fri May 27 12:54:43 2022 +0200
@@ -0,0 +1,28 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := sdl2_net
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.0.1
+$(PKG)_CHECKSUM := 99c17ee2ecf32c8a136163bbaa8f018f7a3e31e9
+$(PKG)_SUBDIR   := SDL2_net-$($(PKG)_VERSION)
+$(PKG)_FILE     := SDL2_net-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://www.libsdl.org/projects/SDL_net/release/$($(PKG)_FILE)
+$(PKG)_DEPS     := sdl2
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'http://hg.libsdl.org/SDL_net/tags' | \
+    $(SED) -n 's,.*release-\([0-9][^<"]*\).*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        $(ENABLE_SHARED_OR_STATIC) \
+        --prefix='$(HOST_PREFIX)' \
+        --with-sdl-prefix='$(HOST_PREFIX)' \
+        --disable-sdltest \
+        --disable-gui
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)'
+endef
diff -r 97c5f8da5036 -r 3d86598a6b7f src/sdl2_ttf.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sdl2_ttf.mk	Fri May 27 12:54:43 2022 +0200
@@ -0,0 +1,29 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := sdl2_ttf
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.0.18
+$(PKG)_CHECKSUM := b4300bf29495adabe5a4e77af758fc9e658156c9
+$(PKG)_SUBDIR   := SDL2_ttf-$($(PKG)_VERSION)
+$(PKG)_FILE     := SDL2_ttf-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://www.libsdl.org/projects/SDL_ttf/release/$($(PKG)_FILE)
+$(PKG)_DEPS     := sdl2 freetype
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'http://hg.libsdl.org/SDL_ttf/tags' | \
+    $(SED) -n 's,.*release-\([0-9][^<"]*\).*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    echo 'Requires.private: freetype2' >> '$(1)/SDL2_ttf.pc.in'
+    cd '$(1)' && ./configure \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        $(ENABLE_SHARED_OR_STATIC) \
+        --prefix='$(HOST_PREFIX)' \
+        --with-sdl-prefix='$(HOST_PREFIX)' \
+        --disable-sdltest \
+        --with-freetype-prefix='$(PREFIX)/$(TARGET)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)'
+endef
diff -r 97c5f8da5036 -r 3d86598a6b7f src/sqlite.mk
--- a/src/sqlite.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/sqlite.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,11 +3,11 @@
 
 PKG             := sqlite
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3370100
-$(PKG)_CHECKSUM := 328bc8146e15b67752b5249b8ac688c13230c517
+$(PKG)_VERSION  := 3380500
+$(PKG)_CHECKSUM := e37f9ea8ac088c6f0aa3462f8e1522ccc58de824
 $(PKG)_SUBDIR   := $(PKG)-autoconf-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://www.sqlite.org/2021/$($(PKG)_FILE)
+$(PKG)_URL      := http://www.sqlite.org/2022/$($(PKG)_FILE)
 $(PKG)_DEPS     := readline zlib
 
 ifeq ($(MXE_SYSTEM),mingw)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/suitesparse-1-fixes.patch
--- a/src/suitesparse-1-fixes.patch	Fri May 27 12:24:32 2022 +0200
+++ b/src/suitesparse-1-fixes.patch	Fri May 27 12:54:43 2022 +0200
@@ -15,19 +15,15 @@
 index 1111111..2222222 100644
 --- a/SuiteSparse_config/SuiteSparse_config.mk
 +++ b/SuiteSparse_config/SuiteSparse_config.mk
-@@ -429,10 +429,8 @@ SO_OPTS = $(LDFLAGS)
+@@ -440,7 +441,7 @@ SO_OPTS = $(LDFLAGS)
  
  ifeq ($(UNAME),Windows)
-     # Cygwin Make on Windows (untested)
+     # Cygwin Make on Windows
 -    AR_TARGET = $(LIBRARY).lib
--    SO_PLAIN  = $(LIBRARY).dll
--    SO_MAIN   = $(LIBRARY).$(SO_VERSION).dll
--    SO_TARGET = $(LIBRARY).$(VERSION).dll
 +    AR_TARGET = $(LIBRARY).a
-+    SO_TARGET = $(LIBRARY).dll
-     SO_INSTALL_NAME = echo
- else
-     # Mac or Linux/Unix
+     SO_TARGET  = $(LIBRARY).dll
+     # The following two links are just garbage copies of the real target
+     # they aren't actually supported by this OS
 
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
@@ -592,11 +588,10 @@
  	$(RM) $(INSTALL_INCLUDE)/SuiteSparse_config.h
  	$(RM) $(INSTALL_DOC)/SUITESPARSECONFIG_README.txt
  	( cd xerbla ; $(MAKE) uninstall )
-diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk
-index 1111111..2222222 100644
---- a/SuiteSparse_config/SuiteSparse_config.mk
-+++ b/SuiteSparse_config/SuiteSparse_config.mk
-@@ -54,6 +54,7 @@ SUITESPARSE_VERSION = 4.5.6
+diff -urN SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk.orig SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk
+--- SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk.orig	2022-03-15 00:33:19.000000000 +0100
++++ SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk	2022-03-20 13:25:30.876107144 +0100
+@@ -73,6 +73,7 @@
      # and documentation in /solo/mydox.
      INSTALL ?= $(SUITESPARSE)
      INSTALL_LIB ?= $(INSTALL)/lib
@@ -604,29 +599,35 @@
      INSTALL_INCLUDE ?= $(INSTALL)/include
      INSTALL_DOC ?= $(INSTALL)/share/doc/suitesparse-$(SUITESPARSE_VERSION)
  
-@@ -339,7 +340,7 @@ SUITESPARSE_VERSION = 4.5.6
- 
+@@ -349,7 +350,7 @@
      ifeq ($(UNAME),Linux)
-         # add the realtime library, librt, and SuiteSparse/lib
--        LDLIBS += -lrt -Wl,-rpath=$(INSTALL_LIB)
-+        LDLIBS += -lrt -Wl,-rpath=$(INSTALL_SO)
+         # add the posix realtime extensions library: librt
+         LDLIBS += -lrt
+-        LDFLAGS += -Wl,-rpath=$(INSTALL_LIB)
++        LDFLAGS += -Wl,-rpath=$(INSTALL_SO)
      endif
  
      #---------------------------------------------------------------------------
-@@ -428,10 +429,11 @@ SUITESPARSE_VERSION = 4.5.6
- SO_OPTS = $(LDFLAGS)
+@@ -365,7 +366,7 @@
+         LAPACK ?= -framework Accelerate
+         # OpenMP is not yet supported by default in clang
+         CFOPENMP =
+-        LDLIBS += -rpath $(INSTALL_LIB)
++        LDLIBS += -rpath $(INSTALL_SO)
+     endif
  
- ifeq ($(UNAME),Windows)
--    # Cygwin Make on Windows (untested)
-     AR_TARGET = $(LIBRARY).a
-     SO_TARGET = $(LIBRARY).dll
-     SO_INSTALL_NAME = echo
+     #---------------------------------------------------------------------------
+@@ -446,7 +447,8 @@
+     # they aren't actually supported by this OS
+     SO_MAIN   = $(LIBRARY).$(SO_VERSION).dll
+     SO_PLAIN = $(LIBRARY).$(VERSION).dll
+-    SO_OPTS  += -shared
 +    SO_OPTS  += -shared -Wl,--out-implib,$(INSTALL_LIB)/$(LIBRARY).dll.a
 +    INSTALL_SO = $(INSTALL)/bin
+     SO_INSTALL_NAME = echo
  else
      # Mac or Linux/Unix
-     AR_TARGET = $(LIBRARY).a
-@@ -550,6 +552,7 @@ config:
+@@ -568,6 +570,7 @@
  	@echo 'System:                   UNAME=          ' '$(UNAME)'
  	@echo 'Install directory:        INSTALL=        ' '$(INSTALL)'
  	@echo 'Install libraries in:     INSTALL_LIB=    ' '$(INSTALL_LIB)'
@@ -696,34 +697,63 @@
  	$(RM) $(INSTALL_INCLUDE)/umfpack*.h
  	$(RM) $(INSTALL_DOC)/UMFPACK_UserGuide.pdf
  	$(RM) $(INSTALL_DOC)/UMFPACK_QuickStart.pdf
-
---- a/Makefile	2019-12-22 12:17:36.147324000 +0100
-+++ b/Makefile	2019-12-22 12:23:59.027388353 +0100
-@@ -12,7 +12,6 @@
- # Compile the default rules for each package
+diff -urN SuiteSparse-5.11.0/Makefile.orig SuiteSparse-5.11.0/Makefile
+--- SuiteSparse-5.11.0/Makefile.orig	2022-03-15 00:33:19.000000000 +0100
++++ SuiteSparse-5.11.0/Makefile	2022-03-20 13:51:19.924606309 +0100
+@@ -16,7 +16,6 @@
+ # installs all libraries SuiteSparse/lib.
  go: metis
  	( cd SuiteSparse_config && $(MAKE) )
--	( cd Mongoose  && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
+-	( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
  	( cd AMD && $(MAKE) )
  	( cd BTF && $(MAKE) )
  	( cd CAMD && $(MAKE) )
-@@ -38,7 +37,6 @@
+@@ -34,7 +33,6 @@
+ 	( cd GPUQREngine && $(MAKE) )
+ endif
+ 	( cd SPQR && $(MAKE) )
+-	( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
+ 	( cd SLIP_LU && $(MAKE) )
+ #	( cd PIRO_BAND && $(MAKE) )
+ #	( cd SKYLINE_SVD && $(MAKE) )
+@@ -44,9 +42,8 @@
+ #       sudo make install INSTALL=/usr/local
+ # See SuiteSparse/README.md for more details.
  # (note that CSparse is not installed; CXSparse is installed instead)
- install: metisinstall
+-install: metisinstall gbinstall moninstall
++install: metisinstall
  	( cd SuiteSparse_config && $(MAKE) install )
--	( cd Mongoose  && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install )
+-	# ( cd Mongoose  && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install )
  	( cd AMD && $(MAKE) install )
  	( cd BTF && $(MAKE) install )
  	( cd CAMD && $(MAKE) install )
-@@ -85,7 +83,6 @@
+@@ -63,7 +60,6 @@
+ 	( cd GPUQREngine && $(MAKE) install )
+ endif
+ 	( cd SPQR && $(MAKE) install )
+-	# ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install )
+ #	( cd PIRO_BAND && $(MAKE) install )
+ #	( cd SKYLINE_SVD && $(MAKE) install )
+ 	( cd SLIP_LU && $(MAKE) install )
+@@ -76,7 +72,7 @@
+ 	@mkdir -p $(INSTALL_LIB)
+ 	@mkdir -p $(INSTALL_INCLUDE)
+ 	@mkdir -p $(INSTALL_DOC)
+-	- $(CP) lib/libmetis.* $(INSTALL_SO)
++	- $(CP) lib/libmetis.* $(INSTALL_SO)
+ 	- $(CP) metis-5.1.0/manual/manual.pdf $(INSTALL_DOC)/METIS_manual.pdf
+ 	- $(CP) metis-5.1.0/README.txt $(INSTALL_DOC)/METIS_README.txt
+         # the following is needed only on the Mac, so *.dylib is hardcoded:
+@@ -93,8 +89,6 @@
+ 	$(RM) $(INSTALL_DOC)/SuiteSparse_README.md
  	( cd SuiteSparse_config && $(MAKE) uninstall )
  	- ( cd metis-5.1.0 && $(MAKE) uninstall )
- 	- ( cd GraphBLAS && $(MAKE) uninstall )
+-	- ( cd GraphBLAS && $(MAKE) uninstall )
 -	- ( cd Mongoose  && $(MAKE) uninstall )
  	( cd AMD && $(MAKE) uninstall )
  	( cd CAMD && $(MAKE) uninstall )
  	( cd COLAMD && $(MAKE) uninstall )
-@@ -116,7 +113,6 @@
+@@ -126,7 +120,6 @@
  # the static library
  library: metis
  	( cd SuiteSparse_config && $(MAKE) )
@@ -731,7 +761,15 @@
  	( cd AMD && $(MAKE) library )
  	( cd BTF && $(MAKE) library )
  	( cd CAMD && $(MAKE) library )
-@@ -143,7 +139,6 @@
+@@ -144,7 +137,6 @@
+ 	( cd GPUQREngine && $(MAKE) library )
+ endif
+ 	( cd SPQR && $(MAKE) library )
+-	( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
+ 	( cd SLIP_LU && $(MAKE) library )
+ #	( cd PIRO_BAND && $(MAKE) library )
+ #	( cd SKYLINE_SVD && $(MAKE) library )
+@@ -154,7 +146,6 @@
  # both the dynamic and static libraries.
  static: metis
  	( cd SuiteSparse_config && $(MAKE) static )
@@ -739,28 +777,38 @@
  	( cd AMD && $(MAKE) static )
  	( cd BTF && $(MAKE) static )
  	( cd CAMD && $(MAKE) static )
-@@ -171,7 +166,6 @@
+@@ -172,7 +163,6 @@
+ 	( cd GPUQREngine && $(MAKE) static )
+ endif
+ 	( cd SPQR && $(MAKE) static )
+-	( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' static )
+ 	( cd SLIP_LU && $(MAKE) static )
+ #	( cd PIRO_BAND && $(MAKE) static )
+ #	( cd SKYLINE_SVD && $(MAKE) static )
+@@ -182,8 +172,6 @@
+ 	- ( cd SuiteSparse_config && $(MAKE) purge )
  	- ( cd metis-5.1.0 && $(MAKE) distclean )
  	- ( cd AMD && $(MAKE) purge )
- 	- ( cd GraphBLAS && $(MAKE) purge )
+-	- ( cd GraphBLAS && $(MAKE) purge )
 -	- ( cd Mongoose  && $(MAKE) purge )
  	- ( cd CAMD && $(MAKE) purge )
  	- ( cd COLAMD && $(MAKE) purge )
  	- ( cd BTF && $(MAKE) purge )
-@@ -198,7 +192,6 @@
+@@ -210,8 +198,6 @@
+ clean:
  	- ( cd SuiteSparse_config && $(MAKE) clean )
  	- ( cd metis-5.1.0 && $(MAKE) clean )
- 	- ( cd GraphBLAS && $(MAKE) clean )
+-	- ( cd GraphBLAS && $(MAKE) clean )
 -	- ( cd Mongoose  && $(MAKE) clean )
  	- ( cd AMD && $(MAKE) clean )
  	- ( cd CAMD && $(MAKE) clean )
  	- ( cd COLAMD && $(MAKE) clean )
-@@ -220,7 +213,6 @@
+@@ -233,8 +219,6 @@
+ 
  # Create the PDF documentation
  docs:
- 	( cd GraphBLAS && $(MAKE) docs )
+-	( cd GraphBLAS && $(MAKE) docs )
 -	( cd Mongoose  && $(MAKE) docs )
  	( cd AMD && $(MAKE) docs )
  	( cd CAMD && $(MAKE) docs )
  	( cd KLU && $(MAKE) docs )
-
diff -r 97c5f8da5036 -r 3d86598a6b7f src/suitesparse.mk
--- a/src/suitesparse.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/suitesparse.mk	Fri May 27 12:54:43 2022 +0200
@@ -2,14 +2,14 @@
 # See index.html for further information.
 
 PKG             := suitesparse
-$(PKG)_VERSION  := 5.7.2
-$(PKG)_CHECKSUM := ccc50177425d0d9bfe878786b8f2729c247efa90
+$(PKG)_VERSION  := 5.12.0
+$(PKG)_CHECKSUM := 9c67fbe6719878ea90fbf10b30fa476e68be0201
 $(PKG)_SUBDIR   := SuiteSparse-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL      := https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := blas lapack
 ifeq ($(USE_SYSTEM_GCC),no)
-  $(PKG)_DEPS += libgomp
+  $(PKG)_DEPS += libgomp mpfr
 endif
 
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/xkbcommon.mk
--- a/src/xkbcommon.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/xkbcommon.mk	Fri May 27 12:54:43 2022 +0200
@@ -22,6 +22,7 @@
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
+	--disable-selective-werror \
         && $(CONFIGURE_POST_HOOK)
 
     $(MAKE) -C '$(1)' -j '$(JOBS)'
diff -r 97c5f8da5036 -r 3d86598a6b7f src/xvidcore.mk
--- a/src/xvidcore.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/xvidcore.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,16 +3,17 @@
 
 PKG             := xvidcore
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.3.3
-$(PKG)_CHECKSUM := 465763c92679ca230526d4890d17dbf6d6974b08
+$(PKG)_VERSION  := 1.3.7
+$(PKG)_CHECKSUM := e6f2f5a65bccdf8d2413557df7ba6d31b7ac9be3
 $(PKG)_SUBDIR   := xvidcore/build/generic
 $(PKG)_FILE     := xvidcore-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://downloads.xvid.org/downloads/$($(PKG)_FILE)
+$(PKG)_URL      := https://downloads.xvid.com/downloads/$($(PKG)_FILE)
 $(PKG)_DEPS     := pthreads
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
-    echo $($(PKG)_VERSION)
+    $(WGET) -q -O- 'https://labs.xvid.com/source/' | \
+    $(SED) -n 's,.*xvidcore-\([0-9][^ ]*\)\.tar.*,\1,p' | \
+    head -1
 endef
 
 ifeq ($(MXE_NATIVE_BUILD),no)
diff -r 97c5f8da5036 -r 3d86598a6b7f src/zeromq-1.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/zeromq-1.patch	Fri May 27 12:54:43 2022 +0200
@@ -0,0 +1,132 @@
+Patch for GCC12
+diff --git a/doc/zmq_socket_monitor_versioned.txt b/doc/zmq_socket_monitor_versioned.txt
+index 5339f404a4..e71dd3544d 100644
+--- a/doc/zmq_socket_monitor_versioned.txt
++++ b/doc/zmq_socket_monitor_versioned.txt
+@@ -244,7 +244,7 @@ EXAMPLE
+ //  in case of error.
+ 
+ static uint64_t
+-get_monitor_event (void *monitor, uint64_t *value, char **local_address, char **remote_address)
++get_monitor_event (void *monitor, uint64_t **value, char **local_address, char **remote_address)
+ {
+     //  First frame in message contains event number
+     zmq_msg_t msg;
+@@ -267,6 +267,11 @@ get_monitor_event (void *monitor, uint64_t *value, char **local_address, char **
+     memcpy (&value_count, zmq_msg_data (&msg), sizeof (value_count));
+     zmq_msg_close (&msg);
+ 
++    if (value) {
++        *value = (uint64_t *) malloc (value_count * sizeof (uint64_t));
++        assert (*value);
++    }
++
+     for (uint64_t i = 0; i < value_count; ++i) {
+         //  Subsequent frames in message contain event values
+         zmq_msg_init (&msg);
+@@ -274,8 +279,8 @@ get_monitor_event (void *monitor, uint64_t *value, char **local_address, char **
+             return -1;              //  Interrupted, presumably
+         assert (zmq_msg_more (&msg));
+ 
+-        if (value_ && value_ + i)
+-            memcpy (value_ + i, zmq_msg_data (&msg), sizeof (*value_));
++        if (value && *value)
++            memcpy (&(*value)[i], zmq_msg_data (&msg), sizeof (uint64_t));
+         zmq_msg_close (&msg);
+     }
+ 
+diff --git a/tests/test_monitor.cpp b/tests/test_monitor.cpp
+index b9309e6df3..7398dbd8d0 100644
+--- a/tests/test_monitor.cpp
++++ b/tests/test_monitor.cpp
+@@ -396,17 +396,19 @@ void test_monitor_versioned_stats (bind_function_t bind_function_,
+     for (int i = 0; i < pulls_count; ++i) {
+         char *push_local_address = NULL;
+         char *push_remote_address = NULL;
+-        uint64_t queue_stat[2];
++        uint64_t *queue_stat = NULL;
+         int64_t event = get_monitor_event_v2 (
+-          push_mon, queue_stat, &push_local_address, &push_remote_address);
++          push_mon, &queue_stat, &push_local_address, &push_remote_address);
+         TEST_ASSERT_EQUAL_STRING (server_endpoint, push_local_address);
+         TEST_ASSERT_EQUAL_STRING_LEN (expected_prefix_, push_remote_address,
+                                       strlen (expected_prefix_));
+         TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_PIPES_STATS, event);
++        TEST_ASSERT_NOT_NULL (queue_stat);
+         TEST_ASSERT_EQUAL_INT (i == 0 ? 0 : send_hwm, queue_stat[0]);
+         TEST_ASSERT_EQUAL_INT (0, queue_stat[1]);
+         free (push_local_address);
+         free (push_remote_address);
++        free (queue_stat);
+     }
+ 
+     //  Close client and server
+diff --git a/tests/testutil_monitoring.cpp b/tests/testutil_monitoring.cpp
+index 06406270a0..8668caee83 100644
+--- a/tests/testutil_monitoring.cpp
++++ b/tests/testutil_monitoring.cpp
+@@ -207,7 +207,7 @@ int expect_monitor_event_multiple (void *server_mon_,
+ }
+ 
+ static int64_t get_monitor_event_internal_v2 (void *monitor_,
+-                                              uint64_t *value_,
++                                              uint64_t **value_,
+                                               char **local_address_,
+                                               char **remote_address_,
+                                               int recv_flag_)
+@@ -239,6 +239,12 @@ static int64_t get_monitor_event_internal_v2 (void *monitor_,
+     memcpy (&value_count, zmq_msg_data (&msg), sizeof (value_count));
+     zmq_msg_close (&msg);
+ 
++    if (value_) {
++        *value_ =
++          (uint64_t *) malloc ((size_t) value_count * sizeof (uint64_t));
++        TEST_ASSERT_NOT_NULL (*value_);
++    }
++
+     for (uint64_t i = 0; i < value_count; ++i) {
+         //  Subsequent frames in message contain event values
+         zmq_msg_init (&msg);
+@@ -249,8 +255,8 @@ static int64_t get_monitor_event_internal_v2 (void *monitor_,
+         TEST_ASSERT_TRUE (zmq_msg_more (&msg));
+         TEST_ASSERT_EQUAL_UINT (sizeof (uint64_t), zmq_msg_size (&msg));
+ 
+-        if (value_ && value_ + i)
+-            memcpy (value_ + i, zmq_msg_data (&msg), sizeof (*value_));
++        if (value_ && *value_)
++            memcpy (&(*value_)[i], zmq_msg_data (&msg), sizeof (uint64_t));
+         zmq_msg_close (&msg);
+     }
+ 
+@@ -266,7 +272,7 @@ static int64_t get_monitor_event_internal_v2 (void *monitor_,
+ }
+ 
+ static int64_t get_monitor_event_with_timeout_v2 (void *monitor_,
+-                                                  uint64_t *value_,
++                                                  uint64_t **value_,
+                                                   char **local_address_,
+                                                   char **remote_address_,
+                                                   int timeout_)
+@@ -299,7 +305,7 @@ static int64_t get_monitor_event_with_timeout_v2 (void *monitor_,
+ }
+ 
+ int64_t get_monitor_event_v2 (void *monitor_,
+-                              uint64_t *value_,
++                              uint64_t **value_,
+                               char **local_address_,
+                               char **remote_address_)
+ {
+diff --git a/tests/testutil_monitoring.hpp b/tests/testutil_monitoring.hpp
+index a69db29015..eb6817d3c1 100644
+--- a/tests/testutil_monitoring.hpp
++++ b/tests/testutil_monitoring.hpp
+@@ -67,7 +67,7 @@ int expect_monitor_event_multiple (void *server_mon_,
+                                    bool optional_ = false);
+ 
+ int64_t get_monitor_event_v2 (void *monitor_,
+-                              uint64_t *value_,
++                              uint64_t **value_,
+                               char **local_address_,
+                               char **remote_address_);
+ 
+
diff -r 97c5f8da5036 -r 3d86598a6b7f src/zlib.mk
--- a/src/zlib.mk	Fri May 27 12:24:32 2022 +0200
+++ b/src/zlib.mk	Fri May 27 12:54:43 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := zlib
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.11
-$(PKG)_CHECKSUM := e1cb0d5c92da8e9a8c2635dfa249c341dfd00322
+$(PKG)_VERSION  := 1.2.12
+$(PKG)_CHECKSUM := 37d26cd1138597c866b8e3e137156c82a0f0f960
 $(PKG)_SUBDIR   := zlib-$($(PKG)_VERSION)
 $(PKG)_FILE     := zlib-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://zlib.net/$($(PKG)_FILE)