Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2021-03-08 08:06:00 +01:00 · 2021-03-08 08:06:00 +01:00 · a56be0d30f
commit a56be0d30f
parent 7abc0d1001 ff084e1933
387 changed files with 2940 additions and 3570 deletions
--- a/Config.in.legacy
+++ b/Config.in.legacy
@ -144,6 +144,16 @@ endif

 ###############################################################################

+comment "Legacy options removed in 2021.05"
+
+config BR2_PACKAGE_KODI_SCREENSAVER_CRYSTALMORPH
+	bool "kodi-screensaver-crystalmorph removed"
+	select BR2_LEGACY
+	help
+	  The package received its last updates in 2017, is not part
+	  of the official Kodi github repo and its build is broken
+	  with Kodi 19.x, so it was removed.
+
 comment "Legacy options removed in 2021.02"

 config BR2_PACKAGE_MPD_AUDIOFILE
--- a/3
+++ b/3
@ -921,6 +921,7 @@ F:	package/copas/
 F:	package/coxpcall/
 F:	package/dado/
 F:	package/ficl/
+F:	package/janet/
 F:	package/libtomcrypt/
 F:	package/libtommath/
 F:	package/libwpe/
@ -1055,6 +1056,7 @@ F:	package/python-wtforms/

 N:	Guillaume William Brs <guillaume.bressaix@gmail.com>
 F:	package/libnids/
+F:	package/libxcrypt/
 F:	package/liquid-dsp/
 F:	package/pixiewps/
 F:	package/python-pybind/
@ -1122,6 +1124,7 @@ F:	package/exempi/

 N:	Ismael Luceno <ismael@iodev.co.uk>
 F:	package/axel/
+F:	package/mawk/

 N:	Jagan Teki <jagan@amarulasolutions.com>
 F:	board/amarula/
--- a/board/qemu/ppc-e500mc/linux.fragment
+++ b/board/qemu/ppc-e500mc/linux.fragment
@ -0,0 +1,10 @@
+# Enables generic PPC e500 base arch support for QEMU.
+# The e500mc is a variant of the e500 arch.
+CONFIG_PPC_QEMU_E500=y
+
+# Enable virtio (blk, rng and net devices)
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_HW_RANDOM_VIRTIO=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_NET=y
--- a/board/qemu/ppc-e500mc/readme.txt
+++ b/board/qemu/ppc-e500mc/readme.txt
@ -0,0 +1,5 @@
+Run the emulation with:
+
+ qemu-system-ppc -M ppce500 -cpu e500mc -m 256 -kernel output/images/uImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "console=ttyS0 rootwait root=/dev/vda" -serial mon:stdio -nographic # qemu_ppc_e500mc_defconfig
+
+The login prompt will appear in the terminal that started Qemu.
--- a/boot/at91bootstrap3/at91bootstrap3.hash
+++ b/boot/at91bootstrap3/at91bootstrap3.hash
@ -1,3 +1,3 @@
 # Locally calculated
 sha256  dd6a3c57c1c84fc3b18187bee3d139146a0e032dd1d8edea7b242730e0bc4fe1  at91bootstrap3-v3.9.3.tar.gz
-sha256  732b2a55b5905031d8ae420136ffb5f8889214865784386bf754cffab8d2bc6e  main.c
+sha256  fd7a1ce5719bb7abf5e289da2e0ea8c933af3ba0f6ad03dbdbd2b7f54a77498a  main.c
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@ -12,7 +12,7 @@ choice
 	  Select the specific Barebox version you want to use

 config BR2_TARGET_BAREBOX_LATEST_VERSION
-	bool "2020.11.0"
+	bool "2021.01.0"

 config BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	bool "Custom version"
@ -40,7 +40,7 @@ endif

 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2020.11.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
+	default "2021.01.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
 	default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
--- a/boot/barebox/barebox.hash
+++ b/boot/barebox/barebox.hash
@ -1,8 +1,8 @@
-# From https://www.barebox.org/download/barebox-2020.11.0.tar.bz2.md5
-md5  1fc2c1a03d7b44dc12fbf4cf1fc6ffe0  barebox-2020.11.0.tar.bz2
+# From https://www.barebox.org/download/barebox-2021.01.0.tar.bz2.md5
+md5  e81e7cd6bc2629e7fcdeaddf59c324c3  barebox-2021.01.0.tar.bz2

 # Locally calculated
-sha256  049d2b1b887d0397f4b5390255459fb0240200b06a3276ffaefdeab7fb243554  barebox-2020.11.0.tar.bz2
+sha256  b39501db1c701b05f862973d8aed628cab0e611421cbaadae8b5262311551ff9  barebox-2021.01.0.tar.bz2

 # License files, locally computed
 sha256  ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4  COPYING
--- a/boot/optee-os/Config.in
+++ b/boot/optee-os/Config.in
@ -18,7 +18,7 @@ choice
 	  Select the version of OP-TEE OS you want to use

 config BR2_TARGET_OPTEE_OS_LATEST
-	bool "3.11.0"
+	bool "3.12.0"
 	help
 	  Use the latest release tag from the OP-TEE OS official Git
 	  repository.
@ -50,7 +50,7 @@ endif

 config BR2_TARGET_OPTEE_OS_VERSION
 	string
-	default "3.11.0"	if BR2_TARGET_OPTEE_OS_LATEST
+	default "3.12.0"	if BR2_TARGET_OPTEE_OS_LATEST
 	default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \
 				if BR2_TARGET_OPTEE_OS_CUSTOM_GIT

--- a/boot/optee-os/optee-os.hash
+++ b/boot/optee-os/optee-os.hash
@ -1,4 +1,4 @@
-# From https://github.com/OP-TEE/optee_os/archive/3.11.0.tar.gz
-sha256 3c34eda1052fbb9ed36fcfdfaecfd2685023b9290670c1a5982f8a0457bfd2cb  optee-os-3.11.0.tar.gz
+# From https://github.com/OP-TEE/optee_os/archive/3.12.0/optee-os-3.12.0.tar.gz
+sha256 b13991099f25d00dac479db93b55034cb93d206e296f2c7aa9c42b92bca2c783  optee-os-3.12.0.tar.gz
 # Locally computed
 sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a  LICENSE
--- a/configs/kontron_smarc_sal28_defconfig
+++ b/configs/kontron_smarc_sal28_defconfig
@ -1,6 +1,6 @@
 BR2_aarch64=y
 BR2_cortex_a72=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_11=y
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_ROOTFS_OVERLAY="board/kontron/smarc-sal28/rootfs_overlay"
@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.11"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1028a-kontron-sl28 freescale/fsl-ls1028a-kontron-sl28-var2 freescale/fsl-ls1028a-kontron-sl28-var3-ads2 freescale/fsl-ls1028a-kontron-sl28-var4 freescale/fsl-ls1028a-kontron-kbox-a-230-ls"
--- a/configs/mx6cubox_defconfig
+++ b/configs/mx6cubox_defconfig
@ -6,8 +6,8 @@ BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_VFPV3=y

 # Toolchain
-# Linux headers same as kernel, a 5.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+# Linux headers same as kernel, a 5.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y

 # System configuration
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@ -17,7 +17,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/solidrun/mx6cubox/post-image.sh"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.69"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.6"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-cubox-i imx6dl-cubox-i-emmc-som-v15 imx6dl-cubox-i-som-v15 imx6dl-hummingboard imx6dl-hummingboard-emmc-som-v15 imx6dl-hummingboard-som-v15 imx6q-cubox-i imx6q-cubox-i-emmc-som-v15 imx6q-cubox-i-som-v15 imx6q-hummingboard imx6q-hummingboard-emmc-som-v15 imx6q-hummingboard-som-v15"
@ -32,7 +32,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx6cuboxi"
 BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
--- a/configs/olimex_a20_olinuxino_lime2_defconfig
+++ b/configs/olimex_a20_olinuxino_lime2_defconfig
@ -3,8 +3,8 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_EABIHF=y

-# Linux headers same as kernel, a 5.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+# Linux headers same as kernel, a 5.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y

 # Toolchain
 # glibc is needed for sunxi-mali-mainline-package.
@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.69"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.6"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@ -43,7 +43,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
--- a/configs/olimex_a20_olinuxino_lime_defconfig
+++ b/configs/olimex_a20_olinuxino_lime_defconfig
@ -3,8 +3,8 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_EABIHF=y

