rixty
/
OpenVoiceOS
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS
1
1
Fork 0
Code Issues Releases Wiki Activity

MycroftOS: Update all Builroot patches to 2019.08.x version

This commit is contained in:
Peter Steenbergen 2019-10-29 15:00:06 +01:00
parent 0bae70f218
commit 057b825f8d
19 changed files with 397 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildroot-external/Config.in
View File

@ -30,8 +30,6 @@ menu "Additional external python modules"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-gtts/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-gtts_token/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-humanhash3/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-ifaddr/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-inflection/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-lazy/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-monotonic/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-msk/Config.in"

3
buildroot-external/configs/mycroftos_rpi3_defconfig
View File

@ -8,7 +8,6 @@ BR2_GLOBAL_PATCH_DIR="../buildroot-patches"
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
BR2_BINUTILS_VERSION_2_32_X=y
BR2_GCC_VERSION_8_X=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_TOOLCHAIN_BUILDROOT_FORTRAN=y
BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y
@ -168,6 +167,7 @@ BR2_PACKAGE_PYTHON_CONFIGSHELL_FB=y
BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y
BR2_PACKAGE_PYTHON_DAEMONIZE=y
BR2_PACKAGE_PYTHON_GOBJECT=y
BR2_PACKAGE_PYTHON_INFLECTION=y
BR2_PACKAGE_PYTHON_LXML=y
BR2_PACKAGE_PYTHON_NETADDR=y
BR2_PACKAGE_PYTHON_OAUTHLIB=y
@ -284,7 +284,6 @@ BR2_PACKAGE_PYTHON_GOOGLE_API_PYTHON_CLIENT=y
BR2_PACKAGE_PYTHON_GPIOZERO=y
BR2_PACKAGE_PYTHON_GTTS=y
BR2_PACKAGE_PYTHON_HUMANHASH3=y
BR2_PACKAGE_PYTHON_INFLECTION=y
BR2_PACKAGE_PYTHON_LAZY=y
BR2_PACKAGE_PYTHON_MSK=y
BR2_PACKAGE_PYTHON_OAUTH2CLIENT=y

7
buildroot-external/package/python-ifaddr/Config.in
View File

@ -1,7 +0,0 @@
config BR2_PACKAGE_PYTHON_IFADDR
bool "python-ifaddr"
help
Enumerates all IP addresses on all network adapters of the
system.
https://github.com/pydron/ifaddr

3
buildroot-external/package/python-ifaddr/python-ifaddr.hash
View File

@ -1,3 +0,0 @@
# md5, sha256 from https://pypi.org/pypi/ifaddr/json
md5 37bf17655723fc085156bf7c595abd04 ifaddr-0.1.4.zip
sha256 cf2a8fbb578da2844d999a0a453825f660ed2d3fc47dcffc5f673dd8de4f0f8b ifaddr-0.1.4.zip

18
buildroot-external/package/python-ifaddr/python-ifaddr.mk
View File

