# HG changeset patch # User Markus Mützel # Date 1641065501 -3600 # Node ID a882556270c816eee5080e42bbb6512687803e6b # Parent 88762923aa9a527bef2d8ea113019a4988c9d83f# Parent 9d6cbb229b0f0748c7038a661242276b68a97a17 maint: merge default to release. diff -r 88762923aa9a -r a882556270c8 dist-files.mk --- a/dist-files.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/dist-files.mk Sat Jan 01 20:31:41 2022 +0100 @@ -159,7 +159,6 @@ gnutls.mk \ graphicsmagick-1-fix-xml2-config.patch \ graphicsmagick-2-dynamicpath.patch \ - graphicsmagick-3-user32.patch \ graphicsmagick-test.cpp \ graphicsmagick.mk \ gsl-test.c \ @@ -671,6 +670,7 @@ renderproto.mk \ rtmidi.mk \ s2tc.mk \ + sdl2.k \ sdl-1-xdata.patch \ sdl-test.c \ sdl.mk \ diff -r 88762923aa9a -r a882556270c8 index.html --- a/index.html Sun Dec 05 18:26:51 2021 +0100 +++ b/index.html Sat Jan 01 20:31:41 2022 +0100 @@ -2722,6 +2722,10 @@ SDL_ttf + sdl2 + SDL2 + + sm sm diff -r 88762923aa9a -r a882556270c8 installer-files/README.html --- a/installer-files/README.html Sun Dec 05 18:26:51 2021 +0100 +++ b/installer-files/README.html Sat Jan 01 20:31:41 2022 +0100 @@ -5,12 +5,11 @@

Welcome

Thank you for installing GNU Octave!

Octave 6.4 is a minor release which mainly fixes bugs and regressions found -since the release of version 6.3.

Some fixes made it necessary to break ABI compatibility between Octave 6.2 -(and earlier) and Octave 6.3 (and later). If you are updating from Octave prior -to version 6.3, re-build any binaries (like .oct or .mex files) when updating to -this version.

Octave 7.1 is a major release with many new features and improvements. Among +other things, it brings updates for Matlab compatibility, better graphics, and +many general improvements since version 6.4.

The minimum required version of the Windows API is now 6.1 (Windows 7 or +newer).

A full list of changes can be found in the Release Notes from the News menu or by typing news on the command prompt.

