Mercurial > mxe-octave

changeset 6068:b916a190b939

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 Wed, 26 Jan 2022 18:49:44 +0100
parents 7c82402297b2 (diff) 1a4cd1dde869 (current diff)
children 0bf2a154ef3e
files dist-files.mk
diffstat 27 files changed, 437 insertions(+), 150 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Mon Jan 24 08:30:50 2022 -0500
+++ b/dist-files.mk	Wed Jan 26 18:49:44 2022 +0100
@@ -121,7 +121,6 @@
   gd-1-libpng15.patch \
   gd-test.c \
   gd.mk \
-  gdal-1-gcc11.patch \
   gdal-2-ucrt.patch \
   gdal.mk \
   gdb.mk \
@@ -208,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 \
@@ -254,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 \
@@ -365,6 +361,7 @@
   mman-win32.mk \
   mpc.mk \
   mpfr.mk \
+  mpg123.mk \
   msitools.mk \
   msvc-atk-1.patch \
   msvc-build-cmake-1.patch \
@@ -567,6 +564,7 @@
   openal-1-fixes.patch \
   openal-test.c \
   openal.mk \
+  openblas-1-skylakex.patch \
   openblas.mk \
   opencore-amr.mk \
   opencsg-1-fixes.patch \
@@ -581,6 +579,7 @@
   openssl.mk \
   opkg-biosig.mk \
   opus.mk \
+  opusfile.mk \
   pango-1-fixes.patch \
   pango.mk \
   pangomm.mk \