-# Linux headers same as kernel, a 5.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+# Linux headers same as kernel, a 5.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y

 # Toolchain
 # glibc is needed for sunxi-mali-mainline-package.
@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.69"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.6"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@ -43,7 +43,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
--- a/configs/qemu_ppc_e500mc_defconfig
+++ b/configs/qemu_ppc_e500mc_defconfig
@ -0,0 +1,29 @@
+# Architecture
+BR2_powerpc=y
+BR2_powerpc_e500mc=y
+
+# Serial port config
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
+
+# Image
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)"
+
+# Linux headers same as the kernel
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7"
+BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+
+# Filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+# BR2_TARGET_ROOTFS_TAR is not set
+
+# host-qemu for gitlab testing
+BR2_PACKAGE_HOST_QEMU=y
+BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y
--- a/linux/Config.in
+++ b/linux/Config.in
@ -28,7 +28,7 @@ choice
 	prompt "Kernel version"

 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "Latest version (5.10)"
+	bool "Latest version (5.11)"

 config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	bool "Latest CIP SLTS version (4.19.152-cip37)"
@ -125,7 +125,7 @@ endif

 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "5.10.19" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "5.11" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default "4.19.152-cip37" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default "4.19.152-cip37-rt16" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
--- a/linux/linux.hash
+++ b/linux/linux.hash
@ -1,4 +1,5 @@
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
+sha256  04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4  linux-5.11.tar.xz
 sha256  27e7bbb0de7f0acc29c3c2e0a70c9a5fafc5fcf250993ce48713f809862ab4d6  linux-5.10.19.tar.xz
 sha256  4e118c072dbe3209ddeaff32ecc558f7e809d54e661550342079f1ee76d9349d  linux-5.4.101.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
--- a/linux/linux.mk
+++ b/linux/linux.mk
@ -78,7 +78,8 @@ LINUX_MAKE_ENV = \

 LINUX_INSTALL_IMAGES = YES
 LINUX_DEPENDENCIES = host-kmod \
-	$(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode)
+	$(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode) \
+	$(if $(BR2_PACKAGE_LINUX_FIRMWARE),linux-firmware)

 # Starting with 4.16, the generated kconfig paser code is no longer
 # shipped with the kernel sources, so we need flex and bison, but
--- a/package/Config.in
+++ b/package/Config.in
@ -178,6 +178,7 @@ menu "Development tools"
 	source "package/jq/Config.in"
 	source "package/libtool/Config.in"
 	source "package/make/Config.in"
+	source "package/mawk/Config.in"
 	source "package/patch/Config.in"
 	source "package/pkgconf/Config.in"
 	source "package/ripgrep/Config.in"
@ -624,6 +625,7 @@ endif
 	source "package/gauche/Config.in"
 	source "package/guile/Config.in"
 	source "package/haserl/Config.in"
+	source "package/janet/Config.in"
 	source "package/jimtcl/Config.in"
 	source "package/lua/Config.in"
 	source "package/luainterpreter/Config.in"
@ -1371,6 +1373,7 @@ menu "Crypto"
 	source "package/libssh2/Config.in"
 	source "package/libtomcrypt/Config.in"
 	source "package/libuecc/Config.in"
+	source "package/libxcrypt/Config.in"
 	source "package/mbedtls/Config.in"
 	source "package/nettle/Config.in"
 	source "package/openssl/Config.in"
--- a/package/bwm-ng/bwm-ng.hash
+++ b/package/bwm-ng/bwm-ng.hash
@ -1,3 +1,3 @@
 # Locally calculated
-sha256  906a2d561f2ec9e0dd68b7f51b302908e99515ea1216d0ecaf14d873ef54ae70  bwm-ng-0.6.2.tar.gz
+sha256  c1a552b6ff48ea3e4e10110a7c188861abc4750befc67c6caaba8eb3ecf67f46  bwm-ng-0.6.3.tar.gz
 sha256  8556cc15ba3c0a411bf7d94bac5870829fb725f294b450c724c1e0856a601556  COPYING
--- a/package/bwm-ng/bwm-ng.mk
+++ b/package/bwm-ng/bwm-ng.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-BWM_NG_VERSION = 0.6.2
+BWM_NG_VERSION = 0.6.3
 BWM_NG_SITE = $(call github,vgropp,bwm-ng,v$(BWM_NG_VERSION))
 BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats
 BWM_NG_LICENSE = GPL-2.0+
--- a/package/cage/Config.in
+++ b/package/cage/Config.in
@ -1,6 +1,7 @@
-comment "cage needs udev, mesa3d w/ EGL and GLES support"
-	depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \
-		!BR2_PACKAGE_MESA3D_OPENGL_ES || \
+comment "cage needs udev, EGL w/ Wayland backend and OpenGL ES support"
+	depends on !BR2_PACKAGE_HAS_LIBEGL || \
+		!BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
+		!BR2_PACKAGE_HAS_LIBGLES || \
 		!BR2_PACKAGE_HAS_UDEV

 comment "cage needs a toolchain w/ threads, dynamic library"
@ -11,9 +12,10 @@ config BR2_PACKAGE_CAGE
 	bool "cage"
 	depends on !BR2_STATIC_LIBS # wlroots
 	depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots
+	depends on BR2_PACKAGE_HAS_LIBEGL # wlroots
+	depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wlroots
+	depends on BR2_PACKAGE_HAS_LIBGLES # wlroots
 	depends on BR2_PACKAGE_HAS_UDEV # wlroots
-	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # wlroots
-	depends on BR2_PACKAGE_MESA3D_OPENGL_ES # wlroots
 	select BR2_PACKAGE_WLROOTS
 	help
 	  Kiosk compositor for Wayland, which displays a single
--- a/package/daemon/daemon.hash
+++ b/package/daemon/daemon.hash
@ -1,3 +1,5 @@
 # From http://www.libslack.org/daemon/
-sha256  f66af2ece784c16dcb5219de1f4fa3ae5787bb3374e44bd4b1d3e275e8ff272c  daemon-0.7.tar.gz
+sha256  ba1f6dc87532c852bfb8f436179cd661c3458ff898f67767c414123198626dfd  daemon-0.7.1.tar.gz
+# Locally calculated
 sha256  204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994  LICENSE
+sha256  cbac6eb0e1f7f95826966c7903939d591092a7f7d7726862946cb49096e8497d  COPYING
--- a/package/daemon/daemon.mk
+++ b/package/daemon/daemon.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-DAEMON_VERSION = 0.7
+DAEMON_VERSION = 0.7.1
 DAEMON_SITE = http://libslack.org/daemon/download
 DAEMON_LICENSE = GPL-2.0+
-DAEMON_LICENSE_FILES = LICENSE
+DAEMON_LICENSE_FILES = LICENSE COPYING

 define DAEMON_CONFIGURE_CMDS
 	(cd $(@D); ./configure)
--- a/package/dav1d/dav1d.hash
+++ b/package/dav1d/dav1d.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  842da2945afcf54e651d17112bf2823a238e6c935a6c8dff3a8e96a2eb740269  dav1d-0.8.1.tar.bz2
+sha256  78ec7a1714d98a8f4ecbc4255e83e6c4c944cdd881871ea234ce40153fd3df04  dav1d-0.8.2.tar.bz2
 sha256  b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9  COPYING
--- a/package/dav1d/dav1d.mk
+++ b/package/dav1d/dav1d.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-DAV1D_VERSION = 0.8.1
+DAV1D_VERSION = 0.8.2
 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2
 DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION)
 DAV1D_LICENSE = BSD-2-Clause
--- a/package/dfu-util/dfu-util.hash
+++ b/package/dfu-util/dfu-util.hash
@ -1,6 +1,6 @@
-# From http://dfu-util.sourceforge.net/releases/dfu-util-0.9.tar.gz.md5
-md5	233bb1e08ef4b405062445d84e28fde6	dfu-util-0.9.tar.gz
+# From http://dfu-util.sourceforge.net/releases/dfu-util-0.10.tar.gz.md5
+md5  8cf55663703cdc6b40f377f999eb8d3d  dfu-util-0.10.tar.gz

 # Locally computed
