Get into shape for Buildroot 2021.02

This commit is contained in:
j1nx 2021-03-29 09:28:25 +02:00
parent 3be58ed50a
commit df21d07af2
14 changed files with 129 additions and 1634 deletions

@ -1 +1 @@
Subproject commit 1abb1d1187dd59bdd812308bdf8025993151acc5
Subproject commit 6c04e6fb0447ddc5e3ffa0a5df268837ebdb0b91

View File

@ -10,8 +10,8 @@ BR2_GLOBAL_PATCH_DIR="../buildroot-patches"
BR2_FORCE_HOST_BUILD=y
BR2_SSP_REGULAR=y
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
BR2_PACKAGE_GLIBC_UTILS=y
BR2_BINUTILS_VERSION_2_34_X=y
BR2_GCC_VERSION_10_X=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_TOOLCHAIN_BUILDROOT_FORTRAN=y
@ -34,7 +34,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL)/board/raspberrypi4-64/post-image.s
BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --aarch64"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/617a1c1722aeaa4d69356e18b88d569366f1ac1b.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/13c43880f2ee6db7d26949cb6a3e8db1a4b76736.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL)/board/raspberrypi/kernel.config"
BR2_LINUX_KERNEL_LZ4=y
@ -66,8 +66,7 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_ESPEAK=y
BR2_PACKAGE_FFMPEG_GPL=y
BR2_PACKAGE_FFMPEG_NONFREE=y
BR2_PACKAGE_FFMPEG_FFPLAY=y
BR2_PACKAGE_FFMPEG_FFPROBE=y
# BR2_PACKAGE_FFMPEG_FFMPEG is not set
BR2_PACKAGE_FFMPEG_AVRESAMPLE=y
BR2_PACKAGE_FFMPEG_POSTPROC=y
BR2_PACKAGE_GSTREAMER1=y
@ -139,14 +138,30 @@ BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TWOLAME=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JPEGFORMAT=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSMUX=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP2=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTP2=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDP=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC=y
BR2_PACKAGE_GST1_PLUGINS_UGLY=y
BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_ASFDEMUX=y
BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC=y
BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB=y
BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX=y
BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD=y
BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC=y
BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264=y
BR2_PACKAGE_GST1_LIBAV=y
BR2_PACKAGE_GST1_VAAPI=y
BR2_PACKAGE_MIMIC=y
@ -154,6 +169,7 @@ BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PULSEAUDIO=y
BR2_PACKAGE_MPV=y
BR2_PACKAGE_PULSEAUDIO_DAEMON=y
BR2_PACKAGE_SQUEEZELITE=y
BR2_PACKAGE_SQUEEZELITE_RESAMPLE=y
BR2_PACKAGE_VLC=y
BR2_PACKAGE_GZIP=y
BR2_PACKAGE_LZIP=y
@ -192,7 +208,6 @@ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y
BR2_PACKAGE_MESA3D_OPENGL_ES=y
BR2_PACKAGE_SDL2_KMSDRM=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT53D=y
BR2_PACKAGE_QT5BASE_CONCURRENT=y
@ -379,6 +394,8 @@ BR2_PACKAGE_LIBSVG_CAIRO=y
BR2_PACKAGE_OPENJPEG=y
BR2_PACKAGE_TIFF=y
BR2_PACKAGE_WAFFLE=y
BR2_PACKAGE_DTC=y
BR2_PACKAGE_DTC_PROGRAMS=y
BR2_PACKAGE_LIBCEC=y
BR2_PACKAGE_LIBINPUT=y
BR2_PACKAGE_LIBV4L=y
@ -387,11 +404,9 @@ BR2_PACKAGE_LIBFASTJSON=y
BR2_PACKAGE_YAJL=y
BR2_PACKAGE_LIBMATROSKA=y
BR2_PACKAGE_LIBMMS=y
BR2_PACKAGE_LIBMPEG2=y
BR2_PACKAGE_LIBMPEG2_BINS=y
BR2_PACKAGE_LIBOPENH264=y
BR2_PACKAGE_LIBOPUSENC=y
BR2_PACKAGE_X264=y
BR2_PACKAGE_X265=y
BR2_PACKAGE_GLIB_NETWORKING=y
BR2_PACKAGE_LIBCURL_CURL=y
@ -519,7 +534,6 @@ BR2_PACKAGE_LOTTIE_QML=y
BR2_PACKAGE_NCPAMIXER=y
BR2_PACKAGE_OVOS_SPLASH=y
BR2_PACKAGE_QT5CT=y
BR2_PACKAGE_RESPEAKER=y
BR2_PACKAGE_SNAPCAST=y
BR2_PACKAGE_SNAPCAST_SERVER=y
BR2_PACKAGE_SPOTIFYD=y

