diff --git a/config/functions b/config/functions
index a909cb6d67..d5e97974c9 100644
--- a/config/functions
+++ b/config/functions
@@ -524,6 +524,7 @@ $(python3 -c "import os; print('cpp_args = {}'.format([x for x in os.getenv('TAR
 $(python3 -c "import os; print('cpp_link_args = {}'.format([x for x in os.getenv('TARGET_LDFLAGS').split()]))")
 
 [properties]
+needs_exe_wrapper = true
 root = '$SYSROOT_PREFIX/usr'
 ${!properties}
 EOF
@@ -829,6 +830,15 @@ do_autoreconf() {
     export LIBTOOL=$TOOLCHAIN/bin/libtool
   fi
 
+  # >autoconf-2.69 will call gtkdocize when used in macros
+  # when called with --install parameter.
+  # use "true" unkess gtkdocsize is in the toolchain.
+  if [ -e "$TOOLCHAIN/bin/gtkdocize" ]; then
+    export GTKDOCIZE=$TOOLCHAIN/bin/gtkdocize
+  else
+    export GTKDOCIZE=true
+  fi
+
   if [ -e "$TOOLCHAIN/bin/autoreconf" -a -e "$INTLTOOLIZE" ]; then
     mkdir -p $ACLOCAL_DIR
     if [ -e "$LIBTOOLIZE" ]; then
diff --git a/packages/addons/addon-depends/go/package.mk b/packages/addons/addon-depends/go/package.mk
index 8e75999709..6a59bc0897 100644
--- a/packages/addons/addon-depends/go/package.mk
+++ b/packages/addons/addon-depends/go/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="go"
-PKG_VERSION="1.16.6"
-PKG_SHA256="498cd89c5c965ea2f2e23eef589e0a2dcb4b94f31c3f7dac575d4c35ae89caf7"
+PKG_VERSION="1.17.1"
+PKG_SHA256="670ce36e100669f9be572a1603858ce4a64eb4b21a31fa5cdefb778609c40337"
 PKG_LICENSE="BSD"
 PKG_SITE="https://golang.org"
 PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz"
diff --git a/packages/addons/addon-depends/librespot-depends/rustup.rs/package.mk b/packages/addons/addon-depends/librespot-depends/rustup.rs/package.mk
index 544068b761..67857f0d10 100644
--- a/packages/addons/addon-depends/librespot-depends/rustup.rs/package.mk
+++ b/packages/addons/addon-depends/librespot-depends/rustup.rs/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rustup.rs"
-PKG_VERSION="1.23.1"
-PKG_SHA256="0203231bfe405ee1c7d5e7e1c013b9b8a2dc87fbd8474e77f500331d8c26365f"
+PKG_VERSION="1.24.3"
+PKG_SHA256="24a8cede4ccbbf45ab7b8de141d92f47d1881bb546b3b9180d5a51dc0622d0f6"
 PKG_LICENSE="MIT"
 PKG_SITE="https://www.rust-lang.org"
 PKG_URL="https://github.com/rust-lang-nursery/rustup.rs/archive/${PKG_VERSION}.tar.gz"
diff --git a/packages/audio/pulseaudio/patches/pulseaudio-dont-build-docs.patch b/packages/audio/pulseaudio/patches/pulseaudio-dont-build-docs.patch
new file mode 100644
index 0000000000..9407dcc8ed
--- /dev/null
+++ b/packages/audio/pulseaudio/patches/pulseaudio-dont-build-docs.patch
@@ -0,0 +1,11 @@
+--- a/meson.build	2021-01-16 17:26:36.000000000 +0000
++++ a/meson.build	2021-04-11 10:31:49.000000000 +0000
+@@ -699,7 +699,7 @@
+ 
+ # Subdirs
+ 
+-subdir('doxygen')
++#subdir('doxygen')
+ subdir('po')
+ if get_option('man')
+   subdir('man')
diff --git a/packages/databases/mariadb-connector-c/package.mk b/packages/databases/mariadb-connector-c/package.mk
index 020aab3d7c..09529b0a47 100644
--- a/packages/databases/mariadb-connector-c/package.mk
+++ b/packages/databases/mariadb-connector-c/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mariadb-connector-c"
-PKG_VERSION="3.1.11"
-PKG_SHA256="2cd769afea447231588580234523121268eae7576f75a7bee25a7e6ec04282f8"
+PKG_VERSION="3.1.13"
+PKG_SHA256="361136e9c365259397190109d50f8b6a65c628177792273b4acdb6978942b5e7"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://mariadb.org/"
 PKG_URL="https://github.com/MariaDB/mariadb-connector-c/archive/v${PKG_VERSION}.tar.gz"
diff --git a/packages/devel/autoconf-archive/package.mk b/packages/devel/autoconf-archive/package.mk
index cfd912670b..16d6b684ec 100644
--- a/packages/devel/autoconf-archive/package.mk
+++ b/packages/devel/autoconf-archive/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="autoconf-archive"
-PKG_VERSION="2019.01.06"
-PKG_SHA256="17195c833098da79de5778ee90948f4c5d90ed1a0cf8391b4ab348e2ec511e3f"
+PKG_VERSION="2021.02.19"
+PKG_SHA256="e8a6eb9d28ddcba8ffef3fa211653239e9bf239aba6a01a6b7cfc7ceaec69cbd"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.gnu.org/software/autoconf-archive/"
 PKG_URL="http://ftpmirror.gnu.org/autoconf-archive/${PKG_NAME}-${PKG_VERSION}.tar.xz"
diff --git a/packages/devel/autoconf/package.mk b/packages/devel/autoconf/package.mk
index 18172507ab..73397a8e96 100644
--- a/packages/devel/autoconf/package.mk
+++ b/packages/devel/autoconf/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 
 PKG_NAME="autoconf"
-PKG_VERSION="2.69"
-PKG_SHA256="64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684"
+PKG_VERSION="2.71"
+PKG_SHA256="f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sources.redhat.com/autoconf/"
 PKG_URL="http://ftpmirror.gnu.org/autoconf/${PKG_NAME}-${PKG_VERSION}.tar.xz"
diff --git a/packages/devel/autoconf/patches/autoconf-0100-backport-runstatedir.patch b/packages/devel/autoconf/patches/autoconf-0100-backport-runstatedir.patch
deleted file mode 100644
index 37a03843aa..0000000000
--- a/packages/devel/autoconf/patches/autoconf-0100-backport-runstatedir.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 8e269b13bc042bc2504d5860e0d453b4aac32909 Mon Sep 17 00:00:00 2001
-From: Matthias Reichl <hias@horus.com>
-Date: Sun, 24 Jun 2018 13:45:26 +0200
-Subject: [PATCH] backport AC_INIT: add --runstatedir option to configure
-
-Backport of a197431414088a417b407b9b20583b2e8f7363bd.
-Changes to NEWS and doc/autoconf.tex have been dropped.
----
- lib/autoconf/general.m4 | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
-index adfae1db..1437c0ca 100644
---- a/lib/autoconf/general.m4
-+++ b/lib/autoconf/general.m4
-@@ -586,6 +586,7 @@ AC_SUBST([datadir],        ['${datarootdir}'])dnl
- AC_SUBST([sysconfdir],     ['${prefix}/etc'])dnl
- AC_SUBST([sharedstatedir], ['${prefix}/com'])dnl
- AC_SUBST([localstatedir],  ['${prefix}/var'])dnl
-+AC_SUBST([runstatedir],    ['${localstatedir}/run'])dnl
- AC_SUBST([includedir],     ['${prefix}/include'])dnl
- AC_SUBST([oldincludedir],  ['/usr/include'])dnl
- AC_SUBST([docdir],         [m4_ifset([AC_PACKAGE_TARNAME],
-@@ -812,6 +813,15 @@ do
-   | -silent | --silent | --silen | --sile | --sil)
-     silent=yes ;;
- 
-+  -runstatedir | --runstatedir | --runstatedi | --runstated \
-+  | --runstate | --runstat | --runsta | --runst | --runs \
-+  | --run | --ru | --r)
-+    ac_prev=runstatedir ;;
-+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-+  | --run=* | --ru=* | --r=*)
-+    runstatedir=$ac_optarg ;;
-+
-   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-     ac_prev=sbindir ;;
-   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-@@ -921,7 +931,7 @@ fi
- for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
- 		datadir sysconfdir sharedstatedir localstatedir includedir \
- 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
--		libdir localedir mandir
-+		libdir localedir mandir runstatedir
- do
-   eval ac_val=\$$ac_var
-   # Remove trailing slashes.
-@@ -1058,6 +1068,7 @@ Fine tuning of the installation directories:
-   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-   --libdir=DIR            object code libraries [EPREFIX/lib]
-   --includedir=DIR        C header files [PREFIX/include]
-   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
--- 
-2.11.0
-
diff --git a/packages/devel/autoconf/patches/autoconf-0200-performance.patch b/packages/devel/autoconf/patches/autoconf-0200-performance.patch
deleted file mode 100644
index 1842fe92b7..0000000000
--- a/packages/devel/autoconf/patches/autoconf-0200-performance.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-The check for solaris 'print' causes significant problems on a linux machine
-with dash as /bin/sh since it triggers the execution of "print" which on some 
-linux systems is a perl script which is part of mailcap. Worse, this perl 
-script calls "which file" and if successful ignores the path file was found 
-in and just runs "file" without a path. Each exection causes PATH to be searched.
-
-Simply assuming the shell's printf function works cuts out all the fork overhead
-and when parallel tasks are running, this overhead appears to be significant.
-
-RP
-2015/11/28
-Upstream-Status: Inappropriate
-
-Index: autoconf-2.69/lib/m4sugar/m4sh.m4
-===================================================================
---- autoconf-2.69.orig/lib/m4sugar/m4sh.m4
-+++ autoconf-2.69/lib/m4sugar/m4sh.m4
-@@ -1045,40 +1045,8 @@ m4_defun([_AS_ECHO_PREPARE],
- [[as_nl='
- '
- export as_nl
--# Printing a long string crashes Solaris 7 /usr/bin/printf.
--as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
--as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
--as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
--# Prefer a ksh shell builtin over an external printf program on Solaris,
--# but without wasting forks for bash or zsh.
--if test -z "$BASH_VERSION$ZSH_VERSION" \
--    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
--  as_echo='print -r --'
--  as_echo_n='print -rn --'
--elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
--  as_echo='printf %s\n'
--  as_echo_n='printf %s'
--else
--  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
--    as_echo_body='eval /usr/ucb/echo -n "$][1$as_nl"'
--    as_echo_n='/usr/ucb/echo -n'
--  else
--    as_echo_body='eval expr "X$][1" : "X\\(.*\\)"'
--    as_echo_n_body='eval
--      arg=$][1;
--      case $arg in @%:@(
--      *"$as_nl"*)
--	expr "X$arg" : "X\\(.*\\)$as_nl";
--	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
--      esac;
--      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
--    '
--    export as_echo_n_body
--    as_echo_n='sh -c $as_echo_n_body as_echo'
--  fi
--  export as_echo_body
--  as_echo='sh -c $as_echo_body as_echo'
--fi
-+as_echo='printf %s\n'
-+as_echo_n='printf %s'
- ]])# _AS_ECHO_PREPARE
- 
- 
diff --git a/packages/devel/autoconf/patches/autoconf-autoreconf-exclude.patch b/packages/devel/autoconf/patches/autoconf-autoreconf-exclude.patch
index d1bd3a2a31..f3f239cbc3 100644
--- a/packages/devel/autoconf/patches/autoconf-autoreconf-exclude.patch
+++ b/packages/devel/autoconf/patches/autoconf-autoreconf-exclude.patch
@@ -43,39 +43,30 @@ Index: autoconf-2.63/bin/autoreconf.in
    # Even if the user specified a configure.ac, trim to get the
    # directory, and look for configure.ac again.  Because (i) the code
    # is simpler, and (ii) we are still able to diagnose simultaneous
-@@ -255,6 +266,11 @@
- {
-   my ($aclocal, $flags) = @_;
- 
-+  @ex = grep (/^aclocal$/, @exclude);
-+  if ($#ex != -1) {
-+    return;
-+  }
-+
-   # aclocal 1.8+ does all this for free.  It can be recognized by its
-   # --force support.
-   if ($aclocal_supports_force)
 @@ -368,7 +384,10 @@
      }
    else
      {
--      xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint");
+-      xsystem_hint ("autopoint is needed because this package uses Gettext",
+-                    $autopoint);
 +      @ex = grep (/^autopoint$/, @exclude);
 +      if ($#ex == -1) {
-+        xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint");
++        xsystem_hint ("autopoint is needed because this package uses Gettext",
++                      $autopoint);
 +      }
      }
  
- 
-@@ -532,16 +551,17 @@
+@@ -532,16 +551,19 @@
  	{
  	  $libtoolize .= " --ltdl";
  	}
--      xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize);
+-      xsystem_hint ("libtoolize is needed because this package uses Libtool",
+-		    $libtoolize);
 -      $rerun_aclocal = 1;
 +      @ex = grep (/^libtoolize$/, @exclude);
 +      if ($#ex == -1) {
-+        xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize);
++        xsystem_hint ("libtoolize is needed because this package uses Libtool",
++                      $libtoolize);
 +        $rerun_aclocal = 1;
 +      }
      }