@@ -668,7 +667,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	Mon Jan 24 08:30:50 2022 -0500
+++ b/index.html	Wed Jan 26 18:49:44 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>
@@ -2502,6 +2510,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 +2738,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/curl.mk	Mon Jan 24 08:30:50 2022 -0500
+++ b/src/curl.mk	Wed Jan 26 18:49:44 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/default-octave.mk	Mon Jan 24 08:30:50 2022 -0500
+++ b/src/default-octave.mk	Wed Jan 26 18:49:44 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/gdal-1-gcc11.patch	Mon Jan 24 08:30:50 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	Mon Jan 24 08:30:50 2022 -0500
+++ b/src/gdal.mk	Wed Jan 26 18:49:44 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	Mon Jan 24 08:30:50 2022 -0500
+++ b/src/gdb.mk	Wed Jan 26 18:49:44 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	Mon Jan 24 08:30:50 2022 -0500
+++ b/src/gdcm.mk	Wed Jan 26 18:49:44 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	Mon Jan 24 08:30:50 2022 -0500
+++ b/src/geos.mk	Wed Jan 26 18:49:44 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/json-c-1-patch-missingfile.patch	Mon Jan 24 08:30:50 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	Mon Jan 24 08:30:50 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	Mon Jan 24 08:30:50 2022 -0500
+++ b/src/json-c.mk	Wed Jan 26 18:49:44 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/levmar.mk	Mon Jan 24 08:30:50 2022 -0500
+++ b/src/levmar.mk	Wed Jan 26 18:49:44 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/libgsasl-1-fixes.patch	Mon Jan 24 08:30:50 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	Mon Jan 24 08:30:50 2022 -0500
+++ b/src/libgsasl.mk	Wed Jan 26 18:49:44 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	Mon Jan 24 08:30:50 2022 -0500
+++ b/src/libunistring.mk	Wed Jan 26 18:49:44 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	Wed Jan 26 18:49:44 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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mpg123.mk	Wed Jan 26 18:49:44 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	Mon Jan 24 08:30:50 2022 -0500
+++ b/src/npp.mk	Wed Jan 26 18:49:44 2022 +0100
@@ -3,8 +3,8 @@
 
 PKG             := npp
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 8.1.9.3
-$(PKG)_CHECKSUM := c864455e096ba9e549eeb16c992bcd3f1f58a047
+$(PKG)_VERSION  := 8.2
+$(PKG)_CHECKSUM := de18f71ed5ce2370a016cc2c9bbd120d09ccd18e
 $(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/openblas-1-skylakex.patch	Wed Jan 26 18:49:44 2022 +0100
@@ -0,0 +1,120 @@
+From 15d4b379138b9a5b84a2fbc2d37cb47b33efdeec Mon Sep 17 00:00:00 2001
+From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
+Date: Sat, 8 Jan 2022 23:48:13 +0100
+Subject: [PATCH 1/3] SkylakeX: match parameters to dgemm kernels for
+ dyn/non-dyn
+
+---
+ param.h | 24 ++++++++++++++++++------
+ 1 file changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/param.h b/param.h
+index 2dffaae3c..4155131f0 100644
+--- a/param.h
++++ b/param.h
+@@ -1669,10 +1669,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #else
+ 
+ #define SGEMM_DEFAULT_UNROLL_M 16
+-#ifndef DYNAMIC_ARCH
+-#define DGEMM_DEFAULT_UNROLL_M 16
+-#else
++#ifdef DYNAMIC_ARCH
+ #define DGEMM_DEFAULT_UNROLL_M 4
++#else
++#define DGEMM_DEFAULT_UNROLL_M 16
+ #endif
+ #define QGEMM_DEFAULT_UNROLL_M 2
+ #define CGEMM_DEFAULT_UNROLL_M 8
+@@ -1680,10 +1680,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #define XGEMM_DEFAULT_UNROLL_M 1
+ 
+ #define SGEMM_DEFAULT_UNROLL_N 4
+-#ifndef DYNAMIC_ARCH
+-#define DGEMM_DEFAULT_UNROLL_N 2
+-#else
++#ifdef DYNAMIC_ARCH
+ #define DGEMM_DEFAULT_UNROLL_N 8
++#else
++#define DGEMM_DEFAULT_UNROLL_N 2
+ #endif
+ #define QGEMM_DEFAULT_UNROLL_N 2
+ #define CGEMM_DEFAULT_UNROLL_N 2
+@@ -1718,17 +1718,29 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #else
+ 
+ #define SGEMM_DEFAULT_P 448
++#ifndef DYNAMIC_ARCH
+ #define DGEMM_DEFAULT_P 192
++#else
++#define DGEMM_DEFAULT_P 384
++#endif
+ #define CGEMM_DEFAULT_P 384
+ #define ZGEMM_DEFAULT_P 256
+ 
+ #define SGEMM_DEFAULT_Q 448
++#ifndef DYNAMIC_ARCH
+ #define DGEMM_DEFAULT_Q 384
++#else
++#define DGEMM_DEFAULT_Q 168
++#endif
+ #define CGEMM_DEFAULT_Q 192
+ #define ZGEMM_DEFAULT_Q 128
+ 
+ #define SGEMM_DEFAULT_R sgemm_r
++#ifndef DYNAMIC_ARCH
+ #define DGEMM_DEFAULT_R 8640
++#else
++#define DGEMM_DEFAULT_R 13824
++#endif
+ #define CGEMM_DEFAULT_R cgemm_r
+ #define ZGEMM_DEFAULT_R zgemm_r
+ 
+
+From f1ac59f20057cefe4dd45122954e2403f1330835 Mon Sep 17 00:00:00 2001
+From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
+Date: Sat, 8 Jan 2022 23:48:58 +0100
+Subject: [PATCH 2/3] Forward DYNAMIC_ARCH option to Makefile.prebuild
+
+---
+ Makefile.system | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.system b/Makefile.system
+index 97fdc3f91..7909f677a 100644
+--- a/Makefile.system
++++ b/Makefile.system
+@@ -277,7 +277,7 @@ HAVE_GAS := $(shell $(AS) -v < /dev/null 2>&1 | grep GNU 2>&1 >/dev/null ; echo
+ GETARCH_FLAGS += -DHAVE_GAS=$(HAVE_GAS)
+ 
+ # Generating Makefile.conf and config.h
+-DUMMY := $(shell $(MAKE) -C $(TOPDIR) -f Makefile.prebuild CC="$(CC)" FC="$(FC)" HOSTCC="$(HOSTCC)" HOST_CFLAGS="$(GETARCH_FLAGS)" CFLAGS="$(CFLAGS)" BINARY=$(BINARY) USE_OPENMP=$(USE_OPENMP) TARGET_CORE=$(TARGET_CORE) ONLY_CBLAS=$(ONLY_CBLAS) TARGET=$(TARGET) all)
++DUMMY := $(shell $(MAKE) -C $(TOPDIR) -f Makefile.prebuild CC="$(CC)" FC="$(FC)" HOSTCC="$(HOSTCC)" HOST_CFLAGS="$(GETARCH_FLAGS)" CFLAGS="$(CFLAGS)" BINARY=$(BINARY) USE_OPENMP=$(USE_OPENMP) DYNAMIC_ARCH=$(DYNAMIC_ARCH) TARGET_CORE=$(TARGET_CORE) ONLY_CBLAS=$(ONLY_CBLAS) TARGET=$(TARGET) all)
+ 
+ ifndef TARGET_CORE
+ include $(TOPDIR)/Makefile.conf
+
+From 2573ccfb2e02abec3f537479d65b58c4d6e746f3 Mon Sep 17 00:00:00 2001
+From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
+Date: Sat, 8 Jan 2022 23:50:34 +0100
+Subject: [PATCH 3/3] make DYNAMIC_ARCH option available to getarch_2nd/param.h
+
+---
+ Makefile.prebuild | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Makefile.prebuild b/Makefile.prebuild
+index d6395da7b..399db956f 100644
+--- a/Makefile.prebuild
++++ b/Makefile.prebuild
+@@ -3,6 +3,10 @@
+ export BINARY
+ export USE_OPENMP
+ 
++ifdef DYNAMIC_ARCH
++override HOST_CFLAGS += -DDYNAMIC_ARCH
++endif
++
+ ifdef TARGET_CORE
+ TARGET_MAKE = Makefile_kernel.conf
+ TARGET_CONF = config_kernel.h
--- a/src/openblas.mk	Mon Jan 24 08:30:50 2022 -0500
+++ b/src/openblas.mk	Wed Jan 26 18:49:44 2022 +0100
@@ -3,8 +3,8 @@
 
 PKG             := openblas
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.3.18
-$(PKG)_CHECKSUM := a9d5ce86908657f002c6566cd8f35fe882709be4
+$(PKG)_VERSION  := 0.3.19
+$(PKG)_CHECKSUM := 0b0b2d1b56ea338ae07d11ab2780c108c188bebf
 $(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/opusfile.mk	Wed Jan 26 18:49:44 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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sdl2_image.mk	Wed Jan 26 18:49:44 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	Wed Jan 26 18:49:44 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	Wed Jan 26 18:49:44 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	Wed Jan 26 18:49:44 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.15
+$(PKG)_CHECKSUM := 1453c5f72f986024c5271c76d74cc232aa57dd79
+$(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	Mon Jan 24 08:30:50 2022 -0500
+++ b/src/sqlite.mk	Wed Jan 26 18:49:44 2022 +0100
@@ -3,11 +3,11 @@
 
 PKG             := sqlite
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3370100
-$(PKG)_CHECKSUM := 328bc8146e15b67752b5249b8ac688c13230c517
+$(PKG)_VERSION  := 3370200
+$(PKG)_CHECKSUM := e56faacadfb4154f8fbd0f2a3f827d13706b70a1
 $(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)