View File

@ -1,2 +1,2 @@
# Locally computed
sha256 220744f0510480217d72191ae54e929ef5fa6cf69733b39a7c8ea52d99e8ed8e fann-7ec1fc7e5bd734f1d3c89b095e630e83c86b9be1.tar.gz
sha256 488e4c52e3ca00ebfe6010e61856184ff4fe470ec36c8b8efe0515c4c316378d fann-a3cd24e528d6a865915a4fed6e8fac164ff8bfdc-br1.tar.gz

View File

@ -4,7 +4,7 @@
#
################################################################################
FANN_VERSION = 7ec1fc7e5bd734f1d3c89b095e630e83c86b9be1
FANN_VERSION = a3cd24e528d6a865915a4fed6e8fac164ff8bfdc
FANN_SITE = git://github.com/libfann/fann.git
FANN_LICENSE = GNU Lesser General Public License v2.1
FANN_AUTORECONF = YES

View File

@ -1,2 +1,2 @@
# sha256 from https://pypi.org
sha256 f4048a6e882a093affc52469889fbbfa0514fec2e4b01b39446f9d795ab44333 python-pymplayer-eaa0a1dbfc60cb0f4f1b3e495d665714c089474a.tar.gz
sha256 4e8e4581761fffdd8915829baf2b16b83265a6aa75455f1647667fdc8091bad2 python-pymplayer-eaa0a1dbfc60cb0f4f1b3e495d665714c089474a-br1.tar.gz

View File

@ -1,2 +1,2 @@
# Locally computed
sha256 e4559ce376aa180fe6cbd4dc8b6821150be63f5d2a3dc60b2c104e01d0076fad qt5ct-587.tar.gz
sha256 7c8aaa1e107e9d3d6ce7ef12a65c458c1202285dfafe26138272fddb7b9bb24a qt5ct-587-br2.tar.gz

View File