@@ -84,11 +75,24 @@ Index: autoconf-2.63/bin/autoreconf.in
        verb "$configure_ac: not running libtoolize: --install not given";
      }
  
--
--
-   # ------------------- #
-   # Rerunning aclocal.  #
-   # ------------------- #
+ 
+   # --------------------- #
+   # Running intltoolize.  #
+   # --------------------- #
+@@ -748,8 +748,11 @@
+     }
+   elsif ($install)
+     {
+-      xsystem_hint ("gtkdocize is needed because this package uses Gtkdoc",
+-		    $gtkdocize);
++      @ex = grep (/^autopoint$/, @exclude);
++      if ($#ex == -1) {
++        xsystem_hint ("gtkdocize is needed because this package uses Gtkdoc",
++		      $gtkdocize);
++      }
+     }
+   else
+     {
 @@ -572,7 +592,10 @@
    # latter runs the former, and (ii) autoconf is stricter than
    # autoheader.  So all in all, autoconf should give better error
@@ -115,8 +119,8 @@ Index: autoconf-2.63/bin/autoreconf.in
  
 @@ -610,7 +636,10 @@
        # We should always run automake, and let it decide whether it shall
-       # update the file or not.  In fact, the effect of `$force' is already
-       # included in `$automake' via `--no-force'.
+       # update the file or not.  In fact, the effect of '$force' is already
+       # included in '$automake' via '--no-force'.
 -      xsystem ($automake);
 +      @ex = grep (/^automake$/, @exclude);
 +      if ($#ex == -1) {
@@ -124,7 +128,7 @@ Index: autoconf-2.63/bin/autoreconf.in
 +      }
      }
  