@ -1,18 +0,0 @@
################################################################################
#
# python-ifaddr
#
################################################################################
PYTHON_IFADDR_VERSION = 0.1.4
PYTHON_IFADDR_SOURCE = ifaddr-$(PYTHON_IFADDR_VERSION).zip
PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/12/40/97ef30db32e0c798fc557af403ea263dbeae8d334571603f02e19f4021a0
PYTHON_IFADDR_SETUP_TYPE = setuptools
define PYTHON_IFADDR_EXTRACT_CMDS
$(UNZIP) -d $(@D) $(DL_DIR)/python-ifaddr/$(PYTHON_IFADDR_SOURCE)
mv $(@D)/ifaddr-$(PYTHON_IFADDR_VERSION)/* $(@D)
$(RM) -r $(@D)/ifaddr-$(PYTHON_IFADDR_VERSION)
endef
$(eval $(python-package))

6
buildroot-external/package/python-inflection/Config.in
View File

@ -1,6 +0,0 @@
config BR2_PACKAGE_PYTHON_INFLECTION
bool "python-inflection"
help
A port of Ruby on Rails inflector to Python.
http://github.com/jpvanhal/inflection

5
buildroot-external/package/python-inflection/python-inflection.hash
View File

@ -1,5 +0,0 @@
# md5, sha256 from https://pypi.org/pypi/inflection/json
md5 7941165e9f148e0520023941c0886b40 inflection-0.3.1.tar.gz
sha256 18ea7fb7a7d152853386523def08736aa8c32636b047ade55f7578c4edeb16ca inflection-0.3.1.tar.gz
# Locally computed sha256 checksums
sha256 4a3f52ac1012a90db398e4c55f1d1bea501dddafef8a4b3adb7533b1d820e148 LICENSE

14
buildroot-external/package/python-inflection/python-inflection.mk
View File

@ -1,14 +0,0 @@
################################################################################
#
# python-inflection
#
################################################################################
PYTHON_INFLECTION_VERSION = 0.3.1
PYTHON_INFLECTION_SOURCE = inflection-$(PYTHON_INFLECTION_VERSION).tar.gz
PYTHON_INFLECTION_SITE = https://files.pythonhosted.org/packages/d5/35/a6eb45b4e2356fe688b21570864d4aa0d0a880ce387defe9c589112077f8
PYTHON_INFLECTION_SETUP_TYPE = setuptools
PYTHON_INFLECTION_LICENSE = MIT
PYTHON_INFLECTION_LICENSE_FILES = LICENSE
$(eval $(python-package))

6
buildroot-external/package/python-speechrecognition/python-speechrecognition.mk
View File

@ -6,9 +6,13 @@
PYTHON_SPEECHRECOGNITION_VERSION = 3.8.1
PYTHON_SPEECHRECOGNITION_SITE = $(call github,Uberi,speech_recognition,$(PYTHON_SPEECHRECOGNITION_VERSION))
PYTHON_SPEECHRECOGNITION_INSTALL_STAGING = YES
PYTHON_SPEECHRECOGNITION_DEPENDENCIES = flac \
python-pyaudio \
python-pocketsphinx \
python-google-api-python-client
PYTHON_SPEECHRECOGNITION_LICENSE = Apache-2.0
PYTHON_SPEECHRECOGNITION_LICENSE_FILES = LICENSE
PYTHON_SPEECHRECOGNITION_SETUP_TYPE = setuptools
$(eval $(python-package))
$(eval $(host-python-package))

14
buildroot-patches/0004-Downgrade-python-pillow-to-4.1.1.patch
View File

@ -1,6 +1,6 @@
From 8c455033a1d5a9010c8f09faaf4c53f1f7995e92 Mon Sep 17 00:00:00 2001
From 24d49f0cf58dbbcb47233195b84252ce9897a5c4 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 2 Sep 2019 16:42:44 +0200
Date: Mon, 28 Oct 2019 13:45:45 +0100
Subject: [PATCH 1/1] Downgrade python-pillow to 4.1.1
---
@ -9,26 +9,26 @@ Subject: [PATCH 1/1] Downgrade python-pillow to 4.1.1
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash
index fa9caae679..d74c79893e 100644
index fe72d01d38..d67b0407a0 100644
--- a/package/python-pillow/python-pillow.hash
+++ b/package/python-pillow/python-pillow.hash
@@ -2,3 +2,4 @@
# sha256 for LICENSE locally computed
sha256 809c0a2ce9032cbcd7b5313f71af4bdc5c8c771cb86eb7559afd954cab82ebb5 Pillow-6.0.0.tar.gz
sha256 0804f77cb1e9b6dbd37601cee11283bba39a8d44b9ddb053400c58e0c0d7d9de Pillow-6.1.0.tar.gz
sha256 64ea4328ed56392b423ef968519a9ad427e3de9b985862c95ed2ed4d793d22ee LICENSE
+sha256 00b6a5f28d00f720235a937ebc2f50f4292a5c7e2d6ab9a8b26153b625c4f431 Pillow-4.1.1.tar.gz
diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
index 6efa9f3923..227a664dde 100644
index a4121da2b4..227a664dde 100644
--- a/package/python-pillow/python-pillow.mk
+++ b/package/python-pillow/python-pillow.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PILLOW_VERSION = 6.0.0
-PYTHON_PILLOW_VERSION = 6.1.0
+PYTHON_PILLOW_VERSION = 4.1.1
PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz
-PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/81/1a/6b2971adc1bca55b9a53ed1efa372acff7e8b9913982a396f3fa046efaf8
-PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/51/fe/18125dc680720e4c3086dd3f5f95d80057c41ab98326877fc7d3ff6d0ee5
+PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/93/73/66854f63b1941aad9af18a1de59f9cf95ad1a87c801540222e332f6688d7
PYTHON_PILLOW_LICENSE = PIL Software License
PYTHON_PILLOW_LICENSE_FILES = LICENSE

18
buildroot-patches/0006-Downgrade-python-psutil-to-5.2.1.patch
View File

@ -1,6 +1,6 @@
From 604cd3de6db49b067154e0405ba605fa73b81443 Mon Sep 17 00:00:00 2001
From 8c2bf3b497d2aacd47d206103d269afb0b017168 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 2 Sep 2019 16:54:02 +0200
Date: Mon, 28 Oct 2019 13:58:07 +0100
Subject: [PATCH 1/1] Downgrade python-psutil to 5.2.1
---
@ -9,28 +9,28 @@ Subject: [PATCH 1/1] Downgrade python-psutil to 5.2.1
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash
index a7d49a9ab6..d8e1020fb1 100644
index e61bffa840..8626528a97 100644
--- a/package/python-psutil/python-psutil.hash
+++ b/package/python-psutil/python-psutil.hash
@@ -1,5 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/psutil/json
md5 571962acd249bcfbae317884af47c402 psutil-5.6.2.tar.gz
sha256 828e1c3ca6756c54ac00f1427fdac8b12e21b8a068c3bb9b631a1734cada25ed psutil-5.6.2.tar.gz
md5 1bbc1788588cc3c2c461cd98a830ba72 psutil-5.6.3.tar.gz
sha256 863a85c1c0a5103a12c05a35e59d336e1d665747e531256e061213e2e90f63f3 psutil-5.6.3.tar.gz
+sha256 fe0ea53b302f68fca1c2a3bac289e11344456786141b73391ed4022b412d5455 psutil-5.2.1.tar.gz
# Locally computed sha256 checksums
sha256 bb073826b0dfb43b631c38ad5d9844cda74cc631d2a5569ad8798be4274a3e17 LICENSE
sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE
diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk
index ed1a9051c8..162d1b7f50 100644
index bb4d58930f..162d1b7f50 100644
--- a/package/python-psutil/python-psutil.mk
+++ b/package/python-psutil/python-psutil.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PSUTIL_VERSION = 5.6.2
-PYTHON_PSUTIL_VERSION = 5.6.3
+PYTHON_PSUTIL_VERSION = 5.2.1
PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz
-PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/c6/c1/beed5e4eaa1345901b595048fab1c85aee647ea0fc02d9e8bf9aceb81078
-PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/1c/ca/5b8c1fe032a458c2c4bcbe509d1401dca9dda35c7fc46b36bb81c2834740
+PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/b8/47/c85fbcd23f40892db6ecc88782beb6ee66d22008c2f9821d777cb1984240
PYTHON_PSUTIL_SETUP_TYPE = setuptools
PYTHON_PSUTIL_LICENSE = BSD-3-Clause

16
buildroot-patches/0014-Downgrade-python-requests-to-2.20.0.patch
View File

@ -1,6 +1,6 @@
From a732a687373349bbb6e1640f5fa71420afb8e953 Mon Sep 17 00:00:00 2001
From eee6e117ed8af312a85cc0f564146d468c43b1a3 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 2 Sep 2019 20:23:25 +0200
Date: Mon, 28 Oct 2019 14:24:52 +0100
Subject: [PATCH 1/1] Downgrade python-requests to 2.20.0
---
@ -9,28 +9,28 @@ Subject: [PATCH 1/1] Downgrade python-requests to 2.20.0
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash
index 46f62c75c5..297bb93110 100644
index 42f45d3a44..c7c1e0f427 100644
--- a/package/python-requests/python-requests.hash
+++ b/package/python-requests/python-requests.hash
@@ -1,5 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/requests/json
md5 1bcd0e0977c3f8db1848ba0e2b7ab904 requests-2.21.0.tar.gz
sha256 502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e requests-2.21.0.tar.gz
md5 ee28bee2de76e9198fc41e48f3a7dd47 requests-2.22.0.tar.gz
sha256 11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 requests-2.22.0.tar.gz
+sha256 99dcfdaaeb17caf6e526f32b6a7b780461512ab3f1d992187801694cba42770c requests-2.20.0.tar.gz
# Locally computed sha256 checksums
sha256 be41abac2c40f8530307e8d172c590b476f4a488bc6a68f8de57b7cf64786687 LICENSE
diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk
index 3d8542fcdf..358835d816 100644
index e64db94523..358835d816 100644
--- a/package/python-requests/python-requests.mk
+++ b/package/python-requests/python-requests.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_REQUESTS_VERSION = 2.21.0
-PYTHON_REQUESTS_VERSION = 2.22.0
+PYTHON_REQUESTS_VERSION = 2.20.0
PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz
-PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/52/2c/514e4ac25da2b08ca5a464c50463682126385c4272c18193876e91f4bc38
-PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/01/62/ddcf76d1d19885e8579acb1b1df26a852b03472c0e46d2b959a714c90608
+PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/97/10/92d25b93e9c266c94b76a5548f020f3f1dd0eb40649cb1993532c0af8f4c
PYTHON_REQUESTS_SETUP_TYPE = setuptools
PYTHON_REQUESTS_LICENSE = Apache-2.0

8
buildroot-patches/0016-Install-glibc-locale-binary-into-target.patch
View File

@ -1,6 +1,6 @@
From 9f17489757e974bd7781544b719392e22395cd8e Mon Sep 17 00:00:00 2001
From 0d0a3cd42688a792b6845482fccf2985b12cf631 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Wed, 6 Feb 2019 08:40:32 +0100
Date: Mon, 28 Oct 2019 14:31:47 +0100
Subject: [PATCH 1/1] Install glibc locale binary into target
---
@ -8,10 +8,10 @@ Subject: [PATCH 1/1] Install glibc locale binary into target
1 file changed, 2 insertions(+)
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index 88178d7eb9..5ce1aafb7c 100644
index 68c6670007..ba28b668b0 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -134,6 +134,8 @@ GLIBC_LIBS_LIB += libthread_db.so.*
@@ -144,6 +144,8 @@ GLIBC_LIBS_LIB += libthread_db.so.*
endif
define GLIBC_INSTALL_TARGET_CMDS

15
buildroot-patches/0018-Bump-RPI-Firmware-version-to-latest.patch
View File

@ -1,6 +1,6 @@
From 4ee090e789a75429c5eb91c6d8cb6c8dd8040cb8 Mon Sep 17 00:00:00 2001
From 9e52511e6b9f427c99aef62b5f8d1f3de6f9528c Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 22 Oct 2019 13:43:53 +0200
Date: Mon, 28 Oct 2019 14:35:36 +0100
Subject: [PATCH 1/1] Bump RPI Firmware version to latest
---
@ -9,22 +9,23 @@ Subject: [PATCH 1/1] Bump RPI Firmware version to latest
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash
index d719fa6e08..5c39b0a0e3 100644
index 61834f7d42..5f6f94d606 100644
--- a/package/rpi-firmware/rpi-firmware.hash
+++ b/package/rpi-firmware/rpi-firmware.hash
@@ -1,2 +1,2 @@
@@ -1,3 +1,3 @@
# Locally computed
-sha256 e911f6342ea8aa9380cae97c6f5ac4ddd370527265f23d5b5d4b2c6f679d4ba8 rpi-firmware-ebf7b40cdc6effe7ffa3fd5195e8be01b94f80da.tar.gz
-sha256 c82c40cf37fac36160a7f6b9c314506beb942bf113a55d30fa163c56a4f98946 rpi-firmware-bcf40b5c2b94178c7564fb451098d44968e44af5.tar.gz
+sha256 6e04cfca954c8e087eae81837a0813a642dcca58f05bcfdf6a15e69dc657a30e rpi-firmware-9f4983548584d4f70e6eec5270125de93a081483.tar.gz
sha256 ba76edfc10a248166d965b8eaf320771c44f4f432d4fce2fd31fd272e7038add boot/LICENCE.broadcom
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 272db1c321..3089c8dbfc 100644
index 717f705f66..c9e7b35268 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RPI_FIRMWARE_VERSION = ebf7b40cdc6effe7ffa3fd5195e8be01b94f80da
-RPI_FIRMWARE_VERSION = bcf40b5c2b94178c7564fb451098d44968e44af5
+RPI_FIRMWARE_VERSION = 9f4983548584d4f70e6eec5270125de93a081483
RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
RPI_FIRMWARE_LICENSE = BSD-3-Clause

18
buildroot-patches/0019-Downgrade-python-cryptography-to-2.6.1.patch
View File

@ -1,6 +1,6 @@
From 05f3feff391df968b07e35298a4bc1df252a4434 Mon Sep 17 00:00:00 2001
From 3d70224b1df36041b305b717ede4e8ca5404e7c4 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Sat, 7 Sep 2019 12:57:13 +0200
Date: Mon, 28 Oct 2019 15:22:52 +0100
Subject: [PATCH 1/1] Downgrade python-cryptography to 2.6.1
---
@ -9,29 +9,29 @@ Subject: [PATCH 1/1] Downgrade python-cryptography to 2.6.1
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash
index 36da21c9c1..20374ed86b 100644
index 715beb71d1..95aa96383a 100644
--- a/package/python-cryptography/python-cryptography.hash
+++ b/package/python-cryptography/python-cryptography.hash
@@ -1,6 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/cryptography/json
md5 2b5e8269c43c9b9ab54fc8c75ba3c7ac cryptography-2.3.1.tar.gz
-sha256 8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6 cryptography-2.3.1.tar.gz
md5 7dfe1035cae43569e571318f000462a4 cryptography-2.7.tar.gz
-sha256 e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6 cryptography-2.7.tar.gz
+sha256 26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6 cryptography-2.6.1.tar.gz
# Locally computed sha256 checksums
sha256 35452b557fab0efb1e80d7edb9c4e5118b9384082adaa051dde342102cb9de8d LICENSE
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.APACHE
sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE
diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk
index 91b680b2be..2c96a7c35a 100644
index dad09672eb..2c96a7c35a 100644
--- a/package/python-cryptography/python-cryptography.mk
+++ b/package/python-cryptography/python-cryptography.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_CRYPTOGRAPHY_VERSION = 2.3.1
-PYTHON_CRYPTOGRAPHY_VERSION = 2.7
+PYTHON_CRYPTOGRAPHY_VERSION = 2.6.1
PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz
-PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/22/21/233e38f74188db94e8451ef6385754a98f3cad9b59bedf3a8e8b14988be4
-PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/c2/95/f43d02315f4ec074219c6e3124a87eba1d2d12196c2767fadfdc07a83884
+PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/07/ca/bc827c5e55918ad223d59d299fff92f3563476c3b00d0a9157d9c0217449
PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools
PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause

12
buildroot-patches/0023-Bump-RPI-BT-Firmware-version-to-latest.patch
View File

@ -1,6 +1,6 @@
From b6b2d68b6f7f78a37f7a05ac1bfa733a711a8ad5 Mon Sep 17 00:00:00 2001
From b7c3b4b1cbc21c15affbf2d7199e1fe8ca4c6162 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 22 Oct 2019 13:36:33 +0200
Date: Mon, 28 Oct 2019 15:48:48 +0100
Subject: [PATCH 1/1] Bump RPI BT Firmware version to latest
---
@ -9,23 +9,23 @@ Subject: [PATCH 1/1] Bump RPI BT Firmware version to latest
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash
index eeb7b605fe..a9703150df 100644
index a3c7281d75..a9703150df 100644
--- a/package/rpi-bt-firmware/rpi-bt-firmware.hash
+++ b/package/rpi-bt-firmware/rpi-bt-firmware.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 155ebd5f08b819e0ce4e1950fcc972b2086cee3c16d36aba348beba1910c1fd2 rpi-bt-firmware-8c1e2bff1da9850f68efcfff3da5d939ec27a2ee.tar.gz
-sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-bt-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz
+sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-bt-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz
sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx
diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk
index f9f300da41..785f007cc3 100644
index 23923453c4..785f007cc3 100644
--- a/package/rpi-bt-firmware/rpi-bt-firmware.mk
+++ b/package/rpi-bt-firmware/rpi-bt-firmware.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RPI_BT_FIRMWARE_VERSION = 8c1e2bff1da9850f68efcfff3da5d939ec27a2ee
-RPI_BT_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327
+RPI_BT_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64
RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION))
RPI_BT_FIRMWARE_LICENSE = PROPRIETARY

12
buildroot-patches/0024-Bump-RPI-Wifi-Firmware-version-to-latest.patch
View File

@ -1,6 +1,6 @@
From fab506fc779c6e5cde48b9e1e852a99fbb16fdf2 Mon Sep 17 00:00:00 2001
From d4e129660fede6331859dd3c955dbcdff851d8c9 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 22 Oct 2019 13:46:15 +0200
Date: Mon, 28 Oct 2019 15:53:01 +0100
Subject: [PATCH 1/1] Bump RPI Wifi Firmware version to latest
---
@ -9,23 +9,23 @@ Subject: [PATCH 1/1] Bump RPI Wifi Firmware version to latest
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
index c61a47ec73..c1f9494577 100644
index 5de9e0f13f..c1f9494577 100644
--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 155ebd5f08b819e0ce4e1950fcc972b2086cee3c16d36aba348beba1910c1fd2 rpi-wifi-firmware-8c1e2bff1da9850f68efcfff3da5d939ec27a2ee.tar.gz
-sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-wifi-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz
+sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-wifi-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.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 2eb8ceec3c..6be02509fe 100644
index 9dd1854b9a..6be02509fe 100644
--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RPI_WIFI_FIRMWARE_VERSION = 8c1e2bff1da9850f68efcfff3da5d939ec27a2ee
-RPI_WIFI_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327
+RPI_WIFI_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64
RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION))
RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY

50
buildroot-patches/0025-Downgrade-python-ifaddr-to-0.1.4.patch Normal file
View File

@ -0,0 +1,50 @@
From b5914a701cd7d5cdf1eeefd33ea0fa5217a99818 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 28 Oct 2019 16:05:40 +0100
Subject: [PATCH 1/1] Downgrade python-ifaddr to 0.1.4
---
package/python-ifaddr/python-ifaddr.hash | 6 ++----
package/python-ifaddr/python-ifaddr.mk | 14 +++++++++-----
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/package/python-ifaddr/python-ifaddr.hash b/package/python-ifaddr/python-ifaddr.hash
index 18df40ac4c..6c0a802b4b 100644
--- a/package/python-ifaddr/python-ifaddr.hash
+++ b/package/python-ifaddr/python-ifaddr.hash
@@ -1,5 +1,3 @@
# md5, sha256 from https://pypi.org/pypi/ifaddr/json
-md5 cc1b7f0a587ef38491f07e50bf91d82e ifaddr-0.1.6.tar.gz
-sha256 c19c64882a7ad51a394451dabcbbed72e98b5625ec1e79789924d5ea3e3ecb93 ifaddr-0.1.6.tar.gz
-# Locally calculated
-sha256 926c6fdac9ede91ae54c67066597466b04f9b4f956a24f9c77931e7765607b2c setup.py
+md5 37bf17655723fc085156bf7c595abd04 ifaddr-0.1.4.zip
+sha256 cf2a8fbb578da2844d999a0a453825f660ed2d3fc47dcffc5f673dd8de4f0f8b ifaddr-0.1.4.zip
diff --git a/package/python-ifaddr/python-ifaddr.mk b/package/python-ifaddr/python-ifaddr.mk
index 23c4ee365e..d2044f39ca 100644
--- a/package/python-ifaddr/python-ifaddr.mk
+++ b/package/python-ifaddr/python-ifaddr.mk
@@ -4,11 +4,15 @@
#
################################################################################
-PYTHON_IFADDR_VERSION = 0.1.6
-PYTHON_IFADDR_SOURCE = ifaddr-$(PYTHON_IFADDR_VERSION).tar.gz
-PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/9f/54/d92bda685093ebc70e2057abfa83ef1b3fb0ae2b6357262a3e19dfe96bb8
+PYTHON_IFADDR_VERSION = 0.1.4
+PYTHON_IFADDR_SOURCE = ifaddr-$(PYTHON_IFADDR_VERSION).zip
+PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/12/40/97ef30db32e0c798fc557af403ea263dbeae8d334571603f02e19f4021a0
PYTHON_IFADDR_SETUP_TYPE = setuptools
-PYTHON_IFADDR_LICENSE = MIT
-PYTHON_IFADDR_LICENSE_FILES = setup.py
+
+define PYTHON_IFADDR_EXTRACT_CMDS
+ $(UNZIP) -d $(@D) $(DL_DIR)/python-ifaddr/$(PYTHON_IFADDR_SOURCE)
+ mv $(@D)/ifaddr-$(PYTHON_IFADDR_VERSION)/* $(@D)
+ $(RM) -r $(@D)/ifaddr-$(PYTHON_IFADDR_VERSION)
+endef
$(eval $(python-package))
--
2.11.0

284
buildroot-patches/0026-Downgrade-MPV-back-to-0.27.2.patch Normal file
View File

@ -0,0 +1,284 @@
From c0890d44021e1be0b3fd32d1c10d9f084061169b Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 29 Oct 2019 08:37:19 +0100
Subject: [PATCH 1/1] Downgrade MPV back to 0.27.2
---
package/mpv/0003-rpi-fix-linking-errors.patch | 90 ++++++++++++++++++++++++++
package/mpv/0004-libva20.patch | 93 +++++++++++++++++++++++++++
package/mpv/Config.in | 1 -
package/mpv/mpv.hash | 3 +-
package/mpv/mpv.mk | 16 +++--
5 files changed, 194 insertions(+), 9 deletions(-)
create mode 100644 package/mpv/0003-rpi-fix-linking-errors.patch
create mode 100644 package/mpv/0004-libva20.patch
diff --git a/package/mpv/0003-rpi-fix-linking-errors.patch b/package/mpv/0003-rpi-fix-linking-errors.patch
new file mode 100644
index 0000000000..0e65a5a3eb
--- /dev/null
+++ b/package/mpv/0003-rpi-fix-linking-errors.patch
@@ -0,0 +1,90 @@
+From fe482a600d507dc7ce77f6d154a9e8b395f74fdd Mon Sep 17 00:00:00 2001
+From: Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
+Date: Tue, 24 Oct 2017 09:47:38 +0100
+Subject: [PATCH] rpi: fix linking errors
+
+Fixes linking issues when compiling with Raspberry Pi support.
+
+Signed-off-by: Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
+---
+Status: pull request https://github.com/mpv-player/mpv/pull/4883
+---
+ waftools/checks/custom.py | 26 +++++++++++++++++++++++++-
+ wscript | 18 +-----------------
+ 2 files changed, 26 insertions(+), 18 deletions(-)
+
+diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py
+index d8065a3..9086795 100644
+--- a/waftools/checks/custom.py
++++ b/waftools/checks/custom.py
+@@ -4,7 +4,7 @@ from waflib import Utils
+ import os
+
+ __all__ = ["check_pthreads", "check_iconv", "check_lua",
+- "check_cocoa", "check_openal"]
++ "check_cocoa", "check_openal", "check_rpi"]
+
+ pthreads_program = load_fragment('pthreads.c')
+
+@@ -103,3 +103,27 @@ def check_openal(ctx, dependency_identifier):
+ if fn(ctx, dependency_identifier):
+ return True
+ return False
++
++def check_rpi(ctx, dependency_identifier):
++ # We need MMAL/bcm_host/dispmanx APIs.
++ # Upstream keeps pkgconfig files in '/opt/vc/lib/pkgconfig'.
++ # See https://github.com/raspberrypi/userland/issues/245
++ # PKG_CONFIG_SYSROOT_DIR helps with cross compilation.
++ prev_pkg_path = os.getenv('PKG_CONFIG_PATH', '')
++ os.environ['PKG_CONFIG_PATH'] = os.pathsep.join(
++ filter(None, [os.path.join(os.getenv('PKG_CONFIG_SYSROOT_DIR', '/'),
++ 'opt/vc/lib/pkgconfig'),
++ prev_pkg_path]))
++
++ checks = [
++ # We still need all OpenGL symbols, because the vo_opengl code is
++ # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core.
++ check_pkg_config('bcm_host', uselib_store='bcm_host'),
++ check_pkg_config('egl'),
++ check_pkg_config('glesv2'),
++ check_cc(lib=['mmal_core', 'mmal_util', 'mmal_vc_client'], use=['bcm_host']),
++ ]
++
++ ret = all((fn(ctx, dependency_identifier) for fn in checks))
++ os.environ['PKG_CONFIG_PATH'] = prev_pkg_path
++ return ret
+diff --git a/wscript b/wscript
+index 9d88588..84e5f2e 100644
+--- a/wscript
++++ b/wscript
+@@ -732,25 +732,9 @@ video_output_features = [
+ 'desc': 'Android support',
+ 'func': check_statement('android/api-level.h', '(void)__ANDROID__'), # arbitrary android-specific header
+ }, {
+- # We need MMAL/bcm_host/dispmanx APIs. Also, most RPI distros require
+- # every project to hardcode the paths to the include directories. Also,
+- # these headers are so broken that they spam tons of warnings by merely
+- # including them (compensate with -isystem and -fgnu89-inline).
+ 'name': '--rpi',
+ 'desc': 'Raspberry Pi support',
+- 'func': compose_checks(
+- check_cc(cflags="-isystem/opt/vc/include/ "+
+- "-isystem/opt/vc/include/interface/vcos/pthreads " +
+- "-isystem/opt/vc/include/interface/vmcs_host/linux " +
+- "-fgnu89-inline",
+- linkflags="-L/opt/vc/lib",
+- header_name="bcm_host.h",
+- lib=['mmal_core', 'mmal_util', 'mmal_vc_client', 'bcm_host']),
+- # We still need all OpenGL symbols, because the vo_opengl code is
+- # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core.
+- check_cc(lib="EGL"),
+- check_cc(lib="GLESv2"),
+- ),
++ 'func': check_rpi,
+ } , {
+ 'name': '--ios-gl',
+ 'desc': 'iOS OpenGL ES hardware decoding interop support',
+--
+2.14.2
+
diff --git a/package/mpv/0004-libva20.patch b/package/mpv/0004-libva20.patch
new file mode 100644
index 0000000000..349dd3cb14
--- /dev/null
+++ b/package/mpv/0004-libva20.patch
@@ -0,0 +1,93 @@
+From 2ecf240b1cd20875991a5b18efafbe799864ff7f Mon Sep 17 00:00:00 2001
+From: Mark Thompson <sw@jkqxz.net>
+Date: Mon, 9 Oct 2017 20:10:26 +0100
+Subject: [PATCH] vaapi: Use libva2 message callbacks
+
+They are no longer global, so they work vaguely sensibly.
+
+Downloaded from upstream commit:
+https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ video/vaapi.c | 32 +++++++++++++++++++++++++++++---
+ 1 file changed, 29 insertions(+), 3 deletions(-)
+
+diff --git a/video/vaapi.c b/video/vaapi.c
+index 6bedbbaa18..3b1cb9cc41 100644
+--- a/video/vaapi.c
++++ b/video/vaapi.c
+@@ -40,9 +40,27 @@ int va_get_colorspace_flag(enum mp_csp csp)
+ return 0;
+ }
+
+-// VA message callbacks are global and do not have a context parameter, so it's
+-// impossible to know from which VADisplay they originate. Try to route them
+-// to existing mpv/libmpv instances within this process.
++#if VA_CHECK_VERSION(1, 0, 0)
++static void va_message_callback(void *context, const char *msg, int mp_level)
++{
++ struct mp_vaapi_ctx *res = context;
++ mp_msg(res->log, mp_level, "libva: %s", msg);
++}
++
++static void va_error_callback(void *context, const char *msg)
++{
++ va_message_callback(context, msg, MSGL_ERR);
++}
++
++static void va_info_callback(void *context, const char *msg)
++{
++ va_message_callback(context, msg, MSGL_V);
++}
++#else
++// Pre-libva2 VA message callbacks are global and do not have a context
++// parameter, so it's impossible to know from which VADisplay they
++// originate. Try to route them to existing mpv/libmpv instances within
++// this process.
+ static pthread_mutex_t va_log_mutex = PTHREAD_MUTEX_INITIALIZER;
+ static struct mp_vaapi_ctx **va_mpv_clients;
+ static int num_va_mpv_clients;
+@@ -77,6 +95,7 @@ static void va_info_callback(const char *msg)
+ {
+ va_message_callback(msg, MSGL_V);
+ }
++#endif
+
+ static void open_lavu_vaapi_device(struct mp_vaapi_ctx *ctx)
+ {
+@@ -108,6 +127,10 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog,
+ },
+ };
+
++#if VA_CHECK_VERSION(1, 0, 0)
++ vaSetErrorCallback(display, va_error_callback, res);
++ vaSetInfoCallback(display, va_info_callback, res);
++#else
+ pthread_mutex_lock(&va_log_mutex);
+ MP_TARRAY_APPEND(NULL, va_mpv_clients, num_va_mpv_clients, res);
+ pthread_mutex_unlock(&va_log_mutex);
+@@ -118,6 +141,7 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog,
+ vaSetErrorCallback(va_error_callback);
+ vaSetInfoCallback(va_info_callback);
+ #endif
++#endif
+
+ int major, minor;
+ int status = vaInitialize(display, &major, &minor);
+@@ -154,6 +178,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx)
+ if (ctx->destroy_native_ctx)
+ ctx->destroy_native_ctx(ctx->native_ctx);
+
++#if !VA_CHECK_VERSION(1, 0, 0)
+ pthread_mutex_lock(&va_log_mutex);
+ for (int n = 0; n < num_va_mpv_clients; n++) {
+ if (va_mpv_clients[n] == ctx) {
+@@ -164,6 +189,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx)
+ if (num_va_mpv_clients == 0)
+ TA_FREEP(&va_mpv_clients); // avoid triggering leak detectors
+ pthread_mutex_unlock(&va_log_mutex);
++#endif
+
+ talloc_free(ctx);
+ }
diff --git a/package/mpv/Config.in b/package/mpv/Config.in
index 32910f2245..69810038f1 100644
--- a/package/mpv/Config.in
+++ b/package/mpv/Config.in
@@ -8,7 +8,6 @@ config BR2_PACKAGE_MPV
select BR2_PACKAGE_FFMPEG
select BR2_PACKAGE_FFMPEG_SWSCALE
select BR2_PACKAGE_ZLIB
- select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND
# Select xkbcommon for wayland to avoid being mysterious
select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND
# Select all necessary X11 dependencies if X.org is enabled
diff --git a/package/mpv/mpv.hash b/package/mpv/mpv.hash
index 734b6a3663..1dac3a4940 100644
--- a/package/mpv/mpv.hash
+++ b/package/mpv/mpv.hash
@@ -1,3 +1,2 @@
# Locally calculated
-sha256 f9f9d461d1990f9728660b4ccb0e8cb5dce29ccaa6af567bec481b79291ca623 v0.29.1.tar.gz
-sha256 a99d7b0625a0566271aad6de694e52eafd566db024f9516720d526c680d3ee30 LICENSE.GPL
+sha256 2ad104d83fd3b2b9457716615acad57e479fd1537b8fc5e37bfe9065359b50be v0.27.2.tar.gz
diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk
index f92b604c28..3ab2673774 100644
--- a/package/mpv/mpv.mk
+++ b/package/mpv/mpv.mk
@@ -4,14 +4,14 @@
#
################################################################################
-MPV_VERSION = 0.29.1
+MPV_VERSION = 0.27.2
MPV_SITE = https://github.com/mpv-player/mpv/archive
MPV_SOURCE = v$(MPV_VERSION).tar.gz
MPV_DEPENDENCIES = \
host-pkgconf ffmpeg zlib \
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
MPV_LICENSE = GPL-2.0+
-MPV_LICENSE_FILES = LICENSE.GPL
+MPV_LICENSE_FILES = LICENSE
MPV_NEEDS_EXTERNAL_WAF = YES
@@ -164,12 +164,16 @@ MPV_CONF_OPTS += --disable-libsmbclient
endif
# SDL support
-# Sdl2 requires 64-bit sync intrinsics
+# Both can't be used at the same time, prefer newer API
+# It also requires 64-bit sync intrinsics
ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8)$(BR2_PACKAGE_SDL2),yy)
-MPV_CONF_OPTS += --enable-sdl2
+MPV_CONF_OPTS += --enable-sdl2 --disable-sdl1
MPV_DEPENDENCIES += sdl2
+else ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8)$(BR2_PACKAGE_SDL),yy)
+MPV_CONF_OPTS += --enable-sdl1 --disable-sdl2
+MPV_DEPENDENCIES += sdl
else
-MPV_CONF_OPTS += --disable-sdl2
+MPV_CONF_OPTS += --disable-sdl1 --disable-sdl2
endif
# Raspberry Pi support
@@ -197,7 +201,7 @@ endif
# wayland support
ifeq ($(BR2_PACKAGE_WAYLAND),y)
MPV_CONF_OPTS += --enable-wayland
-MPV_DEPENDENCIES += libxkbcommon wayland wayland-protocols
+MPV_DEPENDENCIES += libxkbcommon wayland
else
MPV_CONF_OPTS += --disable-wayland
endif
--
2.11.0