diff -r 88762923aa9a -r a882556270c8 installer-files/octave-launch.c --- a/installer-files/octave-launch.c Sun Dec 05 18:26:51 2021 +0100 +++ b/installer-files/octave-launch.c Sat Jan 01 20:31:41 2022 +0100 @@ -268,6 +268,13 @@ size_t num_threads; num_threads = get_num_physical_cores (); + // Setting OPENBLAS_NUM_THREADS to something higher than what NUM_THREADS + // was set to when OpenBLAS was configured, can lead to errors. + // FIXME: Can/should we get that number from the library? +#define MAX_NUM_THREADS 24 + if (num_threads > MAX_NUM_THREADS) + num_threads = MAX_NUM_THREADS; + if (num_threads > 0) { #define THREADS_SZ 64 diff -r 88762923aa9a -r a882556270c8 src/blas.mk --- a/src/blas.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/blas.mk Sat Jan 01 20:31:41 2022 +0100 @@ -17,7 +17,7 @@ define $(PKG)_UPDATE $(WGET) -q -O- ftp://ftp.eq.uc.pt/pub/software/math/netlib/blas/ | \ - $(SED) -n 's|.*>blas-$[0-9\.]*$.tgz<.*|\1|p' | \ + $(SED) -n 's|.*>blas-$[0-9\.]*$.tgz<.*|\1|p' | $(SORT) -V | \ tail -1 endef diff -r 88762923aa9a -r a882556270c8 src/build-cmake.mk --- a/src/build-cmake.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/build-cmake.mk Sat Jan 01 20:31:41 2022 +0100 @@ -3,8 +3,8 @@ PKG := build-cmake $(PKG)_IGNORE := -$(PKG)_VERSION := 3.21.4 -$(PKG)_CHECKSUM := 7d5bde583207dc205cba158ce46f0c389884b211 +$(PKG)_VERSION := 3.22.1 +$(PKG)_CHECKSUM := 71861ee1c487edf05061ab5f7dc4f13a74bfbcdb $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) diff -r 88762923aa9a -r a882556270c8 src/cmake.mk --- a/src/cmake.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/cmake.mk Sat Jan 01 20:31:41 2022 +0100 @@ -3,8 +3,8 @@ PKG := cmake $(PKG)_IGNORE := -$(PKG)_VERSION := 3.21.4 -$(PKG)_CHECKSUM := 7d5bde583207dc205cba158ce46f0c389884b211 +$(PKG)_VERSION := 3.22.1 +$(PKG)_CHECKSUM := 71861ee1c487edf05061ab5f7dc4f13a74bfbcdb $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) diff -r 88762923aa9a -r a882556270c8 src/dbus.mk --- a/src/dbus.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/dbus.mk Sat Jan 01 20:31:41 2022 +0100 @@ -3,8 +3,8 @@ PKG := dbus $(PKG)_IGNORE := -$(PKG)_VERSION := 1.13.18 -$(PKG)_CHECKSUM := 09e90abe435ac3bd8d2d6d1fafc886b0d97c8185 +$(PKG)_VERSION := 1.13.20 +$(PKG)_CHECKSUM := 721389d265da7eaa644789efac4bcd848b11e313 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE) diff -r 88762923aa9a -r a882556270c8 src/double-conversion.mk --- a/src/double-conversion.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/double-conversion.mk Sat Jan 01 20:31:41 2022 +0100 @@ -3,8 +3,8 @@ PKG := double-conversion $(PKG)_IGNORE := -$(PKG)_VERSION := 3.1.5 -$(PKG)_CHECKSUM := ea899f825b61f374b310654927b41244d80b538e +$(PKG)_VERSION := 3.1.7 +$(PKG)_CHECKSUM := 55732a036a077624b0e6bab48652a1d98d472750 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/google/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz diff -r 88762923aa9a -r a882556270c8 src/ffmpeg.mk --- a/src/ffmpeg.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/ffmpeg.mk Sat Jan 01 20:31:41 2022 +0100 @@ -9,7 +9,7 @@ $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.ffmpeg.org/releases/$($(PKG)_FILE) $(PKG)_URL_2 := http://launchpad.net/ffmpeg/main/$($(PKG)_VERSION)/+download/$($(PKG)_FILE) -$(PKG)_DEPS := bzip2 gnutls lame libvpx opencore-amr sdl speex theora vorbis x264 xvidcore zlib +$(PKG)_DEPS := bzip2 gnutls lame libvpx opencore-amr sdl2 speex theora vorbis x264 xvidcore zlib $(PKG)_CONFIG_OPTS := diff -r 88762923aa9a -r a882556270c8 src/freetds.mk --- a/src/freetds.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/freetds.mk Sat Jan 01 20:31:41 2022 +0100 @@ -3,8 +3,8 @@ PKG := freetds $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.3 -$(PKG)_CHECKSUM := 369398abc6491b3c7af4cc91d2b918be854a237b +$(PKG)_VERSION := 1.3.6 +$(PKG)_CHECKSUM := 607006f673573bc26b59e2a63492ffe630023655 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE) diff -r 88762923aa9a -r a882556270c8 src/freetype.mk --- a/src/freetype.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/freetype.mk Sat Jan 01 20:31:41 2022 +0100 @@ -3,8 +3,8 @@ PKG := freetype $(PKG)_IGNORE := -$(PKG)_VERSION := 2.11.0 -$(PKG)_CHECKSUM := f1635a1ed68ee467be33036d8881b7b89177663f +$(PKG)_VERSION := 2.11.1 +$(PKG)_CHECKSUM := 86bdc98b37efe447cf53420bf2c18402ff905112 $(PKG)_SUBDIR := freetype-$($(PKG)_VERSION) $(PKG)_FILE := freetype-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$($(PKG)_VERSION)/$($(PKG)_FILE) diff -r 88762923aa9a -r a882556270c8 src/graphicsmagick-2-dynamicpath.patch --- a/src/graphicsmagick-2-dynamicpath.patch Sun Dec 05 18:26:51 2021 +0100 +++ b/src/graphicsmagick-2-dynamicpath.patch Sat Jan 01 20:31:41 2022 +0100 @@ -1,7 +1,7 @@ -diff -ur GraphicsMagick-1.3.30.orig/magick/blob.c GraphicsMagick-1.3.30/magick/blob.c ---- GraphicsMagick-1.3.30.orig/magick/blob.c 2018-07-16 08:55:01.552444311 -0400 -+++ GraphicsMagick-1.3.30/magick/blob.c 2018-07-17 09:27:05.584144673 -0400 -@@ -1955,6 +1955,29 @@ +diff -ur GraphicsMagick-1.3.37.orig/magick/blob.c GraphicsMagick-1.3.37/magick/blob.c +--- GraphicsMagick-1.3.37.orig/magick/blob.c 2021-12-14 12:59:54.946462559 -0500 ++++ GraphicsMagick-1.3.37/magick/blob.c 2021-12-14 13:05:57.022604525 -0500 +@@ -1975,6 +1975,29 @@ AddConfigurePath(path_map,&path_index,MagickLibConfigPath,exception); # endif /* defined(MagickLibConfigPath) */ @@ -31,14 +31,13 @@ # if defined(MSWINDOWS) && !(defined(MagickLibConfigPath) || defined(MagickShareConfigPath)) { char -Only in GraphicsMagick-1.3.30/magick: .blob.c.swp -diff -ur GraphicsMagick-1.3.30.orig/magick/module.c GraphicsMagick-1.3.30/magick/module.c ---- GraphicsMagick-1.3.30.orig/magick/module.c 2018-07-16 08:55:01.539443999 -0400 -+++ GraphicsMagick-1.3.30/magick/module.c 2018-07-17 08:22:22.161123799 -0400 -@@ -1021,6 +1021,33 @@ - start += length+1; +diff -ur GraphicsMagick-1.3.37.orig/magick/module.c GraphicsMagick-1.3.37/magick/module.c +--- GraphicsMagick-1.3.37.orig/magick/module.c 2021-12-14 12:59:54.935462099 -0500 ++++ GraphicsMagick-1.3.37/magick/module.c 2021-12-14 13:08:20.667611735 -0500 +@@ -1036,6 +1036,33 @@ } } + +#if defined(MSWINDOWS) + { + char buf[FILENAME_MAX+100]; @@ -65,7 +64,7 @@ + } + } +#endif -+ - ++ #if defined(UseInstalledMagick) # if defined(MagickCoderModulesPath) + { diff -r 88762923aa9a -r a882556270c8 src/graphicsmagick-3-user32.patch --- a/src/graphicsmagick-3-user32.patch Sun Dec 05 18:26:51 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +0,0 @@ -diff -ur GraphicsMagick-1.3.36.orig/configure.ac GraphicsMagick-1.3.36/configure.ac ---- GraphicsMagick-1.3.36.orig/configure.ac 2021-01-01 09:35:17.966994198 -0500 -+++ GraphicsMagick-1.3.36/configure.ac 2021-01-01 14:21:04.736125338 -0500 -@@ -2752,7 +2752,8 @@ - found_libgdi32=0 - AC_CHECK_HEADER([windows.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) - AC_CHECK_HEADER([wingdi.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[#include ]) -- AC_CHECK_LIB([gdi32],[OpenClipboard],[found_libgdi32=`expr $found_libgdi32 + 1`],,) -+ AC_CHECK_LIB([user32],[OpenClipboard],[found_libuser32=`expr $found_libuser32 + 1`],[],[]) -+ AC_CHECK_LIB([gdi32],[CreateDIBSection],[found_libgdi32=`expr $found_libgdi32 + 1`],[],[]) - if test $found_libgdi32 -gt 0 - then - passed=`expr $passed + 1` -@@ -2767,7 +2768,7 @@ - AC_MSG_RESULT([no -- some components failed test]) - have_gdi32='no (failed tests)' - else -- LIB_GDI32='-lgdi32' -+ LIB_GDI32='-lgdi32 -luser32' - LIBS="$LIB_GDI32 $LIBS" - AC_DEFINE([HasWINGDI32],[1],[Define to use the Windows GDI32 library]) - AC_MSG_RESULT([yes]) -diff -ur GraphicsMagick-1.3.36.orig/magick/nt_feature.c GraphicsMagick-1.3.36/magick/nt_feature.c ---- GraphicsMagick-1.3.36.orig/magick/nt_feature.c 2021-01-01 09:35:18.045998572 -0500 -+++ GraphicsMagick-1.3.36/magick/nt_feature.c 2021-01-01 14:22:55.233205368 -0500 -@@ -78,6 +78,7 @@ - % - % - */ -+#if defined(HasWINGDI32) - MagickExport void *CropImageToHBITMAP(Image *image, - const RectangleInfo *geometry,ExceptionInfo *exception) - { -@@ -217,6 +218,7 @@ - - return (void *)bitmapH; - } -+#endif - - /* - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -@@ -612,6 +614,7 @@ - % - % - */ -+#if defined(HasWINGDI32) - MagickExport void *ImageToHBITMAP(Image* image) - { - unsigned long -@@ -696,5 +699,6 @@ - - return (void *)bitmapH; - } -+#endif - - #endif -diff -ur GraphicsMagick-1.3.36.orig/magick/nt_feature.h GraphicsMagick-1.3.36/magick/nt_feature.h ---- GraphicsMagick-1.3.36.orig/magick/nt_feature.h 2021-01-01 09:35:18.038998185 -0500 -+++ GraphicsMagick-1.3.36/magick/nt_feature.h 2021-01-01 14:23:42.008779169 -0500 -@@ -23,9 +23,11 @@ - extern MagickExport char - *NTRegistryKeyLookup(const char *key); - -+#if defined(HasWINGDI32) - extern MagickExport void - *CropImageToHBITMAP(Image *,const RectangleInfo *,ExceptionInfo *), - *ImageToHBITMAP(Image* image); -+#endif - - #if !defined(XS_VERSION) - diff -r 88762923aa9a -r a882556270c8 src/graphicsmagick.mk --- a/src/graphicsmagick.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/graphicsmagick.mk Sat Jan 01 20:31:41 2022 +0100 @@ -3,8 +3,8 @@ PKG := graphicsmagick $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.36 -$(PKG)_CHECKSUM := df45052bf485407ad4fb7d3b9b305d3e5ebb14e5 +$(PKG)_VERSION := 1.3.37 +$(PKG)_CHECKSUM := 94e0103f7d2286d1ba46c633d68ab0e1bfa2b2d3 $(PKG)_SUBDIR := GraphicsMagick-$($(PKG)_VERSION) $(PKG)_FILE := GraphicsMagick-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) diff -r 88762923aa9a -r a882556270c8 src/gsl.mk --- a/src/gsl.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/gsl.mk Sat Jan 01 20:31:41 2022 +0100 @@ -3,8 +3,8 @@ PKG := gsl $(PKG)_IGNORE := -$(PKG)_VERSION := 2.7 -$(PKG)_CHECKSUM := 29179db0d746f422bb0ceca2cbda4de107a2c651 +$(PKG)_VERSION := 2.7.1 +$(PKG)_CHECKSUM := 549e1105cd1198537be9707257161531e109bd94 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) diff -r 88762923aa9a -r a882556270c8 src/lapack.mk --- a/src/lapack.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/lapack.mk Sat Jan 01 20:31:41 2022 +0100 @@ -31,7 +31,7 @@ define $(PKG)_UPDATE $(WGET) -q -O- 'http://www.netlib.org/lapack/' | \ - $(SED) -n 's_.*>LAPACK, version $[0-9]\.[0-9]\.[0-9]$.*_\1_ip' | \ + $(SED) -n 's_.*>lapack-$[0-9.]*$.tar.gz<.*_\1_p' | \ head -1 endef diff -r 88762923aa9a -r a882556270c8 src/mesa.mk --- a/src/mesa.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/mesa.mk Sat Jan 01 20:31:41 2022 +0100 @@ -2,8 +2,8 @@ # See index.html for further information. PKG := mesa -$(PKG)_VERSION := 21.1.8 -$(PKG)_CHECKSUM := bb184edbff2f7e9f1705532349a49bd1f53cb631 +$(PKG)_VERSION := 21.2.6 +$(PKG)_CHECKSUM := b7057fa4e57ae4155248b38b5085d083689ac94c $(PKG)_SUBDIR := mesa-$($(PKG)_VERSION) $(PKG)_FILE := mesa-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE) diff -r 88762923aa9a -r a882556270c8 src/npp.mk --- a/src/npp.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/npp.mk Sat Jan 01 20:31:41 2022 +0100 @@ -3,8 +3,8 @@ PKG := npp $(PKG)_IGNORE := -$(PKG)_VERSION := 8.1.9.2 -$(PKG)_CHECKSUM := 1d479b151a4b2f769a6d822c85b8e2b7bc3d8bc5 +$(PKG)_VERSION := 8.1.9.3 +$(PKG)_CHECKSUM := c864455e096ba9e549eeb16c992bcd3f1f58a047 $(PKG)_SUBDIR := $(PKG)_FILE := $(PKG).$($(PKG)_VERSION).portable.zip $(PKG)_URL := https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE) diff -r 88762923aa9a -r a882556270c8 src/of-audio.mk --- a/src/of-audio.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/of-audio.mk Sat Jan 01 20:31:41 2022 +0100 @@ -3,8 +3,8 @@ PKG := of-audio $(PKG)_IGNORE := -$(PKG)_VERSION := 2.0.3 -$(PKG)_CHECKSUM := c1efc877035ffa0b592d5fc03470406d2604c06a +$(PKG)_VERSION := 2.0.4 +$(PKG)_CHECKSUM := 0268406b63582832a8015a82399c1654531d0c04 $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := audio-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz diff -r 88762923aa9a -r a882556270c8 src/of-io.mk --- a/src/of-io.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/of-io.mk Sat Jan 01 20:31:41 2022 +0100 @@ -3,8 +3,8 @@ PKG := of-io $(PKG)_IGNORE := -$(PKG)_VERSION := 2.6.3 -$(PKG)_CHECKSUM := 6ed3e70e3ef108204bff87c9b9d29019b844d273 +$(PKG)_VERSION := 2.6.4 +$(PKG)_CHECKSUM := e8c7e9df8624839c634a730a08a0e5efb856735e $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := io-$($(PKG)_VERSION) $(PKG)_FILE := io-$($(PKG)_VERSION).tar.gz diff -r 88762923aa9a -r a882556270c8 src/of-statistics.mk --- a/src/of-statistics.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/of-statistics.mk Sat Jan 01 20:31:41 2022 +0100 @@ -3,8 +3,8 @@ PKG := of-statistics $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.2 -$(PKG)_CHECKSUM := 8329abd3da0f75f94e5ea85bb6e51dc16c7d0274 +$(PKG)_VERSION := 1.4.3 +$(PKG)_CHECKSUM := 5892ebffd8298db3f9e16fcef917701ad8085ffb $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := statistics-$($(PKG)_VERSION) $(PKG)_FILE := statistics-$($(PKG)_VERSION).tar.gz diff -r 88762923aa9a -r a882556270c8 src/openblas.mk --- a/src/openblas.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/openblas.mk Sat Jan 01 20:31:41 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 diff -r 88762923aa9a -r a882556270c8 src/pstoedit.mk --- a/src/pstoedit.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/pstoedit.mk Sat Jan 01 20:31:41 2022 +0100 @@ -3,8 +3,8 @@ PKG := pstoedit $(PKG)_IGNORE := -$(PKG)_VERSION := 3.77 -$(PKG)_CHECKSUM := 480a6004a47d06f8a506ccc542b2954329e2be97 +$(PKG)_VERSION := 3.78 +$(PKG)_CHECKSUM := c000c82f69b1dfd1211d36b93ba5aa67c28d1f69 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://sourceforge.net/projects/pstoedit/files/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)/download diff -r 88762923aa9a -r a882556270c8 src/sdl2.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/sdl2.mk Sat Jan 01 20:31:41 2022 +0100 @@ -0,0 +1,36 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := sdl2 +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.0.18 +$(PKG)_CHECKSUM := 419c62567d197a52a2136865c158f894939c1adf +$(PKG)_SUBDIR := SDL2-$($(PKG)_VERSION) +$(PKG)_FILE := SDL2-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://www.libsdl.org/release/$($(PKG)_FILE) +$(PKG)_DEPS := libiconv libsamplerate + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://hg.libsdl.org/SDL/tags' | \ + $(SED) -n 's,.*tag/release-$[0-9][^"]*$.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && aclocal -I acinclude && autoconf && $(SHELL) ./configure \ + $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + $(ENABLE_SHARED_OR_STATIC) \ + --prefix='$(HOST_PREFIX)' \ + --enable-libsamplerate \ + --enable-libsamplerate-shared=$(if $(BUILD_SHARED),yes,no) + + $(SED) -i 's,defined(__MINGW64_VERSION_MAJOR),defined(__MINGW64_VERSION_MAJOR) \&\& defined(_WIN64),' '$(1)/include/SDL_cpuinfo.h' + $(SED) -i 's,-XCClinker,,' '$(1)/sdl2.pc' + $(SED) -i 's,-XCClinker,,' '$(1)/sdl2-config' + $(MAKE) -C '$(1)' -j '$(JOBS)' SHELL=$(SHELL) + $(MAKE) -C '$(1)' -j 1 install SHELL=$(SHELL) + if [ "$(MXE_NATIVE_BUILD)" == "no" ]; then \ + $(LN_SF) -sf '$(HOST_BINDIR)/sdl2-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_REFIX)sdl2-config'; \ + fi +endef diff -r 88762923aa9a -r a882556270c8 src/sqlite.mk --- a/src/sqlite.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/sqlite.mk Sat Jan 01 20:31:41 2022 +0100 @@ -3,8 +3,8 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3360000 -$(PKG)_CHECKSUM := a4bcf9e951bfb9745214241ba08476299fc2dc1e +$(PKG)_VERSION := 3370100 +$(PKG)_CHECKSUM := 328bc8146e15b67752b5249b8ac688c13230c517 $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.sqlite.org/2021/$($(PKG)_FILE) diff -r 88762923aa9a -r a882556270c8 src/stable-octave.mk --- a/src/stable-octave.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/stable-octave.mk Sat Jan 01 20:31:41 2022 +0100 @@ -21,7 +21,7 @@ ifeq ($(USE_SYSTEM_FONTCONFIG),no) $(PKG)_FONTCONFIG := fontconfig endif -$(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile pcre portaudio pstoedit qhull qrupdate qscintilla readline sundials-ida suitesparse texinfo zlib +$(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile pcre portaudio pstoedit qhull qrupdate qscintilla rapidjson readline sundials-ida suitesparse texinfo zlib ifeq ($(ENABLE_QT5),yes) $(PKG)_DEPS += qt5 diff -r 88762923aa9a -r a882556270c8 src/wxwidgets.mk --- a/src/wxwidgets.mk Sun Dec 05 18:26:51 2021 +0100 +++ b/src/wxwidgets.mk Sat Jan 01 20:31:41 2022 +0100 @@ -8,7 +8,7 @@ $(PKG)_SUBDIR := wxWidgets-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.bz2 $(PKG)_URL := https://github.com/wxWidgets/wxWidgets/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := libiconv libpng jpeg tiff sdl zlib expat +$(PKG)_DEPS := libiconv libpng jpeg tiff sdl2 zlib expat define $(PKG)_UPDATE $(WGET) -q -O- 'https://github.com//wxWidgets/wxWidgets/tags' | \