Mercurial > mxe-octave

changeset 6112:696446c9c4f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge release to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 04 Mar 2022 17:09:59 +0100
parents b319dc565a3a (diff) 497afa9abf22 (current diff)
children 24e29dcb2e64 3683848f5989
files src/cmake.mk
diffstat 48 files changed, 477 insertions(+), 589 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/dist-files.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -84,8 +84,6 @@
   dri2proto.mk \
   eigen.mk \
   epstool.mk \
-  exiv2-issue847.patch \
-  exiv2-r2796.patch \
   exiv2.mk \
   expat.mk \
   faad2-1-fixes.patch \
@@ -121,7 +119,6 @@
   gd-1-libpng15.patch \
   gd-test.c \
   gd.mk \
-  gdal-1-gcc11.patch \
   gdal-2-ucrt.patch \
   gdal.mk \
   gdb.mk \
@@ -208,8 +205,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 \
@@ -254,7 +249,6 @@
   libgomp.mk \
   libgpg_error-1-fixes.patch \
   libgpg_error.mk \
-  libgsasl-1-fixes.patch \
   libgsasl-test.c \
   libgsasl.mk \
   libgsf-1-fixes.patch \
@@ -365,6 +359,7 @@
   mman-win32.mk \
   mpc.mk \
   mpfr.mk \
+  mpg123.mk \
   msitools.mk \
   msvc-atk-1.patch \
   msvc-build-cmake-1.patch \
@@ -507,6 +502,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 \
@@ -539,6 +535,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 \
@@ -573,12 +570,14 @@
   opencv.mk \
   openexr.mk \
   openjpeg.mk \
+  openlibm.mk \
   openscenegraph-1-fixes.patch \
   openscenegraph.mk \
   openssl-1-fixes.patch \
   openssl.mk \
   opkg-biosig.mk \
   opus.mk \
+  opusfile.mk \
   pango-1-fixes.patch \
   pango.mk \
   pangomm.mk \
@@ -666,7 +665,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 \
--- a/index.html	Wed Mar 02 11:42:27 2022 -0500
+++ b/index.html	Fri Mar 04 17:09:59 2022 +0100
@@ -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>
--- a/src/build-cmake.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/build-cmake.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -3,8 +3,8 @@
 
 PKG             := build-cmake
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.22.1
-$(PKG)_CHECKSUM := 71861ee1c487edf05061ab5f7dc4f13a74bfbcdb
+$(PKG)_VERSION  := 3.22.2
+$(PKG)_CHECKSUM := 672ec927c218a3f4ece5929d7b225fce6bc38187
 $(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)
--- a/src/cmake.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/cmake.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -3,8 +3,8 @@
 
 PKG             := cmake
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.22.1
-$(PKG)_CHECKSUM := 71861ee1c487edf05061ab5f7dc4f13a74bfbcdb
+$(PKG)_VERSION  := 3.22.2
+$(PKG)_CHECKSUM := 672ec927c218a3f4ece5929d7b225fce6bc38187
 $(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)
--- a/src/curl.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/curl.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -3,12 +3,12 @@
 
 PKG             := curl
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 7.80.0
-$(PKG)_CHECKSUM := 5bc5332d0a7f68747d685b3c8681f69447c3498d
+$(PKG)_VERSION  := 7.81.0
+$(PKG)_CHECKSUM := 4783aadbb397031723c80b349363a226e5827803
 $(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)
--- a/src/dbus.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/dbus.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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)
--- a/src/default-octave.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/default-octave.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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) \
--- a/src/exiv2-issue847.patch	Wed Mar 02 11:42:27 2022 -0500
+++ /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
-
--- a/src/exiv2-r2796.patch	Wed Mar 02 11:42:27 2022 -0500
+++ /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 {
--- a/src/exiv2.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/exiv2.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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
--- a/src/expat.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/expat.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -3,8 +3,8 @@
 
 PKG             := expat
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.4.1
-$(PKG)_CHECKSUM := b677b9a1cf3a1424fda183223fae2c58f50151af
+$(PKG)_VERSION  := 2.4.6
+$(PKG)_CHECKSUM := 043460831254c6ae34645b6aaafcc551922b10c8
 $(PKG)_SUBDIR   := expat-$($(PKG)_VERSION)
 $(PKG)_FILE     := expat-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/expat/expat/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/flac.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/flac.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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)
--- a/src/freetds.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/freetds.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -3,8 +3,8 @@
 
 PKG             := freetds
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.3.6
-$(PKG)_CHECKSUM := 607006f673573bc26b59e2a63492ffe630023655
+$(PKG)_VERSION  := 1.3.9
+$(PKG)_CHECKSUM := e785039a594dbdffb300fa6c97ebd691bbf26366
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE)
--- a/src/gcc-isl.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/gcc-isl.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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
--- a/src/gdal-1-gcc11.patch	Wed Mar 02 11:42:27 2022 -0500
+++ /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>
- 
--- a/src/gdal.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/gdal.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -3,18 +3,18 @@
 
 PKG             := gdal
 $(PKG)_IGNORE   :