- 
+   # ---------------------------------------------------- #
 @@ -634,7 +663,10 @@
  	    }
  	  else
diff --git a/packages/devel/autoconf/patches/man-exclude.patch b/packages/devel/autoconf/patches/man-exclude.patch
new file mode 100644
index 0000000000..55e77ba0ad
--- /dev/null
+++ b/packages/devel/autoconf/patches/man-exclude.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.in	2021-02-28 12:25:11.000000000 +0000
++++ b/Makefile.in	2021-02-28 12:25:11.000000000 +0000
+@@ -780,7 +780,6 @@
+   man/autoconf.1 \
+   man/autoheader.1 \
+   man/autom4te.1 \
+-  man/autoreconf.1 \
+   man/autoscan.1 \
+   man/autoupdate.1 \
+   man/ifnames.1
diff --git a/packages/devel/automake/package.mk b/packages/devel/automake/package.mk
index 4b7ccd6a6f..fad2b7fe94 100644
--- a/packages/devel/automake/package.mk
+++ b/packages/devel/automake/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 
 PKG_NAME="automake"
-PKG_VERSION="1.15.1"
-PKG_SHA256="af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf"
+PKG_VERSION="1.16.4"
+PKG_SHA256="80facc09885a57e6d49d06972c0ae1089c5fa8f4d4c7cfe5baea58e5085f136d"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sources.redhat.com/automake/"
 PKG_URL="http://ftpmirror.gnu.org/automake/${PKG_NAME}-${PKG_VERSION}.tar.xz"
diff --git a/packages/devel/automake/patches/automake-01-fix-help2man.patch b/packages/devel/automake/patches/automake-01-fix-help2man.patch
index 4773dbc69d..7d5fa126d1 100644
--- a/packages/devel/automake/patches/automake-01-fix-help2man.patch
+++ b/packages/devel/automake/patches/automake-01-fix-help2man.patch
@@ -12,14 +12,14 @@ index 5a336df..2d2029b 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -701,7 +701,7 @@ update_mans = \
+ update_mans = \
    $(AM_V_GEN): \
      && $(MKDIR_P) doc \
-     && $(extend_PATH) \
--    && $(PERL) $(srcdir)/doc/help2man --output=$@
-+    && $(PERL) $(srcdir)/doc/help2man --output=$@ --no-discard-stderr
+-    && ./pre-inst-env $(PERL) $(srcdir)/doc/help2man --output=$@
++    && ./pre-inst-env $(PERL) $(srcdir)/doc/help2man --output=$@ --no-discard-stderr
  
- amhello_sources = \
-   doc/amhello/configure.ac \
+ checklinkx = $(top_srcdir)/contrib/checklinkx
+ # that 4-second sleep seems to be what gnu.org likes.
 -- 
 1.7.2.5
 