-sha256	36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833	dfu-util-0.9.tar.gz
-sha256	32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670	COPYING
+sha256  a03dc58dfc79c056819c0544b2a5970537566460102b3d82cfb038c60e619b42  dfu-util-0.10.tar.gz
+sha256  32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
--- a/package/dfu-util/dfu-util.mk
+++ b/package/dfu-util/dfu-util.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-DFU_UTIL_VERSION = 0.9
+DFU_UTIL_VERSION = 0.10
 DFU_UTIL_SITE = http://dfu-util.sourceforge.net/releases
 DFU_UTIL_LICENSE = GPL-2.0+
 DFU_UTIL_LICENSE_FILES = COPYING
--- a/package/ell/0001-build-Add-rawmemchr-to-missing.h.patch
+++ b/package/ell/0001-build-Add-rawmemchr-to-missing.h.patch
@ -1,47 +0,0 @@
-From 3916c1cc32be205e185a8a56de5cde1b9ec60e81 Mon Sep 17 00:00:00 2001
-From: Denis Kenzior <denkenz@gmail.com>
-Date: Mon, 30 Nov 2020 13:00:11 -0600
-Subject: [PATCH] build: Add rawmemchr to missing.h
-
-For those systems (i.e. musl) that do not support this
-
-[Upstream: https://git.kernel.org/pub/scm/libs/ell/ell.git/patch/?id=3916c1cc32be205e185a8a56de5cde1b9ec60e81]
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
- configure.ac  |  1 +
- ell/missing.h | 10 ++++++++++
- 2 files changed, 11 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 1e5ead9..f34add1 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -98,6 +98,7 @@ AC_ARG_ENABLE(ubsan, AC_HELP_STRING([--enable-ubsan],
- ])
- 
- AC_CHECK_FUNCS(explicit_bzero)
-+AC_CHECK_FUNCS(rawmemchr)
- 
- AC_CHECK_FUNC(signalfd, dummy=yes,
- 			AC_MSG_ERROR(signalfd support is required))
-diff --git a/ell/missing.h b/ell/missing.h
-index 6b9b0fd..2a3e647 100644
--- a/ell/missing.h
-+++ b/ell/missing.h
-@@ -67,3 +67,13 @@ static inline void explicit_bzero(void *s, size_t n)
- #ifndef SO_BINDTOIFINDEX
- #define SO_BINDTOIFINDEX 62
- #endif
-+
-+#ifndef HAVE_RAWMEMCHR
-+static inline void *rawmemchr(const void *s, int c)
-+{
-+_Pragma("GCC diagnostic push")
-+_Pragma("GCC diagnostic ignored \"-Wstringop-overflow=\"")
-+	return memchr(s, c, (size_t) -1);
-+_Pragma("GCC diagnostic pop")
-+}
-+#endif
-- 
-2.29.2
-
--- a/package/ell/0002-ell-add-missing-include-in-dhcp-server.patch
+++ b/package/ell/0002-ell-add-missing-include-in-dhcp-server.patch
@ -1,26 +0,0 @@
-From 6dfff19d4716ba216de1a3298ed0f667d7782810 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <ericonr@disroot.org>
-Date: Mon, 30 Nov 2020 18:40:33 -0300
-Subject: [PATCH] ell: add missing include in dhcp-server.
-
-[Upstream: https://git.kernel.org/pub/scm/libs/ell/ell.git/patch/?id=6dfff19d4716ba216de1a3298ed0f667d7782810]
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
- ell/dhcp-server.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ell/dhcp-server.c b/ell/dhcp-server.c
-index c983ed4..144e83e 100644
--- a/ell/dhcp-server.c
-+++ b/ell/dhcp-server.c
-@@ -24,6 +24,7 @@
- #include <config.h>
- #endif
- 
-+#include <linux/types.h>
- #include <net/ethernet.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
-- 
-2.29.2
-
--- a/package/ell/ell.hash
+++ b/package/ell/ell.hash
@ -1,5 +1,5 @@
 # Locally computed
-sha256  c2b3848568c75bcf5a0e7d1f2efce4fdb2733d28226ed21c6a6542f0be05d784  ell-0.35-br1.tar.gz
+sha256  7767306f20db41c28b3138b5323bca05fef92238b6b61f81f66c2af684a13886  ell-0.38-br1.tar.gz

 # License files
 sha256  ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5  COPYING
--- a/package/ell/ell.mk
+++ b/package/ell/ell.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-ELL_VERSION = 0.35
+ELL_VERSION = 0.38
 ELL_SITE = https://git.kernel.org/pub/scm/libs/ell/ell.git
 ELL_SITE_METHOD = git
 ELL_LICENSE = LGPL-2.1+
--- a/package/eudev/0001-src-libudev-libudev-monitor.c-do-not-check-if-dev-is.patch
+++ b/package/eudev/0001-src-libudev-libudev-monitor.c-do-not-check-if-dev-is.patch
@ -1,33 +0,0 @@
-From 799591c57368bbe47667f5b696050247a766b117 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Mon, 6 Jan 2020 11:14:47 -0500
-Subject: [PATCH] src/libudev/libudev-monitor.c: do not check if /dev is tmpfs
-
-This check fails for buildroot systems where /dev is not mounted
-as a tmpfs filesystem.  Dropping this check should be safe even
-on regular systems.
-
-This solves issue #172.
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-Signed-off-by: Joel Stanley <joel@jms.id.au>
---
- src/libudev/libudev-monitor.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
-index 614149c6243c..060ba733f33b 100644
--- a/src/libudev/libudev-monitor.c
-+++ b/src/libudev/libudev-monitor.c
-@@ -186,7 +186,7 @@ struct udev_monitor *udev_monitor_new_from_netlink_fd(struct udev *udev, const c
-                  * We do not set a netlink multicast group here, so the socket
-                  * will not receive any messages.
-                  */
-                if (access(UDEV_ROOT_RUN "/udev/control", F_OK) < 0 || !udev_has_devtmpfs(udev)) {
-+                if (access(UDEV_ROOT_RUN "/udev/control", F_OK) < 0) {
-                         log_debug("the udev service seems not to be active, disable the monitor");
-                         group = UDEV_MONITOR_NONE;
-                 } else
-- 
-2.25.0
-
--- a/package/eudev/eudev.hash
+++ b/package/eudev/eudev.hash
@ -1,5 +1,5 @@
 # From http://dev.gentoo.org/~blueness/eudev/
-md5 dedfb1964f6098fe9320de827957331f  eudev-3.2.9.tar.gz
+md5  60b135a189523f333cea5f71a3345c8d  eudev-3.2.10.tar.gz
 # Locally calculated
-sha256 89618619084a19e1451d373c43f141b469c9fd09767973d73dd268b92074d4fc  eudev-3.2.9.tar.gz
-sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
+sha256  87bb028d470fd1b85169349b44c55d5b733733dc2d50ddf1196e026725ead034  eudev-3.2.10.tar.gz
+sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
--- a/package/eudev/eudev.mk
+++ b/package/eudev/eudev.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-EUDEV_VERSION = 3.2.9
+EUDEV_VERSION = 3.2.10
 EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev
 EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
 EUDEV_LICENSE_FILES = COPYING
--- a/package/faketime/faketime.hash
+++ b/package/faketime/faketime.hash
@ -1,3 +1,3 @@
 # Locally calculated
-sha256 06288237cd5890eca148489e5b904ed852ed0ffa8424bfb479342f4daa8442a3 faketime-0.9.8.tar.gz
-sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
+sha256  57d0181150361c0a9b5c8eef05b11392f6134ada2c2d998e92e63daed639647c  faketime-0.9.9.tar.gz
+sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
--- a/package/faketime/faketime.mk
+++ b/package/faketime/faketime.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-FAKETIME_VERSION = 0.9.8
+FAKETIME_VERSION = 0.9.9
 FAKETIME_SITE = $(call github,wolfcw,libfaketime,v$(FAKETIME_VERSION))
 FAKETIME_LICENSE = GPL-2.0
 FAKETIME_LICENSE_FILES = COPYING
--- a/package/ffmpeg/0004-avformat-mpegts-make-sure-mpegts-read-header-always.patch
+++ b/package/ffmpeg/0004-avformat-mpegts-make-sure-mpegts-read-header-always.patch
@ -1,38 +0,0 @@
-From 3136f41e6db8189994a8e4f72eacc92b669776d1 Mon Sep 17 00:00:00 2001
-From: Marton Balint <cus@passwd.hu>
-Date: Sun, 15 Nov 2020 00:39:41 +0100
-Subject: [PATCH] avformat/mpegts: make sure mpegts_read_header always stops at
- the first pmt
-
-mpegts_read_header stops parsing the file at the first PMT. However the check
-that ensured this was wrong because streams can also be added before the first
-PMT is received (e.g. EIT).
-
-So let's make sure we are in the header reading phase by checking if ts->pkt is
-unset instead of checking if the number of streams found so far is 0.
-
-Downloaded from Kodi ffmpeg repo:
-https://github.com/xbmc/FFmpeg/commit/3136f41e6db8189994a8e4f72eacc92b669776d1
-
-Patch was committed upstream:
-http://git.videolan.org/?p=ffmpeg.git;a=patch;h=ca55240b8c1fd4cfdb61f88fd2cb378d475d910a
-
-Signed-off-by: Marton Balint <cus@passwd.hu>
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
- libavformat/mpegts.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
-index c6fd3e1cef63..1da81a0fe62a 100644
--- a/libavformat/mpegts.c
-+++ b/libavformat/mpegts.c
-@@ -2352,7 +2352,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
-         goto out;
- 
-     // stop parsing after pmt, we found header
-    if (!ts->stream->nb_streams)
-+    if (!ts->pkt)
-         ts->stop_parse = 2;
- 
-     set_pmt_found(ts, h->id);
--- a/package/ffmpeg/ffmpeg.hash
+++ b/package/ffmpeg/ffmpeg.hash
@ -1,5 +1,5 @@
 # Locally calculated
-sha256  ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb  ffmpeg-4.3.1.tar.xz
+sha256  46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb  ffmpeg-4.3.2.tar.xz
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING.GPLv2
 sha256  b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe  COPYING.LGPLv2.1
 sha256  cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2  LICENSE.md
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-FFMPEG_VERSION = 4.3.1
+FFMPEG_VERSION = 4.3.2
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
 FFMPEG_SITE = http://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES
--- a/package/frotz/Config.in
+++ b/package/frotz/Config.in
@ -1,14 +1,10 @@
 config BR2_PACKAGE_FROTZ
 	bool "frotz"
-	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_NCURSES
 	help
 	  Frotz is an interpreter for old Infocom adventure games and
-	  other Z-code games. Note that frotz can not be run as root.
+	  other Z-code games. Note that frotz cannot be run as root.
 	  You must add a normal user to your buildroot configuration to
 	  be able to use it.

 	  https://661.org/proj/if/frotz/
-
-comment "frotz needs a toolchain w/ threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
--- a/package/frotz/frotz.hash
+++ b/package/frotz/frotz.hash
@ -1,3 +1,3 @@
 # Locally calculated
-sha256  7e488140791259a1a8c9e16a0c467ca69b694b918c28ffe3d83c654bcb253cca  frotz-2.51.tar.bz2
+sha256  8da558828dd74d6d6ee30483bb32276ef918b8b72b7f6e89b4f7cb27e7abf58b  frotz-2.53.tar.bz2
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
--- a/package/frotz/frotz.mk
+++ b/package/frotz/frotz.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-FROTZ_VERSION = 2.51
+FROTZ_VERSION = 2.53
 FROTZ_SOURCE = frotz-$(FROTZ_VERSION).tar.bz2
 FROTZ_SITE = https://gitlab.com/DavidGriffith/frotz/-/archive/$(FROTZ_VERSION)
 FROTZ_DEPENDENCIES = host-pkgconf ncurses
--- a/package/gd/gd.hash
+++ b/package/gd/gd.hash
@ -1,3 +1,3 @@
 # Locally calculated
-sha256  ecd9155b9a417fb3f837f29e5966323796de247789163761dd72dbf83bfcac58  libgd-2.3.0.tar.xz
+sha256  9767917d9f818faec4ddd763fe4a4ad9f6322c3d25da290ab2ea3e2ce4b52a7b  libgd-2.3.1.tar.xz
 sha256  4d80b4af6c38d7a65128c881623dee2a5daee6b3a6ccab74a5cdfa0dfda96da7  COPYING
--- a/package/gd/gd.mk
+++ b/package/gd/gd.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-GD_VERSION = 2.3.0
+GD_VERSION = 2.3.1
 GD_SOURCE = libgd-$(GD_VERSION).tar.xz
 GD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(GD_VERSION)
 GD_INSTALL_STAGING = YES
--- a/package/genimage/genimage.hash
+++ b/package/genimage/genimage.hash
@ -1,3 +1,3 @@
 # Locally calculated
-sha256  4206e253226a384386c01591251f2ed1ea3485ef63f1e696db03600e1213db79  genimage-13.tar.xz
+sha256  9d1d53b33309fe24ea367ea057eb689bdb8ea33cb99d796de31127ca44ccf44c  genimage-14.tar.xz
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
--- a/package/genimage/genimage.mk
+++ b/package/genimage/genimage.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-GENIMAGE_VERSION = 13
+GENIMAGE_VERSION = 14
 GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz
 GENIMAGE_SITE = https://github.com/pengutronix/genimage/releases/download/v$(GENIMAGE_VERSION)
 HOST_GENIMAGE_DEPENDENCIES = host-pkgconf host-libconfuse
--- a/package/gerbera/Config.in
+++ b/package/gerbera/Config.in
@ -20,6 +20,9 @@ config BR2_PACKAGE_GERBERA
 	  A free media server.
 	  Stream your media to devices on your home network.

+	  Select BR2_PACKAGE_DUKTAPE if you want to enable JavaScript
+	  for scripting.
+
 	  https://gerbera.io

 comment "gerbera needs a toolchain w/ C++, threads, wchar, gcc >= 8"
--- a/package/gerbera/gerbera.mk
+++ b/package/gerbera/gerbera.mk
@ -16,15 +16,20 @@ GERBERA_DEPENDENCIES = \
 	sqlite \
 	util-linux \
 	zlib
-GERBERA_CONF_OPTS = \
-	-DWITH_DEBUG=OFF \
-	-DWITH_JS=OFF
+GERBERA_CONF_OPTS = -DWITH_DEBUG=OFF

 # Uses __atomic_fetch_add_4
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 GERBERA_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
 endif

+ifeq ($(BR2_PACKAGE_DUKTAPE),y)
+GERBERA_DEPENDENCIES += duktape
+GERBERA_CONF_OPTS += -DWITH_JS=ON
+else
+GERBERA_CONF_OPTS += -DWITH_JS=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_EXIV2),y)
 GERBERA_DEPENDENCIES += exiv2
 GERBERA_CONF_OPTS += -DWITH_EXIV2=ON
--- a/package/go/go.hash
+++ b/package/go/go.hash
@ -1,3 +1,3 @@
 # From https://golang.org/dl/
-sha256  540c0ab7781084d124991321ed1458e479982de94454a98afab6acadf38497c2  go1.15.8.src.tar.gz
+sha256  7688063d55656105898f323d90a79a39c378d86fe89ae192eb3b7fc46347c95a  go1.16.src.tar.gz
 sha256	2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  LICENSE
--- a/package/go/go.mk
+++ b/package/go/go.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-GO_VERSION = 1.15.8
+GO_VERSION = 1.16
 GO_SITE = https://storage.googleapis.com/golang
 GO_SOURCE = go$(GO_VERSION).src.tar.gz

@ -49,6 +49,10 @@ else ifeq ($(BR2_aarch64),y)
 GO_GOARCH = arm64
 else ifeq ($(BR2_i386),y)
 GO_GOARCH = 386
+# i386: use softfloat if no SSE2: https://golang.org/doc/go1.16#386
+ifneq ($(BR2_X86_CPU_HAS_SSE2),y)
+GO_GO386 = softfloat
+endif
 else ifeq ($(BR2_x86_64),y)
 GO_GOARCH = amd64
 else ifeq ($(BR2_powerpc64),y)
@ -90,6 +94,7 @@ HOST_GO_CROSS_ENV = \
 	CC_FOR_TARGET="$(TARGET_CC)" \
 	CXX_FOR_TARGET="$(TARGET_CXX)" \
 	GOARCH=$(GO_GOARCH) \
+	$(if $(GO_GO386),GO386=$(GO_GO386)) \
 	$(if $(GO_GOARM),GOARM=$(GO_GOARM)) \
 	GO_ASSUME_CROSSCOMPILING=1

--- a/package/grpc/grpc.hash
+++ b/package/grpc/grpc.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  27dd2fc5c9809ddcde8eb6fa1fa278a3486566dfc28335fca13eb8df8bd3b958  grpc-1.35.0.tar.gz
+sha256  1a5127c81487f4e3e57973bb332f04b9159f94d860c207e096d8a587d371edbd  grpc-1.36.0.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
--- a/package/grpc/grpc.mk
+++ b/package/grpc/grpc.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-GRPC_VERSION = 1.35.0
+GRPC_VERSION = 1.36.0
 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION))
 GRPC_LICENSE = Apache-2.0
 GRPC_LICENSE_FILES = LICENSE