-$(PKG)_VERSION  := 3.0.4
-$(PKG)_CHECKSUM := 5362ecafb9d06fa9d86beb1ab07b974256b13542
+$(PKG)_VERSION  := 3.3.3
+$(PKG)_CHECKSUM := 82221db588433e1a2f919953835c0317b5122ed8
 $(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
--- a/src/gdb.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/gdb.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -2,8 +2,8 @@
 # See index.html for further information.
 
 PKG             := gdb
-$(PKG)_VERSION  := 11.1
-$(PKG)_CHECKSUM := 6cb3361c7f2b22d6d2c25ab4992264aa41bc2471
+$(PKG)_VERSION  := 11.2
+$(PKG)_CHECKSUM := 7c72b1d4a38bb6e155aaad29f4c1abf818b4595d
 $(PKG)_SUBDIR   := gdb-$($(PKG)_VERSION)
 $(PKG)_FILE     := gdb-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
--- a/src/gdcm.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/gdcm.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -8,14 +8,7 @@
 $(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
--- a/src/geos.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/geos.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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)
--- a/src/isl.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/isl.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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
--- a/src/jpeg.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/jpeg.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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)
--- a/src/json-c-1-patch-missingfile.patch	Wed Mar 02 11:42:27 2022 -0500
+++ /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 \
--- a/src/json-c-2-patch-remove-rpl.patch	Wed Mar 02 11:42:27 2022 -0500
+++ /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
--- a/src/json-c.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/json-c.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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
--- a/src/lcms.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/lcms.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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)
--- a/src/levmar.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/levmar.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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
--- a/src/libgpg_error-1-fixes.patch	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/libgpg_error-1-fixes.patch	Fri Mar 04 17:09:59 2022 +0100
@@ -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
--- a/src/libgpg_error.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/libgpg_error.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -3,8 +3,8 @@
 
 PKG             := libgpg_error
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.43
-$(PKG)_CHECKSUM := e71b77e8e32023dfd9cb06504942aa8e028c8795
+$(PKG)_VERSION  := 1.44
+$(PKG)_CHECKSUM := c16ab473d1e558ba1712c77ace38bd03e467cbb0
 $(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)
--- a/src/libgsasl-1-fixes.patch	Wed Mar 02 11:42:27 2022 -0500
+++ /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
-
--- a/src/libgsasl.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/libgsasl.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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
--- a/src/libunistring.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/libunistring.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libwebp.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := libwebp
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.2.1
+$(PKG)_CHECKSUM := 9bbc3cb6f90dccafbd3e39325c28f24ac3f6e041
+$(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
--- a/src/libxml2-1-fixes.patch	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/libxml2-1-fixes.patch	Fri Mar 04 17:09:59 2022 +0100
@@ -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
-
--- a/src/libxml2.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/libxml2.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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.13
+$(PKG)_CHECKSUM := 156b8938fe54b024bbd8a3db319a6b8a58f9c209
+$(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) \
--- a/src/lua.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/lua.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mpg123.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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
--- a/src/npp.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/npp.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -3,8 +3,8 @@
 
 PKG             := npp
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 8.1.9.3
-$(PKG)_CHECKSUM := c864455e096ba9e549eeb16c992bcd3f1f58a047
+$(PKG)_VERSION  := 8.3.1
+$(PKG)_CHECKSUM := acc6d7c77cad77c3ee6200c7d1f1b0389442da64
 $(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)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-ltfat-3-no-cxx11.patch	Fri Mar 04 17:09:59 2022 +0100
@@ -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
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-sparsersb-2-no-cxx11.patch	Fri Mar 04 17:09:59 2022 +0100
@@ -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])
--- a/src/openblas.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/openblas.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/openlibm.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/opusfile.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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
--- a/src/sdl2.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/sdl2.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -3,8 +3,8 @@
 
 PKG             := sdl2
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.0.18
-$(PKG)_CHECKSUM := 419c62567d197a52a2136865c158f894939c1adf
+$(PKG)_VERSION  := 2.0.20
+$(PKG)_CHECKSUM := 18ce006cbf07502f48abfedc088c14404091f3d3
 $(PKG)_SUBDIR   := SDL2-$($(PKG)_VERSION)
 $(PKG)_FILE     := SDL2-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.libsdl.org/release/$($(PKG)_FILE)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sdl2_image.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sdl2_mixer.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sdl2_net.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sdl2_ttf.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -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
--- a/src/sqlite.mk	Wed Mar 02 11:42:27 2022 -0500
+++ b/src/sqlite.mk	Fri Mar 04 17:09:59 2022 +0100
@@ -3,11 +3,11 @@
 
 PKG             := sqlite
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3370100
-$(PKG)_CHECKSUM := 328bc8146e15b67752b5249b8ac688c13230c517
+$(PKG)_VERSION  := 3380000
+$(PKG)_CHECKSUM := c9a089d1e9f87b652698def57a2f01c1f4e37052
 $(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)