diff --git a/packages/devel/binutils/package.mk b/packages/devel/binutils/package.mk
index 52a054a686..b7a58f188d 100644
--- a/packages/devel/binutils/package.mk
+++ b/packages/devel/binutils/package.mk
@@ -16,6 +16,7 @@ PKG_CONFIGURE_OPTS_HOST="--target=${TARGET_NAME} \
                          --with-sysroot=${SYSROOT_PREFIX} \
                          --with-lib-path=${SYSROOT_PREFIX}/lib:${SYSROOT_PREFIX}/usr/lib \
                          --without-ppl \
+                         --enable-static \
                          --without-cloog \
                          --disable-werror \
                          --disable-multilib \
diff --git a/packages/devel/bison/package.mk b/packages/devel/bison/package.mk
index 4afde171f2..34d95ca781 100644
--- a/packages/devel/bison/package.mk
+++ b/packages/devel/bison/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bison"
-PKG_VERSION="3.7.4"
-PKG_SHA256="a3b5813f48a11e540ef26f46e4d288c0c25c7907d9879ae50e430ec49f63c010"
+PKG_VERSION="3.8.1"
+PKG_SHA256="31fc602488aad6bdecf0ccc556e0fc72fc57cdc595cf92398f020e0cf4980f15"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/bison/"
 PKG_URL="http://ftpmirror.gnu.org/bison/${PKG_NAME}-${PKG_VERSION}.tar.xz"
diff --git a/packages/devel/cmake/package.mk b/packages/devel/cmake/package.mk
index d0986997f9..19bfae806e 100644
--- a/packages/devel/cmake/package.mk
+++ b/packages/devel/cmake/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="cmake"
-PKG_VERSION="3.19.2"
-PKG_SHA256="e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0"
+PKG_VERSION="3.21.2"
+PKG_SHA256="94275e0b61c84bb42710f5320a23c6dcb2c6ee032ae7d2a616f53f68b3d21659"
 PKG_LICENSE="BSD"
 PKG_SITE="https://cmake.org/"
 PKG_URL="https://cmake.org/files/v$(get_pkg_version_maj_min)/cmake-${PKG_VERSION}.tar.gz"
diff --git a/packages/devel/cmake/patches/cmake-000-disable-sslv3.patch b/packages/devel/cmake/patches/cmake-000-disable-sslv3.patch
deleted file mode 100644
index 4e184d66a9..0000000000
--- a/packages/devel/cmake/patches/cmake-000-disable-sslv3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/Utilities/cmcurl/lib/vtls/openssl.c.orig	2016-10-06 15:52:59.115761563 +0200
-+++ b/Utilities/cmcurl/lib/vtls/openssl.c	2016-10-06 16:20:36.172690961 +0200
-@@ -108,6 +108,12 @@
- #define OPENSSL_NO_SSL2
- #endif
- 
-+#if !defined(HAVE_SSLV3_CLIENT_METHOD) || \
-+  OPENSSL_VERSION_NUMBER >= 0x10100000L /* 1.1.0+ has no SSLv3 support */ 
-+#undef OPENSSL_NO_SSL3 /* undef first to avoid compiler warnings */
-+#define OPENSSL_NO_SSL3
-+#endif
-+
- #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && /* OpenSSL 1.1.0+ */ \
-   !defined(LIBRESSL_VERSION_NUMBER)
- #define SSLeay_add_ssl_algorithms() SSL_library_init()
---- a/Utilities/cmcurl/lib/vtls/openssl.c.orig	2016-10-19 19:06:52.439430376 +0200
-+++ b/Utilities/cmcurl/lib/vtls/openssl.c	2016-10-19 19:04:21.327612220 +0200
-@@ -1737,7 +1737,7 @@
-     break;
- #endif
-   case CURL_SSLVERSION_SSLv3:
--#ifdef OPENSSL_NO_SSL3_METHOD
-+#ifdef OPENSSL_NO_SSL3
-     failf(data, OSSL_PACKAGE " was built without SSLv3 support");
-     return CURLE_NOT_BUILT_IN;
- #else
diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk
index f199012986..26b24d742a 100644
--- a/packages/devel/glibc/package.mk
+++ b/packages/devel/glibc/package.mk
@@ -45,13 +45,6 @@ post_unpack() {
   find "${PKG_BUILD}" -type f -name '*.py' -exec sed -e '1s,^#![[:space:]]*/usr/bin/python.*,#!/usr/bin/env python3,' -i {} \;
 }
 