--- a/package/iptables/iptables.hash
+++ b/package/iptables/iptables.hash
@ -1,4 +1,4 @@
 # From https://netfilter.org/projects/iptables/downloads.html
-sha256  a0f4fe0c3eb8faa5bd9c8376d132f340b9558e750c91deb2d5028aa3d0047767  iptables-1.8.6.tar.bz2
+sha256  c109c96bb04998cd44156622d36f8e04b140701ec60531a10668cfdff5e8d8f0  iptables-1.8.7.tar.bz2
 # Locally calculated
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-IPTABLES_VERSION = 1.8.6
+IPTABLES_VERSION = 1.8.7
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
 IPTABLES_SITE = https://netfilter.org/projects/iptables/files
 IPTABLES_INSTALL_STAGING = YES
--- a/package/iwd/0001-configure.ac-fix-static-build-with-readline.patch
+++ b/package/iwd/0001-configure.ac-fix-static-build-with-readline.patch
@ -1,61 +0,0 @@
-From 358e0755c3a434d7a815519b8c10ae5d347caad0 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Wed, 16 Dec 2020 07:51:04 +0100
-Subject: [PATCH] configure.ac: fix static build with readline
-
-Retrieve the dependencies of readline through pkg-config (and fallback
-to -lreadline) to avoid the following build failure:
-
-/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/8.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /nvme/rc-buildroot-test/scripts/instance-0/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib/libreadline.a(display.o): in function `cr':
-display.c:(.text+0x1ab): undefined reference to `tputs'
-
-Fixes:
- - http://autobuild.buildroot.org/results/8fb1341f2f5094c346456b43b4fc04996c2e1485
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status:
-https://lists.01.org/hyperkitty/list/iwd@lists.01.org/thread/NFI4P52Y65T6XX7S7DGIVDMZISNQWUUC/]
---
- Makefile.am  | 4 ++--
- configure.ac | 3 +++
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 3cd7eaa6..493d06cc 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -288,7 +288,7 @@ client_iwctl_SOURCES = client/main.c \
- 			client/network.h client/network.c \
- 			client/properties.h client/properties.c \
- 			client/wsc.c client/station.c
-client_iwctl_LDADD = $(ell_ldadd) -lreadline
-+client_iwctl_LDADD = $(ell_ldadd) $(READLINE_LIBS)
- 
- if MANUAL_PAGES
- man_MANS += client/iwctl.1
-@@ -504,7 +504,7 @@ unit_test_client_SOURCES = unit/test-client.c \
- 				client/display.h client/display.c \
- 				client/network.h client/network.c \
- 				client/properties.h client/properties.c
-unit_test_client_LDADD = $(ell_ldadd) -lreadline
-+unit_test_client_LDADD = $(ell_ldadd) $(READLINE_LIBS)
- endif
- 
- unit_test_sae_SOURCES = unit/test-sae.c \
-diff --git a/configure.ac b/configure.ac
-index 7bd917a4..52f27ed9 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -154,6 +154,9 @@ AC_ARG_ENABLE([client], AC_HELP_STRING([--disable-client],
- if (test "${enable_client}" != "no"); then
- 	AC_CHECK_HEADERS(readline/readline.h, enable_readline=yes,
- 			AC_MSG_ERROR(readline header files are required))
-+	PKG_CHECK_MODULES(READLINE, readline, dummy=yes, READLINE_LIBS=-lreadline)
-+	AC_SUBST(READLINE_CFLAGS)
-+	AC_SUBST(READLINE_LIBS)
- fi
- AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no")
- 
-- 
-2.29.2
-
--- a/package/iwd/iwd.hash
+++ b/package/iwd/iwd.hash
@ -1,5 +1,5 @@
 # Locally computed
-sha256  c3ea43eccf27bb92d4e4482ff407cdabd2d1a1e4647d646241de87f2774e9a20  iwd-1.10-br1.tar.gz
+sha256  c0d827f446012cd14e63d174d52b69b0806ae23f0708933d50c57fea64af9c8a  iwd-1.12-br1.tar.gz

 # License files
 sha256  ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5  COPYING
--- a/package/iwd/iwd.mk
+++ b/package/iwd/iwd.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-IWD_VERSION = 1.10
+IWD_VERSION = 1.12
 IWD_SITE = https://git.kernel.org/pub/scm/network/wireless/iwd.git
 IWD_SITE_METHOD = git
 IWD_LICENSE = LGPL-2.1+
--- a/package/janet/Config.in
+++ b/package/janet/Config.in
@ -0,0 +1,10 @@
+config BR2_PACKAGE_JANET
+	bool "janet"
+	help
+	  Janet is a functional and imperative programming language.
+	  The entire language (core library, interpreter, compiler,
+	  assembler, PEG) is less than 1MB. You can also add Janet
+	  scripting to an application by embedding a single C file
+	  and two headers.
+
+	  https://janet-lang.org/
--- a/package/janet/janet.hash
+++ b/package/janet/janet.hash
@ -0,0 +1,5 @@
+# Locally calculated
+sha256  e2cf16b330e47c858a675ac79b5a0af83727ff041efcb133a80f36bedfae57c4  janet-1.15.0.tar.gz
+
+# Locally calculated
+sha256  1114e280d850605ae71b656dfc88115ab06081e8157720a2497f50edf50b110e  LICENSE
--- a/package/janet/janet.mk
+++ b/package/janet/janet.mk
@ -0,0 +1,22 @@
+################################################################################
+#
+# janet
+#
+################################################################################
+
+JANET_VERSION = 1.15.0
+JANET_SITE = $(call github,janet-lang,janet,v$(JANET_VERSION))
+JANET_LICENSE = MIT
+JANET_LICENSE_FILES = LICENSE
+JANET_INSTALL_STAGING = YES
+JANET_CFLAGS = $(TARGET_CFLAGS) -std=c99
+
+ifeq ($(BR2_STATIC_LIBS),y)
+JANET_CONF_OPTS += -Ddynamic_modules=false
+endif
+
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
+JANET_CONF_OPTS += -Dsingle_threaded=true
+endif
+
+$(eval $(meson-package))
--- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash
+++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  6827f1ebefa5f281ace52bdf83b5ab95789c77b88a344524ead1b346668d57e7  kodi-audiodecoder-modplug-2.0.3-Leia.tar.gz
-sha256  317f732723eb58745a9b22c234861dbd2d98972039543f6b549c7cb26eb2cb08  debian/copyright
+sha256  629a9f83a2663ab8f2ea1ae747782d1ce6df870f42d6d9b84c858bc9b607ae9c  kodi-audiodecoder-modplug-3.0.0-Matrix.tar.gz
+sha256  310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af  LICENSE.md
--- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk
+++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-KODI_AUDIODECODER_MODPLUG_VERSION = 2.0.3-Leia
+KODI_AUDIODECODER_MODPLUG_VERSION = 3.0.0-Matrix
 KODI_AUDIODECODER_MODPLUG_SITE = $(call github,xbmc,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION))
 KODI_AUDIODECODER_MODPLUG_LICENSE = GPL-2.0+
-KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = debian/copyright
+KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = LICENSE.md
 KODI_AUDIODECODER_MODPLUG_DEPENDENCIES = kodi libmodplug

 $(eval $(cmake-package))
--- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash
+++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  66305c9d654aed0b9efcf44b90acac0ab8db321dff57523d13faf67606cd78ce  kodi-audiodecoder-nosefart-2.0.2-Leia.tar.gz
-sha256  01a3f135925df23a5d8679ff633fe3d5021125224c9349acd2c35dd0cf3ea762  debian/copyright
+sha256  a4be5f6efc46841c9b1689c91b06f69cd695220b583e62ed2948768fa93d09a2  kodi-audiodecoder-nosefart-3.0.0-Matrix.tar.gz
+sha256  310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af  LICENSE.md
--- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk
+++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-KODI_AUDIODECODER_NOSEFART_VERSION = 2.0.2-Leia
+KODI_AUDIODECODER_NOSEFART_VERSION = 3.0.0-Matrix
 KODI_AUDIODECODER_NOSEFART_SITE = $(call github,xbmc,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION))
 KODI_AUDIODECODER_NOSEFART_LICENSE = GPL-2.0+
-KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = debian/copyright
+KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = LICENSE.md
 KODI_AUDIODECODER_NOSEFART_DEPENDENCIES = kodi

 $(eval $(cmake-package))
--- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash
+++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  271e513a3094b163f986eb5bb5cbc70c7a602f5764cef255cc161cc5094e5648  kodi-audiodecoder-sidplay-1.2.2-Leia.tar.gz
-sha256  dc915100daec3589f59b47f3438e8ec5ccc11ec25ccb3d0e7e66639764f31584  debian/copyright
+sha256  4919d71e76889df1c1e3c5abe60641cc266afdbbcf3976a5509ae3fda142d2c4  kodi-audiodecoder-sidplay-3.0.0-Matrix.tar.gz
+sha256  310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af  LICENSE.md
--- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk
+++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-KODI_AUDIODECODER_SIDPLAY_VERSION = 1.2.2-Leia
+KODI_AUDIODECODER_SIDPLAY_VERSION = 3.0.0-Matrix
 KODI_AUDIODECODER_SIDPLAY_SITE = $(call github,xbmc,audiodecoder.sidplay,$(KODI_AUDIODECODER_SIDPLAY_VERSION))
 KODI_AUDIODECODER_SIDPLAY_LICENSE = GPL-2.0+
-KODI_AUDIODECODER_SIDPLAY_LICENSE_FILES = debian/copyright
+KODI_AUDIODECODER_SIDPLAY_LICENSE_FILES = LICENSE.md
 KODI_AUDIODECODER_SIDPLAY_DEPENDENCIES = host-pkgconf kodi libsidplay2

 $(eval $(cmake-package))
--- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash
+++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  e059f84b04b8e92e5ecc2989303f6a736f37d6e3bda939ac765499e616c91580  kodi-audiodecoder-snesapu-2.0.2-Leia.tar.gz
-sha256  b7e8b234fc40687d647d929fc554b91cdaa4011e5e656e68c5c6ee8c4cdf81d2  debian/copyright
+sha256  3537b735acfbbacaada2aa1d2035acbc698f37cc7626375f408e967ca612b2d0  kodi-audiodecoder-snesapu-3.0.0-Matrix.tar.gz
+sha256  310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af  LICENSE.md
--- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk
+++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-KODI_AUDIODECODER_SNESAPU_VERSION = 2.0.2-Leia
+KODI_AUDIODECODER_SNESAPU_VERSION = 3.0.0-Matrix
 KODI_AUDIODECODER_SNESAPU_SITE = $(call github,xbmc,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION))
 KODI_AUDIODECODER_SNESAPU_LICENSE = GPL-2.0+
-KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = debian/copyright
+KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = LICENSE.md
 KODI_AUDIODECODER_SNESAPU_DEPENDENCIES = kodi

 $(eval $(cmake-package))
--- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash
+++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  3e14a7da3822002a90bf7d31a9f98541ae9ec2137c764dc94ca5b4de4ac8de82  kodi-audiodecoder-stsound-2.0.2-Leia.tar.gz
-sha256  417ded3464139990f7898ac17c9eacde85dc0fafd3b3ca0c497d945b1bd93af5  debian/copyright
+sha256  65b452cd3bdf8b21929084ca0dc238147784defdfb25351c857fa459230e2f3f  kodi-audiodecoder-stsound-3.0.0-Matrix.tar.gz
+sha256  310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af  LICENSE.md
--- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk
+++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-KODI_AUDIODECODER_STSOUND_VERSION = 2.0.2-Leia
+KODI_AUDIODECODER_STSOUND_VERSION = 3.0.0-Matrix
 KODI_AUDIODECODER_STSOUND_SITE = $(call github,xbmc,audiodecoder.stsound,$(KODI_AUDIODECODER_STSOUND_VERSION))
 KODI_AUDIODECODER_STSOUND_LICENSE = GPL-2.0+
-KODI_AUDIODECODER_STSOUND_LICENSE_FILES = debian/copyright
+KODI_AUDIODECODER_STSOUND_LICENSE_FILES = LICENSE.md
 KODI_AUDIODECODER_STSOUND_DEPENDENCIES = kodi

 $(eval $(cmake-package))
--- a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash
+++ b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  b20a3a23056aaf76c216c755f36dff03e943d7c086d3e3fca4c920b93113e073  kodi-audiodecoder-timidity-2.0.5-Leia.tar.gz
+sha256  0e049f25a12d8cfc9965d189de573d87aa3e7e6549e99a7ddcaf9d8cddc111db  kodi-audiodecoder-timidity-3.0.0-Matrix.tar.gz
 sha256  310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af  LICENSE.md
--- a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk
+++ b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-KODI_AUDIODECODER_TIMIDITY_VERSION = 2.0.5-Leia
+KODI_AUDIODECODER_TIMIDITY_VERSION = 3.0.0-Matrix
 KODI_AUDIODECODER_TIMIDITY_SITE = $(call github,xbmc,audiodecoder.timidity,$(KODI_AUDIODECODER_TIMIDITY_VERSION))
 KODI_AUDIODECODER_TIMIDITY_LICENSE = GPL-2.0+
 KODI_AUDIODECODER_TIMIDITY_LICENSE_FILES = LICENSE.md
--- a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash
+++ b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  28876be1e1317b3ec5c3a4fe415f20d92a4c5868912656c5e8ab9cdd7e3f32d8  kodi-audiodecoder-vgmstream-1.1.5-Leia.tar.gz
-sha256  fc7c7ab8774d94fb2eccdf47e3b8052a3906e4b5ec8554191da321020c965d8e  debian/copyright
+sha256  81f4577c2ec53bfa7ab04d3da374b1cc639ef5f5fe9c2837f9e85916b50d9d5d  kodi-audiodecoder-vgmstream-3.0.0-Matrix.tar.gz
+sha256  310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af  LICENSE.md
--- a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk
+++ b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-KODI_AUDIODECODER_VGMSTREAM_VERSION = 1.1.5-Leia
+KODI_AUDIODECODER_VGMSTREAM_VERSION = 3.0.0-Matrix
 KODI_AUDIODECODER_VGMSTREAM_SITE = $(call github,xbmc,audiodecoder.vgmstream,$(KODI_AUDIODECODER_VGMSTREAM_VERSION))
 KODI_AUDIODECODER_VGMSTREAM_LICENSE = GPL-2.0+
-KODI_AUDIODECODER_VGMSTREAM_LICENSE_FILES = debian/copyright
+KODI_AUDIODECODER_VGMSTREAM_LICENSE_FILES = LICENSE.md
 KODI_AUDIODECODER_VGMSTREAM_DEPENDENCIES = kodi

 $(eval $(cmake-package))
--- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash
+++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  42e18fc2477ce5abc3efd89851a4bacc6b9436889a607a15f8232ef68b297f93  kodi-audioencoder-flac-2.0.6-Leia.tar.gz
-sha256  21dc3eb9c75f1ed6367a4cf3f3999b299bc6c172da3730184edd2a5dd4d090aa  debian/copyright
+sha256  e9001f1789970178b551f01d9242a897523af4f2d34f70bfd7bbbe598bce2e6c  kodi-audioencoder-flac-3.0.0-Matrix.tar.gz
+sha256  310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af  LICENSE.md
--- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk
+++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-KODI_AUDIOENCODER_FLAC_VERSION = 2.0.6-Leia
+KODI_AUDIOENCODER_FLAC_VERSION = 3.0.0-Matrix
 KODI_AUDIOENCODER_FLAC_SITE = $(call github,xbmc,audioencoder.flac,$(KODI_AUDIOENCODER_FLAC_VERSION))
 KODI_AUDIOENCODER_FLAC_LICENSE = GPL-2.0+
