From d3dd7210e3f86d8a9a1b98631765315ca3d6d136 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 23 Jun 2020 11:25:06 +0200 Subject: [PATCH 01/22] update harfbuzz --- src/harfbuzz.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk index 3be5856a..543d7285 100644 --- a/src/harfbuzz.mk +++ b/src/harfbuzz.mk @@ -4,8 +4,8 @@ PKG := harfbuzz $(PKG)_WEBSITE := https://wiki.freedesktop.org/www/Software/HarfBuzz/ $(PKG)_DESCR := HarfBuzz $(PKG)_IGNORE := -$(PKG)_VERSION := 2.6.7 -$(PKG)_CHECKSUM := 53974165e3a4b46624619a54407c7dc2cc77354ae1297b5ca1f8987569348693 +$(PKG)_VERSION := 2.6.8 +$(PKG)_CHECKSUM := 059054760ff471d81171659a136dd253a0ddff7faa9249727cca3d7dbd356a6c $(PKG)_GH_CONF := harfbuzz/harfbuzz/releases $(PKG)_DEPS := cc cairo freetype-bootstrap glib icu4c From 875c0d81d8a839de58c877e385a8146c1720d0a3 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 23 Jun 2020 09:33:44 +0000 Subject: [PATCH 02/22] Update packages.json & build-matrix.html --- docs/build-matrix.html | 2 +- docs/packages.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/build-matrix.html b/docs/build-matrix.html index d1c75875..c2491cc4 100644 --- a/docs/build-matrix.html +++ b/docs/build-matrix.html @@ -1269,7 +1269,7 @@ feel free to submit a pull request. harfbuzz - 2.6.7 + 2.6.8 ✓ ✓ ✓ diff --git a/docs/packages.json b/docs/packages.json index 59cc3008..b222fd67 100644 --- a/docs/packages.json +++ b/docs/packages.json @@ -122,7 +122,7 @@ "guile": {"version": "1.8.8", "website": "https://www.gnu.org/software/guile/", "description": "GNU Guile"}, "gumbo": {"version": "0.10.1", "website": "https://github.com/google/gumbo-parser", "description": "Gumbo, an HTML5 parsing library"}, "hamlib": {"version": "3.3", "website": "https://hamlib.github.io/", "description": "HamLib"}, - "harfbuzz": {"version": "2.6.7", "website": "https://wiki.freedesktop.org/www/Software/HarfBuzz/", "description": "HarfBuzz"}, + "harfbuzz": {"version": "2.6.8", "website": "https://wiki.freedesktop.org/www/Software/HarfBuzz/", "description": "HarfBuzz"}, "hdf-eos2": {"version": "20v1.00", "website": "https://hdfeos.org/software/library.php", "description": "HDF-EOS2"}, "hdf-eos5": {"version": "1.16", "website": "https://hdfeos.org/software/library.php", "description": "HDF-EOS5"}, "hdf4": {"version": "4.2.10", "website": "https://www.hdfgroup.org/hdf4/", "description": "HDF4"}, From 7ae744350c3aa767df59d3aa78423c737486d07a Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 25 Jun 2020 15:38:29 +0200 Subject: [PATCH 03/22] update: curl, libjpeg-turbo --- src/curl.mk | 4 ++-- src/libjpeg-turbo.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/curl.mk b/src/curl.mk index 377e5bb2..c33d2b22 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -4,8 +4,8 @@ PKG := curl $(PKG)_WEBSITE := https://curl.haxx.se/libcurl/ $(PKG)_DESCR := cURL $(PKG)_IGNORE := -$(PKG)_VERSION := 7.70.0 -$(PKG)_CHECKSUM := 032f43f2674008c761af19bf536374128c16241fb234699a55f9fb603fcfbae7 +$(PKG)_VERSION := 7.71.0 +$(PKG)_CHECKSUM := cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://curl.haxx.se/download/$($(PKG)_FILE) diff --git a/src/libjpeg-turbo.mk b/src/libjpeg-turbo.mk index e80975f2..58f6d7e4 100644 --- a/src/libjpeg-turbo.mk +++ b/src/libjpeg-turbo.mk @@ -3,8 +3,8 @@ PKG := libjpeg-turbo $(PKG)_WEBSITE := https://libjpeg-turbo.virtualgl.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 2.0.4 -$(PKG)_CHECKSUM := 33dd8547efd5543639e890efbf2ef52d5a21df81faf41bb940657af916a23406 +$(PKG)_VERSION := 2.0.5 +$(PKG)_CHECKSUM := 16f8f6f2715b3a38ab562a84357c793dd56ae9899ce130563c72cd93d8357b5d $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) From 158a4d37be52ce8962d5848e6104f54da4ad99ea Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 25 Jun 2020 14:11:00 +0000 Subject: [PATCH 04/22] Update packages.json & build-matrix.html --- docs/build-matrix.html | 4 ++-- docs/packages.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/build-matrix.html b/docs/build-matrix.html index c2491cc4..41247b99 100644 --- a/docs/build-matrix.html +++ b/docs/build-matrix.html @@ -499,7 +499,7 @@ feel free to submit a pull request. curl - 7.70.0 + 7.71.0 ✓ ✓ ✓ @@ -2059,7 +2059,7 @@ feel free to submit a pull request. libjpeg-turbo - 2.0.4 + 2.0.5 ✓ ✓ ✓ diff --git a/docs/packages.json b/docs/packages.json index b222fd67..1fb7add9 100644 --- a/docs/packages.json +++ b/docs/packages.json @@ -45,7 +45,7 @@ "cryptopp": {"version": "5.6.3", "website": "https://www.cryptopp.com/", "description": "Crypto++ Library"}, "crystalhd": {"version": "1", "website": "https://www.broadcom.com/support/crystal_hd/", "description": "Broadcom Crystal HD Headers"}, "cunit": {"version": "2.1-3", "website": "https://cunit.sourceforge.io/", "description": ""}, - "curl": {"version": "7.70.0", "website": "https://curl.haxx.se/libcurl/", "description": "cURL"}, + "curl": {"version": "7.71.0", "website": "https://curl.haxx.se/libcurl/", "description": "cURL"}, "db": {"version": "6.1.26", "website": "https://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html", "description": "Oracle Berkeley DB"}, "dbus": {"version": "1.13.16", "website": "https://dbus.freedesktop.org/", "description": ""}, "dcmtk": {"version": "3.6.0", "website": "https://dicom.offis.de/dcmtk.php.en", "description": "DCMTK"}, @@ -201,7 +201,7 @@ "libidn2": {"version": "2.3.0", "website": "https://www.gnu.org/software/libidn/#libidn2", "description": "implementation of IDNA2008/TR46 internationalized domain names"}, "libieee1284": {"version": "0.2.11", "website": "http://cyberelk.net/tim/software/libieee1284/", "description": ""}, "libircclient": {"version": "1.10", "website": "https://sourceforge.net/projects/libircclient/", "description": ""}, - "libjpeg-turbo": {"version": "2.0.4", "website": "https://libjpeg-turbo.virtualgl.org/", "description": ""}, + "libjpeg-turbo": {"version": "2.0.5", "website": "https://libjpeg-turbo.virtualgl.org/", "description": ""}, "liblastfm": {"version": "1.0.9", "website": "https://github.com/lastfm/liblastfm", "description": "A Qt C++ library for the Last.fm webservices"}, "liblastfm_qt4": {"version": "1.0.9", "website": "https://github.com/lastfm/liblastfm", "description": "A Qt C++ library for the Last.fm webservices"}, "liblaxjson": {"version": "1.0.5", "website": "https://github.com/andrewrk/liblaxjson", "description": ""}, From e6099cdb3e1252826d3667b69559549dcea1afa3 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Fri, 26 Jun 2020 20:53:39 +1000 Subject: [PATCH 05/22] s3-fetch-and-sync: fix for s3cmd update --- tools/s3-fetch-and-sync | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/s3-fetch-and-sync b/tools/s3-fetch-and-sync index 33f7214a..14d67d50 100755 --- a/tools/s3-fetch-and-sync +++ b/tools/s3-fetch-and-sync @@ -44,5 +44,5 @@ if ! ( \ EDITOR=~/mxe/tools/fake-editor ghi open -L bug -- mxe/mxe fi -s3cmd sync --acl-public ~/mxe/pkg/* s3://mxe-pkg/ +s3cmd sync --acl-public ~/mxe/pkg/ s3://mxe-pkg/ rm -rf ~/mxe/tmp-download-log ~/mxe/tmp-url ~/mxe/log From c0327469677e8f82ca99692efcf3b8f200c2c515 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 30 Jun 2020 11:22:51 +1000 Subject: [PATCH 06/22] sdl2_mixer: use pkg-config to set configure LIBS see #2538 --- src/sdl2_mixer.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sdl2_mixer.mk b/src/sdl2_mixer.mk index b47fb438..cccda0e9 100644 --- a/src/sdl2_mixer.mk +++ b/src/sdl2_mixer.mk @@ -39,7 +39,7 @@ define $(PKG)_BUILD --disable-smpegtest \ SMPEG_CONFIG='$(PREFIX)/$(TARGET)/bin/smpeg2-config' \ WINDRES='$(TARGET)-windres' \ - LIBS='-lvorbis -logg' + LIBS="`$(TARGET)-pkg-config libmodplug libmpg123 opusfile vorbisfile --libs-only-l`" $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT) '$(TARGET)-gcc' \ From f55da59e7121bb42e52c9338e883d51c1fa6b7a1 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 30 Jun 2020 21:52:02 +0200 Subject: [PATCH 07/22] update gsoap --- src/gsoap-1-fixes.patch | 14 +++++++------- src/gsoap.mk | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gsoap-1-fixes.patch b/src/gsoap-1-fixes.patch index bb05ca3f..8cdd4ab0 100644 --- a/src/gsoap-1-fixes.patch +++ b/src/gsoap-1-fixes.patch @@ -34,7 +34,7 @@ diff --git a/gsoap++.pc.in b/gsoap++.pc.in index 1111111..2222222 100644 --- a/gsoap++.pc.in +++ b/gsoap++.pc.in -@@ -9,4 +9,4 @@ Version: 2.8.102 +@@ -9,4 +9,4 @@ Version: 2.8.104 Requires: Libs: -L${libdir} -lgsoap++ Libs.private: @SAMPLE_EXTRA_LIBS@ @@ -44,7 +44,7 @@ diff --git a/gsoap.pc.in b/gsoap.pc.in index 1111111..2222222 100644 --- a/gsoap.pc.in +++ b/gsoap.pc.in -@@ -9,4 +9,4 @@ Version: 2.8.102 +@@ -9,4 +9,4 @@ Version: 2.8.104 Requires: Libs: -L${libdir} -lgsoap Libs.private: @SAMPLE_EXTRA_LIBS@ @@ -54,7 +54,7 @@ diff --git a/gsoapck++.pc.in b/gsoapck++.pc.in index 1111111..2222222 100644 --- a/gsoapck++.pc.in +++ b/gsoapck++.pc.in -@@ -9,4 +9,4 @@ Version: 2.8.102 +@@ -9,4 +9,4 @@ Version: 2.8.104 Requires: Libs: -L${libdir} -lgsoapck++ Libs.private: @SAMPLE_EXTRA_LIBS@ @@ -64,7 +64,7 @@ diff --git a/gsoapck.pc.in b/gsoapck.pc.in index 1111111..2222222 100644 --- a/gsoapck.pc.in +++ b/gsoapck.pc.in -@@ -9,4 +9,4 @@ Version: 2.8.102 +@@ -9,4 +9,4 @@ Version: 2.8.104 Requires: Libs: -L${libdir} -lgsoapck Libs.private: @SAMPLE_EXTRA_LIBS@ @@ -74,7 +74,7 @@ diff --git a/gsoapssl++.pc.in b/gsoapssl++.pc.in index 1111111..2222222 100644 --- a/gsoapssl++.pc.in +++ b/gsoapssl++.pc.in -@@ -9,4 +9,4 @@ Version: 2.8.102 +@@ -9,4 +9,4 @@ Version: 2.8.104 Requires: Libs: -L${libdir} -lgsoapssl++ Libs.private: @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@ @@ -84,7 +84,7 @@ diff --git a/gsoapssl.pc.in b/gsoapssl.pc.in index 1111111..2222222 100644 --- a/gsoapssl.pc.in +++ b/gsoapssl.pc.in -@@ -9,4 +9,4 @@ Version: 2.8.102 +@@ -9,4 +9,4 @@ Version: 2.8.104 Requires: Libs: -L${libdir} -lgsoapssl Libs.private: @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@ @@ -103,7 +103,7 @@ diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h index 1111111..2222222 100644 --- a/gsoap/stdsoap2.h +++ b/gsoap/stdsoap2.h -@@ -3644,6 +3644,12 @@ SOAP_FMAC1 int SOAP_FMAC2 soap_putsetcookies(struct soap *soap); +@@ -3606,6 +3606,12 @@ SOAP_FMAC1 int SOAP_FMAC2 soap_putsetcookies(struct soap *soap); SOAP_FMAC1 int SOAP_FMAC2 soap_putcookies(struct soap *soap, const char *domain, const char *path, int secure); #endif diff --git a/src/gsoap.mk b/src/gsoap.mk index e5cc5db4..7494e481 100644 --- a/src/gsoap.mk +++ b/src/gsoap.mk @@ -4,8 +4,8 @@ PKG := gsoap $(PKG)_WEBSITE := https://www.genivia.com/dev.html $(PKG)_DESCR := gSOAP $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.103 -$(PKG)_CHECKSUM := afe2ba08d2fa56adc3c774b6741587203a72140a255346e9947b8d2ee6c7d4b6 +$(PKG)_VERSION := 2.8.104 +$(PKG)_CHECKSUM := 60fcd137c59a7640470f873d9a0a29c62896a15e8517a2f5a03eb2d7eebc0c52 $(PKG)_SUBDIR := gsoap-$(call SHORT_PKG_VERSION,$(PKG)) $(PKG)_FILE := gsoap_$($(PKG)_VERSION).zip $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/gsoap2/gsoap-$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) From abca8bfb0e653eb20312b45851cbd05acfab2c3f Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 30 Jun 2020 19:53:27 +0000 Subject: [PATCH 08/22] Update packages.json & build-matrix.html --- docs/build-matrix.html | 2 +- docs/packages.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/build-matrix.html b/docs/build-matrix.html index 41247b99..080d07fe 100644 --- a/docs/build-matrix.html +++ b/docs/build-matrix.html @@ -1059,7 +1059,7 @@ feel free to submit a pull request. gsoap - 2.8.103 + 2.8.104 ✓ × ✓ diff --git a/docs/packages.json b/docs/packages.json index 1fb7add9..960c2794 100644 --- a/docs/packages.json +++ b/docs/packages.json @@ -101,7 +101,7 @@ "grantlee": {"version": "5.2.0", "website": "https://github.com/steveire/grantlee", "description": "Grantlee is a set of Free Software libraries written using the Qt framework"}, "graphicsmagick": {"version": "1.3.33", "website": "http://www.graphicsmagick.org/", "description": "GraphicsMagick"}, "gsl": {"version": "2.6", "website": "https://www.gnu.org/software/gsl/", "description": "GSL"}, - "gsoap": {"version": "2.8.103", "website": "https://www.genivia.com/dev.html", "description": "gSOAP"}, + "gsoap": {"version": "2.8.104", "website": "https://www.genivia.com/dev.html", "description": "gSOAP"}, "gst-libav": {"version": "1.16.2", "website": "https://gstreamer.freedesktop.org/modules/gst-libav.html", "description": ""}, "gst-plugins-bad": {"version": "1.16.2", "website": "https://gstreamer.freedesktop.org/modules/gst-plugins-bad.html", "description": ""}, "gst-plugins-base": {"version": "1.16.2", "website": "https://gstreamer.freedesktop.org/modules/gst-plugins-base.html", "description": ""}, From 0c555f28b91253a69292d987879e9dc6a9076562 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 1 Jul 2020 18:45:10 +0200 Subject: [PATCH 09/22] update curl --- src/curl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/curl.mk b/src/curl.mk index c33d2b22..415d30ff 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -4,8 +4,8 @@ PKG := curl $(PKG)_WEBSITE := https://curl.haxx.se/libcurl/ $(PKG)_DESCR := cURL $(PKG)_IGNORE := -$(PKG)_VERSION := 7.71.0 -$(PKG)_CHECKSUM := cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772 +$(PKG)_VERSION := 7.71.1 +$(PKG)_CHECKSUM := 40f83eda27cdbeb25cd4da48cefb639af1b9395d6026d2da1825bf059239658c $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://curl.haxx.se/download/$($(PKG)_FILE) From 9cafefd0f7b9dfb38cc6243a2394a34deaf6919b Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 1 Jul 2020 16:46:24 +0000 Subject: [PATCH 10/22] Update packages.json & build-matrix.html --- docs/build-matrix.html | 2 +- docs/packages.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/build-matrix.html b/docs/build-matrix.html index 080d07fe..1245687f 100644 --- a/docs/build-matrix.html +++ b/docs/build-matrix.html @@ -499,7 +499,7 @@ feel free to submit a pull request. curl - 7.71.0 + 7.71.1 ✓ ✓ ✓ diff --git a/docs/packages.json b/docs/packages.json index 960c2794..288f6a04 100644 --- a/docs/packages.json +++ b/docs/packages.json @@ -45,7 +45,7 @@ "cryptopp": {"version": "5.6.3", "website": "https://www.cryptopp.com/", "description": "Crypto++ Library"}, "crystalhd": {"version": "1", "website": "https://www.broadcom.com/support/crystal_hd/", "description": "Broadcom Crystal HD Headers"}, "cunit": {"version": "2.1-3", "website": "https://cunit.sourceforge.io/", "description": ""}, - "curl": {"version": "7.71.0", "website": "https://curl.haxx.se/libcurl/", "description": "cURL"}, + "curl": {"version": "7.71.1", "website": "https://curl.haxx.se/libcurl/", "description": "cURL"}, "db": {"version": "6.1.26", "website": "https://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html", "description": "Oracle Berkeley DB"}, "dbus": {"version": "1.13.16", "website": "https://dbus.freedesktop.org/", "description": ""}, "dcmtk": {"version": "3.6.0", "website": "https://dicom.offis.de/dcmtk.php.en", "description": "DCMTK"}, From bc85046bc51f26454106035f8269b455e493c156 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 4 Jul 2020 22:16:34 +0200 Subject: [PATCH 11/22] update: dbus, freetds, poppler, vorbis --- src/dbus.mk | 4 ++-- src/freetds.mk | 4 ++-- src/poppler-1-win32.patch | 2 +- src/poppler.mk | 4 ++-- src/vorbis.mk | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/dbus.mk b/src/dbus.mk index d89e8341..84b1ddf3 100644 --- a/src/dbus.mk +++ b/src/dbus.mk @@ -3,8 +3,8 @@ PKG := dbus $(PKG)_WEBSITE := https://dbus.freedesktop.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 1.13.16 -$(PKG)_CHECKSUM := f56b0aa015d0cd13e235225484f411e3c587a0f852c12da03852a324dd1cafb3 +$(PKG)_VERSION := 1.13.18 +$(PKG)_CHECKSUM := 8078f5c25e34ab907ce06905d969dc8ef0ccbec367e1e1707c7ecf8460f4254e $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE) diff --git a/src/freetds.mk b/src/freetds.mk index cf9d94db..a236ee00 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -4,8 +4,8 @@ PKG := freetds $(PKG)_WEBSITE := https://www.freetds.org/ $(PKG)_DESCR := FreeTDS $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.42 -$(PKG)_CHECKSUM := aff70ecdef357b278d117273aab59d63c08a38418794d4fd428eec8fd0b4f00a +$(PKG)_VERSION := 1.2 +$(PKG)_CHECKSUM := f34a6fc707a4156698b3a756d42b7f571da8fb3facdede17fa266acd86c3345a $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://www.freetds.org/files/stable/$($(PKG)_FILE) diff --git a/src/poppler-1-win32.patch b/src/poppler-1-win32.patch index f72aea08..08f0e23e 100644 --- a/src/poppler-1-win32.patch +++ b/src/poppler-1-win32.patch @@ -128,7 +128,7 @@ index 1111111..2222222 100644 option(ENABLE_SPLASH "Build the Splash graphics backend." ON) option(ENABLE_UTILS "Compile poppler command line utils." ON) option(ENABLE_CPP "Compile poppler cpp wrapper." ON) -@@ -713,7 +714,9 @@ endif() +@@ -719,7 +720,9 @@ endif() if(ENABLE_GLIB) add_subdirectory(glib) endif() diff --git a/src/poppler.mk b/src/poppler.mk index c8e4a515..9e96ad49 100644 --- a/src/poppler.mk +++ b/src/poppler.mk @@ -3,8 +3,8 @@ PKG := poppler $(PKG)_WEBSITE := https://poppler.freedesktop.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 0.89.0 -$(PKG)_CHECKSUM := fba230364537782cc5d43b08d693ef69c36586286349683c7b127156a8ef9b5c +$(PKG)_VERSION := 0.90.0 +$(PKG)_CHECKSUM := 94edb0ad3330b74d22caac807aa501e9cc61cbf45a8010625670428b51989685 $(PKG)_SUBDIR := poppler-$($(PKG)_VERSION) $(PKG)_FILE := poppler-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://poppler.freedesktop.org/$($(PKG)_FILE) diff --git a/src/vorbis.mk b/src/vorbis.mk index 07c0f125..dbcfff61 100644 --- a/src/vorbis.mk +++ b/src/vorbis.mk @@ -4,8 +4,8 @@ PKG := vorbis $(PKG)_WEBSITE := https://xiph.org/vorbis/ $(PKG)_DESCR := Vorbis $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.6 -$(PKG)_CHECKSUM := 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +$(PKG)_VERSION := 1.3.7 +$(PKG)_CHECKSUM := 0e982409a9c3fc82ee06e08205b1355e5c6aa4c36bca58146ef399621b0ce5ab $(PKG)_SUBDIR := libvorbis-$($(PKG)_VERSION) $(PKG)_FILE := libvorbis-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://downloads.xiph.org/releases/vorbis/$($(PKG)_FILE) From a3d24518ebcce410274c2c3fe3ae7d9930499d67 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 4 Jul 2020 20:21:50 +0000 Subject: [PATCH 12/22] Update packages.json & build-matrix.html --- docs/build-matrix.html | 8 ++++---- docs/packages.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/build-matrix.html b/docs/build-matrix.html index 1245687f..49715760 100644 --- a/docs/build-matrix.html +++ b/docs/build-matrix.html @@ -519,7 +519,7 @@ feel free to submit a pull request. dbus - 1.13.16 + 1.13.18 ✓ ✓ ✓ @@ -719,7 +719,7 @@ feel free to submit a pull request. freetds - 1.1.42 + 1.2 ✓ ✓ ✓ @@ -3479,7 +3479,7 @@ feel free to submit a pull request. poppler - 0.89.0 + 0.90.0 ✓ ✓ ✓ @@ -4709,7 +4709,7 @@ feel free to submit a pull request. vorbis - 1.3.6 + 1.3.7 ✓ ✓ ✓ diff --git a/docs/packages.json b/docs/packages.json index 288f6a04..b0586b21 100644 --- a/docs/packages.json +++ b/docs/packages.json @@ -47,7 +47,7 @@ "cunit": {"version": "2.1-3", "website": "https://cunit.sourceforge.io/", "description": ""}, "curl": {"version": "7.71.1", "website": "https://curl.haxx.se/libcurl/", "description": "cURL"}, "db": {"version": "6.1.26", "website": "https://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html", "description": "Oracle Berkeley DB"}, - "dbus": {"version": "1.13.16", "website": "https://dbus.freedesktop.org/", "description": ""}, + "dbus": {"version": "1.13.18", "website": "https://dbus.freedesktop.org/", "description": ""}, "dcmtk": {"version": "3.6.0", "website": "https://dicom.offis.de/dcmtk.php.en", "description": "DCMTK"}, "devil": {"version": "cba359b", "website": "https://openil.sourceforge.io/", "description": "DevIL"}, "djvulibre": {"version": "3.5.27", "website": "https://djvu.sourceforge.io/", "description": "DjVuLibre"}, @@ -67,7 +67,7 @@ "fontconfig": {"version": "2.13.1", "website": "https://fontconfig.org/", "description": ""}, "freeglut": {"version": "3.2.1", "website": "https://freeglut.sourceforge.io/", "description": ""}, "freeimage": {"version": "3.15.4", "website": "https://freeimage.sourceforge.io/", "description": "FreeImage"}, - "freetds": {"version": "1.1.42", "website": "https://www.freetds.org/", "description": "FreeTDS"}, + "freetds": {"version": "1.2", "website": "https://www.freetds.org/", "description": "FreeTDS"}, "freetype": {"version": "2.10.2", "website": "https://www.freetype.org/", "description": ""}, "freetype-bootstrap": {"version": "2.10.2", "website": "https://www.freetype.org/", "description": "freetype (without harfbuzz)"}, "freexl": {"version": "1.0.5", "website": "https://www.gaia-gis.it/fossil/freexl/index", "description": "FreeXL"}, @@ -343,7 +343,7 @@ "plotutils": {"version": "2.6", "website": "https://www.gnu.org/software/plotutils/", "description": ""}, "poco": {"version": "1.9.4", "website": "https://pocoproject.org/", "description": "POCO C++ Libraries"}, "polarssl": {"version": "1.3.9", "website": "https://tls.mbed.org/", "description": "Polar SSL Library"}, - "poppler": {"version": "0.89.0", "website": "https://poppler.freedesktop.org/", "description": ""}, + "poppler": {"version": "0.90.0", "website": "https://poppler.freedesktop.org/", "description": ""}, "popt": {"version": "1.16", "website": "https://web.archive.org/web/20190425081726/rpm5.org/", "description": ""}, "portablexdr": {"version": "4.9.1", "website": "https://people.redhat.com/~rjones/portablexdr/", "description": "PortableXDR"}, "portaudio": {"version": "190600_20161030", "website": "http://www.portaudio.com/", "description": ""}, @@ -466,7 +466,7 @@ "vmime": {"version": "5c00f78", "website": "https://www.vmime.org/", "description": "VMime"}, "vo-aacenc": {"version": "0.1.3", "website": "https://github.com/mstorsjo/vo-aacenc", "description": "VO-AACENC"}, "vo-amrwbenc": {"version": "0.1.3", "website": "https://github.com/mstorsjo/vo-amrwbenc", "description": "VO-AMRWBENC"}, - "vorbis": {"version": "1.3.6", "website": "https://xiph.org/vorbis/", "description": "Vorbis"}, + "vorbis": {"version": "1.3.7", "website": "https://xiph.org/vorbis/", "description": "Vorbis"}, "vtk": {"version": "8.2.0", "website": "", "description": ""}, "waf": {"version": "1.8.17", "website": "https://waf.io/", "description": "Waf: the meta build system"}, "wavpack": {"version": "5.3.0", "website": "http://www.wavpack.com/", "description": "WavPack"}, From 5a95067499ce1e6fa639edd35ebd751882353cdb Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 7 Jul 2020 00:37:04 +1000 Subject: [PATCH 13/22] nsis: final upstream gcc10 fix --- src/nsis-1-fixes.patch | 73 +++++++++++------------------------------- 1 file changed, 18 insertions(+), 55 deletions(-) diff --git a/src/nsis-1-fixes.patch b/src/nsis-1-fixes.patch index 38e80634..8204d057 100644 --- a/src/nsis-1-fixes.patch +++ b/src/nsis-1-fixes.patch @@ -3,65 +3,28 @@ This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marius=20Negru=C8=9Biu?= -Date: Mon, 8 Jun 2020 14:08:49 +0300 -Subject: [PATCH 1/1] Fixed memmove() linker error caused by gcc/10.1.0-3 - compiler optimizer +From: Anders +Date: Sat, 27 Jun 2020 23:18:45 +0000 +Subject: [PATCH 1/1] Don't let GCC 10 generate memmove calls (bug #1248) see: https://sourceforge.net/p/nsis/bugs/1248/ taken from: -https://github.com/negrutiu/nsis/commit/c252106dd8203515706d9240e99a92cd0c7e3acb.patch +https://github.com/kichik/nsis/commit/6d9cfd3ef8296e3f9c0be9b3dbe01f0f3491b3dd.patch -diff --git a/Source/bzip2/decompress.c b/Source/bzip2/decompress.c +diff --git a/SCons/Config/gnu b/SCons/Config/gnu index 1111111..2222222 100755 ---- a/Source/bzip2/decompress.c -+++ b/Source/bzip2/decompress.c -@@ -263,7 +263,16 @@ Int32 NSISCALL BZ2_decompress ( DState* s ) - for (i = 0; i < nSelectors; i++) { - v = s->selectorMtf[i]; - tmp = pos[v]; -+/* -+ [Marius] -+ gcc/10.1.0-3 compiler optimizer replace the following line with a msvcrt!memmove() call. -+ This file is built into projects compiled with the -nostdlib parameter, therefore a linker error will occur. -+ We'll qualify the destination array as `volatile` to prevent GCC from optimizing it. -+ Related topic: https://stackoverflow.com/questions/2219829/how-to-prevent-gcc-optimizing-some-statements-in-c -+ ----------------------------------------- - while (v > 0) { pos[v] = pos[v-1]; v--; } -+*/ -+ while (v > 0) { ((volatile UChar*)pos)[v] = pos[v-1]; v--; } - pos[0] = tmp; - s->selector[i] = tmp; - } -@@ -388,7 +397,14 @@ Int32 NSISCALL BZ2_decompress ( DState* s ) - } - */ - while (nn > 0) { -+/* -+ [Marius] -+ Mark destination array as `volatile` to prevent GCC optimizer to generate msvcrt!memmove() calls. -+ See comments above. -+ ----------------------------------------- - s->mtfa[(pp+nn)] = s->mtfa[(pp+nn)-1]; nn--; -+*/ -+ ((volatile UChar*)s->mtfa)[(pp+nn)] = s->mtfa[(pp+nn)-1]; nn--; - }; - s->mtfa[pp] = uc; - } else { -@@ -398,7 +414,14 @@ Int32 NSISCALL BZ2_decompress ( DState* s ) - pp = s->mtfbase[lno] + off; - uc = s->mtfa[pp]; - while (pp > s->mtfbase[lno]) { -+/* -+ [Marius] -+ Mark destination array as `volatile` to prevent GCC optimizer to generate msvcrt!memmove() calls. -+ See comments above. -+ ----------------------------------------- - s->mtfa[pp] = s->mtfa[pp-1]; pp--; -+*/ -+ ((volatile UChar*)s->mtfa)[pp] = s->mtfa[pp-1]; pp--; - }; - s->mtfbase[lno]++; - while (lno > 0) { +--- a/SCons/Config/gnu ++++ b/SCons/Config/gnu +@@ -103,6 +103,10 @@ stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG']) # no standard libraries + stub_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align + stub_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file + ++conf = FlagsConfigure(stub_env) ++conf.CheckCompileFlag('-fno-tree-loop-distribute-patterns') # GCC 10: Don't generate msvcrt!memmove calls (bug #1248) ++conf.Finish() ++ + stub_uenv = stub_env.Clone() + stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE']) + From 9fa156ac3475163919326b7fd154e1c6a4d1811f Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 7 Jul 2020 01:51:48 +1000 Subject: [PATCH 14/22] qtbase: fix -debug-and-release test build fixes #2539 --- src/qtbase.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qtbase.mk b/src/qtbase.mk index d13c5be1..d9ac501f 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -76,7 +76,7 @@ define $(PKG)_BUILD mkdir '$(1)/test-qt' cd '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qt-test.pro' - $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)' + $(MAKE) -C '$(1)/test-qt' '$(BUILD_TYPE)' -j '$(JOBS)' $(INSTALL) -m755 '$(1)/test-qt/$(BUILD_TYPE)/test-qt5.exe' '$(PREFIX)/$(TARGET)/bin/' # build test the manual way From 8eeefe9edbbebfded2cb8e62457d885f90c00e22 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 8 Jul 2020 01:35:00 +0200 Subject: [PATCH 15/22] update: freetds, libgcrypt, mpg123, qca --- src/freetds.mk | 4 ++-- src/libgcrypt-1-fixes.patch | 2 +- src/libgcrypt.mk | 4 ++-- src/mpg123.mk | 4 ++-- src/qca-1-fixes.patch | 2 +- src/qca.mk | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/freetds.mk b/src/freetds.mk index a236ee00..2c66e53a 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -4,8 +4,8 @@ PKG := freetds $(PKG)_WEBSITE := https://www.freetds.org/ $(PKG)_DESCR := FreeTDS $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2 -$(PKG)_CHECKSUM := f34a6fc707a4156698b3a756d42b7f571da8fb3facdede17fa266acd86c3345a +$(PKG)_VERSION := 1.2.2 +$(PKG)_CHECKSUM := 0ce6684b13ad14a281f2d442fb1a72d7b407b0ef6ec7a2927e7e4fa330dfa0cd $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://www.freetds.org/files/stable/$($(PKG)_FILE) diff --git a/src/libgcrypt-1-fixes.patch b/src/libgcrypt-1-fixes.patch index 3f939f9b..75c6f966 100644 --- a/src/libgcrypt-1-fixes.patch +++ b/src/libgcrypt-1-fixes.patch @@ -67,7 +67,7 @@ diff --git a/configure.ac b/configure.ac index 1111111..2222222 100644 --- a/configure.ac +++ b/configure.ac -@@ -38,13 +38,10 @@ m4_define(mym4_version_micro, [1]) +@@ -38,13 +38,10 @@ m4_define(mym4_version_micro, [6]) # processing is done by autoconf and not during the configure run. m4_define(mym4_version, [mym4_version_major.mym4_version_minor.mym4_version_micro]) diff --git a/src/libgcrypt.mk b/src/libgcrypt.mk index 154c8985..810f2ef5 100644 --- a/src/libgcrypt.mk +++ b/src/libgcrypt.mk @@ -3,8 +3,8 @@ PKG := libgcrypt $(PKG)_WEBSITE := https://directory.fsf.org/wiki/Libgcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.5 -$(PKG)_CHECKSUM := 3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3 +$(PKG)_VERSION := 1.8.6 +$(PKG)_CHECKSUM := 0cba2700617b99fc33864a0c16b1fa7fdf9781d9ed3509f5d767178e5fd7b975 $(PKG)_SUBDIR := libgcrypt-$($(PKG)_VERSION) $(PKG)_FILE := libgcrypt-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://gnupg.org/ftp/gcrypt/libgcrypt/$($(PKG)_FILE) diff --git a/src/mpg123.mk b/src/mpg123.mk index 84caa455..d43a0e36 100644 --- a/src/mpg123.mk +++ b/src/mpg123.mk @@ -3,8 +3,8 @@ PKG := mpg123 $(PKG)_WEBSITE := https://www.mpg123.de/ $(PKG)_IGNORE := -$(PKG)_VERSION := 1.26.1 -$(PKG)_CHECKSUM := 74d6629ab7f3dd9a588b0931528ba7ecfa989a2cad6bf53ffeef9de31b0fe032 +$(PKG)_VERSION := 1.26.2 +$(PKG)_CHECKSUM := 00f7bf7ea64fcec2c9d07751d6ad8849343ee09c282ea3b0d5dd486e886e2ff3 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/mpg123/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) diff --git a/src/qca-1-fixes.patch b/src/qca-1-fixes.patch index c06d6d45..53129e77 100644 --- a/src/qca-1-fixes.patch +++ b/src/qca-1-fixes.patch @@ -12,7 +12,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 1111111..2222222 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -233,7 +233,7 @@ foreach(PATH QCA_PLUGINS_INSTALL_DIR +@@ -224,7 +224,7 @@ foreach(PATH QCA_PLUGINS_INSTALL_DIR endif() endforeach() diff --git a/src/qca.mk b/src/qca.mk index d106328b..a998c847 100644 --- a/src/qca.mk +++ b/src/qca.mk @@ -4,8 +4,8 @@ PKG := qca $(PKG)_WEBSITE := https://userbase.kde.org/QCA $(PKG)_DESCR := Qt Cryptographic Architecture $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.1 -$(PKG)_CHECKSUM := c67fc0fa8ae6cb3d0ba0fbd8fca8ee8e4c5061b99f1fd685fd7d9800cef17f6b +$(PKG)_VERSION := 2.3.1 +$(PKG)_CHECKSUM := 4391a544521736986c7f7239168a2deced6a8b2445a8e114c6b47c49658e132d $(PKG)_GH_CONF := KDE/qca/tags,v $(PKG)_DEPS := cc openssl qtbase From cb0b05b387d76bfe61734d4ed170e63ff145dc89 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 8 Jul 2020 00:36:52 +0000 Subject: [PATCH 16/22] Update packages.json & build-matrix.html --- docs/build-matrix.html | 8 ++++---- docs/packages.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/build-matrix.html b/docs/build-matrix.html index 49715760..8309b0c5 100644 --- a/docs/build-matrix.html +++ b/docs/build-matrix.html @@ -719,7 +719,7 @@ feel free to submit a pull request. freetds - 1.2 + 1.2.2 ✓ ✓ ✓ @@ -1859,7 +1859,7 @@ feel free to submit a pull request. libgcrypt - 1.8.5 + 1.8.6 ✓ ✓ ✓ @@ -2859,7 +2859,7 @@ feel free to submit a pull request. mpg123 - 1.26.1 + 1.26.2 ✓ ✓ ✓ @@ -3589,7 +3589,7 @@ feel free to submit a pull request. qca - 2.2.1 + 2.3.1 × ✓ × diff --git a/docs/packages.json b/docs/packages.json index b0586b21..0ce5111b 100644 --- a/docs/packages.json +++ b/docs/packages.json @@ -67,7 +67,7 @@ "fontconfig": {"version": "2.13.1", "website": "https://fontconfig.org/", "description": ""}, "freeglut": {"version": "3.2.1", "website": "https://freeglut.sourceforge.io/", "description": ""}, "freeimage": {"version": "3.15.4", "website": "https://freeimage.sourceforge.io/", "description": "FreeImage"}, - "freetds": {"version": "1.2", "website": "https://www.freetds.org/", "description": "FreeTDS"}, + "freetds": {"version": "1.2.2", "website": "https://www.freetds.org/", "description": "FreeTDS"}, "freetype": {"version": "2.10.2", "website": "https://www.freetype.org/", "description": ""}, "freetype-bootstrap": {"version": "2.10.2", "website": "https://www.freetype.org/", "description": "freetype (without harfbuzz)"}, "freexl": {"version": "1.0.5", "website": "https://www.gaia-gis.it/fossil/freexl/index", "description": "FreeXL"}, @@ -181,7 +181,7 @@ "libffi": {"version": "3.2.1", "website": "https://sourceware.org/libffi/", "description": ""}, "libftdi": {"version": "0.20", "website": "https://www.intra2net.com/en/developer/libftdi/index.php", "description": "LibFTDI"}, "libftdi1": {"version": "1.4", "website": "https://www.intra2net.com/en/developer/libftdi/index.php", "description": "LibFTDI1"}, - "libgcrypt": {"version": "1.8.5", "website": "https://directory.fsf.org/wiki/Libgcrypt", "description": ""}, + "libgcrypt": {"version": "1.8.6", "website": "https://directory.fsf.org/wiki/Libgcrypt", "description": ""}, "libgda": {"version": "4.2.13", "website": "https://www.gnome-db.org/", "description": ""}, "libgdamm": {"version": "4.1.3", "website": "https://launchpad.net/libgdamm", "description": ""}, "libgee": {"version": "0.20.1", "website": "https://wiki.gnome.org/Projects/Libgee", "description": ""}, @@ -281,7 +281,7 @@ "mman-win32": {"version": "9f115ad", "website": "https://code.google.com/p/mman-win32/", "description": "MMA-Win32"}, "mpc": {"version": "1.1.0", "website": "http://www.multiprecision.org/", "description": "GNU MPC"}, "mpfr": {"version": "4.0.2", "website": "https://www.mpfr.org/", "description": ""}, - "mpg123": {"version": "1.26.1", "website": "https://www.mpg123.de/", "description": ""}, + "mpg123": {"version": "1.26.2", "website": "https://www.mpg123.de/", "description": ""}, "muparser": {"version": "2.2.5", "website": "https://beltoforion.de/article.php?a=muparser", "description": "muParser"}, "muparserx": {"version": "4.0.7", "website": "https://beltoforion.de/article.php?a=muparserx", "description": "muParserX"}, "mxe-conf": {"version": "1", "website": "", "description": ""}, @@ -354,7 +354,7 @@ "protobuf": {"version": "3.9.0", "website": "https://github.com/google/protobuf", "description": ""}, "pthreads": {"version": "POSIX 1003.1-2001", "website": "https://en.wikipedia.org/wiki/POSIX_Threads", "description": "POSIX Threads"}, "pugixml": {"version": "1.8", "website": "https://pugixml.org/", "description": "Light-weight, simple, and fast XML parser for C++ with XPath support"}, - "qca": {"version": "2.2.1", "website": "https://userbase.kde.org/QCA", "description": "Qt Cryptographic Architecture"}, + "qca": {"version": "2.3.1", "website": "https://userbase.kde.org/QCA", "description": "Qt Cryptographic Architecture"}, "qdbm": {"version": "1.8.78", "website": "https://fallabs.com/qdbm/", "description": "QDBM"}, "qhttpengine": {"version": "1.0.1", "website": "https://github.com/nitroshare/qhttpengine", "description": ""}, "qjson": {"version": "0.9.0", "website": "https://qjson.sourceforge.io/", "description": "QJson"}, From ac3d0ebd9e4a29a0e0f7f6bda37682221fd054c0 Mon Sep 17 00:00:00 2001 From: TheGreatMcPain Date: Wed, 8 Jul 2020 00:45:10 -0500 Subject: [PATCH 17/22] SDL2: Use bash instead of /bin/sh. Fixes #2541 --- src/sdl2.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sdl2.mk b/src/sdl2.mk index ea2e0642..2998e487 100644 --- a/src/sdl2.mk +++ b/src/sdl2.mk @@ -18,7 +18,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && aclocal -I acinclude && autoconf && ./configure \ + cd '$(1)' && aclocal -I acinclude && autoconf && $(SHELL) ./configure \ $(MXE_CONFIGURE_OPTS) \ --enable-threads \ --enable-directx \ @@ -27,8 +27,8 @@ define $(PKG)_BUILD $(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)' - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(1)' -j '$(JOBS)' SHELL=$(SHELL) + $(MAKE) -C '$(1)' -j 1 install SHELL=$(SHELL) ln -sf '$(PREFIX)/$(TARGET)/bin/sdl2-config' '$(PREFIX)/bin/$(TARGET)-sdl2-config' '$(TARGET)-gcc' \ From 63c4eb50eeca06ddaa737dee5aa20b3abbf040b1 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 8 Jul 2020 18:36:03 +1000 Subject: [PATCH 18/22] libraw: also add private entries to libraw_r.pc file --- src/libraw.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libraw.mk b/src/libraw.mk index 1c2b0cb7..0efb8247 100644 --- a/src/libraw.mk +++ b/src/libraw.mk @@ -19,11 +19,12 @@ define $(PKG)_BUILD CXXFLAGS='-std=gnu++11 $(if $(BUILD_SHARED),-DLIBRAW_BUILDLIB,-DLIBRAW_NODLL)' \ LDFLAGS='-lws2_32' $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' install - # add missing entries to pkg-config file + # add missing entries to pkg-config files (echo ''; \ echo 'Libs.private: -lws2_32 -ljasper'; \ echo 'Cflags.private: -DLIBRAW_NODLL';) \ - >> '$(PREFIX)/$(TARGET)/lib/pkgconfig/$(PKG).pc' + | tee -a '$(PREFIX)/$(TARGET)/lib/pkgconfig/$(PKG).pc' \ + '$(PREFIX)/$(TARGET)/lib/pkgconfig/$(PKG)_r.pc' '$(TARGET)-g++' -Wall -Wextra -std=c++11 \ '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ From 0cf9324af915d2bc8379a3f47d559c457f93f652 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 8 Jul 2020 18:36:32 +1000 Subject: [PATCH 19/22] imagemagick: add libraw dependency --- src/imagemagick.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/imagemagick.mk b/src/imagemagick.mk index ebeefd79..096802bd 100644 --- a/src/imagemagick.mk +++ b/src/imagemagick.mk @@ -8,7 +8,7 @@ $(PKG)_VERSION := 7.0.8-63 $(PKG)_CHECKSUM := 5dda18f70662015d7cc89d6d3699cb14def23ad3d5066a43a50ec222e579884f $(PKG)_GH_CONF := ImageMagick/ImageMagick/tags $(PKG)_DEPS := cc bzip2 ffmpeg fftw freetype jasper jpeg lcms \ - liblqr-1 libltdl libpng openexr pthreads tiff zlib + liblqr-1 libltdl libpng libraw openexr pthreads tiff zlib define $(PKG)_BUILD cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \ From 2b0cade95028e324ec65e659507995703043ecd5 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 10 Jul 2020 14:56:55 +0200 Subject: [PATCH 20/22] update freetds --- src/freetds.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/freetds.mk b/src/freetds.mk index 2c66e53a..591f9886 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -4,8 +4,8 @@ PKG := freetds $(PKG)_WEBSITE := https://www.freetds.org/ $(PKG)_DESCR := FreeTDS $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.2 -$(PKG)_CHECKSUM := 0ce6684b13ad14a281f2d442fb1a72d7b407b0ef6ec7a2927e7e4fa330dfa0cd +$(PKG)_VERSION := 1.2.3 +$(PKG)_CHECKSUM := edfefcd4015ad66f05bd7dd7576dcc49fa58c6ba3cce8a073d7af2f11755fd9b $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://www.freetds.org/files/stable/$($(PKG)_FILE) From 8f1d9c98e5d116675d0e5f983d467a62d1d22b67 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Fri, 10 Jul 2020 13:00:14 +0000 Subject: [PATCH 21/22] Update packages.json & build-matrix.html --- docs/build-matrix.html | 2 +- docs/packages.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/build-matrix.html b/docs/build-matrix.html index 8309b0c5..cc500b6f 100644 --- a/docs/build-matrix.html +++ b/docs/build-matrix.html @@ -719,7 +719,7 @@ feel free to submit a pull request. freetds - 1.2.2 + 1.2.3 ✓ ✓ ✓ diff --git a/docs/packages.json b/docs/packages.json index 0ce5111b..4b3be061 100644 --- a/docs/packages.json +++ b/docs/packages.json @@ -67,7 +67,7 @@ "fontconfig": {"version": "2.13.1", "website": "https://fontconfig.org/", "description": ""}, "freeglut": {"version": "3.2.1", "website": "https://freeglut.sourceforge.io/", "description": ""}, "freeimage": {"version": "3.15.4", "website": "https://freeimage.sourceforge.io/", "description": "FreeImage"}, - "freetds": {"version": "1.2.2", "website": "https://www.freetds.org/", "description": "FreeTDS"}, + "freetds": {"version": "1.2.3", "website": "https://www.freetds.org/", "description": "FreeTDS"}, "freetype": {"version": "2.10.2", "website": "https://www.freetype.org/", "description": ""}, "freetype-bootstrap": {"version": "2.10.2", "website": "https://www.freetype.org/", "description": "freetype (without harfbuzz)"}, "freexl": {"version": "1.0.5", "website": "https://www.gaia-gis.it/fossil/freexl/index", "description": "FreeXL"}, From 885a03134121f7564bd49313a70e3d372a546192 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 11 Jul 2020 14:26:30 +1000 Subject: [PATCH 22/22] gcc6: add missing patches --- plugins/gcc6/gcc6.patch | 131 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 128 insertions(+), 3 deletions(-) diff --git a/plugins/gcc6/gcc6.patch b/plugins/gcc6/gcc6.patch index 9c146529..52580e83 100644 --- a/plugins/gcc6/gcc6.patch +++ b/plugins/gcc6/gcc6.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 2 Feb 2017 02:05:50 +1100 -Subject: [PATCH 1/2] allow native cpu detection when building with clang +Subject: [PATCH 1/4] allow native cpu detection when building with clang function was disabled for non-gcc5 in: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc @@ -29,14 +29,14 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Fri, 6 Apr 2018 13:40:22 +1000 -Subject: [PATCH 2/2] remove hard-coded mingw from include path +Subject: [PATCH 2/4] remove hard-coded mingw from include path diff --git a/gcc/config.gcc b/gcc/config.gcc index 1111111..2222222 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc -@@ -1713,7 +1713,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) +@@ -1765,7 +1765,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) tmake_file="${tmake_file} i386/t-mingw-w32" ;; esac @@ -58,3 +58,128 @@ index 1111111..2222222 100644 /* Output STRING, a string representing a filename, to FILE. We canonicalize it to be in Unix format (backslashes are replaced + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: uros +Date: Sun, 11 Nov 2018 17:44:43 +0000 +Subject: [PATCH 3/4] Backport from mainline 2018-11-04 Uros Bizjak + + + PR middle-end/58372 + * cfgexpand.c (pass_expand::execute): Move the call to + finish_eh_generation in front of the call to expand_stack_alignment. + +testsuite/ChangeLog: + + Backport from mainline + 2018-11-04 Uros Bizjak + + PR middle-end/58372 + * g++.dg/pr58372.C: New test. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@266015 138bc75d-0d04-0410-961f-82ee72b054a4 + +diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c +index 1111111..2222222 100644 +--- a/gcc/cfgexpand.c ++++ b/gcc/cfgexpand.c +@@ -6445,6 +6445,14 @@ pass_expand::execute (function *fun) + sbitmap_free (blocks); + purge_all_dead_edges (); + ++ /* After initial rtl generation, call back to finish generating ++ exception support code. We need to do this before cleaning up ++ the CFG as the code does not expect dead landing pads. */ ++ if (fun->eh->region_tree != NULL) ++ finish_eh_generation (); ++ ++ /* Call expand_stack_alignment after finishing all ++ updates to crtl->preferred_stack_boundary. */ + expand_stack_alignment (); + + /* Fixup REG_EQUIV notes in the prologue if there are tailcalls in this +@@ -6452,12 +6460,6 @@ pass_expand::execute (function *fun) + if (crtl->tail_call_emit) + fixup_tail_calls (); + +- /* After initial rtl generation, call back to finish generating +- exception support code. We need to do this before cleaning up +- the CFG as the code does not expect dead landing pads. */ +- if (fun->eh->region_tree != NULL) +- finish_eh_generation (); +- + /* Remove unreachable blocks, otherwise we cannot compute dominators + which are needed for loop state verification. As a side-effect + this also compacts blocks. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sun, 31 May 2020 18:36:27 +1000 +Subject: [PATCH 4/4] PR c++/66297, DR 1684 - literal class and constexpr + member fns + +taken from: +https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=54069e595976eb556b22c231951cb2703e523a22;hp=8ef2b9a7b59418d9f5e644badbc0aade7f83414f + +diff --git a/gcc/cp/class.c b/gcc/cp/class.c +index 1111111..2222222 100644 +--- a/gcc/cp/class.c ++++ b/gcc/cp/class.c +@@ -5654,7 +5654,9 @@ finalize_literal_type_property (tree t) + && !TYPE_HAS_CONSTEXPR_CTOR (t)) + CLASSTYPE_LITERAL_P (t) = false; + +- if (!CLASSTYPE_LITERAL_P (t)) ++ /* C++14 DR 1684 removed this restriction. */ ++ if (cxx_dialect < cxx14 ++ && !CLASSTYPE_LITERAL_P (t) && !LAMBDA_TYPE_P (t)) + for (fn = TYPE_METHODS (t); fn; fn = DECL_CHAIN (fn)) + if (DECL_DECLARED_CONSTEXPR_P (fn) + && TREE_CODE (fn) != TEMPLATE_DECL +@@ -5662,12 +5664,11 @@ finalize_literal_type_property (tree t) + && !DECL_CONSTRUCTOR_P (fn)) + { + DECL_DECLARED_CONSTEXPR_P (fn) = false; +- if (!DECL_GENERATED_P (fn)) +- { +- error ("enclosing class of constexpr non-static member " +- "function %q+#D is not a literal type", fn); +- explain_non_literal_class (t); +- } ++ if (!DECL_GENERATED_P (fn) ++ && pedwarn (DECL_SOURCE_LOCATION (fn), OPT_Wpedantic, ++ "enclosing class of constexpr non-static member " ++ "function %q+#D is not a literal type", fn)) ++ explain_non_literal_class (t); + } + } + +diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c +index 1111111..2222222 100644 +--- a/gcc/cp/constexpr.c ++++ b/gcc/cp/constexpr.c +@@ -208,16 +208,17 @@ is_valid_constexpr_fn (tree fun, bool complain) + } + } + +- if (DECL_NONSTATIC_MEMBER_FUNCTION_P (fun) ++ /* C++14 DR 1684 removed this restriction. */ ++ if (cxx_dialect < cxx14 ++ && DECL_NONSTATIC_MEMBER_FUNCTION_P (fun) + && !CLASSTYPE_LITERAL_P (DECL_CONTEXT (fun))) + { + ret = false; +- if (complain) +- { +- error ("enclosing class of constexpr non-static member " +- "function %q+#D is not a literal type", fun); +- explain_non_literal_class (DECL_CONTEXT (fun)); +- } ++ if (complain ++ && pedwarn (DECL_SOURCE_LOCATION (fun), OPT_Wpedantic, ++ "enclosing class of constexpr non-static member " ++ "function %q+#D is not a literal type", fun)) ++ explain_non_literal_class (DECL_CONTEXT (fun)); + } + } + else if (CLASSTYPE_VBASECLASSES (DECL_CONTEXT (fun)))