@ -1,47 +1,47 @@
From f058f4270a1dadee8ade285c55fc26b9224920e9 Mon Sep 17 00:00:00 2001
From 9869a77fbda84c96968708e1c32116a6b742c6f8 Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Thu, 29 Oct 2020 19:39:49 +0100
Date: Thu, 18 Mar 2021 09:57:31 +0100
Subject: [PATCH 1/1] Downgrade python-pillow to 7.1.2
---
package/python-pillow/Config.in | 1 -
package/python-pillow/Config.in | 2 --
package/python-pillow/python-pillow.hash | 2 +-
package/python-pillow/python-pillow.mk | 4 ++--
3 files changed, 3 insertions(+), 4 deletions(-)
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/package/python-pillow/Config.in b/package/python-pillow/Config.in
index f98a4a9e5b..f824d1371e 100644
index ae6d8c8346..f824d1371e 100644
--- a/package/python-pillow/Config.in
+++ b/package/python-pillow/Config.in
@@ -1,7 +1,6 @@
@@ -1,8 +1,6 @@
config BR2_PACKAGE_PYTHON_PILLOW
bool "python-pillow"
depends on BR2_PACKAGE_PYTHON3
- select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
- select BR2_PACKAGE_PYTHON3_ZLIB
help
Pillow is the "friendly" PIL fork by Alex Clark and
Contributors. PIL is the Python Imaging Library by Fredrik
diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash
index f80b79fe5f..d222645633 100644
index 0849577f66..0354269e0e 100644
--- a/package/python-pillow/python-pillow.hash
+++ b/package/python-pillow/python-pillow.hash
@@ -1,5 +1,5 @@
@@ -1,4 +1,4 @@
# md5, sha256 from https://pypi.org/project/Pillow/
md5 f1f7592c51260e5080d3cd71781ea675 Pillow-7.1.2.tar.gz
-sha256 97f9e7953a77d5a70f49b9a48da7776dc51e9b738151b22dacf101641594a626 Pillow-7.2.0.tar.gz
-sha256 11c5c6e9b02c9dac08af04f093eb5a2f84857df70a7d4a6a6ad461aca803fb9e Pillow-8.0.1.tar.gz
+sha256 a0b49960110bc6ff5fead46013bcb8825d101026d466f3a4de3476defe0fb0dd Pillow-7.1.2.tar.gz
# Locally computed sha256 checksums
sha256 37de42abe33a247e8f03d2313657a0f174a239a198f526add6544ff3e2643b81 LICENSE
diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
index 931dce53d2..2832eeee0b 100644
index 60a0bb3e1b..a091ebe64f 100644
--- a/package/python-pillow/python-pillow.mk
+++ b/package/python-pillow/python-pillow.mk
@@ -4,8 +4,8 @@
#
################################################################################
-PYTHON_PILLOW_VERSION = 7.2.0
-PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/3e/02/b09732ca4b14405ff159c470a612979acfc6e8645dc32f83ea0129709f7a
-PYTHON_PILLOW_VERSION = 8.0.1
-PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/2b/06/93bf1626ef36815010e971a5ce90f49919d84ab5d2fa310329f843a74bc1
+PYTHON_PILLOW_VERSION = 7.1.2
+PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/ce/ef/e793f6ffe245c960c42492d0bb50f8d14e2ba223f1922a5c3c81569cec44
PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz

View File

@ -1,40 +1,40 @@
From b331a66c7cc9efadf2dcb4ae26cd592bbecb4278 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 7 Jan 2019 14:57:24 +0100
From 132d418ad686aadf646ba7a8c90774e460f05690 Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Thu, 18 Mar 2021 10:01:14 +0100
Subject: [PATCH 1/1] Downgrade python-serial to 3.0
---
package/python-serial/python-serial.hash | 1 +
package/python-serial/python-serial.hash | 2 +-
package/python-serial/python-serial.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/python-serial/python-serial.hash b/package/python-serial/python-serial.hash
index 96209a9965..0c68849324 100644
index d885d3c0c8..dff215eff2 100644
--- a/package/python-serial/python-serial.hash
+++ b/package/python-serial/python-serial.hash
@@ -1,5 +1,6 @@
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/pyserial/json
md5 ed6183b15519a0ae96675e9c3330c69b pyserial-3.4.tar.gz
sha256 6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627 pyserial-3.4.tar.gz
+sha256 056c2d96c83c009d8d04aad43a90f91f10f6a97d42c0d9656c2655c63fb8ff07 pyserial-3.0.tar.gz
md5 1cf25a76da59b530dbfc2cf99392dc83 pyserial-3.5.tar.gz
-sha256 3c77e014170dfffbd816e6ffc205e9842efb10be9f58ec16d3e8675b4925cddb pyserial-3.5.tar.gz
+sha256 056c2d96c83c009d8d04aad43a90f91f10f6a97d42c0d9656c2655c63fb8ff07 pyserial-3.0.tar.gz
# Locally computed sha256 checksums
sha256 a89d951d157e2c199fbbe7ecf8d41bc3bc93de166db524aa6b9b610dbccc832d LICENSE.txt
sha256 f91cb9813de6a5b142b8f7f2dede630b5134160aedaeaf55f4d6a7e2593ca3f3 LICENSE.txt
diff --git a/package/python-serial/python-serial.mk b/package/python-serial/python-serial.mk
index d583ac65ab..70cf6452f5 100644
index 249ea9d5a3..70cf6452f5 100644
--- a/package/python-serial/python-serial.mk
+++ b/package/python-serial/python-serial.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_SERIAL_VERSION = 3.4
-PYTHON_SERIAL_VERSION = 3.5
+PYTHON_SERIAL_VERSION = 3.0
PYTHON_SERIAL_SOURCE = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz
-PYTHON_SERIAL_SITE = https://files.pythonhosted.org/packages/cc/74/11b04703ec416717b247d789103277269d567db575d2fd88f25d9767fe3d
-PYTHON_SERIAL_SITE = https://files.pythonhosted.org/packages/1e/7d/ae3f0a63f41e4d2f6cb66a5b57197850f919f59e558159a4dd3a818f5082
+PYTHON_SERIAL_SITE = https://files.pythonhosted.org/packages/69/89/24fc8c26e23710a0d8fdf9e8134b28ceeab421d3f3e0165ceca6bdb98193
PYTHON_SERIAL_LICENSE = BSD-3-Clause
PYTHON_SERIAL_LICENSE_FILES = LICENSE.txt
PYTHON_SERIAL_SETUP_TYPE = setuptools
--
2.11.0
2.20.1