-pre_build_target() {
-  cd ${PKG_BUILD}
-    aclocal --force --verbose
-    autoconf --force --verbose
-  cd -
-}
-
 pre_configure_target() {
 # Filter out some problematic *FLAGS
   export CFLAGS=$(echo ${CFLAGS} | sed -e "s|-ffast-math||g")
diff --git a/packages/devel/heimdal/patches/22352b90e78e2d162b98b5ef6c84672c397be40a.patch b/packages/devel/heimdal/patches/22352b90e78e2d162b98b5ef6c84672c397be40a.patch
new file mode 100644
index 0000000000..0dcc310262
--- /dev/null
+++ b/packages/devel/heimdal/patches/22352b90e78e2d162b98b5ef6c84672c397be40a.patch
@@ -0,0 +1,29 @@
+From 22352b90e78e2d162b98b5ef6c84672c397be40a Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 17 Mar 2021 17:49:18 +0100
+Subject: [PATCH] autoconf-2.70 fix
+
+autoconf-2.70 and newer are more strict with quoting etc. and thus generate
+a broken configure file:
+
+  configure: 20855: Syntax error: ")" unexpected (expecting "fi")
+
+Gentoo-bug: https://bugs.gentoo.org/776241
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ cf/check-var.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cf/check-var.m4 b/cf/check-var.m4
+index 2fd7bca6f0..71d6f70ca8 100644
+--- a/cf/check-var.m4
++++ b/cf/check-var.m4
+@@ -20,7 +20,7 @@ AC_MSG_RESULT($ac_foo)
+ if test "$ac_foo" = yes; then
+ 	AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1, 
+ 		[Define if you have the `]$1[' variable.])
+-	m4_ifval([$2], AC_CHECK_DECLS([$1],[],[],[$2]))
++	m4_ifval([$2], [AC_CHECK_DECLS([$1],[],[],[$2])])
+ fi
+ ])
+ 
diff --git a/packages/devel/heimdal/patches/yyerror-match-posix-standard.patch b/packages/devel/heimdal/patches/yyerror-match-posix-standard.patch
new file mode 100644
index 0000000000..07b84c3555
--- /dev/null
+++ b/packages/devel/heimdal/patches/yyerror-match-posix-standard.patch
@@ -0,0 +1,83 @@
+From 79b8337d54b2d85f73eff2d033ca592447ac5fce Mon Sep 17 00:00:00 2001
+From: heitbaum <rudi@heitbaum.com>
+Date: Fri, 10 Sep 2021 00:28:16 +1000
+Subject: [PATCH] yyerror: update to POSIX standard
+
+To comply with the latest POSIX standard, in Yacc compatibility mode
+(options `-y`/`--yacc`) Bison now generates prototypes for yyerror and
+yylex.  In some situations, this is breaking compatibility: if the user
+has already declared these functions but with some differences (e.g., to
+declare them as static, or to use specific attributes), the generated
+parser will fail to compile.  To disable these prototypes, #define yyerror
+(to `yyerror`), and likewise for yylex.
+
+refer: https://git.savannah.gnu.org/cgit/bison.git/tree/NEWS
+
+GNU Bison 3.8
+---
+ lib/asn1/asn1parse.y | 1 +
+ lib/com_err/parse.y  | 5 +++--
+ lib/sl/slc-lex.l     | 2 +-
+ lib/sl/slc.h         | 3 ++-
+ 4 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/lib/asn1/asn1parse.y b/lib/asn1/asn1parse.y
+index 9d8b76f582..91b163a28b 100644
+--- a/lib/asn1/asn1parse.y
++++ b/lib/asn1/asn1parse.y
+@@ -65,6 +65,7 @@ static void validate_object_set(IOSObjectSet *);
+ static struct constraint_spec *new_constraint_spec(enum ctype);
+ static Type *new_tag(int tagclass, int tagvalue, int tagenv, Type *oldtype);
+ void yyerror (const char *);
++#define yyerror yyerror
+ static struct objid *new_objid(const char *label, int value);
+ static void add_oid_to_tail(struct objid *, struct objid *);
+ static void fix_labels(Symbol *s);
+diff --git a/lib/com_err/parse.y b/lib/com_err/parse.y
+index 0c2e5084b5..bcb9b05204 100644
+--- a/lib/com_err/parse.y
++++ b/lib/com_err/parse.y
+@@ -35,7 +35,8 @@
+ #include "compile_et.h"
+ #include "lex.h"
+ 
+-void yyerror (char *s);
++void yyerror (const char *s);
++#define yyerror yyerror
+ static long name2number(const char *str);
+ 
+ extern char *yytext;
+@@ -168,7 +169,7 @@ name2number(const char *str)
+ }
+ 
+ void
+-yyerror (char *s)
++yyerror (const char *s)
+ {
+      _lex_error_message ("%s\n", s);
+ }
+diff --git a/lib/sl/slc-lex.l b/lib/sl/slc-lex.l
+index 50965bccd7..3a37302336 100644
+--- a/lib/sl/slc-lex.l
++++ b/lib/sl/slc-lex.l
+@@ -78,7 +78,7 @@ error_message (const char *format, ...)
+ }
+ 
+ void
+-yyerror (char *s)
++yyerror (const char *s)
+ {
+     error_message("%s\n", s);
+ }
+diff --git a/lib/sl/slc.h b/lib/sl/slc.h
+index 6e45ed2f15..e4dc2cba6b 100644
+--- a/lib/sl/slc.h
++++ b/lib/sl/slc.h
+@@ -51,5 +51,6 @@ extern char *filename;
+ extern int error_flag;
+ void error_message (const char *format, ...);
+ int yylex(void);
+-void yyerror (char *s);
++void yyerror (const char *s);
++#define yyerror yyerror
+ extern unsigned lineno;
diff --git a/packages/devel/m4/package.mk b/packages/devel/m4/package.mk
index 943c75ffce..328a79a8c8 100644
--- a/packages/devel/m4/package.mk
+++ b/packages/devel/m4/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 
 PKG_NAME="m4"
-PKG_VERSION="1.4.18"
-PKG_SHA256="6640d76b043bc658139c8903e293d5978309bf0f408107146505eca701e67cf6"
+PKG_VERSION="1.4.19"
+PKG_SHA256="b306a91c0fd93bc4280cfc2e98cb7ab3981ff75a187bea3293811f452c89a8c8"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/m4/"
 PKG_URL="http://ftpmirror.gnu.org/m4/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
diff --git a/packages/devel/m4/patches/fix-compilation-with-glibc-2.28.patch b/packages/devel/m4/patches/fix-compilation-with-glibc-2.28.patch
deleted file mode 100644
index 325be90741..0000000000
--- a/packages/devel/m4/patches/fix-compilation-with-glibc-2.28.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-Those are changes from upstream gnulib commit which fixes compilation with glibc 2.28.
-
-diff --git a/lib/fflush.c b/lib/fflush.c
-index 983ade0..a6edfa1 100644
---- a/lib/fflush.c
-+++ b/lib/fflush.c
-@@ -33,7 +33,7 @@
- #undef fflush
- 
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- 
- /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
- static void
-@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
- 
- #endif
- 
--#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
-+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
- 
- # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
-@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
-   if (stream == NULL || ! freading (stream))
-     return fflush (stream);
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- 
-   clear_ungetc_buffer_preserving_position (stream);
- 
-diff --git a/lib/fpending.c b/lib/fpending.c
-index c84e3a5..789f50e 100644
---- a/lib/fpending.c
-+++ b/lib/fpending.c
-@@ -32,7 +32,7 @@ __fpending (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   return fp->_IO_write_ptr - fp->_IO_write_base;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
-diff --git a/lib/fpurge.c b/lib/fpurge.c
-index b1d417c..3aedcc3 100644
---- a/lib/fpurge.c
-+++ b/lib/fpurge.c
-@@ -62,7 +62,7 @@ fpurge (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   fp->_IO_read_end = fp->_IO_read_ptr;
-   fp->_IO_write_ptr = fp->_IO_write_base;
-   /* Avoid memory leak when there is an active ungetc buffer.  */
-diff --git a/lib/freadahead.c b/lib/freadahead.c
-index c2ecb5b..23ec76e 100644
---- a/lib/freadahead.c
-+++ b/lib/freadahead.c
-@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *);
- size_t
- freadahead (FILE *fp)
- {
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   if (fp->_IO_write_ptr > fp->_IO_write_base)
-     return 0;
-   return (fp->_IO_read_end - fp->_IO_read_ptr)
-diff --git a/lib/freading.c b/lib/freading.c
-index 73c28ac..c24d0c8 100644
---- a/lib/freading.c
-+++ b/lib/freading.c
-@@ -31,7 +31,7 @@ freading (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   return ((fp->_flags & _IO_NO_WRITES) != 0
-           || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
-               && fp->_IO_read_base != NULL));
-diff --git a/lib/fseeko.c b/lib/fseeko.c
-index 0101ab5..193f4e8 100644
---- a/lib/fseeko.c
-+++ b/lib/fseeko.c
-@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
- #endif
- 
-   /* These tests are based on fpurge.c.  */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   if (fp->_IO_read_end == fp->_IO_read_ptr
-       && fp->_IO_write_ptr == fp->_IO_write_base
-       && fp->_IO_save_base == NULL)
-@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
-           return -1;
-         }
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-       fp->_flags &= ~_IO_EOF_SEEN;
-       fp->_offset = pos;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
---- a/lib/stdio-impl.h
-+++ b/lib/stdio-impl.h
-@@ -18,6 +18,12 @@
-    the same implementation of stdio extension API, except that some fields
-    have different naming conventions, or their access requires some casts.  */
- 
-+/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
-+   problem by defining it ourselves.  FIXME: Do not rely on glibc
-+   internals.  */
-+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
-+# define _IO_IN_BACKUP 0x100
-+#endif
- 
- /* BSD stdio derived implementations.  */
- 
--- 
-1.9.1
-
diff --git a/packages/lang/gcc-arm-aarch64-none-elf/package.mk b/packages/lang/gcc-arm-aarch64-none-elf/package.mk
index ce63228f0d..c2aa00d5aa 100644
--- a/packages/lang/gcc-arm-aarch64-none-elf/package.mk
+++ b/packages/lang/gcc-arm-aarch64-none-elf/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="gcc-arm-aarch64-none-elf"
-PKG_VERSION="10.2-2020.11"
-PKG_SHA256="4f9f060e2ca993ec9564054e17b6fdeacb47260e983f766f84f157d00345bf29"
+PKG_VERSION="10.3-2021.07"
+PKG_SHA256="768a5db41d93f48838f1c4bfeae26930df2320c09f0dfa798321082fb937955f"
 PKG_LICENSE="GPL"
 PKG_SITE="https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a"
 PKG_URL="https://developer.arm.com/-/media/Files/downloads/gnu-a/${PKG_VERSION}/binrel/gcc-arm-${PKG_VERSION}-aarch64-aarch64-none-elf.tar.xz"
diff --git a/packages/lang/gcc-arm-aarch64-none-linux-gnu/package.mk b/packages/lang/gcc-arm-aarch64-none-linux-gnu/package.mk
index 23960a203d..ff8408c3ad 100644
--- a/packages/lang/gcc-arm-aarch64-none-linux-gnu/package.mk
+++ b/packages/lang/gcc-arm-aarch64-none-linux-gnu/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="gcc-arm-aarch64-none-linux-gnu"
-PKG_VERSION="10.2-2020.11"
-PKG_SHA256="fe7f72330216612de44891ebe5e228eed7c0c051ac090c395b2b33115c6f5408"
+PKG_VERSION="10.3-2021.07"
+PKG_SHA256="1e33d53dea59c8de823bbdfe0798280bdcd138636c7060da9d77a97ded095a84"
 PKG_LICENSE="GPL"
 PKG_SITE="https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a"
 PKG_URL="https://developer.arm.com/-/media/Files/downloads/gnu-a/${PKG_VERSION}/binrel/gcc-arm-${PKG_VERSION}-x86_64-aarch64-none-linux-gnu.tar.xz"
diff --git a/packages/lang/llvm/package.mk b/packages/lang/llvm/package.mk
index 78372ee23e..bcb9387074 100644
--- a/packages/lang/llvm/package.mk
+++ b/packages/lang/llvm/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="llvm"
-PKG_VERSION="12.0.0"
-PKG_SHA256="49dc47c8697a1a0abd4ee51629a696d7bfe803662f2a7252a3b16fc75f3a8b50"
+PKG_VERSION="12.0.1"
+PKG_SHA256="7d9a8405f557cefc5a21bf5672af73903b64749d9bc3a50322239f56f34ffddf"
 PKG_ARCH="x86_64"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="http://llvm.org/"
@@ -34,6 +34,7 @@ PKG_CMAKE_OPTS_COMMON="-DCMAKE_BUILD_TYPE=MinSizeRel \
                        -DLLVM_ENABLE_ASSERTIONS=OFF \
                        -DLLVM_ENABLE_WERROR=OFF \
                        -DLLVM_ENABLE_ZLIB=ON \
+                       -DLLVM_ENABLE_LIBXML2=OFF \
                        -DLLVM_BUILD_LLVM_DYLIB=ON \
                        -DLLVM_LINK_LLVM_DYLIB=ON \
                        -DLLVM_OPTIMIZED_TABLEGEN=ON \
@@ -49,8 +50,6 @@ pre_configure_host() {
 
 pre_configure_target() {
   PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_COMMON} \
-                         -DCMAKE_C_FLAGS="${CFLAGS}" \
-                         -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
                          -DLLVM_TARGET_ARCH="${TARGET_ARCH}" \
                          -DLLVM_TABLEGEN=${TOOLCHAIN}/bin/llvm-tblgen"
 }
diff --git a/packages/python/devel/meson/package.mk b/packages/python/devel/meson/package.mk
index dbe0096a05..69db6c7a45 100644
--- a/packages/python/devel/meson/package.mk
+++ b/packages/python/devel/meson/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="meson"
-PKG_VERSION="0.57.1"
-PKG_SHA256="72e1c782ba9bda204f4a1ed57f98d027d7b6eb9414c723eebbd6ec7f1955c8a6"
+PKG_VERSION="0.59.1"
+PKG_SHA256="db586a451650d46bbe10984a87b79d9bcdc1caebf38d8e189f8848f8d502356d"
 PKG_LICENSE="Apache"
 PKG_SITE="http://mesonbuild.com"
 PKG_URL="https://github.com/mesonbuild/meson/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
diff --git a/packages/sysutils/squashfs-tools/package.mk b/packages/sysutils/squashfs-tools/package.mk
index bde69d3d00..e5f1020d58 100644
--- a/packages/sysutils/squashfs-tools/package.mk
+++ b/packages/sysutils/squashfs-tools/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="squashfs-tools"
-PKG_VERSION="4.4"
-PKG_SHA256="a7fa4845e9908523c38d4acf92f8a41fdfcd19def41bd5090d7ad767a6dc75c3"
+PKG_VERSION="4.5"
+PKG_SHA256="b9e16188e6dc1857fe312633920f7d71cc36b0162eb50f3ecb1f0040f02edddd"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/plougher/squashfs-tools"
 PKG_URL="https://github.com/plougher/squashfs-tools/archive/${PKG_VERSION}.tar.gz"
diff --git a/packages/sysutils/squashfs-tools/patches/squashfs-tools-4.4-fno-common.patch b/packages/sysutils/squashfs-tools/patches/squashfs-tools-4.4-fno-common.patch
deleted file mode 100644
index dfbf42abb3..0000000000
--- a/packages/sysutils/squashfs-tools/patches/squashfs-tools-4.4-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/squashfs-tools/mksquashfs.h
-+++ b/squashfs-tools/mksquashfs.h
-@@ -143,7 +143,7 @@ struct append_file {
- #endif
- 
- extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
--struct cache *bwriter_buffer, *fwriter_buffer;
-+extern struct cache *bwriter_buffer, *fwriter_buffer;
- extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
- 	*to_frag, *locked_fragment, *to_process_frag;
- extern struct append_file **file_mapping;
diff --git a/packages/tools/mtools/package.mk b/packages/tools/mtools/package.mk
index c62c6e12a8..e72b0c9c60 100644
--- a/packages/tools/mtools/package.mk
+++ b/packages/tools/mtools/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mtools"
-PKG_VERSION="4.0.26"
-PKG_SHA256="539f1c8b476a16e198d8bcb10a5799e22e69de49d854f7dbd85b64c2a45dea1a"
+PKG_VERSION="4.0.29"
+PKG_SHA256="c6b50b4603e7afe54ba0109094669373028db9af743f5c541bca4b7664aefec7"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/mtools/"
 PKG_URL="http://ftpmirror.gnu.org/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
diff --git a/packages/tools/qemu/package.mk b/packages/tools/qemu/package.mk
index e4f787fd60..5854327227 100644
--- a/packages/tools/qemu/package.mk
+++ b/packages/tools/qemu/package.mk
@@ -2,29 +2,48 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="qemu"
-PKG_VERSION="4.0.0"
-PKG_SHA256="13a93dfe75b86734326f8d5b475fde82ec692d5b5a338b4262aeeb6b0fa4e469"
+PKG_VERSION="6.1.0"
+PKG_SHA256="eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96"
 PKG_LICENSE="GPL"
-PKG_SITE="http://wiki.qemu.org"
+PKG_SITE="https://www.qemu.org"
 PKG_URL="https://download.qemu.org/qemu-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="toolchain:host glib:host pixman:host Python3:host zlib:host"
 PKG_LONGDESC="QEMU is a generic and open source machine emulator and virtualizer."
+PKG_TOOLCHAIN="configure"
 
 pre_configure_host() {
-  HOST_CONFIGURE_OPTS="--bindir=${TOOLCHAIN}/bin \
-                       --extra-cflags=-I${TOOLCHAIN}/include \
-                       --extra-ldflags=-L${TOOLCHAIN}/lib \
-                       --libexecdir=${TOOLCHAIN}/lib \
-                       --localstatedir=${TOOLCHAIN}/var \
-                       --prefix=${TOOLCHAIN} \
-                       --sbindir=${TOOLCHAIN}/sbin \
-                       --static \
-                       --sysconfdir=${TOOLCHAIN}/etc \
-                       --disable-blobs \
-                       --disable-docs \
-                       --disable-gcrypt \
-                       --disable-system \
-                       --disable-user \
-                       --disable-vnc \
-                       --disable-werror"
+  HOST_CONFIGURE_OPTS="\
+    --bindir=$TOOLCHAIN/bin \
+    --extra-cflags=-I$TOOLCHAIN/include \
+    --extra-ldflags=-L$TOOLCHAIN/lib \
+    --libexecdir=$TOOLCHAIN/lib \
+    --localstatedir=$TOOLCHAIN/var \
+    --prefix=$TOOLCHAIN \
+    --sbindir=$TOOLCHAIN/sbin \
+    --sysconfdir=$TOOLCHAIN/etc \
+    --enable-tools \
+    --disable-attr \
+    --disable-auth-pam \
+    --disable-blobs \
+    --disable-capstone \
+    --disable-curl \
+    --disable-debug-info \
+    --disable-debug-mutex \
+    --disable-debug-tcg \
+    --disable-docs \
+    --disable-gcrypt \
+    --disable-gnutls \
+    --disable-libxml2 \
+    --disable-system \
+    --disable-tcmalloc \
+    --disable-user \
+    --disable-vnc \
+    --disable-werror \
+    --disable-xkbcommon \
+    --disable-zstd"
+}
+
+makeinstall_host() {
+  mkdir -p $TOOLCHAIN/bin
+    cp $PKG_BUILD/.$HOST_NAME/qemu-img $TOOLCHAIN/bin
 }
diff --git a/packages/wayland/wayland/package.mk b/packages/wayland/wayland/package.mk
index ecece51080..fbc6ac6da8 100644
--- a/packages/wayland/wayland/package.mk
+++ b/packages/wayland/wayland/package.mk
@@ -10,6 +10,7 @@ PKG_URL="https://wayland.freedesktop.org/releases/${PKG_NAME}-${PKG_VERSION}.tar
 PKG_DEPENDS_TARGET="toolchain wayland:host libffi expat libxml2"
 PKG_DEPENDS_HOST="libffi:host expat:host libxml2:host"
 PKG_LONGDESC="a display server protocol"
+PKG_TOOLCHAIN="configure"
 
 PKG_CONFIGURE_OPTS_HOST="--enable-shared \
                          --disable-static \
diff --git a/projects/Samsung/patches/kodi/kodi-0001-use-EGL_KHR_platform_gbm-not-EGL_MESA_platform_gbm.patch b/projects/Samsung/patches/kodi/kodi-0001-use-EGL_KHR_platform_gbm-not-EGL_MESA_platform_gbm.patch
index eb9c8d67d8..c2f01dded9 100644
--- a/projects/Samsung/patches/kodi/kodi-0001-use-EGL_KHR_platform_gbm-not-EGL_MESA_platform_gbm.patch
+++ b/projects/Samsung/patches/kodi/kodi-0001-use-EGL_KHR_platform_gbm-not-EGL_MESA_platform_gbm.patch
@@ -4,9 +4,32 @@ Date: Mon, 6 Jul 2020 06:56:46 +0000
 Subject: [PATCH] use EGL_KHR_platform_gbm not EGL_MESA_platform_gbm
 
 ---
+ xbmc/windowing/gbm/WinSystemGbmEGLContext.cpp  | 2 ++--
  xbmc/windowing/gbm/WinSystemGbmGLESContext.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 2 file changed, 3 insertion(+), 3 deletion(-)
 
+diff --git a/xbmc/windowing/gbm/WinSystemGbmEGLContext.cpp b/xbmc/windowing/gbm/WinSystemGbmEGLContext.cpp
+index d8d775dcad..21efc02d34 100644
+--- a/xbmc/windowing/gbm/WinSystemGbmEGLContext.cpp
++++ b/xbmc/windowing/gbm/WinSystemGbmEGLContext.cpp
+@@ -23,7 +23,7 @@ bool CWinSystemGbmEGLContext::InitWindowSystemEGL(EGLint renderableType, EGLint
+     return false;
+   }
+ 
+-  if (!m_eglContext.CreatePlatformDisplay(m_GBM->GetDevice()->Get(), m_GBM->GetDevice()->Get()))
++  if (!m_eglContext.CreatePlatformDisplay(m_GBM->GetDevice()->Get(), reinterpret_cast<EGLNativeDisplayType>(m_GBM->GetDevice()->Get())))
+   {
+     return false;
+   }
+@@ -87,7 +87,7 @@
+ 
+   if (!m_eglContext.CreatePlatformSurface(
+           m_GBM->GetDevice()->GetSurface()->Get(),
+-          reinterpret_cast<khronos_uintptr_t>(m_GBM->GetDevice()->GetSurface()->Get())))
++          reinterpret_cast<EGLNativeWindowType>(m_GBM->GetDevice()->GetSurface()->Get())))
+   {
+     return false;
+   }
 diff --git a/xbmc/windowing/gbm/WinSystemGbmGLESContext.cpp b/xbmc/windowing/gbm/WinSystemGbmGLESContext.cpp
 index cf293900ca..5b96ebaf21 100644
 --- a/xbmc/windowing/gbm/WinSystemGbmGLESContext.cpp
@@ -22,4 +45,3 @@ index cf293900ca..5b96ebaf21 100644
  std::unique_ptr<CWinSystemBase> CWinSystemBase::CreateWinSystem()
 -- 
 2.17.1
-
diff --git a/tools/docker/focal/Dockerfile b/tools/docker/focal/Dockerfile
index dd7a6aafeb..34d691d5f8 100644
--- a/tools/docker/focal/Dockerfile
+++ b/tools/docker/focal/Dockerfile
@@ -18,13 +18,17 @@ RUN adduser --disabled-password --gecos '' docker \
  && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
 RUN apt-get update && apt-get install -y \
-    wget bash bc gcc sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip unzip diffutils lzop make file \
-    g++ xfonts-utils xsltproc default-jre-headless python3 \
-    libc6-dev libncurses5-dev \
-    libjson-perl libxml-parser-perl libparse-yapp-perl \
-    golang-go \
-    git openssh-client \
+    wget bash bc gcc-10 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \
+      unzip diffutils lzop make file g++-10 xfonts-utils xsltproc default-jre-headless python3 \
+      libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl \
+      golang-go git openssh-client \
     --no-install-recommends \
  && rm -rf /var/lib/apt/lists/*
 
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \
+    --slave /usr/bin/cpp cpp /usr/bin/cpp-10 \
+    --slave /usr/bin/g++ g++ /usr/bin/g++-10 \
+    --slave /usr/bin/gcov gcov /usr/bin/gcov-10
+RUN update-alternatives --config gcc
+
 USER docker