-KODI_AUDIOENCODER_FLAC_LICENSE_FILES = debian/copyright
+KODI_AUDIOENCODER_FLAC_LICENSE_FILES = LICENSE.md
 KODI_AUDIOENCODER_FLAC_DEPENDENCIES = flac kodi libogg host-pkgconf

 $(eval $(cmake-package))
--- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash
+++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  9df54cf5c5ae3882a2d89d745c1d1f8b749e71a7f9305a1b059ecfd356995a36  kodi-audioencoder-lame-2.0.4-Leia.tar.gz
-sha256  68a06632cc80eea941b07e27777788dcd4f7c5ba9c006e24f467a9d4bf4d3582  debian/copyright
+sha256  ad47d8c4dffe6690bd1ff32bb5fd44f11b691706ff9a1e5b6152efee92976a75  kodi-audioencoder-lame-3.0.2-Matrix.tar.gz
+sha256  310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af  LICENSE.md
--- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk
+++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-KODI_AUDIOENCODER_LAME_VERSION = 2.0.4-Leia
+KODI_AUDIOENCODER_LAME_VERSION = 3.0.2-Matrix
 KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,$(KODI_AUDIOENCODER_LAME_VERSION))
 KODI_AUDIOENCODER_LAME_LICENSE = GPL-2.0+
-KODI_AUDIOENCODER_LAME_LICENSE_FILES = debian/copyright
+KODI_AUDIOENCODER_LAME_LICENSE_FILES = LICENSE.md
 KODI_AUDIOENCODER_LAME_DEPENDENCIES = kodi lame
 KODI_AUDIOENCODER_LAME_CONF_OPTS += \
 	-DLAME_INCLUDE_DIRS=$(STAGING_DIR)/usr/include
--- a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash
+++ b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  b4b2b1b7ae8bda35514f20ad0275b434f2b60fc93b1e17ca6e654ae145852b1f  kodi-audioencoder-vorbis-2.0.4-Leia.tar.gz
-sha256  706e890fc5c0496b72d3c36284abcc85f9c83b3f2b21db53a68439c538122a59  debian/copyright
+sha256  ba4e6bf402e31096c1fd791db8db26d0eea575998ae414a74c797e868fd08000  kodi-audioencoder-vorbis-3.0.1-Matrix.tar.gz
+sha256  310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af  LICENSE.md
--- a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk
+++ b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-KODI_AUDIOENCODER_VORBIS_VERSION = 2.0.4-Leia
+KODI_AUDIOENCODER_VORBIS_VERSION = 3.0.1-Matrix
 KODI_AUDIOENCODER_VORBIS_SITE = $(call github,xbmc,audioencoder.vorbis,$(KODI_AUDIOENCODER_VORBIS_VERSION))
 KODI_AUDIOENCODER_VORBIS_LICENSE = GPL-2.0+
-KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = debian/copyright
+KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = LICENSE.md
 KODI_AUDIOENCODER_VORBIS_DEPENDENCIES = kodi libogg libvorbis host-pkgconf

 $(eval $(cmake-package))
--- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash
+++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  03cb2810b2aa335fd308a5e2b6580d21ac840334c55fc891acc310633c3c49b4  kodi-audioencoder-wav-2.0.3-Leia.tar.gz
-sha256  341a6317428fbc7c9d5b971d1c6162ea34be64649caa650ee0a05c06ae53a872  debian/copyright
+sha256  9c4c834717060c5ca643a8f9758c8d784b00382ee6ce20e55ab8f2fe0b5f44dd  kodi-audioencoder-wav-3.0.0-Matrix.tar.gz
+sha256  310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af  LICENSE.md
--- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk
+++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-KODI_AUDIOENCODER_WAV_VERSION = 2.0.3-Leia
+KODI_AUDIOENCODER_WAV_VERSION = 3.0.0-Matrix
 KODI_AUDIOENCODER_WAV_SITE = $(call github,xbmc,audioencoder.wav,$(KODI_AUDIOENCODER_WAV_VERSION))
 KODI_AUDIOENCODER_WAV_LICENSE = GPL-2.0+
-KODI_AUDIOENCODER_WAV_LICENSE_FILES = debian/copyright
+KODI_AUDIOENCODER_WAV_LICENSE_FILES = LICENSE.md
 KODI_AUDIOENCODER_WAV_DEPENDENCIES = kodi

 $(eval $(cmake-package))
--- a/package/kodi-inputstream-adaptive/Config.in
+++ b/package/kodi-inputstream-adaptive/Config.in
@ -3,6 +3,7 @@ config BR2_PACKAGE_KODI_INPUTSTREAM_ADAPTIVE
 	# wvdecrypter/cdm/build/build_config.h
 	depends on BR2_aarch64 || BR2_arm || BR2_i386 || BR2_mipsel \
 		|| BR2_mips64el || BR2_x86_64
+	select BR2_PACKAGE_EXPAT
 	help
 	  Kodi inputstream addon for several manifest types

--- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash
+++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  222b7ad879146c62a1fc6016fc70ca1ca57b3b882882ebc54e0b772bf96482e7  kodi-inputstream-adaptive-2.4.6-Leia.tar.gz
+sha256  353207f5f98bf81ce8d79cec903c28da8c0227d7c7a632692c910d81e59c2dbe  kodi-inputstream-adaptive-2.6.7-Matrix.tar.gz
 sha256  89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860  LICENSE.GPL
--- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk
+++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.4.6-Leia
-KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION))
+KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.6.7-Matrix
+KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,peak3d,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION))
 KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+
 KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL
-KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = kodi
+KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = expat kodi

 $(eval $(cmake-package))
--- a/package/kodi-inputstream-ffmpegdirect/Config.in
+++ b/package/kodi-inputstream-ffmpegdirect/Config.in
@ -0,0 +1,13 @@
+config BR2_PACKAGE_KODI_INPUTSTREAM_FFMPEGDIRECT
+	bool "kodi-inputstream-ffmpegdirect"
+	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
+	select BR2_PACKAGE_BZIP2
+	select BR2_PACKAGE_FFMPEG
+	select BR2_PACKAGE_FFMPEG_GPL
+	select BR2_PACKAGE_FFMPEG_POSTPROC
+	help
+	  This is a Kodi input stream addon for streams that can be
+	  opened by FFmpeg's libavformat, such as plain TS, HLS and
+	  DASH streams.
+
+	  https://github.com/xbmc/inputstream.ffmpegdirect
--- a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash
+++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash
@ -0,0 +1,3 @@
+# Locally computed
+sha256  952eeaa7af717dd954c940feb2902b51e497cde8822222c1bfa98804ec8665c7  kodi-inputstream-ffmpegdirect-1.19.2-Matrix.tar.gz
+sha256  310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af  LICENSE.md
--- a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk
+++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk
@ -0,0 +1,15 @@
+################################################################################
+#
+# kodi-inputstream-ffmpegdirect
+#
+################################################################################
+
+KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION = 1.19.2-Matrix
+KODI_INPUTSTREAM_FFMPEGDIRECT_SITE = $(call github,xbmc,inputstream.ffmpegdirect,$(KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION))
+KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE = GPL-2.0+
+KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE_FILES = LICENSE.md
+KODI_INPUTSTREAM_FFMPEGDIRECT_DEPENDENCIES = bzip2 ffmpeg kodi
+KODI_INPUTSTREAM_FFMPEGDIRECT_CONF_OPTS = \
+	-DFFMPEG_PATH=$(STAGING_DIR)/usr
+
+$(eval $(cmake-package))
--- a/package/kodi-inputstream-rtmp/Config.in
+++ b/package/kodi-inputstream-rtmp/Config.in
@ -1,6 +1,8 @@
 config BR2_PACKAGE_KODI_INPUTSTREAM_RTMP
 	bool "kodi-inputstream-rtmp"
+	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_RTMPDUMP
+	select BR2_PACKAGE_ZLIB
 	help
 	  RTMP input stream add-on for Kodi