View File

@ -1,40 +1,40 @@
From 3bee492eb3f991b66401e4d47730e02dd59bca99 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 2 Sep 2019 20:37:58 +0200
From 8f9cad2b43052880a35c4b33bcf20fbf43adf5e6 Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Thu, 18 Mar 2021 15:14:11 +0100
Subject: [PATCH 1/1] Downgrade python-pyjwt to 1.6.4
---
package/python-pyjwt/python-pyjwt.hash | 1 +
package/python-pyjwt/python-pyjwt.hash | 2 +-
package/python-pyjwt/python-pyjwt.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/python-pyjwt/python-pyjwt.hash b/package/python-pyjwt/python-pyjwt.hash
index 62ec3559af..0842d2d899 100644
index 10875510f0..249ffa285c 100644
--- a/package/python-pyjwt/python-pyjwt.hash
+++ b/package/python-pyjwt/python-pyjwt.hash
@@ -1,5 +1,6 @@
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/PyJWT/json
md5 a4712f980c008696e13e09504120b2a0 PyJWT-1.7.1.tar.gz
sha256 8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96 PyJWT-1.7.1.tar.gz
+sha256 4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176 PyJWT-1.6.4.tar.gz
md5 7a1b1c8bfeb67c31ee4fdadefe5ff4b8 PyJWT-2.0.0.tar.gz
-sha256 7a2b271c6dac2fda9e0c33d176c4253faba2c6c6b3a99c7f28a32c3c97522779 PyJWT-2.0.0.tar.gz
+sha256 4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176 PyJWT-1.6.4.tar.gz
# Locally computed sha256 checksums
sha256 ec82af815b5f9da8685afb300cc5beb7949e1c22b79b6c1c054796cefdf6cac6 LICENSE
sha256 ec82af815b5f9da8685afb300cc5beb7949e1c22b79b6c1c054796cefdf6cac6 LICENSE
diff --git a/package/python-pyjwt/python-pyjwt.mk b/package/python-pyjwt/python-pyjwt.mk
index dfc66e5651..18b7976b19 100644
index 9215911389..18b7976b19 100644
--- a/package/python-pyjwt/python-pyjwt.mk
+++ b/package/python-pyjwt/python-pyjwt.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PYJWT_VERSION = 1.7.1
-PYTHON_PYJWT_VERSION = 2.0.0
+PYTHON_PYJWT_VERSION = 1.6.4
PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz
-PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/2f/38/ff37a24c0243c5f45f5798bd120c0f873eeed073994133c084e1cf13b95c
-PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/14/6d/096dc269d105ba374d6bfd3ecb22b516795ca0572499820dadc8178d9ae1
+PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/00/5e/b358c9bb24421e6155799d995b4aa3aa3307ffc7ecae4ad9d29fd7e07a73
PYTHON_PYJWT_SETUP_TYPE = setuptools
PYTHON_PYJWT_LICENSE = MIT
PYTHON_PYJWT_LICENSE_FILES = LICENSE
--
2.11.0
2.20.1

View File

