Merge pull request #2559 from xmrdsc/update-tor

Bump Tor to 0.4.3.5

.github/ISSUE_TEMPLATE

@@ -1,2 +1,8 @@
-If a package fails to build, upload the log file to
-https://gist.github.com/ and put the link here.
+Please ensure all terminal or log output is correctly enclosed with
+triple back-ticks. See the github markdown guide for more details:
+    https://guides.github.com/features/mastering-markdown/
+
+If a package fails to build, please upload the entire log file to:
+    https://gist.github.com/
+    or your pastebin of choice
+and put the link here.

.gitignore

@@ -5,6 +5,7 @@
 /pkg
 /wip/
 /tmp-*
+/.ccache
 
 # generated by build-pkg
 /*-*.list

Makefile

@@ -19,11 +19,10 @@ DEFAULT_MAX_JOBS   := 6
 PRINTF_COL_1_WIDTH := 13
 SOURCEFORGE_MIRROR := downloads.sourceforge.net
 MXE_MIRROR         := https://mirror.mxe.cc/pkg
-PKG_MIRROR         := https://s3.amazonaws.com/mxe-pkg
+PKG_MIRROR         := https://mxe-pkg.s3.amazonaws.com
 PKG_CDN            := http://d1yihgixbnrglp.cloudfront.net
-GITLAB_BACKUP      := https://gitlab.com/starius/mxe-backup2/raw/master
 # reorder as required, ensuring final one is a http fallback
-MIRROR_SITES       := GITLAB_BACKUP MXE_MIRROR PKG_MIRROR PKG_CDN
+MIRROR_SITES       := MXE_MIRROR PKG_MIRROR PKG_CDN
 
 PWD        := $(shell pwd)
 SHELL      := bash
@@ -47,7 +46,7 @@ SED        := $(shell gsed --help >/dev/null 2>&1 && echo g)sed
 SORT       := $(shell gsort --help >/dev/null 2>&1 && echo g)sort
 DEFAULT_UA := $(shell wget --version | $(SED) -n 's,GNU \(Wget\) \([0-9.]*\).*,\1/\2,p')
 WGET_TOOL   = wget
-WGET        = $(WGET_TOOL) --user-agent='$(or $($(1)_UA),$(DEFAULT_UA))'
+WGET        = $(WGET_TOOL) --user-agent='$(or $($(1)_UA),$(DEFAULT_UA))' -t 2 --timeout=6
 
 REQUIREMENTS := autoconf automake autopoint bash bison bzip2 flex \
                 $(BUILD_CC) $(BUILD_CXX) gperf intltoolize $(LIBTOOL) \
@@ -69,6 +68,11 @@ STRIP_TOOLCHAIN := $(true)
 STRIP_LIB       := $(false)
 STRIP_EXE       := $(true)
 
+# disable by setting MXE_USE_CCACHE
+MXE_USE_CCACHE      := mxe
+MXE_CCACHE_DIR      := $(PWD)/.ccache
+MXE_CCACHE_BASE_DIR := $(PWD)
+
 # define some whitespace variables
 define newline
 
@@ -204,6 +208,16 @@ define AUTOTOOLS_BUILD
     $(AUTOTOOLS_MAKE)
 endef
 
+define CMAKE_TEST
+    # test cmake
+    mkdir '$(BUILD_DIR).test-cmake'
+    cd '$(BUILD_DIR).test-cmake' && '$(TARGET)-cmake' \
+        -DPKG=$(PKG) \
+        -DPKG_VERSION=$($(PKG)_VERSION) \
+        '$(PWD)/src/cmake/test'
+    $(MAKE) -C '$(BUILD_DIR).test-cmake' -j 1 install
+endef
+
 # include github related functions
 include $(PWD)/mxe.github.mk
 
@@ -226,6 +240,7 @@ SHORT_PKG_VERSION = \
     $(word 1,$(subst ., ,$($(1)_VERSION))).$(word 2,$(subst ., ,$($(1)_VERSION)))
 
 UNPACK_ARCHIVE = \
+    $(if $(filter %.tar,     $(1)),tar xf  '$(1)', \
     $(if $(filter %.tgz,     $(1)),tar xzf '$(1)', \
     $(if $(filter %.tar.gz,  $(1)),tar xzf '$(1)', \
     $(if $(filter %.tar.Z,   $(1)),tar xzf '$(1)', \
@@ -238,7 +253,7 @@ UNPACK_ARCHIVE = \
     $(if $(filter %.7z,      $(1)),7za x '$(1)', \
     $(if $(filter %.zip,     $(1)),unzip -q '$(1)', \
     $(if $(filter %.deb,     $(1)),ar x '$(1)' && tar xf data.tar*, \
-    $(error Unknown archive format: $(1))))))))))))))
+    $(error Unknown archive format: $(1)))))))))))))))
 
 UNPACK_PKG_ARCHIVE = \
     $(call UNPACK_ARCHIVE,$(PKG_DIR)/$($(1)_FILE))
@@ -431,7 +446,13 @@ $(PREFIX)/installed/print-git-oneline-$(GIT_HEAD): | $(PREFIX)/installed/.gitkee
 # cross libraries depend on virtual toolchain package, variable used
 # in `cleanup-deps-style` rule below
 CROSS_COMPILER := cc
-MXE_REQS_PKGS   =
+
+# set reqs and bootstrap variables to recursive so pkgs can add themselves
+# CROSS_COMPILER depends (order-only) on MXE_REQS_PKGS
+# all depend (order-only) on BOOTSTRAP_PKGS
+# BOOTSTRAP_PKGS may be prefixed with $(BUILD)~
+MXE_REQS_PKGS  =
+BOOTSTRAP_PKGS =
 
 # warning about switching from `gcc` to `cc`
 $(if $(and $(filter gcc,$(LOCAL_PKG_LIST)$(MAKECMDGOALS)),\
@@ -452,6 +473,9 @@ SCRIPT_PKG_TYPES := script
 # all pkgs have (implied) order-only dependencies on MXE_CONF_PKGS.
 MXE_CONF_PKGS := mxe-conf
 
+# dummy *.mk files (usually overrides for plugins)
+NON_PKG_BASENAMES := overrides
+
 # autotools/cmake are generally always required, but separate them
 # for the case of `make gcc` which should only build real deps.
 AUTOTOOLS_PKGS := $(filter-out $(MXE_CONF_PKGS) %autotools autoconf automake libtool, \
@@ -483,9 +507,9 @@ PKG_DEPS = \
                       $(filter $($($(DEP)_PKG)_TYPE),$(BUILD_PKG_TYPES))), \
                 $($(DEP)_TGT)/installed/$($(DEP)_PKG))))
 
-# order-only package deps unlikely to need target lookup
+# order-only package deps - needs target lookup for e.g. zstd native case
 PKG_OO_DEPS = \
-    $(foreach DEP,$($(PKG)_OO_DEPS), \
+    $(foreach DEP,$(value $(call LOOKUP_PKG_RULE,$(PKG),OO_DEPS,$(TARGET))), \
         $(if $(filter $(DEP),$(PKGS)), \
             $(if $(or $(value $(call LOOKUP_PKG_RULE,$(DEP),BUILD,$(TARGET))), \
                       $(filter $($(DEP)_TYPE),$(BUILD_PKG_TYPES))), \
@@ -505,11 +529,12 @@ PKG_ALL_DEPS = \
 
 # include files from MXE_PLUGIN_DIRS, set base filenames and `all-<plugin>` target
 PLUGIN_FILES := $(realpath $(wildcard $(addsuffix /*.mk,$(MXE_PLUGIN_DIRS))))
-PKGS         := $(sort $(basename $(notdir $(PLUGIN_FILES))))
+PKGS         := $(sort $(filter-out $(NON_PKG_BASENAMES),$(basename $(notdir $(PLUGIN_FILES)))))
 $(foreach FILE,$(PLUGIN_FILES),\
-    $(eval $(basename $(notdir $(FILE)))_MAKEFILE  ?= $(FILE)) \
-    $(eval $(basename $(notdir $(FILE)))_TEST_FILE ?= $(filter-out %.cmake,$(wildcard $(basename $(FILE))-test.*))) \
-    $(eval all-$(lastword $(call split,/,$(dir $(FILE)))): $(basename $(notdir $(FILE)))))
+    $(if $(filter-out $(NON_PKG_BASENAMES),$(basename $(notdir $(FILE)))), \
+        $(eval $(basename $(notdir $(FILE)))_MAKEFILE  ?= $(FILE)) \
+        $(eval $(basename $(notdir $(FILE)))_TEST_FILE ?= $(filter-out %.cmake,$(wildcard $(basename $(FILE))-test.*))) \
+        $(eval all-$(lastword $(call split,/,$(dir $(FILE)))): $(basename $(notdir $(FILE))))))
 include $(PLUGIN_FILES)
 
 # create target sets for PKG_TARGET_RULE loop to avoid creating empty rules
@@ -521,6 +546,8 @@ $(foreach PKG,$(PKGS), \
         $(eval $(PKG)_OO_DEPS += $(BUILD)~autotools)) \
     $(if $(filter $(PKG),$(CMAKE_PKGS)),$(eval $(PKG)_OO_DEPS += cmake-conf)) \
     $(if $(filter $(PKG),$(MXE_CONF_PKGS)),,$(eval $(PKG)_OO_DEPS += mxe-conf)) \
+    $(if $(filter %$(PKG),$(MXE_CONF_PKGS) $(BOOTSTRAP_PKGS)),,$(eval $(PKG)_OO_DEPS += $(BOOTSTRAP_PKGS))) \
+    $(eval $(PKG)_TARGETS := $(sort $($(PKG)_TARGETS))) \
     $(if $($(PKG)_TARGETS),,$(eval $(PKG)_TARGETS := $(CROSS_TARGETS))) \
     $(foreach TARGET,$(filter $($(PKG)_TARGETS),$(CROSS_TARGETS) $(BUILD)), \
         $(eval $(TARGET)~$(PKG)_PKG := $(PKG)) \
@@ -542,7 +569,7 @@ $(foreach TARGET,$(MXE_TARGETS),\
     $(eval $(TARGET)_UC_LIB_TYPE := $(if $(findstring shared,$(TARGET)),SHARED,STATIC)))
 
 # finds a package rule defintion
-RULE_TYPES := BUILD DEPS FILE MESSAGE URL
+RULE_TYPES := BUILD DEPS FILE MESSAGE OO_DEPS URL
 # by truncating the target elements then looking for STAIC|SHARED rules:
 #
 # foo_BUILD_i686-w64-mingw32.static.win32.dw2
@@ -917,6 +944,9 @@ BUILD_PKG_TMP_FILES := *-*.list mxe-*.tar.xz mxe-*.deb* wheezy jessie
 clean:
 	rm -rf $(call TMP_DIR,*) $(PREFIX) \
 	       $(addprefix $(TOP_DIR)/, $(BUILD_PKG_TMP_FILES))
+	@echo
+	@echo 'review ccache size with:'
+	@echo '$(MXE_CCACHE_DIR)/bin/ccache -s'
 
 .PHONY: clean-pkg
 clean-pkg:

README.md

@@ -5,7 +5,9 @@
 [license-page]: LICENSE.md
 [license-badge]: https://img.shields.io/badge/License-MIT-brightgreen.svg
 
-MXE (M cross environment) is a Makefile that compiles a cross
+[![Async Chat (Trial))](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://mxe.zulipchat.com/)
+
+MXE (M cross environment) is a GNU Makefile that compiles a cross
 compiler and cross compiles many free libraries such as SDL and
 Qt. Thus, it provides a nice cross compiling environment for
 various target platforms, which:
@@ -18,6 +20,7 @@ various target platforms, which:
   * is able to update the version numbers of all packages automatically
   * directly uses source packages, thus ensuring the whole build mechanism is transparent
   * allows inter-package and intra-package parallel builds whenever possible
+  * bundles [ccache](https://ccache.samba.org) to speed up repeated builds
   * integrates well with autotools, cmake, qmake, and hand-written makefiles.
   * has been in continuous development since 2007 and is used by several projects
 

docs/gmsl.html

@@ -22,7 +22,7 @@ include the GMSL in your Makefile do<br>
 you have the right version of <span style="font-family: monospace;">gmsl</span>
 use the <span style="font-family: monospace;">gmsl_compatible</span>
 function (see
-below). The current version is <span style="font-family: monospace;">1 1 7</span>.<br>
+below). The current version is <span style="font-family: monospace;">1 1 6</span>.<br>
 <br>
 The GMSL package also includes a test suite for GMSL.&nbsp; Just run <span style="font-family: monospace;">make -f gmsl-tests</span>.<br>
 <h2>Logical Operators</h2>GMSL has boolean $(true) (a non-empty string)
@@ -393,6 +393,25 @@ integer<br>
 Returns:&nbsp;&nbsp;&nbsp;Returns the integer division of the first
 argument by the second<br>
 </span>
+<hr><b>int_modulo</b><br>
+<br>
+<span style="font-family: monospace;">Arguments: 1: A number in x's
+representation<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: Another
+number in x's represntation<br>
+Returns:&nbsp;&nbsp;&nbsp;Returns the remainder of integer division of
+argument 1 divided<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; by
+argument 2 in x's representation<br>
+</span>
+<hr><b>modulo (wrapped version of int_modulo)</b><br>
+<br>
+<span style="font-family: monospace;">Arguments: 1: An integer<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: Another
+integer<br>
+Returns:&nbsp;&nbsp;&nbsp;Returns the remainder of integer division of the first
+argument by the second<br>
+</span>
 <hr><b>int_max, int_min</b><br>
 <br>
 <span style="font-family: monospace;">Arguments: 1: A number in x's
@@ -696,7 +715,7 @@ result in name and arguments being traced.<br>
 </table>
 <span style="font-family: monospace;"></span><br>
 <hr>
-Copyright (c) 2005-2014 <a href="http://www.jgc.org/">John Graham-Cumming</a>.<br>
+Copyright (c) 2005-2018 <a href="http://www.jgc.org/">John Graham-Cumming</a>.<br>
 <hr style="width: 100%; height: 2px;">
 <table style="width: 100%; text-align: left;" border="0" cellpadding="2" cellspacing="2">
   <tbody>

docs/index.html

@@ -21,6 +21,7 @@
         <li><a href="#download"         >Download</a></li>
         <li><a href="https://lists.nongnu.org/mailman/listinfo/mingw-cross-env-list">Mailing List</a></li>
         <li><a href="https://github.com/mxe/mxe/issues">Issue Tracker</a></li>
+        <li><a href="https://mxe.zulipchat.com/">Async Chat (Trial)</a></li>
     </ul>
     <ul>
         <li><a href="#requirements"     >Requirements</a></li>
@@ -41,7 +42,7 @@
 <h2 id="introduction">Introduction</h2>
 
     <p>
-    MXE (M cross environment) is a Makefile that
+    MXE (M cross environment) is a GNU Makefile that
     compiles a cross compiler and cross compiles
     many free libraries such as SDL and Qt. Thus,
     it provides a nice cross compiling environment
@@ -83,6 +84,10 @@
         <a href="#usage">parallel builds</a>
         whenever possible
     </li>
+    <li>
+        bundles <a href="https://ccache.samba.org">ccache</a> to speed
+        up repeated builds
+    </li>
     <li>
         integrates well with <a href="#tutorial-5a">autotools</a>,
         <a href="#tutorial-5b">cmake</a>, <a href="#tutorial-5c">qmake</a>,
@@ -93,7 +98,7 @@
         and is <a href="#used-by">used by several projects</a>
     </li>
     <li>
-        has <a href="http://pkg.mxe.cc/">pre-compiled binaries</a>
+        has <a href="https://pkg.mxe.cc/">pre-compiled binaries</a>
         that <a href="https://github.com/zer0main/battleship">can be used
         in Continuous Integration systems</a>
     </li>
@@ -338,13 +343,14 @@ exit</pre>
     Instead of building MXE packages from source, you can
     download precompiled packages. There are two options:
     tar archives and Debian packages.
-    See <a href="http://pkg.mxe.cc/">pkg.mxe.cc</a>.
+    See <a href="https://pkg.mxe.cc/">pkg.mxe.cc</a>.
     </p>
 
     <h3 id="tutorial-4">Step 4: Environment Variables</h3>
 
     <p>
-    Edit your .bashrc script in order to change $PATH:
+    Edit the appropriate config script (.bashrc, .cshrc, .profile, .zshrc, etc.)
+    for your shell in order to change $PATH:
     </p>
     <pre>export PATH=/<em>where MXE is installed</em>/usr/bin:$PATH</pre>
 
@@ -432,10 +438,10 @@ If a cross compiler is detected then cross compile mode will be used.</pre>
     <a href="https://qt-project.org/">Qt</a> application,
     all you have to do is:
     </p>
-    <pre>/where MXE is installed/usr/i686-w64-mingw32.static/qt/bin/qmake
+    <pre>/&lt;where-MXE-is-installed&gt;/usr/i686-w64-mingw32.static/qt5/bin/qmake
 make</pre>
     <p>
-    Note that Qt 4 is in the "qt" subdirectory. Qt 5 is in the "qt5" subdirectory
+    Note that Qt 5 is in the "qt5" subdirectory. Qt 4 is in the "qt" subdirectory
     and its qmake can be invoked similarly.
     </p>
     <p>
@@ -445,9 +451,7 @@ make</pre>
     <a href="https://qt-project.org/doc/qt-4.8/plugins-howto.html#static-plugins">Qt documentation about static plugins</a>.
     </p>
     <p>
-    Note the sql drivers (-qt-sql-*)
-    and the image handlers for jpeg, tiff, gif and mng
-    are built-in, <em>not</em> plugins.
+    Qt 4 only: Sql drivers (-qt-sql-*) and image handlers for jpeg, tiff, gif and mng are built-in, <em>not</em> plugins.
     </p>
 
     <h3 id="tutorial-5d">Step 5d: Cross compile your Project (Makefile)</h3>
@@ -643,7 +647,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
         <td>≥ 2.2</td>
     </tr>
     <tr>
-        <td><a href="http://lzip.nongnu.org/">Lzip</a></td>
+        <td><a href="https://nongnu.org/lzip/">Lzip</a></td>
         <td></td>
     </tr>
     <tr>
@@ -666,10 +670,6 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
         <td><a href="https://metacpan.org/pod/distribution/XML-Parser/Parser.pm">Perl XML::Parser</a></td>
         <td></td>
     </tr>
-    <tr>
-        <td><a href="https://www.freedesktop.org/wiki/Software/pkg-config/">Pkg-config</a></td>
-        <td>≥ 0.16</td>
-    </tr>
     <tr>
         <td><a href="https://www.python.org/">Python</a></td>
         <td></td>
@@ -725,7 +725,6 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
     p7zip-full \
     patch \
     perl \
-    pkg-config \
     python \
     ruby \
     sed \
@@ -749,7 +748,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
 
     <p>
     You can install a precompiled MXE via Debian packages.
-    See <a href="http://pkg.mxe.cc/">pkg.mxe.cc</a>.
+    See <a href="https://pkg.mxe.cc/">pkg.mxe.cc</a>.
     </p>
 
     <h3 id="requirements-fedora">Fedora/Red Hat/Centos</h3>
@@ -783,7 +782,6 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
     p7zip \
     patch \
     perl \
-    pkgconfig \
     python \
     ruby \
     sed \
@@ -821,7 +819,6 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
     p7zip \
     patch \
     perl5 \
-    pkgconf \
     python \
     ruby \
     unzip \
@@ -891,7 +888,6 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
     patch \
     perl \
     perl-xml-parser \
-    pkgconfig \
     python \
     ruby \
     sed \
@@ -922,7 +918,6 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
     dev-perl/XML-Parser \
     dev-util/gperf \
     dev-util/intltool \
-    dev-util/pkgconfig \
     dev-vcs/git \
     net-misc/wget \
     sys-apps/sed \
@@ -949,18 +944,14 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
     then run:
     </p>
     <!-- https://www.macports.org/ports.php -->
-    <pre>sudo port install \
-    autoconf \
-    automake \
+    <pre>sudo port -N install \
     coreutils \
     gdk-pixbuf2 \
     gnutar \
     gsed \
     intltool \
-    libtool \
     lzip \
     p7zip \
-    pkgconfig \
     wget \
     xz</pre>
 
@@ -988,7 +979,6 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
     libtool \
     lzip \
     p7zip \
-    pkg-config \
     wget \
     xz</pre>
     <p>
@@ -1042,7 +1032,6 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
     patch \
     perl \
     perl-XML-Parser \
-    pkg-config \
     python \
     ruby \
     sed \
@@ -1092,6 +1081,17 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
 
     <h3 id="requirements-wsl">Windows Subsystem for Linux</h3>
 
+    <p>
+    <a href="https://docs.microsoft.com/en-us/windows/wsl/install-win10">
+    Install the Windows Subsystem for Linux</a>, noting that WSL1
+    does not support 32-bit code execution.
+    </p>
+
+    <p>If mixing WSL1 and WSL2,
+    <a href="https://docs.microsoft.com/en-us/windows/wsl/install-win10#set-your-distribution-version-to-wsl-1-or-wsl-2">
+    ensure the distro-specific or global defaults are set.</a>
+    </p>
+
     <p>
     Requirements should match the Debian, Fedora, openSUSE etc. sections
     above, but care should be taken to ensure MXE is installed in the
@@ -1216,6 +1216,13 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
         (short option "-j 4 -k")
         </dd>
 
+    <dt>make foo bar MXE_USE_CCACHE=</dt>
+
+        <dd>
+        disables use of <a href="https://ccache.samba.org">ccache</a>
+        to eliminate potential error sources when debugging
+        </dd>
+
     <dt>make EXCLUDE_PKGS='foo bar'</dt>
 
         <dd>
@@ -1864,7 +1871,7 @@ endef</pre>
 </div>
 
 <div class="section">
-<h2 id="copyright">Copyright © <span class="years">2007–2015</span></h2>
+<h2 id="copyright">Copyright © <span class="years">2007–2019</span></h2>
 
     <ul id="authors-list" class="compact-list">
     <li>Volker Diels-Grabsch</li>
@@ -2928,7 +2935,7 @@ endef</pre>
         <a href="https://github.com/mxe/mxe">Project on GitHub</a>
     </li>
     <li>
-        <a href="http://pkg.mxe.cc/">Binary distribution of packages</a>
+        <a href="https://pkg.mxe.cc/">Binary distribution of packages</a>
     </li>
     <li>
         <a href="https://www.openhub.net/p/mxe">Entry on Open Hub</a>
@@ -3002,7 +3009,7 @@ endef</pre>
         Win32 ports of many free software packages
     </li>
     <li>
-        <a href="http://www.sandroid.org/imcross/">IMCROSS</a>
+        <a href="https://www.sandroid.org/imcross/">IMCROSS</a>
         <br>
         Another project with similar goal
     </li>
@@ -3048,7 +3055,7 @@ endef</pre>
         <a href="https://biosig.sourceforge.io/">BioSig</a>
     </li>
     <li>
-        <a href="http://en.cataclysmdda.com/">Cataclysm: Dark Days Ahead</a>
+        <a href="https://cataclysmdda.org/">Cataclysm: Dark Days Ahead</a>
     </li>
     <li>
         <a href="https://cvtool.sourceforge.io/">cvtool</a>
@@ -3059,6 +3066,12 @@ endef</pre>
     <li>
         <a href="https://www.digikam.org/">digiKam</a>
     </li>
+    <li>
+        <a href="https://domino-chain.gitlab.io/">Domino-Chain</a>
+    </li>
+    <li>
+        <a href="https://github.com/juzzlin/DustRacing2D">Dust Racing 2D</a>
+    </li>
     <li>
         <a href="https://github.com/eiskaltdcpp/eiskaltdcpp">EiskaltDC++</a>
     </li>
@@ -3080,6 +3093,9 @@ endef</pre>
     <li>
         <a href="https://www.gnu.org/software/freedink/">GNU FreeDink</a>
     </li>
+    <li>
+        <a href="https://github.com/juzzlin/Heimer">Heimer</a>
+    </li>
     <li>
         <a href="http://ifwiki.org/index.php/Hugor">Hugor</a>
     </li>
@@ -3116,15 +3132,15 @@ endef</pre>
     <li>
         <a href="https://psi-plus.com/">Psi+</a>
     </li>
-    <li>
-        <a href="https://pushover.sourceforge.io/">Pushover</a>
-    </li>
     <li>
         <a href="https://qelectrotech.org/">QElectroTech</a>
     </li>
     <li>
         <a href="https://qtads.sourceforge.io/">QTads</a>
     </li>
+    <li>
+        <a href="https://github.com/scummvm/scummvm">ScummVM</a>
+    </li>
     <li>
         <a href="https://github.com/sibuserv/sibuserv">Sibuserv</a>
     </li>
@@ -3132,11 +3148,14 @@ endef</pre>
         <a href="https://sigrok.org/">sigrok</a>
     </li>
     <li>
-        <a href="http://spek-project.org/">Spek</a>
+        <a href="http://spek.cc/">Spek</a>
     </li>
     <li>
         <a href="https://springrts.com/">Spring RTS</a>
     </li>
+    <li>
+        <a href="https://www.strawberrymusicplayer.org/">Strawberry Music Player</a>
+    </li>
     <li>
         <a href="https://subsurface-divelog.org/">Subsurface</a>
     </li>
@@ -3164,6 +3183,9 @@ endef</pre>
     <li>
         <a href="https://ufoai.org/">UFO: Alien Invasion</a>
     </li>
+    <li>
+        <a href="https://vcmi.eu/">VCMI Engine</a>
+    </li>
     <li>
         <a href="https://violetland.github.io/">Violetland</a>
     </li>

docs/packages.json

@@ -1,6 +1,7 @@
 {
     "a52dec": {"version": "0.7.4", "website": "https://liba52.sourceforge.io/", "description": "a52dec (aka. liba52)"},
-    "agg": {"version": "2.5", "website": "https://agg.sourceforge.io/", "description": "Anti-Grain Geometry"},
+    "adwaita-icon-theme": {"version": "3.36.1", "website": "https://gtk.org/", "description": "GTK+"},
+    "agg": {"version": "2.5", "website": "https://antigrain.com/", "description": "Anti-Grain Geometry"},
     "alure": {"version": "1.2", "website": "https://kcat.strangesoft.net/alure.html", "description": ""},
     "apr": {"version": "1.5.2", "website": "https://apr.apache.org/", "description": "APR"},
     "apr-util": {"version": "1.5.4", "website": "https://apr.apache.org/", "description": "APR-util"},
@@ -22,6 +23,7 @@
     "cairomm": {"version": "1.11.2", "website": "https://cairographics.org/cairomm/", "description": ""},
     "cblas": {"version": "3.8.0", "website": "https://www.netlib.org/blas/", "description": "C interface to Reference BLAS"},
     "cc": {"version": "1", "website": "https://mxe.cc/", "description": "Dependency package for cross libraries"},
+    "ccache": {"version": "3.6", "website": "https://ccache.samba.org", "description": "ccache – a fast compiler cache"},
     "ccfits": {"version": "2.5", "website": "https://heasarc.gsfc.nasa.gov/fitsio/ccfits", "description": "CCfits"},
     "cegui": {"version": "9726a2b505fb", "website": "http://cegui.org.uk/", "description": "Crazy Eddie’s GUI System (CEGUI)"},
     "cfitsio": {"version": "3410", "website": "https://heasarc.gsfc.nasa.gov/fitsio/", "description": ""},
@@ -29,9 +31,9 @@
     "check": {"version": "0.10.0", "website": "https://check.sourceforge.io/", "description": ""},
     "chipmunk": {"version": "7.0.2", "website": "https://chipmunk-physics.net/", "description": "Chipmunk Physics"},
     "chromaprint": {"version": "1.4.3", "website": "https://acoustid.org/chromaprint", "description": "Chromaprint"},
-    "cimg": {"version": "1.6.3", "website": "http://cimg.eu/", "description": "CImg Library"},
+    "cimg": {"version": "2.7.1", "website": "http://cimg.eu/", "description": "CImg Library"},
     "cloog": {"version": "0.18.4", "website": "https://www.bastoul.net/cloog/", "description": "CLooG Code Generator"},
-    "cmake": {"version": "3.10.0", "website": "https://www.cmake.org/", "description": ""},
+    "cmake": {"version": "3.17.3", "website": "https://www.cmake.org/", "description": ""},
     "cmake-conf": {"version": "1", "website": "", "description": ""},
     "cmark": {"version": "0.28.3", "website": "https://github.com/commonmark/cmark", "description": "CommonMark parsing and rendering library and program in C"},
     "cminpack": {"version": "1.3.4", "website": "http://devernay.free.fr/hacks/cminpack/cminpack.html", "description": ""},
@@ -43,66 +45,69 @@
     "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.64.0", "website": "https://curl.haxx.se/libcurl/", "description": "cURL"},
+    "curl": {"version": "7.72.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.8", "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"},
-    "dlfcn-win32": {"version": "f1acf5d", "website": "https://github.com/dlfcn-win32/dlfcn-win32", "description": "POSIX dlfcn wrapper for Windows"},
+    "dlfcn-win32": {"version": "7f1a5e5", "website": "https://github.com/dlfcn-win32/dlfcn-win32", "description": "POSIX dlfcn wrapper for Windows"},
     "eigen": {"version": "3.3.7", "website": "https://eigen.tuxfamily.org/", "description": ""},
-    "exiv2": {"version": "0.25", "website": "http://www.exiv2.org/", "description": "Exiv2"},
-    "expat": {"version": "2.2.6", "website": "https://github.com/libexpat/libexpat", "description": "Expat XML Parser"},
+    "exiv2": {"version": "0.25", "website": "https://www.exiv2.org/", "description": "Exiv2"},
+    "expat": {"version": "2.2.9", "website": "https://github.com/libexpat/libexpat", "description": "Expat XML Parser"},
     "faad2": {"version": "2.8.8", "website": "https://www.audiocoding.com/", "description": ""},
-    "fdk-aac": {"version": "0.1.4", "website": "https://github.com/mstorsjo/fdk-aac", "description": "FDK-AAC"},
-    "ffmpeg": {"version": "4.1", "website": "https://ffmpeg.org/", "description": ""},
+    "fdk-aac": {"version": "2.0.0", "website": "https://github.com/mstorsjo/fdk-aac", "description": "FDK-AAC"},
+    "ffmpeg": {"version": "4.2.3", "website": "https://ffmpeg.org/", "description": ""},
     "fftw": {"version": "3.3.8", "website": "http://www.fftw.org/", "description": ""},
     "file": {"version": "5.24", "website": "https://www.darwinsys.com/file/", "description": ""},
-    "flac": {"version": "1.3.2", "website": "https://www.xiph.org/flac/", "description": "FLAC"},
+    "flac": {"version": "1.3.3", "website": "https://www.xiph.org/flac/", "description": "FLAC"},
     "flann": {"version": "1.8.4", "website": "https://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN", "description": "FLANN"},
-    "fltk": {"version": "1.3.4-2", "website": "https://www.fltk.org/", "description": "FLTK"},
+    "fltk": {"version": "1.3.5", "website": "https://www.fltk.org/", "description": "FLTK"},
+    "fluidsynth": {"version": "2.0.7", "website": "http://fluidsynth.org/", "description": "FluidSynth - a free software synthesizer based on the SoundFont 2 specifications"},
     "fontconfig": {"version": "2.13.1", "website": "https://fontconfig.org/", "description": ""},
-    "freeglut": {"version": "3.0.0", "website": "https://freeglut.sourceforge.io/", "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.00.111", "website": "http://www.freetds.org/", "description": "FreeTDS"},
-    "freetype": {"version": "2.9.1", "website": "https://www.freetype.org/", "description": ""},
-    "freetype-bootstrap": {"version": "2.9.1", "website": "https://www.freetype.org/", "description": "freetype (without harfbuzz)"},
+    "freetds": {"version": "1.2.4", "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"},
-    "fribidi": {"version": "1.0.5", "website": "https://fribidi.org/", "description": "FriBidi"},
+    "fribidi": {"version": "1.0.8", "website": "https://fribidi.org/", "description": "FriBidi"},
     "ftgl": {"version": "2.1.3~rc5", "website": "https://sourceforge.net/projects/ftgl/", "description": ""},
     "gc": {"version": "7.4.6", "website": "https://github.com/ivmai/bdwgc", "description": ""},
     "gcc": {"version": "5.5.0", "website": "https://gcc.gnu.org/", "description": "GCC"},
     "gd": {"version": "2.1.0", "website": "https://libgd.github.io/", "description": "GD  (without support for xpm)"},
     "gdal": {"version": "2.2.4", "website": "https://www.gdal.org/", "description": "GDAL"},
-    "gdb": {"version": "8.2.1", "website": "https://www.gnu.org/software/gdb/", "description": ""},
+    "gdb": {"version": "9.2", "website": "https://www.gnu.org/software/gdb/", "description": ""},
     "gdk-pixbuf": {"version": "2.32.3", "website": "https://gtk.org/", "description": "GDK-pixbuf"},
-    "gendef": {"version": "6.0.0", "website": "https://sourceforge.net/p/mingw-w64/wiki2/gendef/", "description": ""},
+    "gendef": {"version": "7.0.0", "website": "https://sourceforge.net/p/mingw-w64/wiki2/gendef/", "description": ""},
     "geoip-database": {"version": "20150317-1", "website": "https://www.maxmind.com/", "description": "GeoIP Legacy Database"},
     "geos": {"version": "3.6.2", "website": "https://trac.osgeo.org/geos/", "description": "GEOS"},
-    "gettext": {"version": "0.19.8.1", "website": "https://www.gnu.org/software/gettext/", "description": ""},
-    "ghostscript": {"version": "9.26", "website": "https://www.ghostscript.com/", "description": ""},
+    "gettext": {"version": "0.20.2", "website": "https://www.gnu.org/software/gettext/", "description": ""},
+    "ghostscript": {"version": "9.50", "website": "https://www.ghostscript.com/", "description": ""},
     "giflib": {"version": "5.1.4", "website": "https://sourceforge.net/projects/libungif/", "description": ""},
-    "glew": {"version": "1.12.0", "website": "https://glew.sourceforge.io/", "description": "GLEW"},
+    "glew": {"version": "2.1.0", "website": "https://glew.sourceforge.io/", "description": "GLEW"},
     "glfw2": {"version": "2.7.9", "website": "https://www.glfw.org/", "description": "GLFW 2.x"},
     "glfw3": {"version": "3.2.1", "website": "https://www.glfw.org/", "description": "GLFW 3.x"},
     "glib": {"version": "2.50.2", "website": "https://gtk.org/", "description": "GLib"},
+    "glib-networking": {"version": "2.54.1", "website": "https://www.gnome.org", "description": "Network-related GIO modules for glib"},
     "glibmm": {"version": "2.42.0", "website": "https://www.gtkmm.org/", "description": "GLibmm"},
     "glm": {"version": "0.9.9.0", "website": "https://glm.g-truc.net/", "description": "GLM - OpenGL Mathematics"},
-    "glpk": {"version": "4.60", "website": "https://www.gnu.org/software/glpk/", "description": "GNU Linear Programming Kit"},
+    "glpk": {"version": "4.65", "website": "https://www.gnu.org/software/glpk/", "description": "GNU Linear Programming Kit"},
     "gmp": {"version": "6.1.2", "website": "https://gmplib.org/", "description": "GMP"},
-    "gnutls": {"version": "3.6.6", "website": "https://www.gnu.org/software/gnutls/", "description": "GnuTLS"},
+    "gnutls": {"version": "3.6.15", "website": "https://www.gnu.org/software/gnutls/", "description": "GnuTLS"},
     "googlemock": {"version": "1.7.0", "website": "https://github.com/google/googlemock", "description": "Google Mock"},
-    "googletest": {"version": "1.7.0", "website": "https://github.com/google/googletest", "description": "Google Test"},
-    "gpgme": {"version": "1.12.0", "website": "https://www.gnupg.org/related_software/gpgme/", "description": "gpgme"},
-    "graphicsmagick": {"version": "1.3.21", "website": "http://www.graphicsmagick.org/", "description": "GraphicsMagick"},
-    "gsl": {"version": "2.3", "website": "https://www.gnu.org/software/gsl/", "description": "GSL"},
-    "gsoap": {"version": "2.8.80", "website": "https://www.genivia.com/dev.html", "description": "gSOAP"},
-    "gst-libav": {"version": "1.14.4", "website": "https://gstreamer.freedesktop.org/modules/gst-libav.html", "description": ""},
-    "gst-plugins-bad": {"version": "1.14.4", "website": "https://gstreamer.freedesktop.org/modules/gst-plugins-bad.html", "description": ""},
-    "gst-plugins-base": {"version": "1.14.4", "website": "https://gstreamer.freedesktop.org/modules/gst-plugins-base.html", "description": ""},
-    "gst-plugins-good": {"version": "1.14.4", "website": "https://gstreamer.freedesktop.org/modules/gst-plugins-good.html", "description": ""},
-    "gst-plugins-ugly": {"version": "1.14.4", "website": "https://gstreamer.freedesktop.org/modules/gst-plugins-ugly.html", "description": ""},
-    "gstreamer": {"version": "1.14.4", "website": "https://gstreamer.freedesktop.org/modules/gstreamer.html", "description": ""},
+    "googletest": {"version": "1.8.1", "website": "https://github.com/google/googletest", "description": "Google Test"},
+    "gpgme": {"version": "1.14.0", "website": "https://www.gnupg.org/related_software/gpgme/", "description": "gpgme"},
+    "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.106", "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": ""},
+    "gst-plugins-good": {"version": "1.16.2", "website": "https://gstreamer.freedesktop.org/modules/gst-plugins-good.html", "description": ""},
+    "gst-plugins-ugly": {"version": "1.16.2", "website": "https://gstreamer.freedesktop.org/modules/gst-plugins-ugly.html", "description": ""},
+    "gstreamer": {"version": "1.16.2", "website": "https://gstreamer.freedesktop.org/modules/gstreamer.html", "description": ""},
     "gta": {"version": "1.0.8", "website": "https://www.nongnu.org/gta/", "description": ""},
     "gtk2": {"version": "2.24.29", "website": "https://gtk.org/", "description": "GTK+"},
     "gtk3": {"version": "3.22.7", "website": "https://gtk.org/", "description": "GTK+"},
@@ -116,49 +121,50 @@
     "gtksourceviewmm2": {"version": "2.10.3", "website": "https://projects.gnome.org/gtksourceview/", "description": "GtkSourceViewmm"},
     "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": "http://www.hamlib.org/", "description": "HamLib"},
-    "harfbuzz": {"version": "2.2.0", "website": "https://wiki.freedesktop.org/www/Software/HarfBuzz/", "description": "HarfBuzz"},
-    "hdf-eos2": {"version": "19v1.00", "website": "https://hdfeos.org/software/library.php", "description": "HDF-EOS2"},
-    "hdf-eos5": {"version": "1.15", "website": "https://hdfeos.org/software/library.php", "description": "HDF-EOS5"},
+    "hamlib": {"version": "3.3", "website": "https://hamlib.github.io/", "description": "HamLib"},
+    "harfbuzz": {"version": "2.7.2", "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"},
     "hdf5": {"version": "1.8.12", "website": "https://www.hdfgroup.org/hdf5/", "description": "HDF5"},
-    "hunspell": {"version": "1.6.1", "website": "https://hunspell.github.io/", "description": "Hunspell"},
+    "hidapi": {"version": "a6a622f", "website": "https://github.com/signal11/hidapi/", "description": "HIDAPI"},
+    "hunspell": {"version": "1.7.0", "website": "https://hunspell.github.io/", "description": "Hunspell"},
     "hyperscan": {"version": "4.3.2", "website": "https://01.org/hyperscan", "description": "Hyperscan"},
-    "icu4c": {"version": "56.1", "website": "https://ssl.icu-project.org/", "description": "ICU4C"},
+    "icu4c": {"version": "66.1", "website": "https://github.com/unicode-org/icu", "description": "ICU4C"},
     "id3lib": {"version": "3.8.3", "website": "https://id3lib.sourceforge.io/", "description": ""},
     "ilmbase": {"version": "2.2.0", "website": "https://www.openexr.com/", "description": "IlmBase"},
-    "imagemagick": {"version": "6.9.0-0", "website": "https://www.imagemagick.org/", "description": "ImageMagick"},
+    "imagemagick": {"version": "7.0.8-63", "website": "https://www.imagemagick.org/", "description": "ImageMagick"},
     "intel-tbb": {"version": "c28c8be", "website": "https://www.threadingbuildingblocks.org", "description": "Intel Threading Building Blocks"},
-    "isl": {"version": "0.15", "website": "http://isl.gforge.inria.fr/", "description": "Integer Set Library"},
-    "itk": {"version": "4.13.1", "website": "https://www.itk.org/", "description": "Insight Segmentation and Registration Toolkit (ITK)"},
+    "isl": {"version": "0.15", "website": "https://isl.gforge.inria.fr/", "description": "Integer Set Library"},
+    "itk": {"version": "5.0.1", "website": "https://www.itk.org/", "description": "Insight Segmentation and Registration Toolkit (ITK)"},
     "itpp": {"version": "4.3.1", "website": "https://itpp.sourceforge.io/", "description": ""},
-    "jack": {"version": "1.9.10", "website": "http://jackaudio.org/", "description": "JACK Audio Connection Kit"},
+    "jack": {"version": "1.9.10", "website": "https://jackaudio.org/", "description": "JACK Audio Connection Kit"},
     "jansson": {"version": "2.12", "website": "http://www.digip.org/jansson/", "description": "Jansson"},
-    "jasper": {"version": "2.0.14", "website": "https://www.ece.uvic.ca/~mdadams/jasper/", "description": "JasPer"},
-    "jpeg": {"version": "9c", "website": "https://www.ijg.org/", "description": ""},
+    "jasper": {"version": "2.0.19", "website": "https://www.ece.uvic.ca/~mdadams/jasper/", "description": "JasPer"},
+    "jpeg": {"version": "9d", "website": "https://www.ijg.org/", "description": ""},
     "json-c": {"version": "0.13.1", "website": "https://github.com/json-c/json-c/wiki", "description": ""},
     "json-glib": {"version": "1.0.4", "website": "https://wiki.gnome.org/action/show/Projects/JsonGlib", "description": "JSON-Glib"},
     "json_spirit": {"version": "4.08", "website": "https://www.codeproject.com/Articles/20027/JSON-Spirit-A-C-JSON-Parser-Generator-Implemented", "description": ""},
-    "jsoncpp": {"version": "1.8.4", "website": "https://github.com/open-source-parsers/jsoncpp", "description": "A C++ library for interacting with JSON"},
+    "jsoncpp": {"version": "1.9.1", "website": "https://github.com/open-source-parsers/jsoncpp", "description": "A C++ library for interacting with JSON"},
     "lame": {"version": "3.100", "website": "https://lame.sourceforge.io/", "description": ""},
     "lapack": {"version": "3.8.0", "website": "https://www.netlib.org/lapack/", "description": "Reference LAPACK — Linear Algebra PACKage"},
-    "lcms": {"version": "2.9", "website": "http://www.littlecms.com/", "description": ""},
+    "lcms": {"version": "2.11", "website": "http://www.littlecms.com/", "description": ""},
     "lcms1": {"version": "1.19", "website": "http://www.littlecms.com/", "description": ""},
     "lensfun": {"version": "0.3.2", "website": "https://lensfun.sourceforge.io/", "description": ""},
     "levmar": {"version": "2.6", "website": "https://www.ics.forth.gr/~lourakis/levmar", "description": ""},
     "libaacs": {"version": "0.9.0", "website": "https://www.videolan.org/developers/libaacs.html", "description": ""},
     "libao": {"version": "1.2.2", "website": "https://www.xiph.org/libao/", "description": "AO"},
-    "libarchive": {"version": "3.3.3", "website": "https://www.libarchive.org/", "description": "Libarchive"},
+    "libarchive": {"version": "3.4.0", "website": "https://www.libarchive.org/", "description": "Libarchive"},
     "libass": {"version": "0.14.0", "website": "https://code.google.com/p/libass/", "description": ""},
-    "libassuan": {"version": "2.5.1", "website": "https://www.gnupg.org/related_software/libassuan/", "description": "libassuan"},
+    "libassuan": {"version": "2.5.3", "website": "https://www.gnupg.org/related_software/libassuan/", "description": "libassuan"},
     "libatomic_ops": {"version": "7.4.8", "website": "https://github.com/ivmai/libatomic_ops", "description": "The atomic_ops project (Atomic memory update operations portable implementation)"},
     "libbluray": {"version": "0.9.2", "website": "https://www.videolan.org/developers/libbluray.html", "description": ""},
     "libbs2b": {"version": "3.1.0", "website": "https://bs2b.sourceforge.io/", "description": "Bauer Stereophonic-to-Binaural library"},
     "libcaca": {"version": "0.99.beta19", "website": "http://caca.zoy.org/wiki/libcaca", "description": ""},
     "libcddb": {"version": "1.3.2", "website": "https://sourceforge.net/projects/libcddb/", "description": "Access data on a CDDB"},
-    "libcdio": {"version": "0.94", "website": "https://www.gnu.org/software/libcdio/", "description": "Libcdio"},
+    "libcdio": {"version": "2.1.0", "website": "https://www.gnu.org/software/libcdio/", "description": "Libcdio"},
     "libcdio-paranoia": {"version": "10.2+0.93+1", "website": "https://www.gnu.org/software/libcdio/", "description": "Libcdio-paranoia"},
-    "libcint": {"version": "3.0.14", "website": "https://github.com/sunqm/libcint", "description": "General GTO integrals for quantum chemistry"},
+    "libcint": {"version": "3.0.18", "website": "https://github.com/sunqm/libcint", "description": "General GTO integrals for quantum chemistry"},
     "libcomm14cux": {"version": "2.1.1", "website": "https://github.com/colinbourassa/libcomm14cux/", "description": ""},
     "libcroco": {"version": "0.6.2", "website": "http://www.linuxfromscratch.org/blfs/view/svn/general/libcroco.html", "description": "Libcroco"},
     "libdnet": {"version": "1.11", "website": "https://libdnet.sourceforge.io/", "description": ""},
@@ -166,43 +172,43 @@
     "libdvdcss": {"version": "1.4.2", "website": "https://www.videolan.org/developers/libdvdcss.html", "description": ""},
     "libdvdetect": {"version": "0.71", "website": "https://www.dvdetect.de/", "description": "Fast database lookup for DVDs"},
     "libdvdnav": {"version": "6.0.0", "website": "https://www.videolan.org/developers/libdvdnav.html", "description": ""},
-    "libdvdread": {"version": "6.0.0", "website": "https://www.videolan.org/developers/libdvdnav.html", "description": ""},
+    "libdvdread": {"version": "6.0.1", "website": "https://www.videolan.org/developers/libdvdnav.html", "description": ""},
     "libechonest": {"version": "2.3.1", "website": "https://github.com/lfranchi/libechonest", "description": ""},
     "libepoxy": {"version": "1.3.1", "website": "https://github.com/anholt/libepoxy", "description": ""},
-    "libevent": {"version": "2.1.8", "website": "https://libevent.org/", "description": ""},
-    "libf2c": {"version": "1", "website": "http://www.netlib.org/f2c/", "description": ""},
+    "libevent": {"version": "2.1.11", "website": "https://libevent.org/", "description": ""},
+    "libf2c": {"version": "1", "website": "https://www.netlib.org/f2c/", "description": ""},
     "libfcgi": {"version": "2.4.2", "website": "https://github.com/FastCGI-Archives", "description": "FastCGI"},
     "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.4", "website": "https://directory.fsf.org/wiki/Libgcrypt", "description": ""},
-    "libgda": {"version": "4.2.13", "website": "http://www.gnome-db.org/", "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": ""},
     "libgeotiff": {"version": "1.4.2", "website": "https://trac.osgeo.org/geotiff/", "description": "GeoTiff"},
-    "libgit2": {"version": "0.27.7", "website": "https://libgit2.github.com/", "description": ""},
+    "libgit2": {"version": "1.0.0", "website": "https://libgit2.github.com/", "description": ""},
     "libglade": {"version": "2.6.4", "website": "https://glade.gnome.org/", "description": "glade"},
     "libgnurx": {"version": "2.6.1", "website": "https://sourceforge.net/projects/mingw/files/UserContributed/regex/", "description": ""},
-    "libgpg_error": {"version": "1.35", "website": "https://www.gnupg.org/related_software/libgpg-error/", "description": "libgpg-error"},
-    "libgsasl": {"version": "1.8.0", "website": "https://www.gnu.org/software/gsasl/", "description": "Libgsasl"},
+    "libgpg_error": {"version": "1.39", "website": "https://www.gnupg.org/related_software/libgpg-error/", "description": "libgpg-error"},
+    "libgsasl": {"version": "1.8.1", "website": "https://www.gnu.org/software/gsasl/", "description": "Libgsasl"},
     "libgsf": {"version": "1.14.30", "website": "https://developer.gnome.org/gsf/", "description": ""},
     "libharu": {"version": "2.3.0", "website": "http://libharu.org/", "description": ""},
     "libiberty": {"version": "2.28", "website": "https://gcc.gnu.org/onlinedocs/libiberty/", "description": ""},
     "libical": {"version": "2.0.0", "website": "https://libical.github.io/libical/", "description": ""},
-    "libiconv": {"version": "1.15", "website": "https://www.gnu.org/software/libiconv/", "description": ""},
+    "libiconv": {"version": "1.16", "website": "https://www.gnu.org/software/libiconv/", "description": ""},
     "libid3tag": {"version": "0.15.1b", "website": "https://sourceforge.net/projects/mad/files/libid3tag/", "description": ""},
-    "libidn": {"version": "1.35", "website": "https://www.gnu.org/software/libidn/", "description": "Libidn"},
-    "libidn2": {"version": "2.1.1", "website": "https://www.gnu.org/software/libidn/#libidn2", "description": "implementation of IDNA2008/TR46 internationalized domain names"},
+    "libidn": {"version": "1.36", "website": "https://www.gnu.org/software/libidn/", "description": "Libidn"},
+    "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.2", "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": ""},
     "liblo": {"version": "0.29", "website": "https://liblo.sourceforge.io/", "description": ""},
     "liblqr-1": {"version": "0.4.2", "website": "https://liblqr.wikidot.com/", "description": ""},
     "liblsmash": {"version": "2.14.5", "website": "https://l-smash.github.io/l-smash/", "description": "L-SMASH"},
-    "libltdl": {"version": "2.4.4", "website": "https://www.gnu.org/software/libtool/manual/html_node/Using-libltdl.html", "description": "GNU Libtool Library (libltdl)"},
+    "libltdl": {"version": "2.4.6", "website": "https://www.gnu.org/software/libtool/manual/html_node/Using-libltdl.html", "description": "GNU Libtool Library (libltdl)"},
     "libmad": {"version": "0.15.1b", "website": "https://www.underbit.com/products/mad/", "description": ""},
     "libmicrohttpd": {"version": "0.9.38", "website": "https://www.gnu.org/software/libmicrohttpd/", "description": "GNU Libmicrohttpd"},
     "libmikmod": {"version": "3.3.7", "website": "http://mikmod.raphnet.net/", "description": "libMikMod"},
@@ -210,9 +216,10 @@
     "libmng": {"version": "2.0.3", "website": "https://www.libmng.com/", "description": ""},
     "libmodplug": {"version": "0.8.8.4", "website": "https://modplug-xmms.sourceforge.io/", "description": ""},
     "libmpcdec": {"version": "1.2.6", "website": "https://www.musepack.net/", "description": ""},
+    "libmpeg2": {"version": "0.5.1", "website": "https://libmpeg2.sourceforge.io/", "description": "libmpeg2 - a free MPEG-2 video stream decoder"},
     "libmysqlclient": {"version": "6.1.6", "website": "https://dev.mysql.com/downloads/connector/c/", "description": ""},
-    "libnice": {"version": "0.1.13", "website": "https://nice.freedesktop.org/wiki/", "description": ""},
-    "libntlm": {"version": "1.5", "website": "https://www.nongnu.org/libntlm/", "description": "Libntlm"},
+    "libnice": {"version": "0.1.16", "website": "https://libnice.freedesktop.org", "description": ""},
+    "libntlm": {"version": "1.6", "website": "https://www.nongnu.org/libntlm/", "description": "Libntlm"},
     "liboauth": {"version": "1.0.3", "website": "https://liboauth.sourceforge.io/", "description": ""},
     "libodbc++": {"version": "0.2.5", "website": "https://libodbcxx.sourceforge.io/", "description": ""},
     "liboil": {"version": "0.3.17", "website": "https://liboil.freedesktop.org/", "description": ""},
@@ -221,8 +228,9 @@
     "libpano13": {"version": "2.9.18", "website": "https://panotools.sourceforge.io/", "description": ""},
     "libpaper": {"version": "1.1.24+nmu5", "website": "https://packages.debian.org/unstable/libpaper1", "description": ""},
     "libplist": {"version": "2.0.0", "website": "https://github.com/libimobiledevice/libplist", "description": ""},
-    "libpng": {"version": "1.6.36", "website": "http://www.libpng.org/", "description": ""},
+    "libpng": {"version": "1.6.37", "website": "http://www.libpng.org/", "description": ""},
     "libqrencode": {"version": "4.0.2", "website": "https://fukuchi.org/works/qrencode/", "description": "a fast and compact QR Code encoding library"},
+    "libraw": {"version": "0.19.5", "website": "https://libraw.org", "description": "A library for reading RAW files obtained from digital photo cameras"},
     "librosco": {"version": "0.1.11", "website": "https://github.com/colinbourassa/librosco/", "description": ""},
     "librsvg": {"version": "2.40.5", "website": "https://librsvg.sourceforge.io/", "description": ""},
     "librtmp": {"version": "fa8646d", "website": "https://rtmpdump.mplayerhq.hu/", "description": ""},
@@ -233,58 +241,61 @@
     "libsignal-protocol-c": {"version": "2.3.2", "website": "https://github.com/signalapp/libsignal-protocol-c", "description": "libsignal-protocol-c"},
     "libsigrok": {"version": "0.5.0", "website": "https://www.sigrok.org/wiki/Libsigrok", "description": "libsigrok"},
     "libsndfile": {"version": "1.0.28", "website": "http://www.mega-nerd.com/libsndfile/", "description": ""},
-    "libsodium": {"version": "1.0.17", "website": "https://download.libsodium.org/doc/", "description": ""},
+    "libsodium": {"version": "1.0.18", "website": "https://download.libsodium.org/doc/", "description": ""},
     "libsoup": {"version": "2.57.1", "website": "https://github.com/GNOME/libsoup", "description": "HTTP client/server library for GNOME"},
     "libspatialindex": {"version": "1.8.5", "website": "https://libspatialindex.github.io/", "description": "libspatialindex"},
     "libspectre": {"version": "0.2.8", "website": "https://libspectre.freedesktop.org/", "description": ""},
-    "libssh": {"version": "0.7.5", "website": "https://www.libssh.org", "description": "SSHv2 and SSHv1 protocol on client and server side"},
-    "libssh2": {"version": "1.8.0", "website": "https://libssh2.org/", "description": ""},
+    "libssh": {"version": "0.9.1", "website": "https://www.libssh.org", "description": "SSHv2 and SSHv1 protocol on client and server side"},
+    "libssh2": {"version": "1.9.0", "website": "https://libssh2.org/", "description": ""},
     "libsvm": {"version": "3.22", "website": "https://www.csie.ntu.edu.tw/~cjlin/libsvm", "description": ""},
-    "libtool": {"version": "2.4.4", "website": "https://www.gnu.org/software/libtool/", "description": "GNU Libtool"},
+    "libtasn1": {"version": "4.16.0", "website": "https://www.gnu.org/software/libtasn1/", "description": "GnuTLS"},
+    "libtool": {"version": "2.4.6", "website": "https://www.gnu.org/software/libtool/", "description": "GNU Libtool"},
     "libtorrent-rasterbar": {"version": "1.1.6", "website": "https://www.libtorrent.org/", "description": ""},
     "libunistring": {"version": "0.9.10", "website": "https://www.gnu.org/software/libunistring/", "description": ""},
     "libusb": {"version": "1.2.6.0", "website": "https://libusb-win32.sourceforge.io/", "description": "LibUsb"},
-    "libusb1": {"version": "1.0.22", "website": "https://libusb.info/", "description": "LibUsb-1.0"},
-    "libuv": {"version": "1.24.1", "website": "https://libuv.org", "description": ""},
-    "libvpx": {"version": "1.5.0", "website": "https://www.webmproject.org/code/", "description": "vpx"},
-    "libwebp": {"version": "1.0.2", "website": "https://developers.google.com/speed/webp/", "description": ""},
+    "libusb1": {"version": "1.0.23", "website": "https://libusb.info/", "description": "LibUsb-1.0"},
+    "libuv": {"version": "1.30.1", "website": "https://libuv.org", "description": ""},
+    "libvpx": {"version": "1.8.2", "website": "https://www.webmproject.org/code/", "description": "vpx"},
+    "libwebp": {"version": "1.0.3", "website": "https://developers.google.com/speed/webp/", "description": ""},
     "libwebsockets": {"version": "2.4.2", "website": "https://libwebsockets.org/", "description": ""},
     "libxml++": {"version": "2.40.1", "website": "https://libxmlplusplus.sourceforge.io/", "description": "libxml2"},
-    "libxml2": {"version": "2.9.4", "website": "http://www.xmlsoft.org/", "description": ""},
-    "libxslt": {"version": "1.1.29", "website": "http://xmlsoft.org/XSLT/", "description": ""},
-    "libzip": {"version": "1.5.1", "website": "https://libzip.org/", "description": ""},
-    "libzmq": {"version": "d2293da", "website": "https://github.com/zeromq/libzmq", "description": "ZeroMQ core engine in C++, implements ZMTP/3.0"},
-    "llvm": {"version": "7.0.0", "website": "https://llvm.org/", "description": ""},
+    "libxml2": {"version": "2.9.10", "website": "http://xmlsoft.org/", "description": ""},
+    "libxslt": {"version": "1.1.34", "website": "http://xmlsoft.org/XSLT/", "description": ""},
+    "libyaml": {"version": "0.2.5", "website": "https://github.com/yaml/libyaml", "description": "A C library for parsing and emitting YAML."},
+    "libzip": {"version": "1.5.2", "website": "https://libzip.org/", "description": ""},
+    "libzmq": {"version": "c89390f", "website": "https://github.com/zeromq/libzmq", "description": "ZeroMQ core engine in C++, implements ZMTP/3.0"},
+    "llvm": {"version": "10.0.0", "website": "https://llvm.org/", "description": ""},
     "log4cxx": {"version": "0.10.0", "website": "https://logging.apache.org/log4cxx/", "description": ""},
     "lua": {"version": "5.3.3", "website": "https://www.lua.org/", "description": "Lua"},
     "luabind": {"version": "0.9.1", "website": "https://github.com/luabind/luabind", "description": "Luabind"},
-    "luajit": {"version": "2.0.4", "website": "https://luajit.org/luajit.html", "description": "LuaJIT"},
-    "lz4": {"version": "1.8.3", "website": "https://github.com/lz4/lz4", "description": "lossless compression algorithm optimized for speed"},
+    "luajit": {"version": "2.0.5", "website": "https://luajit.org/luajit.html", "description": "LuaJIT"},
+    "lz4": {"version": "1.9.2", "website": "https://github.com/lz4/lz4", "description": "lossless compression algorithm optimized for speed"},
     "lzma": {"version": "1900", "website": "https://www.7-zip.org/sdk.html", "description": "LZMA SDK"},
     "lzo": {"version": "2.10", "website": "https://www.oberhumer.com/opensource/lzo/", "description": ""},
     "matio": {"version": "1.5.2", "website": "https://sourceforge.net/projects/matio/", "description": ""},
     "mdbtools": {"version": "0.7.1", "website": "https://sourceforge.net/projects/mdbtools/", "description": ""},
+    "mesa": {"version": "18.3.6", "website": "", "description": ""},
     "metis": {"version": "5.1.0", "website": "glaros.dtc.umn.edu", "description": "metis"},
-    "mingw-w64": {"version": "6.0.0", "website": "https://mingw-w64.sourceforge.io/", "description": "MinGW-w64 Runtime"},
+    "mingw-w64": {"version": "7.0.0", "website": "https://mingw-w64.sourceforge.io/", "description": "MinGW-w64 Runtime"},
     "miniupnpc": {"version": "2.0", "website": "http://miniupnp.free.fr/", "description": ""},
-    "minizip": {"version": "68a48aa", "website": "https://www.winimage.com/zLibDll/minizip.html", "description": ""},
+    "minizip": {"version": "2aa369c", "website": "https://www.winimage.com/zLibDll/minizip.html", "description": ""},
     "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": "3.1.5", "website": "https://www.mpfr.org/", "description": ""},
-    "mpg123": {"version": "1.25.10", "website": "https://www.mpg123.de/", "description": ""},
-    "muparser": {"version": "2.2.5", "website": "http://beltoforion.de/article.php?a=muparser", "description": "muParser"},
-    "muparserx": {"version": "4.0.7", "website": "http://beltoforion.de/article.php?a=muparserx", "description": "muParserX"},
+    "mpfr": {"version": "4.0.2", "website": "https://www.mpfr.org/", "description": ""},
+    "mpg123": {"version": "1.26.3", "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": ""},
-    "mxml": {"version": "2.11", "website": "https://michaelrsweet.github.io/mxml/", "description": "Mini-XML"},
+    "mxml": {"version": "3.1", "website": "https://michaelrsweet.github.io/mxml/", "description": "Mini-XML"},
     "nasm": {"version": "2.14.02", "website": "https://www.nasm.us/", "description": "NASM - The Netwide Assembler"},
     "ncurses": {"version": "e14300b", "website": "https://www.gnu.org/software/ncurses/", "description": "Ncurses"},
     "neon": {"version": "0.30.2", "website": "https://web.archive.org/web/webdav.org/neon/", "description": "HTTP and WebDAV client library (libneon)"},
     "netcdf": {"version": "4.6.1", "website": "https://www.unidata.ucar.edu/software/netcdf/", "description": "NetCDF"},
     "netcdf-cxx4": {"version": "4.3.0", "website": "https://www.unidata.ucar.edu/software/netcdf/", "description": "NetCDF-CXX4"},
     "netpbm": {"version": "10.35.96", "website": "https://netpbm.sourceforge.io/", "description": "Netpbm"},
-    "nettle": {"version": "3.4.1", "website": "https://www.lysator.liu.se/~nisse/nettle/", "description": ""},
-    "nlopt": {"version": "2.4.2", "website": "https://ab-initio.mit.edu/wiki/index.php/NLopt", "description": "NLopt"},
-    "nsis": {"version": "3.01", "website": "https://nsis.sourceforge.io/", "description": "NSIS"},
+    "nettle": {"version": "3.6", "website": "https://www.lysator.liu.se/~nisse/nettle/", "description": ""},
+    "nlopt": {"version": "2.6.1", "website": "https://nlopt.readthedocs.io/en/latest/", "description": "NLopt"},
+    "nsis": {"version": "3.06.1", "website": "https://nsis.sourceforge.io/", "description": "NSIS"},
     "ocaml-cairo": {"version": "1.2.0", "website": "https://cairographics.org/cairo-ocaml/", "description": "cairo-ocaml"},
     "ocaml-camlimages": {"version": "4.0.1", "website": "http://gallium.inria.fr/camlimages", "description": "camlimages"},
     "ocaml-core": {"version": "4.00.1", "website": "https://caml.inria.fr/", "description": "ocaml"},
@@ -295,34 +306,34 @@
     "ocaml-native": {"version": "4.00.1", "website": "https://caml.inria.fr/", "description": "ocaml"},
     "ocaml-xml-light": {"version": "2.2", "website": "http://tech.motion-twin.com/xmllight.html", "description": "xml-light"},
     "oce": {"version": "0.18.2", "website": "https://github.com/tpaviot/oce", "description": "Open CASCADE Community Edition"},
-    "ogg": {"version": "1.3.3", "website": "https://www.xiph.org/ogg/", "description": "OGG"},
+    "ogg": {"version": "1.3.4", "website": "https://www.xiph.org/ogg/", "description": "OGG"},
     "old": {"version": "0.17", "website": "https://blitiri.com.ar/p/old/", "description": ""},
-    "openal": {"version": "1.16.0", "website": "https://openal-soft.org/", "description": ""},
-    "openblas": {"version": "0.2.20", "website": "https://www.openblas.net/", "description": "OpenBLAS"},
+    "openal": {"version": "1.19.1", "website": "https://openal-soft.org/", "description": ""},
+    "openblas": {"version": "0.3.6", "website": "https://www.openblas.net/", "description": "OpenBLAS"},
     "opencore-amr": {"version": "0.1.3", "website": "https://opencore-amr.sourceforge.io/", "description": ""},
     "opencsg": {"version": "1.4.2", "website": "http://www.opencsg.org/", "description": ""},
     "opencv": {"version": "3.3.0", "website": "https://opencv.org/", "description": "OpenCV"},
     "openexr": {"version": "2.2.0", "website": "https://www.openexr.com/", "description": "OpenEXR"},
-    "openjpeg": {"version": "2.3.0", "website": "https://www.openjpeg.org/", "description": "OpenJPEG"},
+    "openjpeg": {"version": "2.3.1", "website": "https://www.openjpeg.org/", "description": "OpenJPEG"},
     "openmp-validation": {"version": "ff8cf0c", "website": "https://github.com/uhhpctools/omp-validation", "description": "OpenMP Validation Suite"},
     "openscenegraph": {"version": "3.6.3", "website": "http://www.openscenegraph.org/", "description": "OpenSceneGraph"},
-    "openssl": {"version": "1.1.1b", "website": "https://www.openssl.org/", "description": ""},
+    "openssl": {"version": "1.1.1g", "website": "https://www.openssl.org/", "description": ""},
     "openthreads": {"version": "3.6.3", "website": "http://www.openscenegraph.org/", "description": "OpenThreads"},
-    "opus": {"version": "1.3", "website": "https://opus-codec.org/", "description": ""},
+    "opus": {"version": "1.3.1", "website": "https://opus-codec.org/", "description": ""},
     "opusfile": {"version": "0.11", "website": "https://opus-codec.org/", "description": ""},
     "osgearth": {"version": "2.10", "website": "http://osgearth.org/", "description": "Geospatial SDK for OpenSceneGraph"},
     "ossim": {"version": "43a071a", "website": "https://trac.osgeo.org/ossim", "description": "OSSIM"},
     "pango": {"version": "1.37.4", "website": "https://www.pango.org/", "description": "Pango"},
     "pangomm": {"version": "2.34.0", "website": "https://www.pango.org/", "description": "Pangomm"},
     "pcl": {"version": "1.9.1", "website": "http://www.pointclouds.org/", "description": "PCL (Point Cloud Library)"},
-    "pcre": {"version": "8.43", "website": "https://www.pcre.org/", "description": "PCRE"},
-    "pcre2": {"version": "10.32", "website": "https://www.pcre.org/", "description": "PCRE2"},
+    "pcre": {"version": "8.44", "website": "https://www.pcre.org/", "description": "PCRE"},
+    "pcre2": {"version": "10.35", "website": "https://www.pcre.org/", "description": "PCRE2"},
     "pdcurses": {"version": "3.4", "website": "https://pdcurses.sourceforge.io/", "description": "PDcurses"},
     "pdflib_lite": {"version": "7.0.5p3", "website": "https://www.pdflib.com/download/free-software/pdflib-lite-7/", "description": "PDFlib Lite"},
     "pe-parse": {"version": "64989f6", "website": "https://github.com/trailofbits/pe-parse", "description": "Principled, lightweight C/C++ PE parser"},
-    "pe-util": {"version": "04f9475", "website": "https://github.com/gsauthof/pe-util", "description": "List shared object dependencies of a portable executable (PE)"},
+    "pe-util": {"version": "5b07cb3", "website": "https://github.com/gsauthof/pe-util", "description": "List shared object dependencies of a portable executable (PE)"},
     "pfstools": {"version": "2.0.4", "website": "https://pfstools.sourceforge.io/", "description": ""},
-    "physfs": {"version": "3.0.1", "website": "https://icculus.org/physfs/", "description": ""},
+    "physfs": {"version": "3.0.2", "website": "https://icculus.org/physfs/", "description": ""},
     "picomodel": {"version": "1142ad8", "website": "https://code.google.com/p/picomodel/", "description": ""},
     "pire": {"version": "0.0.5", "website": "https://github.com/yandex/pire", "description": "PIRE"},
     "pixman": {"version": "0.33.6", "website": "https://cairographics.org/", "description": ""},
@@ -331,81 +342,82 @@
     "plibc": {"version": "cd7ed09", "website": "https://plibc.sourceforge.io/", "description": "Plibc"},
     "plotmm": {"version": "0.1.2", "website": "https://plotmm.sourceforge.io/", "description": "PlotMM"},
     "plotutils": {"version": "2.6", "website": "https://www.gnu.org/software/plotutils/", "description": ""},
-    "poco": {"version": "1.9.0", "website": "https://pocoproject.org/", "description": "POCO C++ Libraries"},
+    "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.51.0", "website": "https://poppler.freedesktop.org/", "description": ""},
-    "popt": {"version": "1.16", "website": "http://freshmeat.net/projects/popt/", "description": ""},
+    "poppler": {"version": "20.09.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": ""},
     "portmidi": {"version": "217", "website": "https://portmedia.sourceforge.io/portmidi/", "description": ""},
     "postgresql": {"version": "9.2.4", "website": "https://www.postgresql.org/", "description": "PostgreSQL"},
-    "primesieve": {"version": "7.3", "website": "https://primesieve.org/", "description": "Primesieve"},
+    "primesieve": {"version": "7.4", "website": "https://primesieve.org/", "description": "Primesieve"},
     "proj": {"version": "5.1.0", "website": "https://trac.osgeo.org/proj/", "description": ""},
-    "protobuf": {"version": "3.6.1.3", "website": "https://github.com/google/protobuf", "description": ""},
+    "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.1.3", "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"},
-    "qscintilla2": {"version": "2.10.8", "website": "https://www.riverbankcomputing.com/software/qscintilla/intro", "description": "QScintilla2"},
+    "qscintilla2": {"version": "2.11.2", "website": "https://www.riverbankcomputing.com/software/qscintilla/intro", "description": "QScintilla2"},
     "qt": {"version": "4.8.7", "website": "https://www.qt.io/", "description": "Qt"},
-    "qt3d": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qt5": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtactiveqt": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtbase": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtcanvas3d": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtcharts": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtconnectivity": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtdatavis3d": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtdeclarative": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtgamepad": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtgraphicaleffects": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtifw": {"version": "3.0.4", "website": "https://doc.qt.io/qtinstallerframework/index.html", "description": "Qt Installer Framework"},
-    "qtimageformats": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qt3d": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qt5": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtactiveqt": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtbase": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtcharts": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtconnectivity": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtdatavis3d": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtdeclarative": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtgamepad": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtgraphicaleffects": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtifw": {"version": "3.2.2", "website": "https://doc.qt.io/qtinstallerframework/index.html", "description": "Qt Installer Framework"},
+    "qtimageformats": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
     "qtkeychain": {"version": "0.9.1", "website": "https://github.com/frankosterfeld/qtkeychain", "description": "QtKeychain"},
-    "qtlocation": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtmultimedia": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtnetworkauth": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtlocation": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtlottie": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtmultimedia": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtnetworkauth": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
     "qtofficeopenxml": {"version": "02dda4a", "website": "https://github.com/dbzhang800/QtOfficeOpenXml/", "description": "QtOfficeOpenXml"},
-    "qtpurchasing": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtquickcontrols": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtquickcontrols2": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtremoteobjects": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtscript": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtscxml": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtsensors": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtserialbus": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtserialport": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtpurchasing": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtquick3d": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtquickcontrols": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtquickcontrols2": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtremoteobjects": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtscript": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtscxml": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtsensors": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtserialbus": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtserialport": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
     "qtserialport_qt4": {"version": "5c3b6cc", "website": "https://www.qt.io/", "description": "Qt"},
     "qtservice": {"version": "ee17851", "website": "https://qt.gitorious.org/qt-solutions/", "description": "Qt Solutions"},
     "qtsparkle": {"version": "4c852e5", "website": "https://github.com/davidsansome/qtsparkle", "description": "Qt auto-updater lib"},
     "qtsparkle_qt4": {"version": "4c852e5", "website": "https://github.com/davidsansome/qtsparkle", "description": "Qt auto-updater lib"},
-    "qtspeech": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtsvg": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtspeech": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtsvg": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
     "qtsystems": {"version": "e3332ee", "website": "https://www.qt.io/", "description": "Qt"},
-    "qttools": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qttranslations": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtvirtualkeyboard": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtwebchannel": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtwebkit": {"version": "5.212", "website": "https://github.com/annulen/webkit", "description": "QtWebKit"},
-    "qtwebsockets": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtwebview": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtwinextras": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "qtxlsxwriter": {"version": "5b685b5", "website": "https://github.com/VSRonin/QtXlsxWriter/", "description": "QtXlsxWriter"},
-    "qtxmlpatterns": {"version": "5.12.1", "website": "https://www.qt.io/", "description": "Qt"},
-    "quazip": {"version": "0.7.6", "website": "https://github.com/stachenov/quazip", "description": ""},
-    "qwt": {"version": "6.1.4", "website": "https://qwt.sourceforge.io/", "description": "Qwt"},
+    "qttools": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qttranslations": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtvirtualkeyboard": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtwebchannel": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtwebkit": {"version": "5.13.1", "website": "https://github.com/annulen/webkit", "description": "QtWebKit"},
+    "qtwebsockets": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtwebview": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtwinextras": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "qtxlsxwriter": {"version": "d3bd83b", "website": "https://github.com/VSRonin/QtXlsxWriter/", "description": "QtXlsxWriter"},
+    "qtxmlpatterns": {"version": "5.15.1", "website": "https://www.qt.io/", "description": "Qt"},
+    "quazip": {"version": "0.8.1", "website": "https://github.com/stachenov/quazip", "description": ""},
+    "qwt": {"version": "6.1.5", "website": "https://qwt.sourceforge.io/", "description": "Qwt"},
     "qwtplot3d": {"version": "d80c908", "website": "https://github.com/sintegrial/qwtplot3d", "description": "QwtPlot3D"},
     "ragel": {"version": "6.9", "website": "https://www.colm.net/open-source/ragel/", "description": "Ragel"},
     "readline": {"version": "8.0", "website": "https://tiswww.case.edu/php/chet/readline/rltop.html", "description": "Readline"},
     "rubberband": {"version": "1.8.1", "website": "https://breakfastquay.com/rubberband/", "description": "Rubberband"},
     "rucksack": {"version": "3.1.0", "website": "https://github.com/andrewrk/rucksack", "description": ""},
-    "scons-local": {"version": "3.0.1", "website": "https://scons.org/", "description": "Standalone SCons"},
+    "scons-local": {"version": "3.1.2", "website": "https://scons.org/", "description": "Standalone SCons"},
     "sdl": {"version": "1.2.15", "website": "https://www.libsdl.org/", "description": "SDL"},
-    "sdl2": {"version": "2.0.9", "website": "https://www.libsdl.org/", "description": "SDL2"},
+    "sdl2": {"version": "2.0.12", "website": "https://www.libsdl.org/", "description": "SDL2"},
     "sdl2_gfx": {"version": "1.0.4", "website": "https://www.ferzkopp.net/joomla/content/view/19/14/", "description": "SDL2_gfx"},
-    "sdl2_image": {"version": "2.0.4", "website": "https://www.libsdl.org/", "description": "SDL2_image"},
+    "sdl2_image": {"version": "2.0.5", "website": "https://www.libsdl.org/", "description": "SDL2_image"},
     "sdl2_mixer": {"version": "2.0.4", "website": "https://www.libsdl.org/", "description": "SDL2_mixer"},
     "sdl2_net": {"version": "2.0.0", "website": "https://www.libsdl.org/", "description": ""},
     "sdl2_ttf": {"version": "2.0.14", "website": "https://www.libsdl.org/", "description": "SDL2_ttf"},
@@ -427,59 +439,59 @@
     "speex": {"version": "1.2.0", "website": "https://speex.org/", "description": "Speex"},
     "speexdsp": {"version": "1.2rc3", "website": "https://speex.org/", "description": "SpeexDSP"},
     "sqlcipher": {"version": "3.4.2", "website": "https://www.zetetic.net/sqlcipher/", "description": "SQLite extension that provides 256 bit AES encryption of database files"},
-    "sqlite": {"version": "3270200", "website": "https://www.sqlite.org/", "description": "SQLite"},
+    "sqlite": {"version": "3330000", "website": "https://www.sqlite.org/", "description": "SQLite"},
     "subversion": {"version": "1.9.7", "website": "https://subversion.apache.org/", "description": ""},
     "suitesparse": {"version": "4.5.6", "website": "http://faculty.cse.tamu.edu/davis/suitesparse.html", "description": "SuiteSparse"},
     "t4k_common": {"version": "0.1.1", "website": "https://tux4kids.alioth.debian.org/", "description": ""},
-    "taglib": {"version": "5cb589a", "website": "https://taglib.org/", "description": "TagLib"},
-    "tcl": {"version": "8.6.9", "website": "https://tcl.tk/", "description": ""},
+    "taglib": {"version": "2918602", "website": "https://taglib.org/", "description": "TagLib"},
+    "tcl": {"version": "8.6.10", "website": "https://tcl.tk/", "description": ""},
     "tclap": {"version": "1.2.1", "website": "https://tclap.sourceforge.io/", "description": ""},
     "teem": {"version": "1.11.0", "website": "https://teem.sourceforge.io/", "description": "Teem"},
     "termcap": {"version": "1.3.1", "website": "https://www.gnu.org/software/termutils/", "description": "Termcap"},
     "theora": {"version": "1.1.1", "website": "https://theora.org/", "description": "Theora"},
     "tidy-html5": {"version": "5.6.0", "website": "https://www.html-tidy.org/", "description": "HTML/XML syntax checker and reformatter"},
-    "tiff": {"version": "4.0.10", "website": "http://simplesystems.org/libtiff/", "description": "LibTIFF"},
+    "tiff": {"version": "4.1.0", "website": "http://simplesystems.org/libtiff/", "description": "LibTIFF"},
     "tinyxml": {"version": "2.6.2", "website": "https://sourceforge.net/projects/tinyxml/", "description": ""},
-    "tinyxml2": {"version": "7.0.0", "website": "http://grinninglizard.com/tinyxml2/", "description": ""},
+    "tinyxml2": {"version": "7.0.1", "website": "http://grinninglizard.com/tinyxml2/", "description": ""},
     "tre": {"version": "0.8.0", "website": "https://laurikari.net/tre/", "description": "TRE"},
-    "twolame": {"version": "0.3.13", "website": "http://www.twolame.org/", "description": "TwoLAME"},
+    "twolame": {"version": "0.4.0", "website": "http://www.twolame.org/", "description": "TwoLAME"},
     "ucl": {"version": "1.03", "website": "https://www.oberhumer.com/opensource/ucl/", "description": "UCL"},
     "unrtf": {"version": "0.21.9", "website": "https://www.gnu.org/software/unrtf/", "description": "unRTF"},
     "unzip": {"version": "6.10b", "website": "https://infozip.sourceforge.io/UnZip.html", "description": "Info-ZIP"},
     "upx": {"version": "3.91", "website": "https://upx.github.io/", "description": "UPX"},
     "vamp-plugin-sdk": {"version": "2.5", "website": "https://vamp-plugins.org/", "description": "Vamp Plugins SDK"},
     "vc": {"version": "1.3.3", "website": "https://github.com/VcDevel/Vc", "description": "SIMD Vector Classes for C++"},
-    "vcdimager": {"version": "0.7.24", "website": "https://www.gnu.org/software/vcdimager/", "description": ""},
+    "vcdimager": {"version": "2.0.1", "website": "https://www.gnu.org/software/vcdimager/", "description": ""},
     "vidstab": {"version": "1.1.0", "website": "http://public.hronopik.de/vid.stab/features.php?lang=en", "description": "vid.stab video stablizer"},
     "vigra": {"version": "1.9.0", "website": "https://ukoethe.github.io/vigra/", "description": ""},
-    "vmime": {"version": "dad5b4a", "website": "https://www.vmime.org/", "description": "VMime"},
+    "vmime": {"version": "6c4bd0d", "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.1.0", "website": "http://www.wavpack.com/", "description": "WavPack"},
-    "wget": {"version": "1.20.1", "website": "https://www.gnu.org/software/wget/", "description": ""},
-    "widl": {"version": "6.0.0", "website": "https://www.winehq.org/docs/widl/", "description": "Wine IDL Compiler"},
+    "wavpack": {"version": "5.3.0", "website": "http://www.wavpack.com/", "description": "WavPack"},
+    "wget": {"version": "1.20.3", "website": "https://www.gnu.org/software/wget/", "description": ""},
+    "widl": {"version": "7.0.0", "website": "https://www.winehq.org/docs/widl/", "description": "Wine IDL Compiler"},
     "winpcap": {"version": "4_1_3", "website": "https://www.winpcap.org/", "description": "WinPcap"},
-    "wt": {"version": "3.3.7", "website": "https://www.webtoolkit.eu/", "description": "Wt"},
-    "wxwidgets": {"version": "3.0.2", "website": "https://www.wxwidgets.org/", "description": "wxWidgets"},
+    "wt": {"version": "4.3.1", "website": "https://www.webtoolkit.eu/", "description": "Wt"},
+    "wxwidgets": {"version": "3.0.5.1", "website": "https://www.wxwidgets.org/", "description": "wxWidgets"},
     "x264": {"version": "20180806-2245", "website": "https://www.videolan.org/developers/x264.html", "description": ""},
-    "x265": {"version": "2.4", "website": "http://x265.org", "description": ""},
-    "xapian-core": {"version": "1.2.21", "website": "https://xapian.org/", "description": "Xapian-Core"},
+    "x265": {"version": "2.4", "website": "http://x265.org/", "description": ""},
+    "xapian-core": {"version": "1.4.16", "website": "https://xapian.org/", "description": "Xapian-Core"},
     "xerces": {"version": "3.1.4", "website": "https://xerces.apache.org/xerces-c/", "description": "Xerces-C++"},
     "xmlrpc-c": {"version": "d4364f4", "website": "https://xmlrpc-c.sourceforge.io/", "description": ""},
-    "xmlsec": {"version": "1.2.25", "website": "https://www.aleksey.com/xmlsec/", "description": ""},
+    "xmlsec": {"version": "1.2.29", "website": "https://www.aleksey.com/xmlsec/", "description": ""},
     "xmlwrapp": {"version": "0.7.0", "website": "https://sourceforge.net/projects/xmlwrapp/", "description": ""},
     "xorg-macros": {"version": "1.19.0", "website": "https://cgit.freedesktop.org/xorg/util/macros/", "description": "X.org utility macros"},
     "xvidcore": {"version": "1.3.4", "website": "https://www.xvid.com/", "description": ""},
-    "xxhash": {"version": "0.6.5", "website": "https://cyan4973.github.io/xxHash/", "description": "xxHash"},
-    "xz": {"version": "5.2.4", "website": "https://tukaani.org/xz/", "description": "XZ"},
-    "yaml-cpp": {"version": "0.6.1", "website": "https://github.com/jbeder/yaml-cpp", "description": "A YAML parser and emitter for C++"},
+    "xxhash": {"version": "0.7.2", "website": "https://cyan4973.github.io/xxHash/", "description": "xxHash"},
+    "xz": {"version": "5.2.5", "website": "https://tukaani.org/xz/", "description": "XZ"},
+    "yaml-cpp": {"version": "0.6.2", "website": "https://github.com/jbeder/yaml-cpp", "description": "A YAML parser and emitter for C++"},
     "yasm": {"version": "1.3.0", "website": "https://yasm.tortall.net/", "description": "Yasm"},
     "zip": {"version": "3.0", "website": "https://infozip.sourceforge.io/Zip.html", "description": "Info-ZIP"},
     "zlib": {"version": "1.2.11", "website": "https://zlib.net/", "description": ""},
-    "zstd": {"version": "1.3.8", "website": "https://github.com/facebook/zstd", "description": "Zstandard is a fast lossless compression algorithm"},
-    "zziplib": {"version": "0.13.62", "website": "https://zziplib.sourceforge.io/", "description": "ZZIPlib"},
+    "zstd": {"version": "1.4.5", "website": "https://github.com/facebook/zstd", "description": "Zstandard is a fast lossless compression algorithm"},
+    "zziplib": {"version": "0.13.69", "website": "https://github.com/gdraheim/zziplib", "description": "ZZIPlib"},
     "": null
 }

ext/__gmsl

@@ -5,7 +5,7 @@
 # A library of functions to be used with GNU Make's $(call) that
 # provides functionality not available in standard GNU Make.
 #
-# Copyright (c) 2005-2014 John Graham-Cumming
+# Copyright (c) 2005-2018 John Graham-Cumming
 #
 # This file is part of GMSL
 #
@@ -42,7 +42,7 @@
 # This is the GNU Make Standard Library version number as a list with
 # three items: major, minor, revision
 
-gmsl_version := 1 1 7
+gmsl_version := 1 1 8
 
 __gmsl_name := GNU Make Standard Library
 
@@ -510,7 +510,7 @@ set_equal = $(__gmsl_tr2)$(call seq,$1,$2)
 # Returns:   Returns the integer for human consumption that is represented
 #            by the string of x's
 # ----------------------------------------------------------------------------
-int_decode = $(__gmsl_tr1)$(words $1)
+int_decode = $(__gmsl_tr1)$(if $1,$(if $(call seq,$(word 1,$1),x),$(words $1),$1),0)
 
 # ----------------------------------------------------------------------------
 # Function:  int_encode
@@ -602,8 +602,7 @@ multiply = $(__gmsl_tr2)$(call __gmsl_int_wrap,int_multiply,$1,$2)
 #            by argument 2 in x's representation
 # ----------------------------------------------------------------------------
 int_divide = $(__gmsl_tr2)$(strip $(if $1,$(if $2,                         \
-                 $(if $(call int_gte,$1,$2),                               \
-                     x $(call int_divide,$(call int_subtract,$1,$2),$2),), \
+                 $(subst M,x,$(filter-out x,$(subst $2,M,$1))),            \
                  $(call __gmsl_error,Division by zero))))
 
 # ----------------------------------------------------------------------------
@@ -614,6 +613,26 @@ int_divide = $(__gmsl_tr2)$(strip $(if $1,$(if $2,                         \
 # ----------------------------------------------------------------------------
 divide = $(__gmsl_tr2)$(call __gmsl_int_wrap,int_divide,$1,$2)
 
+# ----------------------------------------------------------------------------
+# Function:  int_modulo
+# Arguments: 1: A number in x's representation
+#            2: Another number in x's represntation
+# Returns:   Returns the remainder of integer division of argument 1 divided 
+#            by argument 2 in x's representation
+# ----------------------------------------------------------------------------
+int_modulo = $(__gmsl_tr2)$(strip $(if $1,$(if $2,                         \
+                 $(filter-out M,$(subst $2,M,$1)),                         \
+                 $(call __gmsl_error,Division by zero))))
+
+# ----------------------------------------------------------------------------
+# Function:  modulo (wrapped version of int_modulo)
+# Arguments: 1: An integer
+#            2: Another integer
+# Returns:   Returns the remainder of integer division of the first argument
+#            by the second
+# ----------------------------------------------------------------------------
+modulo = $(__gmsl_tr2)$(call __gmsl_int_wrap,int_modulo,$1,$2)
+
 # ----------------------------------------------------------------------------
 # Function:  int_max, int_min
 # Arguments: 1: A number in x's representation

ext/gmsl

@@ -5,7 +5,7 @@
 # A library of functions to be used with GNU Make's $(call) that
 # provides functionality not available in standard GNU Make.
 #
-# Copyright (c) 2005-2014 John Graham-Cumming
+# Copyright (c) 2005-2018 John Graham-Cumming
 #
 # This file is part of GMSL
 #

mxe.github.mk

@@ -132,7 +132,7 @@ endef
 # called with owner/repo/releases[/latest],tag prefix, tag suffix, filter-out, version sep
 define MXE_GET_GH_RELEASE
     $(WGET) -q -O- 'https://github.com/$(strip $(1))' \
-    | $(SED) -n 's,.*releases/tag/\([^"]*\)".*,\1,p' \
+    | $(SED) -n 's,.*releases/tag/\([^"&;]*\)".*,\1,p' \
     | $(if $(4),grep -vi '$(strip $(4))') \
     | $(SED) -n 's,^$(strip $(2))\([^"]*\)$(strip $(3))$$,\1,p' \
     | tr '$(strip $(5))' '.' \

plugins/apps/tor.mk

@@ -2,8 +2,8 @@
 
 PKG             := tor
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.3.0.7
-$(PKG)_CHECKSUM := 9640c4448ef3cad7237c68ed6984e705db8fb2b9d6bb74c8815d01bb06527d02
+$(PKG)_VERSION  := 0.4.3.5
+$(PKG)_CHECKSUM := 616a0e4ae688d0e151d46e3e4258565da4d443d1ddbd316db0b90910e2d5d868
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://torproject.org/dist/$($(PKG)_FILE)

plugins/apps/wrk-1-fixes.patch

@@ -272,7 +272,7 @@ From: Boris Nagaev <bnagaev@gmail.com>
 Date: Tue, 22 Mar 2016 23:05:26 +0100
 Subject: [PATCH 4/8] reorder -lssl and -lcrypto
 
-See http://stackoverflow.com/a/27136346
+See https://stackoverflow.com/a/27136346
 
 diff --git a/Makefile b/Makefile
 index 1111111..2222222 100644
@@ -410,7 +410,7 @@ index 1111111..2222222 100644
      luaL_openlibs(L);
 -    (void) luaL_dostring(L, "wrk = require \"wrk\"");
 +
-+    // Taken from http://stackoverflow.com/a/19426724
++    // Taken from https://stackoverflow.com/a/19426724
 +    lua_getglobal(L, "package");
 +    lua_getfield(L, -1, "preload");
 +    luaL_loadbuffer(L, luaJIT_BC_wrk, luaJIT_BC_wrk_SIZE, NULL);

plugins/examples/host-toolchain/README.md

@@ -85,7 +85,7 @@ running a Linux VM on Windows).
 
 
 [cmake-generators]:https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html
-[cmder]:http://cmder.net/
+[cmder]:https://cmder.net/
 [conemu]:https://conemu.github.io/
 [git-win]:https://git-for-windows.github.io/
 [msys2]:https://msys2.github.io/

plugins/examples/openssl1.0/openssl1.0-1-fixes.patch

@@ -8,7 +8,7 @@ Date: Wed, 8 Jan 2014 02:19:10 +0100
 Subject: [PATCH 1/2] winsock2
 
 -This patch has been taken from:
--http://rt.openssl.org/Ticket/Display.html?id=2285&user=guest&pass=guest
+-https://rt.openssl.org/Ticket/Display.html?id=2285&user=guest&pass=guest
 
 diff --git a/ssl/dtls1.h b/ssl/dtls1.h
 index 1111111..2222222 100644

plugins/examples/openssl1.0/openssl1.0-overlay.mk

@@ -5,6 +5,3 @@ $(PLUGIN_HEADER)
 
 dcmtk_CONFIGURE_OPTS := --with-openssl
 dcmtk_DEPS    := $(filter-out openssl,$(dcmtk_DEPS)) openssl1.0
-
-vmime_DEPS    := $(filter-out gnutls,$(vmime_DEPS)) openssl1.0
-vmime_TLS_LIB := openssl

plugins/examples/qt5-freeze/Qt5QuickConfig.cmake

@@ -0,0 +1,190 @@
+
+if (CMAKE_VERSION VERSION_LESS 3.1.0)
+    message(FATAL_ERROR "Qt 5 Quick module requires at least CMake version 3.1.0")
+endif()
+
+get_filename_component(_qt5Quick_install_prefix "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+# For backwards compatibility only. Use Qt5Quick_VERSION instead.
+set(Qt5Quick_VERSION_STRING 5.7.1)
+
+set(Qt5Quick_LIBRARIES Qt5::Quick)
+
+macro(_qt5_Quick_check_file_exists file)
+    if(NOT EXISTS "${file}" )
+        message(FATAL_ERROR "The imported target \"Qt5::Quick\" references the file
+   \"${file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+    endif()
+endmacro()
+
+macro(_populate_Quick_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION)
+    set_property(TARGET Qt5::Quick APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+
+    set(imported_location "${_qt5Quick_install_prefix}/bin/${LIB_LOCATION}")
+    _qt5_Quick_check_file_exists(${imported_location})
+    set_target_properties(Qt5::Quick PROPERTIES
+        "INTERFACE_LINK_LIBRARIES" "${_Qt5Quick_LIB_DEPENDENCIES}"
+        "IMPORTED_LOCATION_${Configuration}" ${imported_location}
+        # For backward compatibility with CMake < 2.8.12
+        "IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}" "${_Qt5Quick_LIB_DEPENDENCIES}"
+    )
+
+    set(imported_implib "${_qt5Quick_install_prefix}/lib/${IMPLIB_LOCATION}")
+    _qt5_Quick_check_file_exists(${imported_implib})
+    if(NOT "${IMPLIB_LOCATION}" STREQUAL "")
+        set_target_properties(Qt5::Quick PROPERTIES
+        "IMPORTED_IMPLIB_${Configuration}" ${imported_implib}
+        )
+    endif()
+endmacro()
+
+if (NOT TARGET Qt5::Quick)
+
+    set(_Qt5Quick_OWN_INCLUDE_DIRS "${_qt5Quick_install_prefix}/include/" "${_qt5Quick_install_prefix}/include/QtQuick")
+    set(Qt5Quick_PRIVATE_INCLUDE_DIRS
+        "${_qt5Quick_install_prefix}/include/QtQuick/5.7.1"
+        "${_qt5Quick_install_prefix}/include/QtQuick/5.7.1/QtQuick"
+    )
+
+    foreach(_dir ${_Qt5Quick_OWN_INCLUDE_DIRS})
+        _qt5_Quick_check_file_exists(${_dir})
+    endforeach()
+
+    # Only check existence of private includes if the Private component is
+    # specified.
+    list(FIND Qt5Quick_FIND_COMPONENTS Private _check_private)
+    if (NOT _check_private STREQUAL -1)
+        foreach(_dir ${Qt5Quick_PRIVATE_INCLUDE_DIRS})
+            _qt5_Quick_check_file_exists(${_dir})
+        endforeach()
+    endif()
+
+    set(Qt5Quick_INCLUDE_DIRS ${_Qt5Quick_OWN_INCLUDE_DIRS})
+
+    set(Qt5Quick_DEFINITIONS -DQT_QUICK_LIB)
+    set(Qt5Quick_COMPILE_DEFINITIONS QT_QUICK_LIB)
+    set(_Qt5Quick_MODULE_DEPENDENCIES "Qml;Gui;Core")
+
+
+    set(Qt5Quick_OWN_PRIVATE_INCLUDE_DIRS ${Qt5Quick_PRIVATE_INCLUDE_DIRS})
+
+    set(_Qt5Quick_FIND_DEPENDENCIES_REQUIRED)
+    if (Qt5Quick_FIND_REQUIRED)
+        set(_Qt5Quick_FIND_DEPENDENCIES_REQUIRED REQUIRED)
+    endif()
+    set(_Qt5Quick_FIND_DEPENDENCIES_QUIET)
+    if (Qt5Quick_FIND_QUIETLY)
+        set(_Qt5Quick_DEPENDENCIES_FIND_QUIET QUIET)
+    endif()
+    set(_Qt5Quick_FIND_VERSION_EXACT)
+    if (Qt5Quick_FIND_VERSION_EXACT)
+        set(_Qt5Quick_FIND_VERSION_EXACT EXACT)
+    endif()
+
+    set(Qt5Quick_EXECUTABLE_COMPILE_FLAGS "")
+
+    foreach(_module_dep ${_Qt5Quick_MODULE_DEPENDENCIES})
+        if (NOT Qt5${_module_dep}_FOUND)
+            find_package(Qt5${_module_dep}
+                5.7.1 ${_Qt5Quick_FIND_VERSION_EXACT}
+                ${_Qt5Quick_DEPENDENCIES_FIND_QUIET}
+                ${_Qt5Quick_FIND_DEPENDENCIES_REQUIRED}
+                PATHS "${CMAKE_CURRENT_LIST_DIR}/.." NO_DEFAULT_PATH
+            )
+        endif()
+
+        if (NOT Qt5${_module_dep}_FOUND)
+            set(Qt5Quick_FOUND False)
+            return()
+        endif()
+
+        list(APPEND Qt5Quick_INCLUDE_DIRS "${Qt5${_module_dep}_INCLUDE_DIRS}")
+        list(APPEND Qt5Quick_PRIVATE_INCLUDE_DIRS "${Qt5${_module_dep}_PRIVATE_INCLUDE_DIRS}")
+        list(APPEND Qt5Quick_DEFINITIONS ${Qt5${_module_dep}_DEFINITIONS})
+        list(APPEND Qt5Quick_COMPILE_DEFINITIONS ${Qt5${_module_dep}_COMPILE_DEFINITIONS})
+        list(APPEND Qt5Quick_EXECUTABLE_COMPILE_FLAGS ${Qt5${_module_dep}_EXECUTABLE_COMPILE_FLAGS})
+    endforeach()
+    list(REMOVE_DUPLICATES Qt5Quick_INCLUDE_DIRS)
+    list(REMOVE_DUPLICATES Qt5Quick_PRIVATE_INCLUDE_DIRS)
+    list(REMOVE_DUPLICATES Qt5Quick_DEFINITIONS)
+    list(REMOVE_DUPLICATES Qt5Quick_COMPILE_DEFINITIONS)
+    list(REMOVE_DUPLICATES Qt5Quick_EXECUTABLE_COMPILE_FLAGS)
+
+    set(_Qt5Quick_LIB_DEPENDENCIES "Qt5::Qml;Qt5::Gui;Qt5::Core")
+
+
+    add_library(Qt5::Quick SHARED IMPORTED)
+
+    set_property(TARGET Qt5::Quick PROPERTY
+      INTERFACE_INCLUDE_DIRECTORIES ${_Qt5Quick_OWN_INCLUDE_DIRS})
+    set_property(TARGET Qt5::Quick PROPERTY
+      INTERFACE_COMPILE_DEFINITIONS QT_QUICK_LIB)
+
+    set_property(TARGET Qt5::Quick PROPERTY INTERFACE_QT_ENABLED_FEATURES )
+    set_property(TARGET Qt5::Quick PROPERTY INTERFACE_QT_DISABLED_FEATURES d3d12)
+
+    set(_Qt5Quick_PRIVATE_DIRS_EXIST TRUE)
+    foreach (_Qt5Quick_PRIVATE_DIR ${Qt5Quick_OWN_PRIVATE_INCLUDE_DIRS})
+        if (NOT EXISTS ${_Qt5Quick_PRIVATE_DIR})
+            set(_Qt5Quick_PRIVATE_DIRS_EXIST FALSE)
+        endif()
+    endforeach()
+
+    if (_Qt5Quick_PRIVATE_DIRS_EXIST)
+        add_library(Qt5::QuickPrivate INTERFACE IMPORTED)
+        set_property(TARGET Qt5::QuickPrivate PROPERTY
+            INTERFACE_INCLUDE_DIRECTORIES ${Qt5Quick_OWN_PRIVATE_INCLUDE_DIRS}
+        )
+        set(_Qt5Quick_PRIVATEDEPS)
+        foreach(dep ${_Qt5Quick_LIB_DEPENDENCIES})
+            if (TARGET ${dep}Private)
+                list(APPEND _Qt5Quick_PRIVATEDEPS ${dep}Private)
+            endif()
+        endforeach()
+        set_property(TARGET Qt5::QuickPrivate PROPERTY
+            INTERFACE_LINK_LIBRARIES Qt5::Quick ${_Qt5Quick_PRIVATEDEPS}
+        )
+    endif()
+
+    _populate_Quick_target_properties(RELEASE "Qt5Quick.dll" "libQt5Quick.a" )
+
+    if (EXISTS
+        "${_qt5Quick_install_prefix}/bin/Qt5Quickd.dll"
+      AND EXISTS
+        "${_qt5Quick_install_prefix}/lib/libQt5Quickd.a" )
+        _populate_Quick_target_properties(DEBUG "Qt5Quickd.dll" "libQt5Quickd.a" )
+    endif()
+
+
+
+    file(GLOB pluginTargets "${CMAKE_CURRENT_LIST_DIR}/Qt5Quick_*Plugin.cmake")
+
+    macro(_populate_Quick_plugin_properties Plugin Configuration PLUGIN_LOCATION)
+        set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+
+        set(imported_location "${_qt5Quick_install_prefix}/plugins/${PLUGIN_LOCATION}")
+        _qt5_Quick_check_file_exists(${imported_location})
+        set_target_properties(Qt5::${Plugin} PROPERTIES
+            "IMPORTED_LOCATION_${Configuration}" ${imported_location}
+        )
+    endmacro()
+
+    if (pluginTargets)
+        foreach(pluginTarget ${pluginTargets})
+            include(${pluginTarget})
+        endforeach()
+    endif()
+
+
+
+
+_qt5_Quick_check_file_exists("${CMAKE_CURRENT_LIST_DIR}/Qt5QuickConfigVersion.cmake")
+
+endif()

plugins/examples/qt5-freeze/openssl-1-fixes.patch

@@ -8,7 +8,7 @@ Date: Wed, 8 Jan 2014 02:19:10 +0100
 Subject: [PATCH 1/2] winsock2
 
 -This patch has been taken from:
--http://rt.openssl.org/Ticket/Display.html?id=2285&user=guest&pass=guest
+-https://rt.openssl.org/Ticket/Display.html?id=2285&user=guest&pass=guest
 
 diff --git a/ssl/dtls1.h b/ssl/dtls1.h
 index 1111111..2222222 100644

plugins/examples/qt5-freeze/qtbase.mk

@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b665
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch)))
 $(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := https://download.qt.io/official_releases/qt/5.7/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_URL      := https://download.qt.io/new_archive/qt/5.7/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc dbus fontconfig freetds freetype harfbuzz jpeg libmysqlclient libpng openssl pcre postgresql sqlite zlib
 
 # allows for side-by-side install with later Qt

plugins/examples/qt5-freeze/qtdeclarative.mk

@@ -18,4 +18,8 @@ endef
 
 define $(PKG)_BUILD
     $(QMAKE_MAKE_INSTALL)
+    
+    # Workaround for fixing build of current version of QtWebkit with Qt 5.7.1
+    cp $(PWD)/plugins/examples/qt5-freeze/Qt5QuickConfig.cmake \
+       $(PREFIX)/$(TARGET)/qt5/lib/cmake/Qt5Quick/
 endef

plugins/examples/qt5-freeze/qtmultimedia-1-fixes.patch

@@ -0,0 +1,70 @@
+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: Boris Pek <tehnick-8@yandex.ru>
+Date: Tue, 29 Oct 2019 01:41:03 +0300
+Subject: [PATCH 1/1] mingw-w64 6.x fixed (see QTBUG-63905, QTBUG-70630,
+ QTBUG-70655)
+
+
+diff --git a/src/plugins/common/evr/evrdefs.h b/src/plugins/common/evr/evrdefs.h
+index f898209b..4f3dd832 100644
+--- a/src/plugins/common/evr/evrdefs.h
++++ b/src/plugins/common/evr/evrdefs.h
+@@ -83,7 +83,8 @@ HRESULT WINAPI Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex**);
+ #define MF_E_TRANSFORM_NEED_MORE_INPUT ((HRESULT)0xC00D6D72L)
+ #endif
+ 
+-#ifdef __GNUC__
++#if defined(__GNUC__) && !defined(_MFVideoNormalizedRect_)
++#define _MFVideoNormalizedRect_
+ typedef struct MFVideoNormalizedRect {
+     float left;
+     float top;
+diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
+index 117b02ad..27bb3abb 100644
+--- a/src/plugins/directshow/directshow.pro
++++ b/src/plugins/directshow/directshow.pro
+@@ -1,23 +1,31 @@
+ TARGET = dsengine
+-win32:!qtHaveModule(opengl)|contains(QT_CONFIG,dynamicgl) {
++QT += multimedia-private
++
++win32:!qtHaveModule(opengl)|qtConfig(dynamicgl) {
+     LIBS_PRIVATE += -lgdi32 -luser32
+ }
+ 
+-QT += multimedia-private
+-
+ HEADERS += dsserviceplugin.h
+ SOURCES += dsserviceplugin.cpp
+ 
+-!config_wmsdk: DEFINES += QT_NO_WMSDK
++# Remove WINVER/_WIN32_WINNT definitions added to qt_build_config.prf
++# by qtbase/d57a7c41712f8627a462d893329dc3f0dbb52d32 since the multimedia
++# headers of MinGW 5.3/7.1 are too broken to compile with 0x0601.
++mingw {
++    DEFINES -= WINVER=0x0601 _WIN32_WINNT=0x0601
++    DEFINES += NO_DSHOW_STRSAFE
++}
+ 
+-mingw: DEFINES += NO_DSHOW_STRSAFE
++mingw {
++    LIBS_PRIVATE += -lamstrmid
++}
+ 
+-!config_wmf: include(player/player.pri)
+-!wince: include(camera/camera.pri)
++include(common/common.pri)
++include(player/player.pri)
++include(camera/camera.pri)
+ 
+ OTHER_FILES += \
+-    directshow.json \
+-    directshow_camera.json
++    directshow.json
+ 
+ PLUGIN_TYPE = mediaservice
+ PLUGIN_CLASS_NAME = DSServicePlugin

plugins/examples/qt5-freeze/qtwebkit-1-fixes.patch

@@ -1,47 +0,0 @@
-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: Tony Theodore <tonyt@logyst.com>
-Date: Wed, 18 Jan 2017 19:38:56 +1100
-Subject: [PATCH] fix msys build
-
-Taken from:
-https://github.com/Alexpux/Qt-builds/blob/master/patches/qt/5.0.x/qt-5.0.0-fix-build-under-msys.patch
-
-diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri
-index 1111111..2222222 100644
---- a/Source/WebCore/DerivedSources.pri
-+++ b/Source/WebCore/DerivedSources.pri
-@@ -752,7 +752,7 @@ IDL_ATTRIBUTES_FILE = $$PWD/bindings/scripts/IDLAttributes.txt
- preprocessIdls.input = IDL_ATTRIBUTES_FILE
- preprocessIdls.script = $$PREPROCESS_IDLS_SCRIPT
- # FIXME : We need to use only perl at some point.
--win_cmd_shell: preprocessIdls.commands = type nul > $$IDL_FILES_TMP $$EOC
-+win_cmd_shell: preprocessIdls.commands = cat /dev/null > $$IDL_FILES_TMP $$EOC
- else: preprocessIdls.commands = cat /dev/null > $$IDL_FILES_TMP $$EOC
- for(binding, IDL_BINDINGS) {
-     # We need "$$binding" instead of "$$binding ", because Windows' echo writes trailing whitespaces. (http://wkb.ug/88304)
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Sun, 25 Sep 2016 22:21:54 +0200
-Subject: [PATCH] Include intrin.h for declaration of _mm_mfence
-
-taken from:
-https://aur.archlinux.org/cgit/aur.git/tree/0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch?h=mingw-w64-qt5-webkit
-
-diff --git a/Source/WTF/wtf/Atomics.h b/Source/WTF/wtf/Atomics.h
-index 1111111..2222222 100644
---- a/Source/WTF/wtf/Atomics.h
-+++ b/Source/WTF/wtf/Atomics.h
-@@ -68,6 +68,8 @@
- #elif !COMPILER(GCC)
- extern "C" void _ReadWriteBarrier(void);
- #pragma intrinsic(_ReadWriteBarrier)
-+#else
-+#include <intrin.h>
- #endif
- #include <windows.h>
- #elif OS(QNX)

plugins/examples/qt5-freeze/qtwebkit.mk

@@ -1,25 +0,0 @@
-# This file is part of MXE. See LICENSE.md for licensing information.
-
-PKG             := qtwebkit
-$(PKG)_WEBSITE  := https://www.qt.io/
-$(PKG)_DESCR    := Qt
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION   = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03
-$(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch)))
-$(PKG)_SUBDIR    = $(subst qtbase,qtwebkit,$(qtbase_SUBDIR))
-$(PKG)_FILE      = $(subst qtbase,qtwebkit,$(qtbase_FILE))
-$(PKG)_URL       = $(subst /submodules/,/,$(subst official_releases/qt,community_releases,$(subst qtbase,qtwebkit,$(qtbase_URL))))
-$(PKG)_DEPS     := cc qtbase qtmultimedia sqlite
-
-define $(PKG)_UPDATE
-    echo $(qtbase_VERSION)
-endef
-
-define $(PKG)_BUILD_SHARED
-    # looks for build tools with .exe suffix and tries to use win_flex
-    $(SED) -i 's,\.exe,,' '$(SOURCE_DIR)/Tools/qmake/mkspecs/features/functions.prf'
-    cd '$(BUILD_DIR)' && mkdir -p .git && $(QMAKE_EXECUTABLE) FLEX=flex '$(SOURCE_DIR)'
-    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
-    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
-endef

plugins/gcc10/gcc10-overlay.mk

@@ -0,0 +1,41 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+# override relevant cloog, isl, and gcc variables changed in:
+# https://github.com/mxe/mxe/pull/965
+#
+# simply expanded variables (*_SUBDIR, *_FILE, etc.) need to be set
+
+PKG             := cloog
+$(PKG)_TARGETS  := $(MXE_TARGETS)
+
+PKG             := isl
+$(PKG)_VERSION  := 0.16.1
+$(PKG)_CHECKSUM := 412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae970126d2
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := https://isl.gforge.inria.fr/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
+
+PKG             := gcc
+$(PKG)_VERSION  := 10.2.0
+$(PKG)_CHECKSUM := b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c
+$(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
+$(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := https://ftp.gnu.org/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_PATCHES  := $(dir $(lastword $(MAKEFILE_LIST)))/gcc10.patch
+$(PKG)_DEPS     := binutils mingw-w64 $(addprefix $(BUILD)~,gmp isl mpc mpfr zstd)
+
+_$(PKG)_CONFIGURE_OPTS = --with-zstd='$(PREFIX)/$(BUILD)'
+
+# copy db-2-install-exe.patch to gcc7 plugin when gcc10 is default
+db_PATCHES := $(TOP_DIR)/src/db-1-fix-including-winioctl-h-lowcase.patch
+
+# set these in respective makefiles when gcc10 becomes default
+# remove from here and leave them blank for gcc5 plugin
+libssh_EXTRA_WARNINGS = -Wno-error=implicit-fallthrough
+gtkimageview_EXTRA_WARNINGS = -Wno-error=misleading-indentation
+guile_EXTRA_WARNINGS = -Wno-error=misleading-indentation
+gtkmm2_EXTRA_WARNINGS = -Wno-error=cast-function-type
+gtkmm3_EXTRA_WARNINGS = -Wno-error=cast-function-type
+gtkglextmm_EXTRA_WARNINGS = -Wno-error=cast-function-type

plugins/gcc10/gcc10.patch

@@ -0,0 +1,69 @@
+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: Tony Theodore <tonyt@logyst.com>
+Date: Sun, 10 May 2020 15:06:47 +1000
+Subject: [PATCH 1/2] 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
+
+clang can build it correctly and this should probably be a feature test
+
+diff --git a/gcc/config/i386/driver-i386.c b/gcc/config/i386/driver-i386.c
+index 1111111..2222222 100644
+--- a/gcc/config/i386/driver-i386.c
++++ b/gcc/config/i386/driver-i386.c
+@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3.  If not see
+ 
+ const char *host_detect_local_cpu (int argc, const char **argv);
+ 
+-#if defined(__GNUC__) && (__GNUC__ >= 5 || !defined(__PIC__))
++#if defined(__GNUC__) && (__GNUC__ >= 5 || !defined(__PIC__)) || defined(__clang__)
+ #include "cpuid.h"
+ 
+ struct cache_desc
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Sun, 10 May 2020 15:09:58 +1000
+Subject: [PATCH 2/2] remove hard-coded mingw from paths
+
+
+diff --git a/gcc/config.gcc b/gcc/config.gcc
+index 1111111..2222222 100644
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -2169,7 +2169,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
+ 			tmake_file="${tmake_file} i386/t-mingw-w32"
+ 			;;
+ 	esac
+-        native_system_header_dir=/mingw/include
++        native_system_header_dir=/include
+ 	target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.c"
+ 	extra_options="${extra_options} i386/cygming.opt i386/mingw.opt"
+ 	case ${target} in
+diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
+index 1111111..2222222 100644
+--- a/gcc/config/i386/mingw32.h
++++ b/gcc/config/i386/mingw32.h
+@@ -186,7 +186,7 @@ along with GCC; see the file COPYING3.  If not see
+ 
+ /* Override startfile prefix defaults.  */
+ #ifndef STANDARD_STARTFILE_PREFIX_1
+-#define STANDARD_STARTFILE_PREFIX_1 "/mingw/lib/"
++#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
+ #endif
+ #ifndef STANDARD_STARTFILE_PREFIX_2
+ #define STANDARD_STARTFILE_PREFIX_2 ""
+@@ -195,7 +195,7 @@ along with GCC; see the file COPYING3.  If not see
+ /* For native mingw-version we need to take care that NATIVE_SYSTEM_HEADER_DIR
+    macro contains POSIX-style path.  See bug 52947.  */
+ #undef NATIVE_SYSTEM_HEADER_DIR
+-#define NATIVE_SYSTEM_HEADER_DIR "/mingw/include"
++#define NATIVE_SYSTEM_HEADER_DIR "/include"
+ 
+ /* Output STRING, a string representing a filename, to FILE.
+    We canonicalize it to be in Unix format (backslashes are replaced

plugins/gcc4/gcc4-overlay.mk

@@ -18,5 +18,5 @@ $(PKG)_VERSION  := 0.12.2
 $(PKG)_CHECKSUM := f4b3dbee9712850006e44f0db2103441ab3d13b406f77996d1df19ee89d11fb4
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL      := http://isl.gforge.inria.fr/$($(PKG)_FILE)
+$(PKG)_URL      := https://isl.gforge.inria.fr/$($(PKG)_FILE)
 $(PKG)_URL_2    := https://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)

plugins/gcc4/gcc4.patch

@@ -6,8 +6,8 @@ Date: Thu, 30 Jul 2015 10:00:49 +0200
 Subject: [PATCH 1/2] mingw-float
 
 This patch has been taken from:
-http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html
-http://sourceforge.net/p/mingw/bugs/1809
+https://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html
+https://sourceforge.net/p/mingw/bugs/1809
 
 diff --git a/gcc/ginclude/float.h b/gcc/ginclude/float.h
 index 805b84d..b9dcc48 100644
@@ -41,7 +41,7 @@ Date: Thu, 30 Jul 2015 10:04:07 +0200
 Subject: [PATCH 2/2] intrinsics
 
 This patch has been taken from:
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56038
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56038
 
 diff --git a/gcc/config/i386/adxintrin.h b/gcc/config/i386/adxintrin.h
 index dd2a26c..2e680b3 100644

plugins/gcc6/gcc6-overlay.mk

@@ -13,7 +13,7 @@ $(PKG)_VERSION  := 0.16.1
 $(PKG)_CHECKSUM := 412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae970126d2
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL      := http://isl.gforge.inria.fr/$($(PKG)_FILE)
+$(PKG)_URL      := https://isl.gforge.inria.fr/$($(PKG)_FILE)
 $(PKG)_URL_2    := https://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
 
 PKG             := gcc

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 <tonyt@logyst.com>
 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 <tonyt@logyst.com>
 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 <uros@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Sun, 11 Nov 2018 17:44:43 +0000
+Subject: [PATCH 3/4] Backport from mainline 2018-11-04 Uros Bizjak
+ <ubizjak@gmail.com>
+
+	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  <ubizjak@gmail.com>
+
+	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 <tonyt@logyst.com>
+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)))

plugins/gcc7/gcc7-overlay.mk

@@ -13,12 +13,12 @@ $(PKG)_VERSION  := 0.16.1
 $(PKG)_CHECKSUM := 412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae970126d2
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL      := http://isl.gforge.inria.fr/$($(PKG)_FILE)
+$(PKG)_URL      := https://isl.gforge.inria.fr/$($(PKG)_FILE)
 $(PKG)_URL_2    := https://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
 
 PKG             := gcc
-$(PKG)_VERSION  := 7.4.0
-$(PKG)_CHECKSUM := eddde28d04f334aec1604456e536416549e9b1aa137fc69204e65eb0c009fe51
+$(PKG)_VERSION  := 7.5.0
+$(PKG)_CHECKSUM := b81946e7f01f90528a1f7352ab08cc602b9ccc05d4e44da4bd501c5a189ee661
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://ftp.gnu.org/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)

plugins/gcc8/gcc8-overlay.mk

@@ -13,12 +13,12 @@ $(PKG)_VERSION  := 0.16.1
 $(PKG)_CHECKSUM := 412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae970126d2
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL      := http://isl.gforge.inria.fr/$($(PKG)_FILE)
+$(PKG)_URL      := https://isl.gforge.inria.fr/$($(PKG)_FILE)
 $(PKG)_URL_2    := https://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
 
 PKG             := gcc
-$(PKG)_VERSION  := 8.3.0
-$(PKG)_CHECKSUM := 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+$(PKG)_VERSION  := 8.4.0
+$(PKG)_CHECKSUM := e30a6e52d10e1f27ed55104ad233c30bd1e99cfb5ff98ab022dc941edd1b2dd4
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://ftp.gnu.org/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)

plugins/gcc8/gcc8.patch

@@ -36,7 +36,7 @@ diff --git a/gcc/config.gcc b/gcc/config.gcc
 index 1111111..2222222 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -1801,7 +1801,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
+@@ -1810,7 +1810,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
  			tmake_file="${tmake_file} i386/t-mingw-w32"
  			;;
  	esac
@@ -58,3 +58,4 @@ index 1111111..2222222 100644
  
  /* Output STRING, a string representing a filename, to FILE.
     We canonicalize it to be in Unix format (backslashes are replaced
+

plugins/gcc9/gcc9-overlay.mk

@@ -0,0 +1,38 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+# override relevant cloog, isl, and gcc variables changed in:
+# https://github.com/mxe/mxe/pull/965
+#
+# simply expanded variables (*_SUBDIR, *_FILE, etc.) need to be set
+
+PKG             := cloog
+$(PKG)_TARGETS  := $(MXE_TARGETS)
+
+PKG             := isl
+$(PKG)_VERSION  := 0.16.1
+$(PKG)_CHECKSUM := 412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae970126d2
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := https://isl.gforge.inria.fr/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
+
+PKG             := gcc
+$(PKG)_VERSION  := 9.3.0
+$(PKG)_CHECKSUM := 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+$(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
+$(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := https://ftp.gnu.org/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_PATCHES  := $(dir $(lastword $(MAKEFILE_LIST)))/gcc9.patch
+
+# copy db-2-install-exe.patch to gcc7 plugin when gcc9 is default
+db_PATCHES := $(TOP_DIR)/src/db-1-fix-including-winioctl-h-lowcase.patch
+
+# set these in respective makefiles when gcc9 becomes default
+# remove from here and leave them blank for gcc5 plugin
+libssh_EXTRA_WARNINGS = -Wno-error=implicit-fallthrough
+gtkimageview_EXTRA_WARNINGS = -Wno-error=misleading-indentation
+guile_EXTRA_WARNINGS = -Wno-error=misleading-indentation
+gtkmm2_EXTRA_WARNINGS = -Wno-error=cast-function-type
+gtkmm3_EXTRA_WARNINGS = -Wno-error=cast-function-type
+gtkglextmm_EXTRA_WARNINGS = -Wno-error=cast-function-type

plugins/gcc9/gcc9.patch

@@ -0,0 +1,60 @@
+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: Tony Theodore <tonyt@logyst.com>
+Date: Thu, 2 Feb 2017 02:05:50 +1100
+Subject: [PATCH 1/2] 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
+
+clang can build it correctly and this should probably be a feature test
+
+diff --git a/gcc/config/i386/driver-i386.c b/gcc/config/i386/driver-i386.c
+index 1111111..2222222 100644
+--- a/gcc/config/i386/driver-i386.c
++++ b/gcc/config/i386/driver-i386.c
+@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3.  If not see
+ 
+ const char *host_detect_local_cpu (int argc, const char **argv);
+ 
+-#if defined(__GNUC__) && (__GNUC__ >= 5 || !defined(__PIC__))
++#if defined(__GNUC__) && (__GNUC__ >= 5 || !defined(__PIC__)) || defined(__clang__)
+ #include "cpuid.h"
+ 
+ struct cache_desc
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Fri, 6 Apr 2018 13:40:22 +1000
+Subject: [PATCH 2/2] 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
+@@ -1940,7 +1940,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
+ 			tmake_file="${tmake_file} i386/t-mingw-w32"
+ 			;;
+ 	esac
+-        native_system_header_dir=/mingw/include
++        native_system_header_dir=/include
+ 	target_gtfiles="\$(srcdir)/config/i386/winnt.c"
+ 	extra_options="${extra_options} i386/cygming.opt i386/mingw.opt"
+ 	case ${target} in
+diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
+index 1111111..2222222 100644
+--- a/gcc/config/i386/mingw32.h
++++ b/gcc/config/i386/mingw32.h
+@@ -195,7 +195,7 @@ along with GCC; see the file COPYING3.  If not see
+ /* For native mingw-version we need to take care that NATIVE_SYSTEM_HEADER_DIR
+    macro contains POSIX-style path.  See bug 52947.  */
+ #undef NATIVE_SYSTEM_HEADER_DIR
+-#define NATIVE_SYSTEM_HEADER_DIR "/mingw/include"
++#define NATIVE_SYSTEM_HEADER_DIR "/include"
+ 
+ /* Output STRING, a string representing a filename, to FILE.
+    We canonicalize it to be in Unix format (backslashes are replaced

plugins/go/README.md

@@ -3,7 +3,7 @@
 See also article [cross-compile go code, including cgo][1]
 by Dimitri John Ledkov.
 
-[1]: http://blog.surgut.co.uk/2014/06/cross-compile-go-code-including-cgo.html
+[1]: https://blog.surgut.co.uk/2014/06/cross-compile-go-code-including-cgo.html
 
 Package `go-native` installs native Go 1.4. This version of Go
 doesn't depend on Go installation.

plugins/luarocks/lpeg.mk

@@ -1,7 +1,7 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := lpeg
-$(PKG)_WEBSITE  := http://www.inf.puc-rio.br/~roberto/lpeg/lpeg.html
+$(PKG)_WEBSITE  := http://www.inf.puc-rio.br/~roberto/lpeg/
 $(PKG)_OWNER    := https://github.com/starius
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.0.1

plugins/luarocks/luarocks.mk

@@ -93,7 +93,7 @@ define $(PKG)_BUILD_SHARED
      echo 'echo "== Using MXE wrapper: $(PREFIX)/$(TARGET)/bin/luarocks"'; \
      echo '# Creating a directory is an atomic operation, that is why'; \
      echo '# it can be used as a mutex.'; \
-     echo '# See http://wiki.bash-hackers.org/howto/mutex'; \
+     echo '# See https://wiki.bash-hackers.org/howto/mutex'; \
      echo 'while ( ! mkdir "$(PREFIX)/$(TARGET)/lib/luarocks/lock.dir" ); do'; \
      echo '    echo "Waiting for $(PREFIX)/$(TARGET)/lib/luarocks/lock.dir to lock"'; \
      echo '    sleep 5'; \

plugins/native/autoconf.mk

@@ -13,6 +13,8 @@ $(PKG)_OWNER    := https://github.com/tonytheodore
 $(PKG)_TARGETS  := $(BUILD)
 $(PKG)_DEPS     := m4
 
+REQUIREMENTS := $(filter-out $(PKG), $(REQUIREMENTS))
+
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://ftp.gnu.org/gnu/autoconf/?C=M;O=D' | \
     $(SED) -n 's,.*<a href="autoconf-\([0-9][^"]*\)\.tar.*,\1,p' | \

plugins/native/automake-1-fixes.patch

@@ -1,28 +0,0 @@
-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: Patryk (PsychoX) Ludwikowski <psychoxivi@gmail.com>
-Date: Sun, 10 Jun 2018 06:49:41 +0000
-Subject: [PATCH 1/1] Avoids deprecated syntax that causes failure in newer versions of Perl.
-
-Contains patch for using too new Perl. Avoids deprecated syntax that causes failure in newer versions of Perl. More info at https://github.com/mxe/mxe/issues/2140
-
-Backported from:
-http://git.savannah.gnu.org/cgit/automake.git/commit/?id=13f00eb4493c217269b76614759e452d8302955e
-Original author: Paul Eggert <eggert@cs.ucla.edu>
-Signed-off-by: Adam Duskett <aduskett@gmail.com>
-
-diff --git a/bin/automake.in b/bin/automake.in
-index 1111111..2222222 100644
---- a/bin/automake.in
-+++ b/bin/automake.in
-@@ -3878,7 +3878,7 @@ sub substitute_ac_subst_variables_worker
- sub substitute_ac_subst_variables
- {
-   my ($text) = @_;
--  $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
-+  $text =~ s/\$[{]([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
-   return $text;
- }

plugins/native/automake.mk

@@ -2,8 +2,8 @@
 
 PKG             := automake
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.15
-$(PKG)_CHECKSUM := 7946e945a96e28152ba5a6beb0625ca715c6e32ac55f2e353ef54def0c8ed924
+$(PKG)_VERSION  := 1.16.1
+$(PKG)_CHECKSUM := 608a97523f97db32f1f5d5615c98ca69326ced2054c9f82e65bade7fc4c9dea8
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://ftp.gnu.org/gnu/automake/$($(PKG)_FILE)
@@ -13,6 +13,8 @@ $(PKG)_OWNER    := https://github.com/tonytheodore
 $(PKG)_TARGETS  := $(BUILD)
 $(PKG)_DEPS     := autoconf
 
+REQUIREMENTS := $(filter-out $(PKG), $(REQUIREMENTS))
+
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://ftp.gnu.org/gnu/automake/?C=M;O=D' | \
     $(SED) -n 's,.*<a href="automake-\([0-9][^"]*\)\.tar.*,\1,p' | \

plugins/native/bison.mk

@@ -13,6 +13,8 @@ $(PKG)_OWNER    := https://github.com/tonytheodore
 $(PKG)_TARGETS  := $(BUILD)
 $(PKG)_DEPS     := flex
 
+REQUIREMENTS := $(filter-out $(PKG), $(REQUIREMENTS))
+
 # recursive variable so always use literal instead of $(PKG)
 MXE_REQS_PKGS   += $(BUILD)~bison
 

plugins/native/cygwin/README.md

@@ -0,0 +1,19 @@
+Cygwin Platform Specific Overrides
+----------------------------------
+
+#### [cygwinports](https://github.com/cygwinports)
+
+Patches (e.g. gettext) can be fetched with:
+
+```sh
+wget -O- -q https://github.com/cygwinports/gettext | \
+grep patch | \
+sed -n 's,.*href=.*/blob/master/\([^"]*.patch\).*,\1,p' | \
+xargs -I % wget https://raw.githubusercontent.com/cygwinports/gettext/master/% -O gettext-%
+```
+
+and tidy up patch level with (requires GNU Sed for `-i` option):
+
+```sh
+sed -i 's,src/gettext-[0-9.]*/,src/,g' *.patch
+```

plugins/native/cygwin/gettext-0.18.1.1-autopoint-V.patch

@@ -0,0 +1,54 @@
+--- origsrc/gettext-tools/misc/autopoint.in	2010-06-06 08:49:57.000000000 -0400
++++ src/gettext-tools/misc/autopoint.in	2011-10-16 00:57:42.789133600 -0400
+@@ -161,9 +161,9 @@ Options:
+       --version        print version information and exit
+   -f, --force          force overwriting of files that already exist
+   -n, --dry-run        print modifications but don't perform them"
+-#  echo "\
+-#  -V version           copy the infrastructure of the specified gettext version
+-#                         (dangerous)"
++  echo "\
++  -V version           copy the infrastructure of the specified gettext version
++                         (dangerous)"
+   echo "
+ Report bugs to <bug-gnu-gettext@gnu.org>."
+ }
+@@ -210,17 +210,17 @@ func_fatal_error ()
+         force=yes ;;
+       --help | --hel | --he | --h )
+         func_usage; exit 0 ;;
+-#      -V ) # Some people put a space between -V and the version number.
+-#        shift
+-#        if test $# = 0; then
+-#          func_usage 1>&2
+-#          exit 1
+-#        fi
+-#        ver=$1;
+-#        shift ;;
+-#      -V*) # Some people omit the space between -V and the version number.
+-#        ver=`echo "X$1" | sed -e 's/^X-V//'`
+-#        shift ;;
++      -V ) # Some people put a space between -V and the version number.
++        shift
++        if test $# = 0; then
++          func_usage 1>&2
++          exit 1
++        fi
++        ver=$1;
++        shift ;;
++      -V*) # Some people omit the space between -V and the version number.
++        ver=`echo "X$1" | sed -e 's/^X-V//'`
++        shift ;;
+       --version | --versio | --versi | --vers | --ver | --ve | --v )
+         func_version
+         exit 0 ;;
+@@ -276,7 +276,7 @@ fi
+   if test -n "$xver"; then
+     if test -n "$ver"; then
+       if test "X$ver" != "X$xver"; then
+-        func_fatal_error "Version mismatch: specified -V $ver but the package uses gettext version $xver"
++        echo "autopoint: warning: Version mismatch: specified -V $ver but the package uses gettext version $xver. Forcibly upgrading to $ver" 1>&2
+       fi
+     else
+       ver="$xver"
+

plugins/native/cygwin/gettext-0.19.3-localename.patch

@@ -0,0 +1,168 @@
+--- origsrc/gettext-runtime/gnulib-lib/localename.c	2014-10-16 01:00:08.000000000 -0500
++++ src/gettext-runtime/gnulib-lib/localename.c	2014-11-17 23:22:47.747353600 -0600
+@@ -60,7 +60,7 @@
+ # endif
+ #endif
+ 
+-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
++#if defined WINDOWS_NATIVE /* Native Windows */
+ # define WIN32_LEAN_AND_MEAN
+ # include <windows.h>
+ # include <winnls.h>
+@@ -1412,7 +1412,7 @@ gl_locale_name_canonicalize (char *name)
+ #endif
+ 
+ 
+-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
++#if defined WINDOWS_NATIVE /* Native Windows */
+ 
+ /* Canonicalize a Windows native locale name to a Unix locale name.
+    NAME is a sufficiently large buffer.
+@@ -2825,11 +2825,6 @@ gl_locale_name_environ (int category, co
+          Ignore invalid LANG value set by the Terminal application.  */
+       if (strcmp (retval, "UTF-8") != 0)
+ #endif
+-#if defined __CYGWIN__
+-      /* Cygwin.
+-         Ignore dummy LANG value set by ~/.profile.  */
+-      if (strcmp (retval, "C.UTF-8") != 0)
+-#endif
+         return retval;
+     }
+ 
+@@ -2867,7 +2862,7 @@ gl_locale_name_default (void)
+          "C.UTF-8" locale, which operates in the same way as the "C" locale.
+   */
+ 
+-#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
++#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE)
+ 
+   /* The system does not have a way of setting the locale, other than the
+      POSIX specified environment variables.  We use C as default locale.  */
+@@ -2922,7 +2917,7 @@ gl_locale_name_default (void)
+ 
+ # endif
+ 
+-# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
++# if defined WINDOWS_NATIVE /* Native Windows */
+   {
+     LCID lcid;
+ 
+--- origsrc/gettext-runtime/intl/localename.c	2014-09-30 21:35:20.000000000 -0500
++++ src/gettext-runtime/intl/localename.c	2014-11-17 23:22:47.755854700 -0600
+@@ -60,7 +60,7 @@
+ # endif
+ #endif
+ 
+-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
++#if defined WINDOWS_NATIVE_ /* Native Windows */
+ # define WIN32_LEAN_AND_MEAN
+ # include <windows.h>
+ # include <winnls.h>
+@@ -1412,7 +1412,7 @@ gl_locale_name_canonicalize (char *name)
+ #endif
+ 
+ 
+-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
++#if defined WINDOWS_NATIVE /* Native Windows */
+ 
+ /* Canonicalize a Windows native locale name to a Unix locale name.
+    NAME is a sufficiently large buffer.
+@@ -2770,7 +2770,7 @@ gl_locale_name_thread (int category, con
+    However it does not specify the exact format.  Neither do SUSV2 and
+    ISO C 99.  So we can use this feature only on selected systems (e.g.
+    those using GNU C Library).  */
+-#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__)
++#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__) || defined(__CYGWIN__)
+ # define HAVE_LOCALE_NULL
+ #endif
+ 
+@@ -2825,11 +2825,6 @@ gl_locale_name_environ (int category, co
+          Ignore invalid LANG value set by the Terminal application.  */
+       if (strcmp (retval, "UTF-8") != 0)
+ #endif
+-#if defined __CYGWIN__
+-      /* Cygwin.
+-         Ignore dummy LANG value set by ~/.profile.  */
+-      if (strcmp (retval, "C.UTF-8") != 0)
+-#endif
+         return retval;
+     }
+ 
+@@ -2867,7 +2862,7 @@ gl_locale_name_default (void)
+          "C.UTF-8" locale, which operates in the same way as the "C" locale.
+   */
+ 
+-#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
++#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE)
+ 
+   /* The system does not have a way of setting the locale, other than the
+      POSIX specified environment variables.  We use C as default locale.  */
+@@ -2922,7 +2917,7 @@ gl_locale_name_default (void)
+ 
+ # endif
+ 
+-# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
++# if defined WINDOWS_NATIVE /* Native Windows */
+   {
+     LCID lcid;
+ 
+--- origsrc/gettext-tools/gnulib-lib/localename.c	2014-10-16 01:00:35.000000000 -0500
++++ src/gettext-tools/gnulib-lib/localename.c	2014-11-17 23:22:47.763355600 -0600
+@@ -60,7 +60,7 @@
+ # endif
+ #endif
+ 
+-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
++#if defined WINDOWS_NATIVE_ /* Native Windows */
+ # define WIN32_LEAN_AND_MEAN
+ # include <windows.h>
+ # include <winnls.h>
+@@ -1412,7 +1412,7 @@ gl_locale_name_canonicalize (char *name)
+ #endif
+ 
+ 
+-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
++#if defined WINDOWS_NATIVE /* Native Windows */
+ 
+ /* Canonicalize a Windows native locale name to a Unix locale name.
+    NAME is a sufficiently large buffer.
+@@ -2770,7 +2770,7 @@ gl_locale_name_thread (int category, con
+    However it does not specify the exact format.  Neither do SUSV2 and
+    ISO C 99.  So we can use this feature only on selected systems (e.g.
+    those using GNU C Library).  */
+-#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__)
++#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__) || defined(__CYGWIN__)
+ # define HAVE_LOCALE_NULL
+ #endif
+ 
+@@ -2825,11 +2825,6 @@ gl_locale_name_environ (int category, co
+          Ignore invalid LANG value set by the Terminal application.  */
+       if (strcmp (retval, "UTF-8") != 0)
+ #endif
+-#if defined __CYGWIN__
+-      /* Cygwin.
+-         Ignore dummy LANG value set by ~/.profile.  */
+-      if (strcmp (retval, "C.UTF-8") != 0)
+-#endif
+         return retval;
+     }
+ 
+@@ -2867,7 +2862,7 @@ gl_locale_name_default (void)
+          "C.UTF-8" locale, which operates in the same way as the "C" locale.
+   */
+ 
+-#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
++#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE)
+ 
+   /* The system does not have a way of setting the locale, other than the
+      POSIX specified environment variables.  We use C as default locale.  */
+@@ -2922,7 +2917,7 @@ gl_locale_name_default (void)
+ 
+ # endif
+ 
+-# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
++# if defined WINDOWS_NATIVE /* Native Windows */
+   {
+     LCID lcid;
+ 

plugins/native/cygwin/gettext-0.19.3-tests-cygwin.patch

@@ -0,0 +1,89 @@
+--- origsrc/gettext-tools/tests/format-c-3-prg.c	2013-05-31 00:01:54.000000000 -0500
++++ src/gettext-tools/tests/format-c-3-prg.c	2014-11-17 23:26:21.975557100 -0600
+@@ -34,7 +34,7 @@
+ /* Disable the override of setlocale that libgnuintl.h activates on MacOS X
+    and Windows.  This test relies on the fake setlocale function in
+    setlocale.c.  */
+-#undef setlocale
++/* #undef setlocale */
+ 
+ #define _(string) gettext (string)
+ 
+--- origsrc/gettext-tools/tests/format-c-4-prg.c	2013-05-31 00:01:54.000000000 -0500
++++ src/gettext-tools/tests/format-c-4-prg.c	2014-11-17 23:26:21.979557600 -0600
+@@ -34,7 +34,7 @@
+ /* Disable the override of setlocale that libgnuintl.h activates on MacOS X
+    and Windows.  This test relies on the fake setlocale function in
+    setlocale.c.  */
+-#undef setlocale
++/* #undef setlocale */
+ 
+ #define _(string) gettext (string)
+ 
+--- origsrc/gettext-tools/tests/plural-1	2014-04-14 20:52:11.000000000 -0500
++++ src/gettext-tools/tests/plural-1	2014-11-17 23:26:21.983058100 -0600
+@@ -50,15 +50,15 @@ ${DIFF} plural-1-fr.po.strip plural-1-fr
+ 
+ : ${DIFF=diff}
+ echo 'un morceau de gateau' > plural-1-cake.ok
+-LANGUAGE= ../cake fr 1 > plural-1-cake.tmp || Exit 1
++LANGUAGE= ../cake fr_FR 1 > plural-1-cake.tmp || Exit 1
+ LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
+ ${DIFF} plural-1-cake.ok cake.out || Exit 1
+ echo '2 morceaux de gateau' > plural-1-cake.ok
+-LANGUAGE= ../cake fr 2 > plural-1-cake.tmp || Exit 1
++LANGUAGE= ../cake fr_FR 2 > plural-1-cake.tmp || Exit 1
+ LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
+ ${DIFF} plural-1-cake.ok cake.out || Exit 1
+ echo '10 morceaux de gateau' > plural-1-cake.ok
+-LANGUAGE= ../cake fr 10 > plural-1-cake.tmp || Exit 1
++LANGUAGE= ../cake fr_FR 10 > plural-1-cake.tmp || Exit 1
+ LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
+ ${DIFF} plural-1-cake.ok cake.out || Exit 1
+ 
+--- origsrc/gettext-tools/tests/plural-1-prg.c	2013-05-31 00:01:54.000000000 -0500
++++ src/gettext-tools/tests/plural-1-prg.c	2014-11-17 23:26:21.989058800 -0600
+@@ -30,7 +30,7 @@
+ /* Disable the override of setlocale that libgnuintl.h activates on MacOS X
+    and Windows.  This test relies on the fake setlocale function in
+    setlocale.c.  */
+-#undef setlocale
++/* #undef setlocale */
+ 
+ int
+ main (int argc, char *argv[])
+--- origsrc/gettext-tools/tests/plural-2	2014-04-14 20:52:11.000000000 -0500
++++ src/gettext-tools/tests/plural-2	2014-11-17 23:25:50.637077600 -0600
+@@ -3,8 +3,8 @@
+ 
+ : ${MSGFMT=msgfmt}
+ test -d plural-2-dir || mkdir plural-2-dir
+-test -d plural-2-dir/ll || mkdir plural-2-dir/ll
+-test -d plural-2-dir/ll/LC_MESSAGES || mkdir plural-2-dir/ll/LC_MESSAGES
++test -d plural-2-dir/es || mkdir plural-2-dir/es
++test -d plural-2-dir/es/LC_MESSAGES || mkdir plural-2-dir/es/LC_MESSAGES
+ 
+ cat <<EOF > plural-2.data
+ ja
+@@ -44,7 +44,7 @@ EOF
+ while read lang; do
+   read formula
+   read dataok
+-  cat > plural-2-ll.po <<EOF
++  cat > plural-2-es.po <<EOF
+ msgid ""
+ msgstr ""
+ "MIME-Version: 1.0\n"
+@@ -65,10 +65,10 @@ msgstr[7] "7"
+ msgstr[8] "8"
+ msgstr[9] "9"
+ EOF
+-  ${MSGFMT} -o plural-2-dir/ll/LC_MESSAGES/plural.mo plural-2-ll.po || Exit 1
++  ${MSGFMT} -o plural-2-dir/es/LC_MESSAGES/plural.mo plural-2-es.po || Exit 1
+   (for i in '' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19; do
+      LANGUAGE= TEXTDOMAIN=plural TEXTDOMAINDIR=plural-2-dir \
+-       $NGETTEXT --env LC_ALL=ll X Y ${i}0 ${i}1 ${i}2 ${i}3 ${i}4 ${i}5 ${i}6 ${i}7 ${i}8 ${i}9
++       $NGETTEXT --env LC_ALL=es_ES X Y ${i}0 ${i}1 ${i}2 ${i}3 ${i}4 ${i}5 ${i}6 ${i}7 ${i}8 ${i}9
+    done) > dataout
+   test "$dataok" = `cat dataout` || {
+     echo "Formula evaluation error for language $lang" 1>&2

plugins/native/cygwin/gettext-0.19.8.1-cygwin-ftm.patch

@@ -0,0 +1,11 @@
+--- origsrc/gettext-runtime/intl/libgnuintl.in.h	2016-06-09 17:56:00.000000000 -0500
++++ src/gettext-runtime/intl/libgnuintl.in.h	2016-10-20 11:03:43.187813700 -0500
+@@ -435,7 +435,7 @@ extern int vswprintf (wchar_t *, size_t,
+ extern char *setlocale (int, const char *);
+ #endif
+ 
+-#if @HAVE_NEWLOCALE@
++#if @HAVE_NEWLOCALE@ && __POSIX_VISIBLE >= 200809
+ 
+ #undef newlocale
+ #define newlocale libintl_newlocale

plugins/native/cygwin/gettext-0.19.8.1-have_wprintf.patch

@@ -0,0 +1,11 @@
+--- origsrc/gettext-runtime/m4/intl.m4	2016-03-20 02:37:53.000000000 -0500
++++ src/gettext-runtime/m4/intl.m4	2016-10-20 11:07:16.828746100 -0500
+@@ -94,7 +94,7 @@
+     HAVE_NEWLOCALE=0
+   fi
+   AC_SUBST([HAVE_NEWLOCALE])
+-  if test "$ac_cv_func_wprintf" = yes; then
++  if test "$ac_cv_func_fwprintf" = yes; then
+     HAVE_WPRINTF=1
+   else
+     HAVE_WPRINTF=0

plugins/native/cygwin/gettext-0.19.8.1-no-woe32dll.patch

@@ -0,0 +1,31 @@
+--- origsrc/gettext-tools/configure.ac	2016-06-09 17:56:00.000000000 -0500
++++ src/gettext-tools/configure.ac	2016-10-10 02:10:37.323106300 -0500
+@@ -100,7 +100,7 @@ LT_LANG([Windows Resource])
+ dnl On mingw and Cygwin, we can activate special Makefile rules which add
+ dnl version information to the shared libraries and executables.
+ case "$host_os" in
+-  mingw* | cygwin*) special_makefile_rules=woe32 ;;
++  mingw*) special_makefile_rules=woe32 ;;
+   os2*) special_makefile_rules=os2 ;;
+   *) special_makefile_rules=none ;;
+ esac
+@@ -212,7 +212,7 @@ dnl    must arrange to define the auxili
+ dnl    exported variables _also_ in the static library.
+ if test "$enable_shared" = yes; then
+   case "$host_os" in
+-    mingw* | cygwin*) is_woe32dll=yes ;;
++    mingw*) is_woe32dll=yes ;;
+     *) is_woe32dll=no ;;
+   esac
+ else
+--- origsrc/m4/woe32-dll.m4	2016-03-20 02:37:53.000000000 -0500
++++ src/m4/woe32-dll.m4	2016-10-10 02:11:04.906081600 -0500
+@@ -30,7 +30,7 @@ AC_DEFUN([gl_WOE32_DLL],
+ [
+   AC_REQUIRE([AC_CANONICAL_HOST])
+   case "$host_os" in
+-    mingw* | cygwin*)
++    mingw*)
+       AC_MSG_CHECKING([for auto-import of symbols])
+       AC_CACHE_VAL([gl_cv_ld_autoimport], [
+         gl_save_LDFLAGS="$LDFLAGS"

plugins/native/cygwin/gettext.mk

@@ -0,0 +1,12 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+PKG := gettext
+
+define $(PKG)_BUILD_$(BUILD)
+    # review patches to remove autoreconf step
+    cd '$(SOURCE_DIR)' && autoreconf -fi
+    cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
+        $(MXE_CONFIGURE_OPTS)
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_DOCS)
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_DOCS)
+endef

plugins/native/darwin/autoconf.mk

@@ -0,0 +1 @@
+../autoconf.mk

plugins/native/darwin/automake.mk

@@ -0,0 +1 @@
+../automake.mk

plugins/native/darwin/gettext-1.patch

@@ -0,0 +1,150 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+From 41eb83cf4aa73f0ac4e70173562f11a17a1d0298 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Sun, 12 May 2019 23:26:04 +0200
+Subject: [PATCH 1/3] build: Fix "make install" failure with --disable-shared
+ on glibc systems.
+
+Reported by Gabor Z. Papp <gzp@papp.hu>.
+
+This is a regression from 2018-11-25.
+
+* gettext-tools/configure.ac (PRELOADABLE_LIBINTL): Set to false if
+--disable-shared was specified.
+
+diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
+index cf1dd734d..fdf75c1ad 100644
+--- a/gettext-tools/configure.ac
++++ b/gettext-tools/configure.ac
+@@ -119,7 +119,7 @@ AM_CONDITIONAL([USE_INCLUDED_LIBINTL], [test $USE_INCLUDED_LIBINTL = yes])
+ AM_CONDITIONAL([BUILD_INCLUDED_LIBINTL], [test $BUILD_INCLUDED_LIBINTL = yes])
+ AM_CONDITIONAL([PACKAGE_IS_GETTEXT_TOOLS], [true])
+ AM_CONDITIONAL([PRELOADABLE_LIBINTL],
+-  [test $USE_INCLUDED_LIBINTL = no && test $GLIBC2 = yes])
++  [test $USE_INCLUDED_LIBINTL = no && test $GLIBC2 = yes && test "$enable_shared" = yes])
+ 
+ dnl This line internationalizes the bison generated parsers.
+ BISON_I18N
+-- 
+2.20.1
+
+
+From 767946e1c31506ecbb082240d3ea87818c777fdd Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Sat, 18 May 2019 17:25:10 +0200
+Subject: [PATCH 2/3] libasprintf: Avoid compilation error on mingw with
+ -D__USE_MINGW_ANSI_STDIO=1.
+
+* gettext-runtime/libasprintf/lib-asprintf.c (asprintf, vasprintf): Don't define
+on mingw when __USE_MINGW_ANSI_STDIO is non-zero.
+
+(cherry picked from commit ca6f6cfbb4c78c063f2a50bb758edfc95c9d64a2)
+
+diff --git a/gettext-runtime/libasprintf/lib-asprintf.c b/gettext-runtime/libasprintf/lib-asprintf.c
+index 54649659b..c2fe4ed16 100644
+--- a/gettext-runtime/libasprintf/lib-asprintf.c
++++ b/gettext-runtime/libasprintf/lib-asprintf.c
+@@ -1,5 +1,5 @@
+ /* Library functions for class autosprintf.
+-   Copyright (C) 2002-2003, 2006, 2018 Free Software Foundation, Inc.
++   Copyright (C) 2002-2003, 2006, 2018-2019 Free Software Foundation, Inc.
+    Written by Bruno Haible <bruno@clisp.org>, 2002.
+ 
+    This program is free software: you can redistribute it and/or modify
+@@ -40,10 +40,13 @@
+ #include "asprintf.c"
+ 
+ /* Define the same functions also without the 'libasprintf_' prefix,
+-   for binary backward-compatibility.  */
++   for binary backward-compatibility.
++   But don't redefine functions already defined by mingw.  */
++#if !(defined __MINGW32__ && __USE_MINGW_ANSI_STDIO)
+ #undef asprintf
+ #undef vasprintf
+ #include "vasprintf.c"
+ #include "asprintf.c"
++#endif
+ 
+ #endif
+-- 
+2.20.1
+
+
+From 546f164e95baa8be680a9f0b446a053e637f4488 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Sat, 18 May 2019 18:01:31 +0200
+Subject: [PATCH 3/3] build: Avoid trouble on mingw caused by mingw's *printf
+ functions.
+
+Reported by Michele Locati <michele@locati.it>
+in <https://lists.gnu.org/archive/html/bug-gettext/2019-05/msg00103.html>.
+
+* gettext-runtime/intl/Makefile.am (AM_CPPFLAGS): Define __USE_MINGW_ANSI_STDIO
+to 0.
+* gettext-runtime/libasprintf/Makefile.am (DEFS): Likewise.
+* libtextstyle/lib/Makefile.am (AM_CPPFLAGS): Likewise.
+
+(cherry picked from commit 45500ab1765581d6a3b7d2e6a6c2595466de70af)
+
+diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am
+index 9f6e576f1..4b0e70f66 100644
+--- a/gettext-runtime/intl/Makefile.am
++++ b/gettext-runtime/intl/Makefile.am
+@@ -52,6 +52,15 @@ AM_CPPFLAGS = \
+   -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
+   -DLIBDIR=\"$(libdir)\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL
+ 
++if WOE32
++# On mingw, disable the declarations of *printf functions as aliases to the
++# corresponding __mingw_*printf functions, because
++# - these functions are useless for i18n purposes (not POSIX/XSI compliant),
++# - they pull in a dependency to the libgcc_s_sjlj DLL (through the symbols
++#   __udivdi3, __umoddi3).
++AM_CPPFLAGS += -D__USE_MINGW_ANSI_STDIO=0
++endif
++
+ # Parametrization of the 'relocatable-lib-lgpl' module.
+ AM_CPPFLAGS += \
+   -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
+diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am
+index 4189ef1a1..be78f6835 100644
+--- a/gettext-runtime/libasprintf/Makefile.am
++++ b/gettext-runtime/libasprintf/Makefile.am
+@@ -26,6 +26,15 @@ RM = rm -f
+ 
+ DEFS = -DIN_LIBASPRINTF @DEFS@
+ 
++if WOE32
++# On mingw, disable the declarations of *printf functions as aliases to the
++# corresponding __mingw_*printf functions, because
++# - these functions are useless for i18n purposes (not POSIX/XSI compliant),
++# - they pull in a dependency to the libgcc_s_sjlj DLL (through the symbols
++#   __udivdi3, __umoddi3).
++DEFS += -D__USE_MINGW_ANSI_STDIO=0
++endif
++
+ 
+ # Library include file.
+ 
+diff --git a/libtextstyle/lib/Makefile.am b/libtextstyle/lib/Makefile.am
+index 9f2cb0e17..32b1a7c4f 100644
+--- a/libtextstyle/lib/Makefile.am
++++ b/libtextstyle/lib/Makefile.am
+@@ -48,6 +48,13 @@ if INCLUDED_LIBXML
+ AM_CPPFLAGS += -DLIBXML_STATIC
+ endif
+ 
++if WOE32
++# On mingw, disable the declarations of *printf functions as aliases to the
++# corresponding __mingw_*printf functions, because they pull in a dependency
++# to the libgcc_s_sjlj DLL (through the symbols __udivdi3, __umoddi3).
++AM_CPPFLAGS += -D__USE_MINGW_ANSI_STDIO=0
++endif
++
+ # Rules generated and collected by gnulib-tool.
+ include Makefile.gnulib
+ 
+-- 
+2.20.1
+

plugins/native/darwin/gettext.mk

@@ -0,0 +1,26 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+PKG := gettext
+
+$(PKG)_VERSION  := 0.20.1
+$(info $(shell printf '%-$(PRINTF_COL_1_WIDTH)s %s\n' [warning] **$(PKG)-$($(PKG)_VERSION)**))
+$(PKG)_CHECKSUM := 53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800
+$(PKG)_SUBDIR   := gettext-$($(PKG)_VERSION)
+$(PKG)_FILE     := gettext-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := https://ftp.gnu.org/gnu/gettext/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://ftpmirror.gnu.org/gettext/$($(PKG)_FILE)
+$(PKG)_PATCHES  := $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-1.patch
+
+define $(PKG)_BUILD_$(BUILD)
+    cd '$(SOURCE_DIR)' && autoreconf -fi
+    # causes issues with other packages so use different prefix
+    # but install *.m4 files and bins to standard location
+    cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
+        $(MXE_CONFIGURE_OPTS) \
+        --with-included-libcroco \
+        --prefix='$(PREFIX)/$(TARGET).gnu' \
+        --bindir='$(PREFIX)/$(TARGET)/bin' \
+        --datarootdir='$(PREFIX)/$(TARGET)/share'
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_DOCS)
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_DOCS)
+endef

plugins/native/darwin/libtool.mk

@@ -0,0 +1 @@
+../libtool.mk

plugins/native/darwin/m4-1-fixes.patch

@@ -0,0 +1 @@
+../m4-1-fixes.patch

plugins/native/darwin/m4.mk

@@ -0,0 +1 @@
+../m4.mk

plugins/native/darwin/overrides.mk

@@ -0,0 +1,24 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+# Xcode no longer supports 32-bit compiler
+# https://mxe.cc/#issue-non-multilib
+
+override EXCLUDE_PKGS += ocaml%
+$(foreach PKG,$(filter ocaml%,$(PKGS)),\
+    $(foreach TGT,$(MXE_TARGETS),\
+        $(eval $(PKG)_BUILD_$(TGT) :=)))
+
+# silence "install JDK" popups
+# move the rule to main Makefile if other systems abandon java
+# and conditionally include the dependency
+check-requirements: disable-native-jre
+
+.PHONY: disable-native-jre
+disable-native-jre:
+	@mkdir -p '$(PREFIX)/$(BUILD)/bin'
+	@( \
+	 echo '#!/bin/sh'; \
+	 echo 'exit 1'; \
+	) > '$(PREFIX)/$(BUILD)/bin/java'
+	@chmod 0755 '$(PREFIX)/$(BUILD)/bin/java'
+	@cp '$(PREFIX)/$(BUILD)/bin/java' '$(PREFIX)/$(BUILD)/bin/javac'

plugins/native/flex.mk

@@ -12,6 +12,8 @@ $(PKG)_OWNER    := https://github.com/tonytheodore
 $(PKG)_TARGETS  := $(BUILD)
 $(PKG)_DEPS     :=
 
+REQUIREMENTS := $(filter-out $(PKG), $(REQUIREMENTS))
+
 # recursive variable so always use literal instead of $(PKG)
 MXE_REQS_PKGS   += $(BUILD)~flex
 

plugins/native/libtool.mk

@@ -3,6 +3,8 @@
 PKG                  := libtool
 $(PKG)_DEPS_$(BUILD) := autoconf automake
 
+REQUIREMENTS := $(filter-out $(PKG), $(REQUIREMENTS))
+
 define $(PKG)_BUILD_$(BUILD)
     mkdir '$(1).build'
     cd    '$(1).build' && '$(1)/configure' \

plugins/native/m4-1-fixes.patch

@@ -0,0 +1,25 @@
+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: Tony Theodore <tonyt@logyst.com>
+Date: Fri, 28 Jun 2019 18:34:23 +1000
+Subject: [PATCH 1/1] fix darwin build
+
+see:
+https://github.com/macports/macports-ports/commit/edf0ee1e2cfa884c73089e7ca32e7009f071dbd0
+
+diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
+index 1111111..2222222 100644
+--- a/lib/vasnprintf.c
++++ b/lib/vasnprintf.c
+@@ -4858,7 +4858,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
+ #endif
+                   *fbp = dp->conversion;
+ #if USE_SNPRINTF
+-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
++# if !defined(__APPLE__) && !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
+                 fbp[1] = '%';
+                 fbp[2] = 'n';
+                 fbp[3] = '\0';

plugins/native/m4.mk

@@ -2,8 +2,8 @@
 
 PKG             := m4
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.4.17
-$(PKG)_CHECKSUM := f0543c3beb51fa6b3337d8025331591e0e18d8ec2886ed391f1aade43477d508
+$(PKG)_VERSION  := 1.4.18
+$(PKG)_CHECKSUM := f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://ftp.gnu.org/gnu/m4/$($(PKG)_FILE)
@@ -13,6 +13,8 @@ $(PKG)_OWNER    := https://github.com/tonytheodore
 $(PKG)_TARGETS  := $(BUILD)
 $(PKG)_DEPS     :=
 
+REQUIREMENTS := $(filter-out $(PKG), $(REQUIREMENTS))
+
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://ftp.gnu.org/gnu/m4/?C=M;O=D' | \
     $(SED) -n 's,.*<a href="m4-\([0-9][^"]*\)\.tar.*,\1,p' | \
@@ -22,10 +24,9 @@ endef
 
 define $(PKG)_BUILD_$(BUILD)
     # gets has been removed from recent glibc
-    $(SED) -i -e '/gets is a/d' '$(1)/lib/stdio.in.h'
-    mkdir '$(1).build'
-    cd    '$(1).build' && '$(1)/configure' \
+    $(SED) -i -e '/gets is a/d' '$(SOURCE_DIR)/lib/stdio.in.h'
+    cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
         --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 install
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 endef

plugins/native/patch.mk

@@ -13,6 +13,8 @@ $(PKG)_OWNER    := https://github.com/tonytheodore
 $(PKG)_TARGETS  := $(BUILD)
 $(PKG)_DEPS     :=
 
+REQUIREMENTS := $(filter-out $(PKG), $(REQUIREMENTS))
+
 # recursive variable so always use literal instead of $(PKG)
 MXE_REQS_PKGS   += $(BUILD)~patch
 

plugins/qt4/qt4-overlay.mk

@@ -15,9 +15,6 @@ $(PKG)_QT_DIR     := qt
 PKG               := openscenegraph
 $(PKG)_DEPS       := $(filter-out qtbase ,$($(PKG)_DEPS)) qt
 
-PKG               := poppler
-$(PKG)_DEPS       := $(filter-out qtbase ,$($(PKG)_DEPS)) qt
-
 PKG               := qjson
 $(PKG)_DEPS       := $(filter-out qtbase ,$($(PKG)_DEPS)) qt
 $(PKG)_QT_SUFFIX  :=

plugins/tcl.tk/tk.mk

@@ -4,8 +4,8 @@ PKG             := tk
 $(PKG)_WEBSITE  := https://tcl.tk/
 $(PKG)_OWNER    := https://github.com/highperformancecoder
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 8.6.4
-$(PKG)_CHECKSUM := 08f99df85e5dc9c4271762163c6aabb962c8b297dc5c4c1af8bdd05fc2dd26c1
+$(PKG)_VERSION  := 8.6.10
+$(PKG)_CHECKSUM := 63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386
 $(PKG)_SUBDIR   := tk$($(PKG)_VERSION)
 $(PKG)_FILE     := tk$($(PKG)_VERSION)-src.tar.gz
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/tcl/Tcl/$($(PKG)_VERSION)/$($(PKG)_FILE)
@@ -26,6 +26,6 @@ define $(PKG)_BUILD
         --with-tcl='$(PREFIX)/$(TARGET)/lib' \
         $(if $(findstring x86_64,$(TARGET)), --enable-64bit) \
         CFLAGS='-D__MINGW_EXCPT_DEFINE_PSDK'
-    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' LIBS='-lmincore -lnetapi32 -lz -ltclstub86 -limm32 -lcomctl32 -luuid -lole32 -lgdi32 -lcomdlg32'
     $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 endef

src/adwaita-icon-theme.mk

@@ -0,0 +1,27 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+PKG             := adwaita-icon-theme
+$(PKG)_WEBSITE  := https://gtk.org/
+$(PKG)_DESCR    := GTK+
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 3.36.1
+$(PKG)_CHECKSUM := e498518627044dfd7db7d79a5b3d437848caf1991ef4ef036a2d3a2ac2c1f14d
+$(PKG)_SUBDIR   := adwaita-icon-theme-$($(PKG)_VERSION)
+$(PKG)_FILE     := adwaita-icon-theme-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := https://download.gnome.org/sources/adwaita-icon-theme/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
+$(PKG)_DEPS     := cc gettext librsvg gtk3
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'https://gitlab.gnome.org/GNOME/adwaita-icon-theme/tags' | \
+    $(SED) -n "s,.*<a [^>]\+>v\?\([0-9]\+\.[0-9.]\+\)<.*,\1,p" | \
+    grep '^3\.' | \
+    grep -v '^3\.9[0-9]' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
+        $(MXE_CONFIGURE_OPTS)
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_CRUFT) EXTRA_DIST=
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_CRUFT) EXTRA_DIST=
+endef

src/agg-1-fixes.patch

@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Tue, 12 Jun 2012 17:05:49 +0200
-Subject: [PATCH 1/1] automake 1.12 compatibility fix
+Subject: [PATCH 1/2] automake 1.12 compatibility fix
 
 
 diff --git a/configure.in b/configure.in
@@ -20,3 +20,25 @@ index 1111111..2222222 100644
  if test "x$U" != "x"; then
    AC_MSG_ERROR(Compiler not ANSI compliant)
  fi
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Norbert Nemec <norbert.nemec@native-instruments.de>
+Date: Thu, 27 Mar 2014 21:22:56 +0100
+Subject: [PATCH 2/2] comment out non-const accessor to const member
+
+taken from:
+https://github.com/NNemec/antigrain/commit/24d4ee2c82aa13bc2cad0e5a0637d584a0982294
+
+diff --git a/include/agg_renderer_outline_aa.h b/include/agg_renderer_outline_aa.h
+index 1111111..2222222 100644
+--- a/include/agg_renderer_outline_aa.h
++++ b/include/agg_renderer_outline_aa.h
+@@ -1375,7 +1375,7 @@ namespace agg
+         //---------------------------------------------------------------------
+         void profile(const line_profile_aa& prof) { m_profile = &prof; }
+         const line_profile_aa& profile() const { return *m_profile; }
+-        line_profile_aa& profile() { return *m_profile; }
++//        line_profile_aa& profile() { return *m_profile; }
+ 
+         //---------------------------------------------------------------------
+         int subpixel_width() const { return m_profile->subpixel_width(); }

src/agg.mk

@@ -1,20 +1,20 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := agg
-$(PKG)_WEBSITE  := https://agg.sourceforge.io/
+$(PKG)_WEBSITE  := https://antigrain.com/
 $(PKG)_DESCR    := Anti-Grain Geometry
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 2.5
 $(PKG)_CHECKSUM := ab1edc54cc32ba51a62ff120d501eecd55fceeedf869b9354e7e13812289911f
 $(PKG)_SUBDIR   := agg-$($(PKG)_VERSION)
 $(PKG)_FILE     := agg-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://www.antigrain.com/$($(PKG)_FILE)
+$(PKG)_URL      := https://antigrain.com/$($(PKG)_FILE)
 $(PKG)_URL_2    := https://web.archive.org/web/20170111090029/www.antigrain.com/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc freetype sdl
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://www.antigrain.com/download/index.html' | \
-    $(SED) -n 's,.*<A href="http://www.antigrain.com/agg-\([0-9.]*\).tar.gz".*,\1,p' | \
+    $(WGET) -q -O- 'https://antigrain.com/download/index.html' | \
+    $(SED) -n 's,.*<A href="https://antigrain.com/agg-\([0-9.]*\).tar.gz".*,\1,p' | \
     head -1
 endef
 

src/apr-util.mk

@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844
 $(PKG)_SUBDIR   := apr-util-$($(PKG)_VERSION)
 $(PKG)_FILE     := apr-util-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://archive.apache.org/dist/apr/$($(PKG)_FILE)
-$(PKG)_URL_2    := http://mirror.apache-kr.org/apr/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://www.apache.org/dist/apr/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc apr expat libiconv
 
 define $(PKG)_UPDATE

src/apr.mk

@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6d
 $(PKG)_SUBDIR   := apr-$($(PKG)_VERSION)
 $(PKG)_FILE     := apr-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://archive.apache.org/dist/apr/$($(PKG)_FILE)
-$(PKG)_URL_2    := http://mirror.apache-kr.org/apr/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://www.apache.org/dist/apr/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc
 
 define $(PKG)_UPDATE

src/atk.mk

@@ -12,10 +12,9 @@ $(PKG)_URL      := https://download.gnome.org/sources/atk/$(call SHORT_PKG_VERSI
 $(PKG)_DEPS     := cc gettext glib
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://git.gnome.org/browse/atk/refs/tags' | \
-    grep '<a href=' | \
-    $(SED) -n "s,.*<a href='[^']*/tag/?h=ATK_\\([0-9]*_[0-9]*[02468]_[^<]*\\)'.*,\\1,p" | \
-    $(SED) 's,_,.,g' | \
+    $(WGET) -q -O- 'https://gitlab.gnome.org/GNOME/atk/tags' | \
+    $(SED) -n "s,.*<a [^>]\+>ATK_\([0-9]\+_[0-9_]\+\)<.*,\1,p" | \
+    $(SED) "s,_,.,g;" | \
     head -1
 endef
 

src/atkmm.mk

@@ -12,9 +12,8 @@ $(PKG)_URL      := https://download.gnome.org/sources/atkmm/$(call SHORT_PKG_VER
 $(PKG)_DEPS     := cc atk glibmm
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://git.gnome.org/browse/atkmm/refs/tags' | \
-    grep '<a href=' | \
-    $(SED) -n 's,.*<a[^>]*>\([0-9][^<]*\)<.*,\1,p' | \
+    $(WGET) -q -O- 'https://gitlab.gnome.org/GNOME/atkmm/tags' | \
+    $(SED) -n "s,.*<a [^>]\+>v\?\([0-9]\+\.[0-9.]\+\)<.*,\1,p" | \
     head -1
 endef
 

src/aubio.mk

@@ -23,6 +23,7 @@ define $(PKG)_BUILD
         AR='$(TARGET)-ar'                         \
         CC='$(TARGET)-gcc'                        \
         PKGCONFIG='$(TARGET)-pkg-config'          \
+        $(PYTHON2)                                \
         '$(BUILD_DIR)/$(waf_SUBDIR)/waf'          \
             configure                             \
             -j '$(JOBS)'                          \
@@ -37,7 +38,7 @@ define $(PKG)_BUILD
     # disable txt2man and doxygen
     $(SED) -i '/\(TXT2MAN\|DOXYGEN\)/d' '$(1)/build/c4che/_cache.py'
 
-    cd '$(1)' && '$(BUILD_DIR)/$(waf_SUBDIR)/waf' build install
+    cd '$(1)' && $(PYTHON2) '$(BUILD_DIR)/$(waf_SUBDIR)/waf' build install
 
     '$(TARGET)-gcc'                               \
         -W -Wall -Werror -ansi -pedantic          \

src/boost-1-fixes.patch

@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: xantares <xantares09@hotmail.com>
 Date: Mon, 28 Sep 2015 08:21:42 +0000
-Subject: [PATCH 1/3] Fix {make,jump}_fcontext visibility with mingw
+Subject: [PATCH 1/4] Fix {make,jump}_fcontext visibility with mingw
 
 taken from: https://github.com/boostorg/context/pull/22
 
@@ -57,7 +57,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Wed, 28 Feb 2018 19:43:45 +1100
-Subject: [PATCH 2/3] fast-forward asio/ssl from 1.62 release
+Subject: [PATCH 2/4] fast-forward asio/ssl from 1.62 release
 
 
 diff --git a/boost/asio/ssl/detail/impl/engine.ipp b/boost/asio/ssl/detail/impl/engine.ipp
@@ -550,7 +550,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: jzmaddock <john@johnmaddock.co.uk>
 Date: Fri, 24 Jul 2015 18:50:28 +0100
-Subject: [PATCH 3/3] Remove depricated type_traits usage.
+Subject: [PATCH 3/4] Remove depricated type_traits usage.
 
 curl -L 'https://patch-diff.githubusercontent.com/raw/boostorg/iostreams/pull/15.patch' | sed 's,include/,,g' | git am
 
@@ -588,3 +588,27 @@ index 1111111..2222222 100644
  } // End namespaces detail, iostreams, boost.
  
  #endif // BOOST_IOSTREAMS_DETAIL_IS_DEREFERENCEABLE_HPP_INCLUDED
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Wed, 8 Apr 2020 00:37:10 +1000
+Subject: [PATCH 4/4] fix darwin build
+
+
+diff --git a/tools/build/src/tools/darwin.jam b/tools/build/src/tools/darwin.jam
+index 1111111..2222222 100644
+--- a/tools/build/src/tools/darwin.jam
++++ b/tools/build/src/tools/darwin.jam
+@@ -135,12 +135,6 @@ rule init ( version ? : command * : options * : requirement * )
+     
+     # - Set the toolset generic common options.
+     common.handle-options darwin : $(condition) : $(command) : $(options) ;
+-    
+-    # - GCC 4.0 and higher in Darwin does not have -fcoalesce-templates.
+-    if $(real-version) < "4.0.0"
+-    {
+-        flags darwin.compile.c++ OPTIONS $(condition) : -fcoalesce-templates ;
+-    }
+     # - GCC 4.2 and higher in Darwin does not have -Wno-long-double.
+     if $(real-version) < "4.2.0"
+     {

src/boost.mk

@@ -16,7 +16,7 @@ $(PKG)_DEPS_$(BUILD) := zlib
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://www.boost.org/users/download/' | \
-    $(SED) -n 's,.*/boost/\([0-9][^"/]*\)/".*,\1,p' | \
+    $(SED) -n 's,.*/release/\([0-9][^"/]*\)/.*,\1,p' | \
     grep -v beta | \
     head -1
 endef
@@ -103,22 +103,24 @@ define $(PKG)_BUILD_$(BUILD)
     # --without-mpi \
     # --without-python \
 
-    cd '$(SOURCE_DIR)' && ./tools/build/b2 \
-        -a \
-        -q \
-        -j '$(JOBS)' \
-        --ignore-site-config \
-        variant=release \
-        link=static \
-        threading=multi \
-        runtime-link=static \
-        --disable-icu \
-        --with-system \
-        --with-filesystem \
-        --build-dir='$(BUILD_DIR)' \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --exec-prefix='$(PREFIX)/$(TARGET)/bin' \
-        --libdir='$(PREFIX)/$(TARGET)/lib' \
-        --includedir='$(PREFIX)/$(TARGET)/include' \
-        install
+    cd '$(SOURCE_DIR)' && \
+        $(if $(call seq,darwin,$(OS_SHORT_NAME)),PATH=/usr/bin:$$PATH) \
+        ./tools/build/b2 \
+            -a \
+            -q \
+            -j '$(JOBS)' \
+            --ignore-site-config \
+            variant=release \
+            link=static \
+            threading=multi \
+            runtime-link=static \
+            --disable-icu \
+            --with-system \
+            --with-filesystem \
+            --build-dir='$(BUILD_DIR)' \
+            --prefix='$(PREFIX)/$(TARGET)' \
+            --exec-prefix='$(PREFIX)/$(TARGET)/bin' \
+            --libdir='$(PREFIX)/$(TARGET)/lib' \
+            --includedir='$(PREFIX)/$(TARGET)/include' \
+            install
 endef

src/bzip2.mk

@@ -14,7 +14,8 @@ define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://ftp.osuosl.org/pub/clfs/conglomeration/bzip2/' | \
     grep 'bzip2-' | \
     $(SED) -n 's,.*bzip2-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    head -1
+    sort -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD_COMMON

src/cairo.mk

@@ -12,7 +12,7 @@ $(PKG)_DEPS     := cc fontconfig freetype-bootstrap glib libpng lzo pixman zlib
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://cairographics.org/releases/?C=M;O=D' | \
-    $(SED) -n 's,.*"cairo-\([0-9][^"]*\)\.tar.*,\1,p' | \
+    $(SED) -n 's,.*"cairo-\([0-9]\.[0-9][^"]*\)\.tar.*,\1,p' | \
     head -1
 endef
 

src/ccache.mk

@@ -0,0 +1,94 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+PKG             := ccache
+$(PKG)_WEBSITE  := https://ccache.samba.org
+$(PKG)_DESCR    := ccache – a fast compiler cache
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 3.6
+$(PKG)_CHECKSUM := a6b129576328fcefad00cb72035bc87bc98b6a76aec0f4b59bed76d67a399b1f
+$(PKG)_SUBDIR   := ccache-$($(PKG)_VERSION)
+$(PKG)_FILE     := ccache-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := https://www.samba.org/ftp/ccache/ccache-$($(PKG)_VERSION).tar.xz
+$(PKG)_DEPS     := $(BUILD)~$(PKG)
+$(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
+
+$(PKG)_DEPS_$(BUILD) :=
+
+define $(PKG)_UPDATE
+    $(call GET_LATEST_VERSION, https://www.samba.org/ftp/ccache)
+endef
+
+BOOTSTRAP_PKGS += ccache
+
+$(PKG)_SYS_CONF := $(MXE_CCACHE_DIR)/etc/$(PKG).conf
+$(PKG)_USR_CONF := $(MXE_CCACHE_DIR)/$(PKG).conf
+
+ifeq (mxe,$(MXE_USE_CCACHE))
+define $(PKG)_BUILD_$(BUILD)
+    # remove any previous symlinks
+    rm -fv '$(PREFIX)/$(BUILD)/bin/$(BUILD_CC)' '$(PREFIX)/$(BUILD)/bin/$(BUILD_CXX)'
+
+    # minimal reqs build with bundled zlib
+    cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
+        $(MXE_CONFIGURE_OPTS) \
+        --with-bundled-zlib \
+        --disable-man \
+        --prefix='$(MXE_CCACHE_DIR)' \
+        --sysconfdir='$(dir $($(PKG)_SYS_CONF))'
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_DOCS)
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_DOCS)
+
+    # setup symlinks
+    ln -sf '$(MXE_CCACHE_DIR)/bin/ccache' '$(PREFIX)/$(BUILD)/bin/$(BUILD_CC)'
+    ln -sf '$(MXE_CCACHE_DIR)/bin/ccache' '$(PREFIX)/$(BUILD)/bin/$(BUILD_CXX)'
+
+    # https://ccache.samba.org/manual/latest.html#_configuration_settings
+    # always set/replace mxe `system` config
+    mkdir -p '$(dir $($(PKG)_SYS_CONF))'
+    (echo '# ccache system config'; \
+     echo '# this file is controlled by mxe, user config is in:'; \
+     echo '# $($(PKG)_USR_CONF)'; \
+     echo; \
+     echo 'base_dir = $(MXE_CCACHE_BASE_DIR)'; \
+     echo 'cache_dir = $(MXE_CCACHE_DIR)'; \
+     echo 'compiler_check = %compiler% -v'; \
+     ) > '$($(PKG)_SYS_CONF)'
+
+    # leave user config alone if set
+    [ -f '$($(PKG)_USR_CONF)' ] || \
+    (mkdir -p '$(dir $($(PKG)_USR_CONF))' && \
+    (echo '# ccache user config'; \
+     echo '# https://ccache.samba.org/manual/latest.html#_configuration_settings'; \
+     echo '# system config: $($(PKG)_SYS_CONF)'; \
+     echo; \
+     echo 'max_size = 20.0G'; \
+     ) > '$($(PKG)_USR_CONF)')
+endef
+
+define $(PKG)_BUILD
+    # setup symlinks
+    ln -sf '$(MXE_CCACHE_DIR)/bin/ccache' '$(PREFIX)/$(BUILD)/bin/$(TARGET)-gcc'
+    ln -sf '$(MXE_CCACHE_DIR)/bin/ccache' '$(PREFIX)/$(BUILD)/bin/$(TARGET)-g++'
+
+    # setup cmake toolchain to allow runtime override
+    # CMAKE_CXX_COMPILER_LAUNCHER shows original cc and isn't clear in logs etc.
+    mkdir -p '$(CMAKE_TOOLCHAIN_DIR)'
+    (echo 'option(MXE_USE_CCACHE "Enable ccache by default" ON)'; \
+     echo 'if(MXE_USE_CCACHE)'; \
+     echo '  set(CMAKE_C_COMPILER $(PREFIX)/$(BUILD)/bin/$(TARGET)-gcc)'; \
+     echo '  set(CMAKE_CXX_COMPILER $(PREFIX)/$(BUILD)/bin/$(TARGET)-g++)'; \
+     echo 'endif()'; \
+     ) > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake'
+endef
+else
+define $(PKG)_BUILD_$(BUILD)
+    # remove symlinks
+    rm -fv '$(PREFIX)/$(BUILD)/bin/$(BUILD_CC)' '$(PREFIX)/$(BUILD)/bin/$(BUILD_CXX)'
+endef
+
+define $(PKG)_BUILD
+    # remove symlinks and cmake toolchain
+    rm -fv '$(PREFIX)/$(BUILD)/bin/$(TARGET)-'*
+    rm -fv '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake'
+endef
+endif

src/cimg-1-add-option-exe-suffix-exesfx.patch

@@ -1,51 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-From 68ca8760276836154d4cc09585c21771856c1cf8 Mon Sep 17 00:00:00 2001
-From: Boris Nagaev <bnagaev@gmail.com>
-Date: Sun, 20 Sep 2015 18:18:36 +0300
-Subject: [PATCH] examples Makefile: add option exe suffix (EXESFX)
-
-On MinGW, `make Mwindows` produces executables without
-.exe suffix. Makefile did not provide an option to set
-the suffix of executables.
-
- $ make CC=i686-w64-mingw32.static-gcc EXESFX=.exe ...
----
- examples/Makefile | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/examples/Makefile b/examples/Makefile
-index af16fdb..fda92d2 100644
---- a/examples/Makefile
-+++ b/examples/Makefile
-@@ -88,6 +88,11 @@ CIMG_VERSION = _cimg_version
- X11PATH      = /usr/X11R6
- CC           = g++
- EXEPFX       =
-+ifeq ($(MSYSTEM),MINGW32)
-+EXESFX       = .exe
-+else
-+EXESFX       =
-+endif
- CCVER       = $(CC)
- ifeq ($(notdir $(CC)),g++)
- CCVER        = `$(CC) -v 2>&1 | tail -n 1`
-@@ -248,13 +253,9 @@ endif
- 	@echo
- 	@echo "** Compiling '$* ($(CIMG_VERSION))' with '$(CCVER)'"
- 	@echo
--	$(CC) -o $(EXEPFX)$* $< $(CFLAGS) $(CONF_CFLAGS) $(LIBS) $(CONF_LIBS)
-+	$(CC) -o $(EXEPFX)$*$(EXESFX) $< $(CFLAGS) $(CONF_CFLAGS) $(LIBS) $(CONF_LIBS)
- ifeq ($(STRIP_EXE),true)
--ifeq ($(MSYSTEM),MINGW32)
--	strip $(EXEPFX)$*.exe
--else
--	strip $(EXEPFX)$*
--endif
-+	strip $(EXEPFX)$*$(EXESFX)
- endif
- menu:
- 	@echo
--- 
-1.9.1
-

src/cimg-2-split-cflags-to-define-and-incdir.patch

@@ -1,168 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-From db2da6e11d917fae648af3cd3c31190bc0fc8b74 Mon Sep 17 00:00:00 2001
-From: Boris Nagaev <bnagaev@gmail.com>
-Date: Sun, 20 Sep 2015 18:57:34 +0300
-Subject: [PATCH] examples Makefile: split CFLAGS to DEFINE, INCDIR
-
-Changes of INCDIR (-I) and DEFINE (-D, -m, -f) are now independent.
-It is convenient for cross-compilation with MinGW.
----
- examples/Makefile | 68 +++++++++++++++++++++++++++++++++++++++++--------------
- 1 file changed, 51 insertions(+), 17 deletions(-)
-
-diff --git a/examples/Makefile b/examples/Makefile
-index af16fdb..81afc91 100644
---- a/examples/Makefile
-+++ b/examples/Makefile
-@@ -137,11 +137,15 @@ endif
- ifeq ($(notdir $(CC)),icpc)
- CIMG_OPENMP_CFLAGS = #-Dcimg_use_openmp -openmp -i-static    # -> Seems to bug the compiler!
- else
--CIMG_OPENMP_CFLAGS = -Dcimg_use_openmp -fopenmp
-+CIMG_OPENMP_DEFINE = -Dcimg_use_openmp -fopenmp
-+CIMG_OPENMP_INCDIR =
-+CIMG_OPENMP_CFLAGS = $(CIMG_OPENMP_DEFINE) $(CIMG_OPENMP_INCDIR)
- endif
- 
- # Flags to enable OpenCV support.
--CIMG_OPENCV_CFLAGS = -Dcimg_use_opencv -I/usr/include/opencv
-+CIMG_OPENCV_DEFINE = -Dcimg_use_opencv
-+CIMG_OPENCV_INCDIR = -I/usr/include/opencv
-+CIMG_OPENCV_CFLAGS = $(CIMG_OPENCV_DEFINE) $(CIMG_OPENCV_INCDIR)
- CIMG_OPENCV_LIBS = -lopencv_core -lopencv_highgui
- #CIMG_OPENCV_LIBS = -lcv -lhighgui    #-> Use this for OpenCV < 2.2.0
- 
-@@ -151,7 +155,9 @@ CIMG_NODISPLAY_CFLAGS = -Dcimg_display=0
- # Flags to enable the use of the X11 library.
- # (X11 is used by CImg to handle display windows)
- # !!! For 64bits systems : replace -L$(X11PATH)/lib by -L$(X11PATH)/lib64 !!!
--CIMG_X11_CFLAGS = -I$(X11PATH)/include
-+CIMG_X11_DEFINE =
-+CIMG_X11_INCDIR = -I$(X11PATH)/include
-+CIMG_X11_CFLAGS = $(CIMG_X11_DEFINE) $(CIMG_X11_INCDIR)
- CIMG_X11_LIBS = -L$(X11PATH)/lib -lpthread -lX11
- 
- # Flags to enable fast image display, using the XSHM library (when using X11).
-@@ -160,63 +166,87 @@ CIMG_XSHM_CFLAGS = # -Dcimg_use_xshm
- CIMG_XSHM_LIBS = # -lXext
- 
- # Flags to enable GDI32 display (Windows native).
--CIMG_GDI32_CFLAGS = -mwindows
-+CIMG_GDI32_DEFINE = -mwindows
-+CIMG_GDI32_INCDIR =
-+CIMG_GDI32_CFLAGS = $(CIMG_GDI32_DEFINE) $(CIMG_GDI32_INCDIR)
- CIMG_GDI32_LIBS = -lgdi32
- 
- # Flags to enable screen mode switching, using the XRandr library (when using X11).
- # ( http://www.x.org/wiki/Projects/XRandR )
- # !!! Not supported by the X11 server on MacOSX, so do not use it on MacOSX !!!
--CIMG_XRANDR_CFLAGS = -Dcimg_use_xrandr
-+CIMG_XRANDR_DEFINE = -Dcimg_use_xrandr
-+CIMG_XRANDR_INCDIR =
-+CIMG_XRANDR_CFLAGS = $(CIMG_XRANDR_DEFINE) $(CIMG_XRANDR_INCDIR)
- CIMG_XRANDR_LIBS = -lXrandr
- 
- # Flags to enable native support for PNG image files, using the PNG library.
- # ( http://www.libpng.org/ )
--CIMG_PNG_CFLAGS = -Dcimg_use_png
-+CIMG_PNG_DEFINE = -Dcimg_use_png
-+CIMG_PNG_INCDIR =
-+CIMG_PNG_CFLAGS = $(CIMG_PNG_DEFINE) $(CIMG_PNG_INCDIR)
- CIMG_PNG_LIBS = -lpng -lz
- 
- # Flags to enable native support for JPEG image files, using the JPEG library.
- # ( http://www.ijg.org/ )
--CIMG_JPEG_CFLAGS = -Dcimg_use_jpeg
-+CIMG_JPEG_DEFINE = -Dcimg_use_jpeg
-+CIMG_JPEG_INCDIR =
-+CIMG_JPEG_CFLAGS = $(CIMG_JPEG_DEFINE) $(CIMG_JPEG_INCDIR)
- CIMG_JPEG_LIBS = -ljpeg
- 
- # Flags to enable native support for TIFF image files, using the TIFF library.
- # ( http://www.libtiff.org/ )
--CIMG_TIFF_CFLAGS = -Dcimg_use_tiff
-+CIMG_TIFF_DEFINE = -Dcimg_use_tiff
-+CIMG_TIFF_INCDIR =
-+CIMG_TIFF_CFLAGS = $(CIMG_TIFF_DEFINE) $(CIMG_TIFF_INCDIR)
- CIMG_TIFF_LIBS = -ltiff
- 
- # Flags to enable native support for MINC2 image files, using the MINC2 library.
- # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
--CIMG_MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
-+CIMG_MINC2_DEFINE = -Dcimg_use_minc2
-+CIMG_MINC2_INCDIR = -I${HOME}/local/include
-+CIMG_MINC2_CFLAGS = $(CIMG_MINC2_DEFINE) $(CIMG_MINC2_INCDIR)
- CIMG_MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
- 
- # Flags to enable native support for EXR image files, using the OpenEXR library.
- # ( http://www.openexr.com/ )
--CIMG_EXR_CFLAGS = -Dcimg_use_openexr -I/usr/include/OpenEXR
-+CIMG_EXR_DEFINE = -Dcimg_use_openexr
-+CIMG_EXR_INCDIR = -I/usr/include/OpenEXR
-+CIMG_EXR_CFLAGS = $(CIMG_EXR_DEFINE) $(CIMG_EXR_INCDIR)
- CIMG_EXR_LIBS = -lIlmImf -lHalf
- 
- # Flags to enable native support for various video files, using the FFMPEG library.
- # ( http://www.ffmpeg.org/ )
--CIMG_FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -I/usr/include/libavcodec -I/usr/include/libavformat -I/usr/include/libswscale -I/usr/include/ffmpeg
-+CIMG_FFMPEG_DEFINE = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS
-+CIMG_FFMPEG_INCDIR = -I/usr/include/libavcodec -I/usr/include/libavformat -I/usr/include/libswscale -I/usr/include/ffmpeg
-+CIMG_FFMPEG_CFLAGS = $(CIMG_FFMPEG_DEFINE) $(CIMG_FFMPEG_INCDIR)
- CIMG_FFMPEG_LIBS = -lavcodec -lavformat -lswscale
- 
- # Flags to enable native support for compressed .cimgz files, using the Zlib library.
- # ( http://www.zlib.net/ )
--CIMG_ZLIB_CFLAGS = -Dcimg_use_zlib
-+CIMG_ZLIB_DEFINE = -Dcimg_use_zlib
-+CIMG_ZLIB_INCDIR =
-+CIMG_ZLIB_CFLAGS = $(CIMG_ZLIB_DEFINE) $(CIMG_ZLIB_INCDIR)
- CIMG_ZLIB_LIBS = -lz
- 
- # Flags to enable native support for downloading files from the network.
- # ( http://curl.haxx.se/libcurl/ )
--CIMG_CURL_CFLAGS = -Dcimg_use_curl
-+CIMG_CURL_DEFINE = -Dcimg_use_curl
-+CIMG_CURL_INCDIR =
-+CIMG_CURL_CFLAGS = $(CIMG_CURL_DEFINE)
- CIMG_CURL_LIBS = -lcurl
- 
- # Flags to enable native support of most classical image file formats, using the Magick++ library.
- # ( http://www.imagemagick.org/Magick++/ )
--CIMG_MAGICK_CFLAGS = -Dcimg_use_magick `Magick++-config --cppflags` `Magick++-config --cxxflags`
-+CIMG_MAGICK_DEFINE = -Dcimg_use_magick
-+CIMG_MAGICK_INCDIR = `Magick++-config --cppflags` `Magick++-config --cxxflags`
-+CIMG_MAGICK_CFLAGS = $(CIMG_MAGICK_DEFINE) $(CIMG_MAGICK_INCDIR)
- CIMG_MAGICK_LIBS = `Magick++-config --ldflags` `Magick++-config --libs`
- 
- # Flags to enable faster Discrete Fourier Transform computation, using the FFTW3 library
- # ( http://www.fftw.org/ )
--CIMG_FFTW3_CFLAGS = -Dcimg_use_fftw3
-+CIMG_FFTW3_DEFINE = -Dcimg_use_fftw3
-+CIMG_FFTW3_INCDIR =
-+CIMG_FFTW3_CFLAGS = $(CIMG_FFTW3_DEFINE) $(CIMG_FFTW3_INCDIR)
- ifeq ($(OSTYPE),msys)
- CIMG_FFTW3_LIBS = -lfftw3-3
- else
-@@ -225,12 +255,16 @@ endif
- 
- # Flags to enable the use of LAPACK routines for matrix computation
- # ( http://www.netlib.org/lapack/ )
--CIMG_LAPACK_CFLAGS = -Dcimg_use_lapack
-+CIMG_LAPACK_DEFINE = -Dcimg_use_lapack
-+CIMG_LAPACK_INCDIR =
-+CIMG_LAPACK_CFLAGS = $(CIMG_LAPACK_DEFINE) $(CIMG_LAPACK_INCDIR)
- CIMG_LAPACK_LIBS = -lblas -lg2c -llapack
- 
- # Flags to enable the use of the Board library
- # ( http://libboard.sourceforge.net/ )
--CIMG_BOARD_CFLAGS = -Dcimg_use_board -I/usr/include/board
-+CIMG_BOARD_DEFINE = -Dcimg_use_board
-+CIMG_BOARD_INCDIR = -I/usr/include/board
-+CIMG_BOARD_CFLAGS = $(CIMG_BOARD_DEFINE) $(CIMG_BOARD_INCDIR)
- CIMG_BOARD_LIBS = -lboard
- 
- # Flags to compile on Sun Solaris
--- 
-1.9.1
-

src/cimg.mk

@@ -4,56 +4,27 @@ PKG             := cimg
 $(PKG)_WEBSITE  := http://cimg.eu/
 $(PKG)_DESCR    := CImg Library
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.6.3
-$(PKG)_CHECKSUM := c2a3c62d05d1e322afa6afae086cf96df82a3a13b839e9bf1cedcb014d921ce7
+$(PKG)_VERSION  := 2.7.1
+$(PKG)_CHECKSUM := 3ff9805ca2534775e3a41acfff9b2c6435e43dce7e84c0532fcdff62a68481d3
 $(PKG)_SUBDIR   := CImg-$($(PKG)_VERSION)
 $(PKG)_FILE     := CImg_$($(PKG)_VERSION).zip
 $(PKG)_URL      := http://cimg.eu/files/$($(PKG)_FILE)
-$(PKG)_DEPS     := cc fftw imagemagick jpeg libpng opencv openexr tiff zlib
+$(PKG)_DEPS     := cc
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://cimg.eu/files/' | \
     $(SED) -n 's,.*CImg_\([0-9][^"]*\)\.zip.*,\1,p' | \
+    $(SORT) -Vr | \
     head -1
 endef
 
 define $(PKG)_BUILD
-    cp -r '$(1)/CImg.h' '$(1)/plugins' '$(PREFIX)/$(TARGET)/include/'
+    cp -r '$(SOURCE_DIR)/CImg.h' '$(SOURCE_DIR)/plugins' '$(PREFIX)/$(TARGET)/include/'
 
-    # Build examples
-
-    # use Mlinux instead of Mwindows to get more features
-    # Mlinux does not link against CIMG_GDI32_LIBS,
-    # so set CIMG_X11_LIBS to -lgdi32
-
-    # no colored terminal, no X server, no minc2
-    # curl is not used by any example
-
-    $(MAKE) -C '$(1)/examples' -j '$(JOBS)' \
-        'CIMG_VERSION=$($(PKG)_VERSION)' \
-        'CC=$(TARGET)-g++' \
-        'EXESFX=.exe' \
-        'CIMG_VT100_CFLAGS=' \
-        'CIMG_X11_CFLAGS=-mwindows' 'CIMG_X11_LIBS=-lgdi32' \
-        'CIMG_XSHM_CFLAGS=' 'CIMG_XSHM_LIBS=' \
-        'CIMG_XRANDR_CFLAGS=' 'CIMG_XRANDR_LIBS=' \
-        'CIMG_MINC2_CFLAGS=' 'CIMG_MINC2_LIBS=' \
-        'CIMG_CURL_CFLAGS=' 'CIMG_CURL_LIBS=' \
-        'CIMG_TIFF_INCDIR=`$(TARGET)-pkg-config --cflags libtiff-4`' \
-        'CIMG_TIFF_LIBS=`$(TARGET)-pkg-config --libs libtiff-4`' \
-        'CIMG_EXR_INCDIR=`$(TARGET)-pkg-config --cflags OpenEXR`' \
-        'CIMG_EXR_LIBS=`$(TARGET)-pkg-config --libs OpenEXR`' \
-        'CIMG_PNG_INCDIR=`$(TARGET)-pkg-config --cflags libpng`' \
-        'CIMG_PNG_LIBS=`$(TARGET)-pkg-config --libs libpng`' \
-        'CIMG_JPEG_INCDIR=`$(TARGET)-pkg-config --cflags libjpeg`' \
-        'CIMG_JPEG_LIBS=`$(TARGET)-pkg-config --libs libjpeg`' \
-        'CIMG_ZLIB_INCDIR=`$(TARGET)-pkg-config --cflags zlib`' \
-        'CIMG_ZLIB_LIBS=`$(TARGET)-pkg-config --libs zlib`' \
-        'CIMG_OPENCV_INCDIR=`$(TARGET)-pkg-config --cflags opencv`' \
-        'CIMG_OPENCV_LIBS=`$(TARGET)-pkg-config --libs opencv`' \
-        'CIMG_MAGICK_INCDIR=`$(TARGET)-pkg-config --cflags ImageMagick++`' \
-        'CIMG_MAGICK_LIBS=`$(TARGET)-pkg-config --libs ImageMagick++`' \
-        'CIMG_FFTW3_INCDIR=`$(TARGET)-pkg-config --cflags fftw3`' \
-        'CIMG_FFTW3_LIBS=`$(TARGET)-pkg-config --libs fftw3`' \
-        Mlinux
+    # Build demo
+    '$(TARGET)-g++' \
+        -W -Wall -Werror -std=c++11 -pedantic \
+        -mwindows -lgdi32 \
+        '$(SOURCE_DIR)/examples/CImg_demo.cpp' \
+        -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe'
 endef

src/cmake-conf.mk

@@ -5,7 +5,7 @@ $(PKG)_VERSION := 1
 $(PKG)_UPDATE  := echo 1
 $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
 $(PKG)_DEPS    := $(BUILD)~$(PKG)
-$(PKG)_FILE_DEPS := $(wildcard $(PWD)/src/cmake/conf/*)
+$(PKG)_FILE_DEPS := $(wildcard $(PWD)/src/cmake/*/*)
 $(PKG)_DEPS_$(BUILD) := cmake
 
 # ensure conf is also built for a minimal `make cc cmake`

src/cmake.mk

@@ -3,8 +3,8 @@
 PKG             := cmake
 $(PKG)_WEBSITE  := https://www.cmake.org/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.10.0
-$(PKG)_CHECKSUM := b3345c17609ea0f039960ef470aa099de9942135990930a57c14575aae884987
+$(PKG)_VERSION  := 3.17.3
+$(PKG)_CHECKSUM := 0bd60d512275dc9f6ef2a2865426a184642ceb3761794e6b65bff233b91d8c40
 $(PKG)_SUBDIR   := cmake-$($(PKG)_VERSION)
 $(PKG)_FILE     := cmake-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
@@ -12,6 +12,9 @@ $(PKG)_TARGETS  := $(BUILD)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
+    echo 'NOTE: Please ensure all cmake packages build after updating with:' >&2;
+    echo '    make `make show-downstream-deps-cmake` MXE_TARGETS="$(MXE_TARGET_LIST)"' >&2;
+    echo '' >&2;
     $(WGET) -q -O- 'https://www.cmake.org/cmake/resources/software.html' | \
     $(SED) -n 's,.*cmake-\([0-9.]*\)\.tar.*,\1,p' | \
     $(SORT) -V | \

src/cmake/conf/mxe-conf.cmake.in

@@ -22,6 +22,16 @@ if(NOT ${CMAKE_COMMAND} STREQUAL @PREFIX@/@BUILD@/bin/cmake AND NOT DEFINED ENV{
     set(ENV{_MXE_CMAKE_TOOLCHAIN_INCLUDED} TRUE)
 endif()
 
+# Use CACHE variables to allow user setting with `-D`
+# Use CACHE FORCE in rare cases of misconfigured CMakeLists.txt
+#   - e.g include(FindPkgConfig)
+#     https://github.com/mxe/mxe/issues/1023
+#   - projects may still set these in which case FORCE doesn't have
+#     any advantage, just causes inconvenience
+#     https://github.com/mxe/mxe/pull/1621#discussion_r106937505
+# Use normal variables expected to be set by toolchain/system
+#   - projects should test for these values and not try to override
+
 ## General configuration
 set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR @PROCESSOR@ CACHE STRING "System Processor")
@@ -32,19 +42,30 @@ set(CMAKE_CROSS_COMPILING ON)
 
 
 ## Library config
-set(BUILD_SHARED_LIBS @CMAKE_SHARED_BOOL@ CACHE BOOL "BUILD_SHARED_LIBS" FORCE)
-set(BUILD_STATIC_LIBS @CMAKE_STATIC_BOOL@ CACHE BOOL "BUILD_STATIC_LIBS" FORCE)
-set(BUILD_SHARED @CMAKE_SHARED_BOOL@ CACHE BOOL "BUILD_SHARED" FORCE)
-set(BUILD_STATIC @CMAKE_STATIC_BOOL@ CACHE BOOL "BUILD_STATIC" FORCE)
+set(BUILD_SHARED_LIBS @CMAKE_SHARED_BOOL@ CACHE BOOL "BUILD_SHARED_LIBS")
+set(BUILD_STATIC_LIBS @CMAKE_STATIC_BOOL@ CACHE BOOL "BUILD_STATIC_LIBS")
+set(BUILD_SHARED @CMAKE_SHARED_BOOL@ CACHE BOOL "BUILD_SHARED")
+set(BUILD_STATIC @CMAKE_STATIC_BOOL@ CACHE BOOL "BUILD_STATIC")
 set(LIBTYPE @LIBTYPE@)
 
 
 ## Paths etc.
-set(CMAKE_FIND_ROOT_PATH @PREFIX@/@TARGET@)
+# These MODEs shouldn't be changed by users, we only want headers/libs
+# from cross-build and "never" want binaries. We do, however, want
+# `*-config` scripts but there's no way to instruct cmake to do that.
+#
+# The best solution may be to whitelist utilities
+#   https://github.com/mxe/mxe/issues/1667
+# and symlink them to an additional root path, changing PROGRAM to ONLY
+
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_PREFIX_PATH @PREFIX@/@TARGET@)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+
+# Allow user to specify list of locations to search
+set(CMAKE_FIND_ROOT_PATH @PREFIX@/@TARGET@ CACHE PATH "List of root paths to search on the filesystem")
+set(CMAKE_PREFIX_PATH @PREFIX@/@TARGET@ CACHE PATH "List of directories specifying installation prefixes to be searched")
 set(CMAKE_INSTALL_PREFIX @PREFIX@/@TARGET@ CACHE PATH "Installation Prefix")
 # For custom mxe FindPackage scripts
 set(CMAKE_MODULE_PATH "@PREFIX@/share/cmake/modules" ${CMAKE_MODULE_PATH})

src/cmake/modules/TryRunResults.cmake

@@ -154,7 +154,7 @@ set( C_CHAR_SIGNED
 set( C_CHAR_SIGNED__TRYRUN_OUTPUT
      ""
      CACHE STRING "Output from TRY_RUN" FORCE)
-set( HAVE_IOEO_EXITCODE 
+set( HAVE_IOEO_EXITCODE
      "0"
      CACHE STRING "Result from TRY_RUN" FORCE)
 set( CMAKE_REQUIRE_LARGE_FILE_SUPPORT
@@ -163,3 +163,15 @@ set( CMAKE_REQUIRE_LARGE_FILE_SUPPORT
 set( CMAKE_REQUIRE_LARGE_FILE_SUPPORT__TRYRUN_OUTPUT
      ""
      CACHE STRING "Output from TRY_RUN" FORCE)
+set( _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE
+     "1"
+     CACHE STRING "Result from TRY_RUN" FORCE)
+set( _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE__TRYRUN_OUTPUT
+     ""
+     CACHE STRING "Output from TRY_RUN" FORCE)
+set( POPPLER_HAS_CAIRO_EXITCODE
+     "0"
+     CACHE STRING "Result from TRY_RUN" FORCE)
+set( POPPLER_HAS_CAIRO_EXITCODE__TRYRUN_OUTPUT
+     ""
+     CACHE STRING "Output from TRY_RUN" FORCE)

src/curl.mk

@@ -4,12 +4,12 @@ PKG             := curl
 $(PKG)_WEBSITE  := https://curl.haxx.se/libcurl/
 $(PKG)_DESCR    := cURL
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 7.64.0
-$(PKG)_CHECKSUM := 2f2f13fa34d44aa29cb444077ad7dc4dc6d189584ad552e0aaeb06e608af6001
+$(PKG)_VERSION  := 7.72.0
+$(PKG)_CHECKSUM := 0ded0808c4d85f2ee0db86980ae610cc9d165e9ca9da466196cc73c346513713
 $(PKG)_SUBDIR   := curl-$($(PKG)_VERSION)
 $(PKG)_FILE     := curl-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://curl.haxx.se/download/$($(PKG)_FILE)
-$(PKG)_DEPS     := cc gnutls libidn2 libssh2 pthreads
+$(PKG)_DEPS     := cc libidn2 libssh2 pthreads
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://curl.haxx.se/download/?C=M;O=D' | \
@@ -18,16 +18,17 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
+    cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
         $(MXE_CONFIGURE_OPTS) \
-        --with-gnutls \
+        --with-winssl \
         --without-ssl \
         --with-libidn2 \
         --enable-sspi \
         --enable-ipv6 \
         --with-libssh2 \
         LIBS=`'$(TARGET)-pkg-config' pthreads --libs`
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_DOCS)
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_DOCS)
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_DOCS)
     ln -sf '$(PREFIX)/$(TARGET)/bin/curl-config' '$(PREFIX)/bin/$(TARGET)-curl-config'
 
     '$(TARGET)-gcc' \

src/dbus-1-fixes.patch

@@ -12,7 +12,7 @@ diff --git a/dbus/dbus-sysdeps-thread-win.c b/dbus/dbus-sysdeps-thread-win.c
 index 1111111..2222222 100644
 --- a/dbus/dbus-sysdeps-thread-win.c
 +++ b/dbus/dbus-sysdeps-thread-win.c
-@@ -69,6 +69,8 @@ _dbus_win_get_dll_hmodule (void)
+@@ -70,6 +70,8 @@ _dbus_win_get_dll_hmodule (void)
  #define hinst_t HINSTANCE
  #endif
  
@@ -21,7 +21,7 @@ index 1111111..2222222 100644
  BOOL WINAPI DllMain (hinst_t, DWORD, LPVOID);
  
  /* We need this to free the TLS events on thread exit */
-@@ -107,6 +109,8 @@ DllMain (hinst_t hinstDLL,
+@@ -108,6 +110,8 @@ DllMain (hinst_t hinstDLL,
    return TRUE;
  }
  

src/dbus.mk

@@ -3,8 +3,8 @@
 PKG             := dbus
 $(PKG)_WEBSITE  := https://dbus.freedesktop.org/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.13.8
-$(PKG)_CHECKSUM := 82a89f64e1b55e459725186467770995f33cac5eb8a050b5d8cbeb338078c4f6
+$(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)

src/dcmtk-2-mingw-w64.patch

@@ -6,7 +6,7 @@ Date: Tue, 7 Oct 2014 21:50:59 -0700
 Subject: [PATCH] Fix i686-w64-mingw32
 
 Cherry-picked from
-http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=b8a53c5f7fd12e9479f830680ef84f93805fd004
+https://git.dcmtk.org/?p=dcmtk.git;a=commitdiff;h=b8a53c5f7fd12e9479f830680ef84f93805fd004
 
 diff --git a/config/configure.in b/config/configure.in
 index e343ce1..a305114 100644

src/devil.mk

@@ -14,7 +14,7 @@ define $(PKG)_BUILD
     $(SED) -i 's,resources\\\\,./resources/,' '$(SOURCE_DIR)/DevIL/src-IL/msvc/IL.rc'
     cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)/DevIL' \
         -DIL_TESTS=OFF \
-        -DCMAKE_CXX_FLAGS="-D__STDC_LIMIT_MACROS"
+        -DCMAKE_CXX_FLAGS="-D__STDC_LIMIT_MACROS -fpermissive"
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
     $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 endef

src/dlfcn-win32.mk

@@ -4,8 +4,8 @@ PKG             := dlfcn-win32
 $(PKG)_WEBSITE  := https://github.com/dlfcn-win32/dlfcn-win32
 $(PKG)_DESCR    := POSIX dlfcn wrapper for Windows
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := f1acf5d
-$(PKG)_CHECKSUM := b89eabefdd52612379ddfdab1bea196200b1d3e3c5d4acf06f5c1d4ba1ce3fdf
+$(PKG)_VERSION  := 7f1a5e5
+$(PKG)_CHECKSUM := 436e9468ff143472685aac42304e823395e0b358363f37ca92b74266485e3133
 $(PKG)_GH_CONF  := dlfcn-win32/dlfcn-win32/branches/master
 $(PKG)_DEPS     := cc
 

src/exiv2.mk

@@ -1,18 +1,18 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := exiv2
-$(PKG)_WEBSITE  := http://www.exiv2.org/
+$(PKG)_WEBSITE  := https://www.exiv2.org/
 $(PKG)_DESCR    := Exiv2
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.25
 $(PKG)_CHECKSUM := c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4
 $(PKG)_SUBDIR   := exiv2-$($(PKG)_VERSION)
 $(PKG)_FILE     := exiv2-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://www.exiv2.org/releases/$($(PKG)_FILE)
+$(PKG)_URL      := https://www.exiv2.org/releases/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc expat gettext mman-win32 zlib
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://www.exiv2.org/download.html' | \
+    $(WGET) -q -O- 'https://www.exiv2.org/download.html' | \
     grep 'href="exiv2-' | \
     $(SED) -n 's,.*exiv2-\([0-9][^>]*\)\.tar.*,\1,p' | \
     head -1

src/expat.mk

@@ -4,8 +4,8 @@ PKG             := expat
 $(PKG)_WEBSITE  := https://github.com/libexpat/libexpat
 $(PKG)_DESCR    := Expat XML Parser
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.2.6
-$(PKG)_CHECKSUM := 17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2
+$(PKG)_VERSION  := 2.2.9
+$(PKG)_CHECKSUM := f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237
 $(PKG)_SUBDIR   := expat-$($(PKG)_VERSION)
 $(PKG)_FILE     := expat-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/expat/expat/$($(PKG)_VERSION)/$($(PKG)_FILE)

src/fdk-aac.mk

@@ -7,8 +7,8 @@ PKG             := fdk-aac
 $(PKG)_WEBSITE  := https://github.com/mstorsjo/fdk-aac
 $(PKG)_DESCR    := FDK-AAC
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.1.4
-$(PKG)_CHECKSUM := 5910fe788677ca13532e3f47b7afaa01d72334d46a2d5e1d1f080f1173ff15ab
+$(PKG)_VERSION  := 2.0.0
+$(PKG)_CHECKSUM := f7d6e60f978ff1db952f7d5c3e96751816f5aef238ecf1d876972697b85fd96c
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/opencore-amr/$(PKG)/$($(PKG)_FILE)

src/ffmpeg.mk

@@ -3,8 +3,8 @@
 PKG             := ffmpeg
 $(PKG)_WEBSITE  := https://ffmpeg.org/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.1
-$(PKG)_CHECKSUM := b684fb43244a5c4caae652af9022ed5d85ce15210835bce054a33fb26033a1a5
+$(PKG)_VERSION  := 4.2.3
+$(PKG)_CHECKSUM := 217eb211c33303b37c5521a5abe1f0140854d6810c6a6ee399456cc96356795e
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := https://ffmpeg.org/releases/$($(PKG)_FILE)
@@ -26,7 +26,7 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
+    cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
         --cross-prefix='$(TARGET)'- \
         --enable-cross-compile \
         --arch=$(firstword $(subst -, ,$(TARGET))) \
@@ -61,7 +61,8 @@ define $(PKG)_BUILD
         --enable-libvorbis \
         --enable-libvpx \
         --enable-libx264 \
-        --enable-libxvid
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+        --enable-libxvid \
+        $($(PKG)_CONFIGURE_OPTS)
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 endef

src/file.mk

@@ -7,13 +7,12 @@ $(PKG)_VERSION  := 5.24
 $(PKG)_CHECKSUM := 802cb3de2e49e88ef97cdcb52cd507a0f25458112752e398445cea102bc750ce
 $(PKG)_SUBDIR   := file-$($(PKG)_VERSION)
 $(PKG)_FILE     := file-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://distfiles.macports.org/file/$($(PKG)_FILE)
-# astron.com is down
-# $(PKG)_URL_2    := ftp://ftp.astron.com/pub/file/$($(PKG)_FILE)
+$(PKG)_URL      := https://astron.com/pub/file/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://distfiles.macports.org/file/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc libgnurx
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://distfiles.macports.org/file/' | \
+    $(WGET) -q -O- 'https://astron.com/pub/file/' | \
     grep 'file-' | \
     $(SED) -n 's,.*file-\([0-9][^>]*\)\.tar.*,\1,p' | \
     tail -1

src/flac.mk

@@ -4,8 +4,8 @@ PKG             := flac
 $(PKG)_WEBSITE  := https://www.xiph.org/flac/
 $(PKG)_DESCR    := FLAC
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.3.2
-$(PKG)_CHECKSUM := 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f
+$(PKG)_VERSION  := 1.3.3
+$(PKG)_CHECKSUM := 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748
 $(PKG)_SUBDIR   := flac-$($(PKG)_VERSION)
 $(PKG)_FILE     := flac-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://downloads.xiph.org/releases/flac/$($(PKG)_FILE)

src/fltk-test.cpp

@@ -2,7 +2,7 @@
  * This file is part of MXE. See LICENSE.md for licensing information.
  *
  * This is a slightly modified version of:
- * http://www.fltk.org/doc-1.3/basics.html
+ * https://www.fltk.org/doc-1.3/basics.html
  */
 
 #include <FL/Fl.H>

src/fltk.mk

@@ -4,8 +4,8 @@ PKG             := fltk
 $(PKG)_WEBSITE  := https://www.fltk.org/
 $(PKG)_DESCR    := FLTK
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.3.4-2
-$(PKG)_CHECKSUM := 25d349c18c99508737d48f225a2eb26a43338f9247551cab72a317fa42cda910
+$(PKG)_VERSION  := 1.3.5
+$(PKG)_CHECKSUM := 8729b2a055f38c1636ba20f749de0853384c1d3e9d1a6b8d4d1305143e115702
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_MAJOR    := $(word 1,$(subst -, ,$($(PKG)_VERSION)))
 $(PKG)_FILE     := $($(PKG)_SUBDIR)-source.tar.gz

src/fluidsynth-1-fixes.patch

@@ -0,0 +1,215 @@
+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: Tony Theodore <tonyt@logyst.com>
+Date: Sun, 8 Sep 2019 18:22:33 +1000
+Subject: [PATCH 1/4] Allow optional build of bins, docs, and tests
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1111111..2222222 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -74,6 +74,11 @@ option ( enable-pulseaudio "compile PulseAudio support (if it is available)" on
+ option ( enable-readline "compile readline lib line editing (if it is available)" on )
+ option ( enable-threads "enable multi-threading support (such as parallel voice synthesis)" on )
+ 
++# Options for build components
++option ( build-bins "build binary programs" on )
++option ( build-docs "build docs" on )
++option ( build-tests "build tests" on )
++
+ # Platform specific options
+ if ( CMAKE_SYSTEM MATCHES "Linux|FreeBSD|DragonFly" )
+     option ( enable-lash "compile LASH support (if it is available)" on )
+@@ -632,8 +637,12 @@ link_directories (
+ 
+ # Process subdirectories
+ add_subdirectory ( src )
+-add_subdirectory ( test )
+-add_subdirectory ( doc )
++if ( build-tests )
++    add_subdirectory ( test )
++endif ()
++if ( build-docs )
++    add_subdirectory ( doc )
++endif ()
+ 
+ # pkg-config support
+ set ( prefix "${CMAKE_INSTALL_PREFIX}" )
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1111111..2222222 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -331,32 +331,34 @@ target_link_libraries ( libfluidsynth
+ )
+ 
+ # ************ CLI program ************
++if ( build-bins )
++    set ( fluidsynth_bin "fluidsynth" )
++    set ( fluidsynth_SOURCES fluidsynth.c )
+ 
+-set ( fluidsynth_SOURCES fluidsynth.c )
+-
+-add_executable ( fluidsynth
+-    ${fluidsynth_SOURCES}
+-)
++    add_executable ( fluidsynth
++        ${fluidsynth_SOURCES}
++    )
+ 
+-if ( FLUID_CPPFLAGS )
+-  set_target_properties ( fluidsynth
+-    PROPERTIES COMPILE_FLAGS ${FLUID_CPPFLAGS} )
+-endif ( FLUID_CPPFLAGS )
++    if ( FLUID_CPPFLAGS )
++      set_target_properties ( fluidsynth
++        PROPERTIES COMPILE_FLAGS ${FLUID_CPPFLAGS} )
++    endif ( FLUID_CPPFLAGS )
+ 
+-target_link_libraries ( fluidsynth
+-    libfluidsynth
+-    ${SYSTEMD_LIBRARIES}
+-    ${FLUID_LIBS}
+-)
++    target_link_libraries ( fluidsynth
++        libfluidsynth
++        ${SYSTEMD_LIBRARIES}
++        ${FLUID_LIBS}
++    )
++endif ()
+ 
+ if ( MACOSX_FRAMEWORK )
+-  install ( TARGETS fluidsynth libfluidsynth
++  install ( TARGETS ${fluidsynth_bin} libfluidsynth
+     RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+     FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
+     ARCHIVE DESTINATION ${FRAMEWORK_INSTALL_DIR}
+ )
+ else ( MACOSX_FRAMEWORK )
+-  install ( TARGETS fluidsynth libfluidsynth
++  install ( TARGETS ${fluidsynth_bin} libfluidsynth
+     RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+     LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+     ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Sun, 8 Sep 2019 18:24:56 +1000
+Subject: [PATCH 2/4] Set *.pc libs/requires based on detected features
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1111111..2222222 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -221,6 +221,7 @@ if ( WIN32 )
+ 
+   if ( enable-dsound AND HAVE_DSOUND_H )
+     set ( WINDOWS_LIBS "${WINDOWS_LIBS};dsound" )
++    set ( PC_LIBS "${PC_LIBS} -ldsound" )
+     set ( DSOUND_SUPPORT 1 )
+   endif ()
+ 
+@@ -465,6 +466,7 @@ else(NOT enable-pkgconfig)
+ 
+     # Mandatory libraries: glib and gthread
+     pkg_check_modules ( GLIB REQUIRED glib-2.0>=2.6.5 gthread-2.0>=2.6.5 )
++    set ( PC_REQUIRES "${PC_REQUIRES} glib-2.0 gthread-2.0")
+ 
+     if ( GLIB_glib-2.0_VERSION AND GLIB_glib-2.0_VERSION VERSION_LESS "2.26.0" )
+         message ( WARNING "Your version of glib is very old. This may cause problems with fluidsynth's sample cache on Windows. Consider updating to glib 2.26 or newer!" )
+@@ -481,6 +483,7 @@ else(NOT enable-pkgconfig)
+     if ( LIBSNDFILE_SUPPORT )
+         pkg_check_modules ( LIBSNDFILE_VORBIS sndfile>=1.0.18 )
+         set ( LIBSNDFILE_HASVORBIS ${LIBSNDFILE_VORBIS_FOUND} )
++        set ( PC_REQUIRES "${PC_REQUIRES} sndfile")
+     endif ( LIBSNDFILE_SUPPORT )
+     else ( enable-libsndfile )
+     unset_pkg_config ( LIBSNDFILE )
+@@ -507,6 +510,9 @@ else(NOT enable-pkgconfig)
+     if ( enable-portaudio )
+     pkg_check_modules ( PORTAUDIO portaudio-2.0>=19 )
+     set ( PORTAUDIO_SUPPORT ${PORTAUDIO_FOUND} )
++    if ( PORTAUDIO_SUPPORT )
++      set ( PC_REQUIRES "${PC_REQUIRES} portaudio-2.0")
++    endif ()
+     else ( enable-portaudio )
+     unset_pkg_config ( PORTAUDIO )
+     endif ( enable-portaudio )
+@@ -515,6 +521,9 @@ else(NOT enable-pkgconfig)
+     if ( enable-jack )
+     pkg_check_modules ( JACK jack )
+     set ( JACK_SUPPORT ${JACK_FOUND} )
++    if ( JACK_SUPPORT )
++        set ( PC_REQUIRES "${PC_REQUIRES} jack")
++    endif ()
+     else ( enable-jack )
+     unset_pkg_config ( JACK )
+     endif ( enable-jack )
+@@ -543,6 +552,9 @@ else(NOT enable-pkgconfig)
+     if ( enable-dbus )
+     pkg_check_modules ( DBUS dbus-1>=1.0.0 )
+     set ( DBUS_SUPPORT ${DBUS_FOUND} )
++    if ( DBUS_SUPPORT )
++        set ( PC_REQUIRES "${PC_REQUIRES} dbus-1")
++    endif ()
+     else ( enable-dbus )
+     unset_pkg_config ( DBUS )
+     endif ( enable-dbus )
+diff --git a/fluidsynth.pc.in b/fluidsynth.pc.in
+index 1111111..2222222 100644
+--- a/fluidsynth.pc.in
++++ b/fluidsynth.pc.in
+@@ -6,5 +6,6 @@ includedir=@includedir@
+ Name: FluidSynth
+ Description: Software SoundFont synth
+ Version: @VERSION@
+-Libs: -L${libdir} -lfluidsynth
++Requires: @PC_REQUIRES@
++Libs: -L${libdir} -lfluidsynth @PC_LIBS@
+ Cflags: -I${includedir}
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Sat, 14 Sep 2019 12:09:14 +1000
+Subject: [PATCH 3/4] use detected mman libs
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1111111..2222222 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -261,6 +261,11 @@ if ( WIN32 )
+   if ( MINGW )
+     set ( MINGW32 1 )
+     add_compile_options ( -mms-bitfields )
++    # mman-win32
++    if ( HAVE_SYS_MMAN_H )
++        set ( WINDOWS_LIBS "${WINDOWS_LIBS};mman" )
++        set ( PC_LIBS "${PC_LIBS} -lmman" )
++    endif ()
+   endif  ( MINGW )
+ else ( WIN32 )
+ # Check PThreads, but not in Windows
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Sun, 13 Oct 2019 00:32:36 +1100
+Subject: [PATCH 4/4] add readline to PC_REQUIRES when detected
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1111111..2222222 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -606,6 +606,7 @@ if ( enable-readline )
+   if ( HAVE_READLINE )
+     set ( WITH_READLINE 1 )
+     set ( READLINE_LIBS ${READLINE_LIBRARIES} )
++    set ( PC_REQUIRES "${PC_REQUIRES} readline")
+   endif ( HAVE_READLINE )
+ else ( enable-readline )
+   unset ( READLINE_LIBS CACHE )