--- a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash
+++ b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  56dac63262fa736620863900d903616d4827d735992e6d8beda84e377a5599e5  kodi-inputstream-rtmp-2.0.9-Leia.tar.gz
-sha256  ddba7d22c2586f13de40786c21f3b87c6913c9937f4862dc828d33cfff0395eb  debian/copyright
+sha256  efaaa9b07c18810582a3826df476fc36a2aac82be7512271545073c3f6cc0212  kodi-inputstream-rtmp-3.4.0-Matrix.tar.gz
+sha256  310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af  LICENSE.md
--- a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk
+++ b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-KODI_INPUTSTREAM_RTMP_VERSION = 2.0.9-Leia
+KODI_INPUTSTREAM_RTMP_VERSION = 3.4.0-Matrix
 KODI_INPUTSTREAM_RTMP_SITE = $(call github,xbmc,inputstream.rtmp,$(KODI_INPUTSTREAM_RTMP_VERSION))
 KODI_INPUTSTREAM_RTMP_LICENSE = GPL-2.0+
-KODI_INPUTSTREAM_RTMP_LICENSE_FILES = debian/copyright
-KODI_INPUTSTREAM_RTMP_DEPENDENCIES = kodi rtmpdump
+KODI_INPUTSTREAM_RTMP_LICENSE_FILES = LICENSE.md
+KODI_INPUTSTREAM_RTMP_DEPENDENCIES = kodi openssl rtmpdump zlib

 $(eval $(cmake-package))
--- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
+++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
@ -6,7 +6,7 @@

 # Not possible to directly refer to kodi variables, because of
 # first/second expansion trickery...
-KODI_JSONSCHEMABUILDER_VERSION = 18.9-Leia
+KODI_JSONSCHEMABUILDER_VERSION = 19.0-Matrix
 KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION))
 KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz
 KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi
--- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash
+++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  e83c32380a51ea74bd5f0af74afc747ff5de99167934e2644bc2b3438cd998d0  kodi-peripheral-joystick-1.4.9-Leia.tar.gz
-sha256  2bb807179053b1a7795f9952539a394664847f561a9ffa4ccc36d7bb3cddadf9  debian/copyright
+sha256  4dc63c6c5bdad25881eeba800765d97c53b2583addf28e71bbcd67775452ecdb  kodi-peripheral-joystick-1.7.1-Matrix.tar.gz
+sha256  310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af  LICENSE.md
--- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk
+++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-KODI_PERIPHERAL_JOYSTICK_VERSION = 1.4.9-Leia
+KODI_PERIPHERAL_JOYSTICK_VERSION = 1.7.1-Matrix
 KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION))
 KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+
-KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = debian/copyright
+KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md
 KODI_PERIPHERAL_JOYSTICK_DEPENDENCIES = kodi tinyxml udev

 $(eval $(cmake-package))
--- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash
+++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  c1d755230b0f2fe943cf7297a6d187371088f39391944d422d2bf5969c8863c1  kodi-peripheral-xarcade-51e1a4550a6c7d7feeb01760a731af17bea6c524.tar.gz
-sha256  848ad4f3a480c953b556467fb9a315dd352ec1d267e012144c46adc571e39efb  debian/copyright
+sha256  6fa8e1d0e6ebb6c385a7aef6e6c7629d2f1f52601ade7839093c1c3abb844894  kodi-peripheral-xarcade-1.2.0-Matrix.tar.gz
+sha256  310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af  LICENSE.md
--- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk
+++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk
@ -4,10 +4,10 @@
 #
 ################################################################################

-KODI_PERIPHERAL_XARCADE_VERSION = 51e1a4550a6c7d7feeb01760a731af17bea6c524
+KODI_PERIPHERAL_XARCADE_VERSION = 1.2.0-Matrix
 KODI_PERIPHERAL_XARCADE_SITE = $(call github,kodi-game,peripheral.xarcade,$(KODI_PERIPHERAL_XARCADE_VERSION))
 KODI_PERIPHERAL_XARCADE_LICENSE = GPL-2.0+
-KODI_PERIPHERAL_XARCADE_LICENSE_FILES = debian/copyright
+KODI_PERIPHERAL_XARCADE_LICENSE_FILES = LICENSE.md
 KODI_PERIPHERAL_XARCADE_DEPENDENCIES = kodi

 $(eval $(cmake-package))
--- a/package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch
+++ b/package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch
@ -1,56 +0,0 @@
-From a6e25dba4b5c1d911a4644a0ca116abc642cd72a Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Thu, 30 Jul 2015 09:28:24 +0200
-Subject: [PATCH] kodiplatform-config.cmake: fix for cross-compilation
-
-Use CMAKE_FIND_ROOT_PATH in kodiplatform-config.cmake in order to make
-it cross-compilation friendly.
-
-Patch sent upstream: https://github.com/xbmc/kodi-platform/pull/30
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
- CMakeLists.txt               | 2 +-
- kodiplatform-config.cmake.in | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 25d8004..db23dc9 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -22,7 +22,7 @@ if(NOT WIN32)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- endif()
- 
-set(kodiplatform_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} "${CMAKE_INSTALL_PREFIX}/include/kodi")
-+set(kodiplatform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/kodi")
- IF(WIN32)
-   LIST(APPEND kodiplatform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/kodi/windows")
- ENDIF(WIN32)
-diff --git a/kodiplatform-config.cmake.in b/kodiplatform-config.cmake.in
-index 3fc5273..1bc437a 100644
--- a/kodiplatform-config.cmake.in
-+++ b/kodiplatform-config.cmake.in
-@@ -10,16 +10,16 @@
- #
- # propagate these properties from one build system to the other
- set (kodiplatform_VERSION "@kodiplatform_VERSION_MAJOR@.@kodiplatform_VERSION_MINOR@")
-set (kodiplatform_INCLUDE_DIRS @kodiplatform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include)
-+set (kodiplatform_INCLUDE_DIRS @TINYXML_INCLUDE_DIR@ ${CMAKE_FIND_ROOT_PATH}@kodiplatform_INCLUDE_DIRS@ ${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/include)
- set (kodiplatform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
- set (kodiplatform_LINKER_FLAGS "@kodiplatform_LINKER_FLAGS@")
- set (kodiplatform_CONFIG_VARS "@kodiplatform_CONFIG_VARS@")
- 
- # libraries come from the build tree where this file was generated
- if(WIN32)
-  set (kodiplatform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/kodiplatform.lib")
-+  set (kodiplatform_LIBRARY "${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/kodiplatform.lib")
- else(WIN32)
-  set (kodiplatform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lkodiplatform")
-+  set (kodiplatform_LIBRARY "-L${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lkodiplatform")
- endif(WIN32)
- set (kodiplatform_LIBRARIES ${kodiplatform_LIBRARY} "@kodiplatform_LIBRARIES@")
- mark_as_advanced (kodiplatform_LIBRARY)
-- 
-2.5.0
-
--- a/package/kodi-platform/Config.in
+++ b/package/kodi-platform/Config.in
@ -1,7 +0,0 @@
-config BR2_PACKAGE_KODI_PLATFORM
-	bool
-	select BR2_PACKAGE_LIBPLATFORM
-	help
-	  Kodi add-on platform support library
-
-	  https://github.com/xbmc/kodi-platform
--- a/package/kodi-platform/kodi-platform.hash
+++ b/package/kodi-platform/kodi-platform.hash
@ -1,3 +0,0 @@
-# Locally computed
-sha256  159165ae641da5eb273885ce53b8a4b84e62a595c4974f9d12c1b5d1428ef25c  kodi-platform-809c5e9d711e378561440a896fcb7dbcd009eb3d.tar.gz
-sha256  2f4bc4c1244b679121749378ff1a2b4b4e318897dac3d346a236432948ebeea7  debian/copyright
--- a/package/kodi-platform/kodi-platform.mk
+++ b/package/kodi-platform/kodi-platform.mk
@ -1,14 +0,0 @@
-################################################################################
-#
-# kodi-platform
-#
-################################################################################
-
-KODI_PLATFORM_VERSION = 809c5e9d711e378561440a896fcb7dbcd009eb3d
-KODI_PLATFORM_SITE = $(call github,xbmc,kodi-platform,$(KODI_PLATFORM_VERSION))
-KODI_PLATFORM_LICENSE = GPL-2.0+
-KODI_PLATFORM_LICENSE_FILES = debian/copyright
-KODI_PLATFORM_INSTALL_STAGING = YES
-KODI_PLATFORM_DEPENDENCIES = libplatform kodi
-
-$(eval $(cmake-package))
--- a/Show More
+++ b/Show More