@ -1,6 +1,6 @@
From 04b2b1e2bc267a68b8b377d070a655a47e901744 Mon Sep 17 00:00:00 2001
From e33b75b1d7184d593b376b70cb6253edbd96215f Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Thu, 29 Oct 2020 20:05:23 +0100
Date: Thu, 18 Mar 2021 15:18:06 +0100
Subject: [PATCH 1/1] Downgrade python-pyyaml to 5.1.2
---
@ -10,46 +10,48 @@ Subject: [PATCH 1/1] Downgrade python-pyyaml to 5.1.2
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash
index 90e1f2199e..fb6cd3b365 100644
index 82b2f4f880..025b5ac065 100644
--- a/package/python-pyyaml/python-pyyaml.hash
+++ b/package/python-pyyaml/python-pyyaml.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/PyYAML/json
md5 d3590b85917362e837298e733321962b PyYAML-5.3.1.tar.gz
-sha256 b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d PyYAML-5.3.1.tar.gz
md5 46e25294c7efec23d4072ed6a7777f46 PyYAML-5.4.1.tar.gz
-sha256 607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e PyYAML-5.4.1.tar.gz
+sha256 01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4 PyYAML-5.1.2.tar.gz
# Locally computed sha256 checksums
sha256 c40112449f254b9753045925248313e9270efa36d226b22d82d4cc6c43c57f29 LICENSE
sha256 8d3928f9dc4490fd635707cb88eb26bd764102a7282954307d3e5167a577e8a4 LICENSE
diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk
index 7bbae309c6..7cdd8edefb 100644
index c9013de8ec..87c2079f92 100644
--- a/package/python-pyyaml/python-pyyaml.mk
+++ b/package/python-pyyaml/python-pyyaml.mk
@@ -5,9 +5,9 @@
################################################################################
# Please keep in sync package/python3-pyyaml/python3-pyyaml.mk
-PYTHON_PYYAML_VERSION = 5.3.1
-PYTHON_PYYAML_VERSION = 5.4.1
+PYTHON_PYYAML_VERSION = 5.1.2
PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz
-PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/64/c2/b80047c7ac2478f9501676c988a5411ed5572f35d1beff9cae07d321512c
-PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d
+PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/e3/e8/b3212641ee2718d556df0f23f78de8303f068fe29cdaa7a91018849582fe
PYTHON_PYYAML_SETUP_TYPE = distutils
-PYTHON_PYYAML_SETUP_TYPE = setuptools
+PYTHON_PYYAML_SETUP_TYPE = distutils
PYTHON_PYYAML_LICENSE = MIT
PYTHON_PYYAML_LICENSE_FILES = LICENSE
diff --git a/package/python3-pyyaml/python3-pyyaml.mk b/package/python3-pyyaml/python3-pyyaml.mk
index c0dcebf4fc..6c149168ae 100644
index f758341502..5a331905a3 100644
--- a/package/python3-pyyaml/python3-pyyaml.mk
+++ b/package/python3-pyyaml/python3-pyyaml.mk
@@ -5,9 +5,9 @@
################################################################################
# Please keep in sync with package/python-pyyaml/python-pyyaml.mk
-PYTHON3_PYYAML_VERSION = 5.3.1
-PYTHON3_PYYAML_VERSION = 5.4.1
+PYTHON3_PYYAML_VERSION = 5.1.2
PYTHON3_PYYAML_SOURCE = PyYAML-$(PYTHON3_PYYAML_VERSION).tar.gz
-PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/64/c2/b80047c7ac2478f9501676c988a5411ed5572f35d1beff9cae07d321512c
-PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d
+PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/e3/e8/b3212641ee2718d556df0f23f78de8303f068fe29cdaa7a91018849582fe
PYTHON3_PYYAML_SETUP_TYPE = distutils
-PYTHON3_PYYAML_SETUP_TYPE = setuptools
+PYTHON3_PYYAML_SETUP_TYPE = distutils
PYTHON3_PYYAML_LICENSE = MIT
PYTHON3_PYYAML_LICENSE_FILES = LICENSE
--

File diff suppressed because it is too large Load Diff

View File

