Mercurial > mxe-octave
changeset 6052:c49cd10af708
maint: Merge release to default.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Tue, 11 Jan 2022 22:23:06 +0100 |
| parents | 94f0d0af14d2 (diff) ff5b7c1526aa (current diff) |
| children | 3271eabb7af5 |
| files | |
| diffstat | 12 files changed, 151 insertions(+), 96 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Tue Jan 11 22:16:31 2022 +0100 +++ b/dist-files.mk Tue Jan 11 22:23:06 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 \ @@ -254,7 +253,6 @@ libgomp.mk \ libgpg_error-1-fixes.patch \ libgpg_error.mk \ - libgsasl-1-fixes.patch \ libgsasl-test.c \ libgsasl.mk \ libgsf-1-fixes.patch \ @@ -569,6 +567,7 @@ openal-1-fixes.patch \ openal-test.c \ openal.mk \ + openblas-1-skylakex.patch \ openblas.mk \ opencore-amr.mk \ opencsg-1-fixes.patch \ @@ -670,7 +669,7 @@ renderproto.mk \ rtmidi.mk \ s2tc.mk \ - sdl2.k \ + sdl2.mk \ sdl-1-xdata.patch \ sdl-test.c \ sdl.mk \
--- a/src/curl.mk Tue Jan 11 22:16:31 2022 +0100 +++ b/src/curl.mk Tue Jan 11 22:23:06 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/gdal-1-gcc11.patch Tue Jan 11 22:16:31 2022 +0100 +++ /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 Tue Jan 11 22:16:31 2022 +0100 +++ b/src/gdal.mk Tue Jan 11 22:23:06 2022 +0100 @@ -3,13 +3,13 @@ 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' | \ @@ -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/gdcm.mk Tue Jan 11 22:16:31 2022 +0100 +++ b/src/gdcm.mk Tue Jan 11 22:23:06 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/libgsasl-1-fixes.patch Tue Jan 11 22:16:31 2022 +0100 +++ /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 Tue Jan 11 22:16:31 2022 +0100 +++ b/src/libgsasl.mk Tue Jan 11 22:23:06 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 Tue Jan 11 22:16:31 2022 +0100 +++ b/src/libunistring.mk Tue Jan 11 22:23:06 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)
--- a/src/npp.mk Tue Jan 11 22:16:31 2022 +0100 +++ b/src/npp.mk Tue Jan 11 22:23:06 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 Tue Jan 11 22:23:06 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 Tue Jan 11 22:16:31 2022 +0100 +++ b/src/openblas.mk Tue Jan 11 22:23:06 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
--- a/src/sqlite.mk Tue Jan 11 22:16:31 2022 +0100 +++ b/src/sqlite.mk Tue Jan 11 22:23:06 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)