@ -14,8 +14,8 @@ index 8730ec959b..d10a8b1db9 100644
+++ b/package/rpi-firmware/rpi-firmware.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 c7a8c2b8cfe1977095d62086d340d6c15a383562aba2742e21df7f5f792aeb4b rpi-firmware-358f4c271f2bc10931aae8fe0879ffaded8b9c44.tar.gz
+sha256 1d9ec856aa152f059a80c457fd679144fab163dd72c8fbecb9e53532ea294748 rpi-firmware-70f1581eec2c036b7e9309f1af41c651fb125447.tar.gz
-sha256 ae4e317681995e0f7becd7900ae667cba394e3a0b7ca93a267f3303df7284697 rpi-firmware-d016a6eb01c8c7326a89cb42809fed2a21525de5.tar.gz
+sha256 x rpi-firmware-8717598c7eb443c39c28a4b3a66b4d369ae0a83f.tar.gz
sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 8b2b2c7154..6099e1f170 100644
@ -25,8 +25,8 @@ index 8b2b2c7154..6099e1f170 100644
#
################################################################################
-RPI_FIRMWARE_VERSION = 358f4c271f2bc10931aae8fe0879ffaded8b9c44
+RPI_FIRMWARE_VERSION = 70f1581eec2c036b7e9309f1af41c651fb125447
-RPI_FIRMWARE_VERSION = d016a6eb01c8c7326a89cb42809fed2a21525de5
+RPI_FIRMWARE_VERSION = 8717598c7eb443c39c28a4b3a66b4d369ae0a83f
RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
RPI_FIRMWARE_LICENSE = BSD-3-Clause
RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

View File

@ -14,8 +14,8 @@ index b8931d2c45..9afc5a96b0 100644
+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-wifi-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz
+sha256 033a21d19fbdc7617b8c5b58d4be5951e29be5be787a45875b615f4d4dcf3f5b rpi-wifi-firmware-b66ab26cebff689d0d3257f56912b9bb03c20567.tar.gz
-sha256 cf806f6bdba0f803b90bc210f524a6ac37bac7ad19306c61474bb2dc59875e87 rpi-wifi-firmware-9c0ffe9a7f0753b36ed88f7981905a989d940ea9.tar.gz
+sha256 a942cc52cabf17661675d0877f39b1159fca2c83d57299d2dde06ad6e39ab0ab rpi-wifi-firmware-83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5.tar.gz
sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx
diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
index 6be02509fe..3277a6e4a0 100644
@ -25,9 +25,9 @@ index 6be02509fe..3277a6e4a0 100644
#
################################################################################
-RPI_WIFI_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64
-RPI_WIFI_FIRMWARE_VERSION = 9c0ffe9a7f0753b36ed88f7981905a989d940ea9
-RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION))
+RPI_WIFI_FIRMWARE_VERSION = b66ab26cebff689d0d3257f56912b9bb03c20567
+RPI_WIFI_FIRMWARE_VERSION = 83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5
+RPI_WIFI_FIRMWARE_SITE = $(call github,RPi-Distro,firmware-nonfree,$(RPI_WIFI_FIRMWARE_VERSION))
RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY
RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx

View File

@ -0,0 +1,35 @@
From 4a26b5d65bcfccaff6d32f751e668d663c883f1e Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Fri, 26 Mar 2021 09:59:24 +0100
Subject: [PATCH 1/1] Fix qt5webengine host dependencies
---
package/qt5/qt5webengine/qt5webengine.mk | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
index 7e557725d3..6ac99823e4 100644
--- a/package/qt5/qt5webengine/qt5webengine.mk
+++ b/package/qt5/qt5webengine/qt5webengine.mk
@@ -29,6 +29,18 @@ endif
QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss
+ifeq ($(BR2_PACKAGE_QT5BASE_FONTCONFIG),y)
+QT5WEBENGINE_DEPENDENCIES += host-freetype
+endif
+
+ifeq ($(BR2_PACKAGE_QT5BASE_JPEG),y)
+QT5WEBENGINE_DEPENDENCIES += host-libjpeg
+endif
+
+ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
+QT5WEBENGINE_DEPENDENCIES += host-harfbuzz
+endif
+
QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg
ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y)
--
2.20.1