From bcce90e9475d7420739b85b5f4c30bda6a2c5959 Mon Sep 17 00:00:00 2001
From: j1nx
Date: Thu, 19 Aug 2021 11:10:17 +0200
Subject: [PATCH] Bump packages and skills
---
buildroot-external/Config.in | 2 ++
buildroot-external/configs/rpi4_64-gui_defconfig | 1 +
.../mycroft-skill-ovos-common-play.mk | 2 +-
.../mycroft-skill-weather/mycroft-skill-weather.mk | 2 +-
.../python-ovos-skill-manager.hash | 2 +-
.../python-ovos-skill-manager.mk | 2 +-
.../python-ovos-stt-plugin-chromium.hash | 5 ++---
.../python-ovos-stt-plugin-chromium.mk | 5 ++---
.../python-ovos-vlc-plugin.hash | 2 +-
.../python-ovos-vlc-plugin.mk | 2 +-
.../python-ovos-wake-word-plugin-precise.hash | 2 +-
.../python-ovos-wake-word-plugin-precise.mk | 2 +-
.../python-ovos-workshop/python-ovos-workshop.hash | 2 +-
.../python-ovos-workshop/python-ovos-workshop.mk | 2 +-
.../package/python-padacioso/Config.in | 7 +++++++
.../package/python-padacioso/python-padacioso.hash | 3 +++
.../package/python-padacioso/python-padacioso.mk | 13 +++++++++++++
.../package/python-simplematch/Config.in | 6 ++++++
.../python-simplematch/python-simplematch.hash | 5 +++++
.../python-simplematch/python-simplematch.mk | 14 ++++++++++++++
20 files changed, 65 insertions(+), 16 deletions(-)
create mode 100644 buildroot-external/package/python-padacioso/Config.in
create mode 100644 buildroot-external/package/python-padacioso/python-padacioso.hash
create mode 100644 buildroot-external/package/python-padacioso/python-padacioso.mk
create mode 100644 buildroot-external/package/python-simplematch/Config.in
create mode 100644 buildroot-external/package/python-simplematch/python-simplematch.hash
create mode 100644 buildroot-external/package/python-simplematch/python-simplematch.mk
diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in
index de30a1c6..cbbe2085 100644
--- a/buildroot-external/Config.in
+++ b/buildroot-external/Config.in
@@ -148,6 +148,7 @@ menu "Additional external python modules"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-utils/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-vlc-plugin/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-workshop/Config.in"
+ source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-padacioso/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-padaos/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-padatious/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-pafy/Config.in"
@@ -176,6 +177,7 @@ menu "Additional external python modules"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-requests-futures/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-rsa/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-sgmllib3k/Config.in"
+ source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-simplematch/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-smbus2/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-smmap/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-source/Config.in"
diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig
index 78cf1260..ec2a25d1 100644
--- a/buildroot-external/configs/rpi4_64-gui_defconfig
+++ b/buildroot-external/configs/rpi4_64-gui_defconfig
@@ -644,6 +644,7 @@ BR2_PACKAGE_PYTHON_OVOS_SKILL_MANAGER=y
BR2_PACKAGE_PYTHON_OVOS_UTILS=y
BR2_PACKAGE_PYTHON_OVOS_VLC_PLUGIN=y
BR2_PACKAGE_PYTHON_OVOS_WORKSHOP=y
+BR2_PACKAGE_PYTHON_PADACIOSO=y
BR2_PACKAGE_PYTHON_PADATIOUS=y
BR2_PACKAGE_PYTHON_PAFY=y
BR2_PACKAGE_PYTHON_PAKO=y
diff --git a/buildroot-external/package/mycroft-skill-ovos-common-play/mycroft-skill-ovos-common-play.mk b/buildroot-external/package/mycroft-skill-ovos-common-play/mycroft-skill-ovos-common-play.mk
index b75cd765..1ad89481 100644
--- a/buildroot-external/package/mycroft-skill-ovos-common-play/mycroft-skill-ovos-common-play.mk
+++ b/buildroot-external/package/mycroft-skill-ovos-common-play/mycroft-skill-ovos-common-play.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MYCROFT_SKILL_OVOS_COMMON_PLAY_VERSION = c121f318c78adc10eda707a86821986e4da09c10
+MYCROFT_SKILL_OVOS_COMMON_PLAY_VERSION = 17a1093b9b7d9d3e518e03a7d87bdac242879cbd
MYCROFT_SKILL_OVOS_COMMON_PLAY_SITE = git://github.com/OpenVoiceOS/skill-ovos-common-play
MYCROFT_SKILL_OVOS_COMMON_PLAY_SITE_METHOD = git
MYCROFT_SKILL_OVOS_COMMON_PLAY_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
diff --git a/buildroot-external/package/mycroft-skill-weather/mycroft-skill-weather.mk b/buildroot-external/package/mycroft-skill-weather/mycroft-skill-weather.mk
index f2c058df..9751fe01 100644
--- a/buildroot-external/package/mycroft-skill-weather/mycroft-skill-weather.mk
+++ b/buildroot-external/package/mycroft-skill-weather/mycroft-skill-weather.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MYCROFT_SKILL_WEATHER_VERSION = 2bde73ef876335fd703fa112ce14cab455abd5ab
+MYCROFT_SKILL_WEATHER_VERSION = 250574761a866a9bc97c8579aaa29637df8d7bdf
MYCROFT_SKILL_WEATHER_SITE = git://github.com/OpenVoiceOS/skill-weather
MYCROFT_SKILL_WEATHER_SITE_METHOD = git
MYCROFT_SKILL_WEATHER_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
diff --git a/buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.hash b/buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.hash
index 99be19f5..a6c614a3 100644
--- a/buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.hash
+++ b/buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.hash
@@ -1 +1 @@
-sha256 783e35b54df72f7558cff6efb7a50a612783fc391f5a95cf69c72a52ea6d31ec python-ovos-skill-manager-a4fac1f45c4acd9acf7ac24d8f0b7d090dab8564.tar.gz
+sha256 4d39cfc95cfc3e7beceb8fa2bf1d1f8d67b1e50d6bc78814512cfd8a5897b2f0 python-ovos-skill-manager-802ec33f30b7b3983cf285724a397eda430a8a84.tar.gz
diff --git a/buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.mk b/buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.mk
index 001c24f3..e8bcf910 100644
--- a/buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.mk
+++ b/buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PYTHON_OVOS_SKILL_MANAGER_VERSION = a4fac1f45c4acd9acf7ac24d8f0b7d090dab8564
+PYTHON_OVOS_SKILL_MANAGER_VERSION = 802ec33f30b7b3983cf285724a397eda430a8a84
PYTHON_OVOS_SKILL_MANAGER_SITE = $(call github,OpenVoiceOS,ovos_skill_manager,$(PYTHON_OVOS_SKILL_MANAGER_VERSION))
PYTHON_OVOS_SKILL_MANAGER_SETUP_TYPE = setuptools
PYTHON_OVOS_SKILL_MANAGER_LICENSE_FILES = LICENSE
diff --git a/buildroot-external/package/python-ovos-stt-plugin-chromium/python-ovos-stt-plugin-chromium.hash b/buildroot-external/package/python-ovos-stt-plugin-chromium/python-ovos-stt-plugin-chromium.hash
index dd32aaaf..afb0a2d4 100644
--- a/buildroot-external/package/python-ovos-stt-plugin-chromium/python-ovos-stt-plugin-chromium.hash
+++ b/buildroot-external/package/python-ovos-stt-plugin-chromium/python-ovos-stt-plugin-chromium.hash
@@ -1,3 +1,2 @@
-# md5, sha256 from https://pypi.org/pypi/ovos-stt-plugin-chromium/json
-md5 5d910e964c79778b516de225562cdd61 ovos-stt-plugin-chromium-0.1.0.tar.gz
-sha256 2e9164679ab48efdcac392b8b87c0f5a119c1138ad14d6472218a758cc986460 ovos-stt-plugin-chromium-0.1.0.tar.gz
+# md5, sha256 from local
+sha256 5fe7571f793a8bb6092441d69d19e970626fbb300fd137c7a91f3a658a7302c0 python-ovos-stt-plugin-chromium-07c09f1892e50a7204647a5a4a0445697c877a70.tar.gz
diff --git a/buildroot-external/package/python-ovos-stt-plugin-chromium/python-ovos-stt-plugin-chromium.mk b/buildroot-external/package/python-ovos-stt-plugin-chromium/python-ovos-stt-plugin-chromium.mk
index 261fb779..b0489efb 100644
--- a/buildroot-external/package/python-ovos-stt-plugin-chromium/python-ovos-stt-plugin-chromium.mk
+++ b/buildroot-external/package/python-ovos-stt-plugin-chromium/python-ovos-stt-plugin-chromium.mk
@@ -4,9 +4,8 @@
#
################################################################################
-PYTHON_OVOS_STT_PLUGIN_CHROMIUM_VERSION = 0.1.3
-PYTHON_OVOS_STT_PLUGIN_CHROMIUM_SOURCE = ovos-stt-plugin-chromium-$(PYTHON_OVOS_STT_PLUGIN_CHROMIUM_VERSION).tar.gz
-PYTHON_OVOS_STT_PLUGIN_CHROMIUM_SITE = https://files.pythonhosted.org/packages/0c/6c/b7fc257c7cf886d0b9a286682b3631c65adaac64f2f9a7d8d4263ff4664f
+PYTHON_OVOS_STT_PLUGIN_CHROMIUM_VERSION = 07c09f1892e50a7204647a5a4a0445697c877a70
+PYTHON_OVOS_STT_PLUGIN_CHROMIUM_SITE = $(call github,OpenVoiceOS,ovos-stt-plugin-chromium,$(PYTHON_OVOS_STT_PLUGIN_CHROMIUM_VERSION))
PYTHON_OVOS_STT_PLUGIN_CHROMIUM_SETUP_TYPE = setuptools
$(eval $(python-package))
diff --git a/buildroot-external/package/python-ovos-vlc-plugin/python-ovos-vlc-plugin.hash b/buildroot-external/package/python-ovos-vlc-plugin/python-ovos-vlc-plugin.hash
index 78853cee..18429ed2 100644
--- a/buildroot-external/package/python-ovos-vlc-plugin/python-ovos-vlc-plugin.hash
+++ b/buildroot-external/package/python-ovos-vlc-plugin/python-ovos-vlc-plugin.hash
@@ -1 +1 @@
-sha256 5c50cf04d365cd53adb001bcb629bce2a9cd510c805275a29cf11df0f45a64c7 python-ovos-vlc-plugin-f440a4b40f54e15d26eda1171a8308983f34ebc1.tar.gz
+sha256 08d3e36f7ffaed1fa2bf5d3fa5728ed7472ec315f6fd022803928a6b5b5c5abf python-ovos-vlc-plugin-feee64d1cc16f9adf61b593ecb5c65ab4a68cba7.tar.gz
diff --git a/buildroot-external/package/python-ovos-vlc-plugin/python-ovos-vlc-plugin.mk b/buildroot-external/package/python-ovos-vlc-plugin/python-ovos-vlc-plugin.mk
index 38edffe2..47d93883 100644
--- a/buildroot-external/package/python-ovos-vlc-plugin/python-ovos-vlc-plugin.mk
+++ b/buildroot-external/package/python-ovos-vlc-plugin/python-ovos-vlc-plugin.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PYTHON_OVOS_VLC_PLUGIN_VERSION = f440a4b40f54e15d26eda1171a8308983f34ebc1
+PYTHON_OVOS_VLC_PLUGIN_VERSION = feee64d1cc16f9adf61b593ecb5c65ab4a68cba7
PYTHON_OVOS_VLC_PLUGIN_SITE = $(call github,OpenVoiceOS,ovos-vlc-plugin,$(PYTHON_OVOS_VLC_PLUGIN_VERSION))
PYTHON_OVOS_VLC_PLUGIN_SETUP_TYPE = setuptools
PYTHON_OVOS_VLC_PLUGIN_LICENSE_FILES = LICENSE
diff --git a/buildroot-external/package/python-ovos-wake-word-plugin-precise/python-ovos-wake-word-plugin-precise.hash b/buildroot-external/package/python-ovos-wake-word-plugin-precise/python-ovos-wake-word-plugin-precise.hash
index 59a791fe..51eefb6e 100644
--- a/buildroot-external/package/python-ovos-wake-word-plugin-precise/python-ovos-wake-word-plugin-precise.hash
+++ b/buildroot-external/package/python-ovos-wake-word-plugin-precise/python-ovos-wake-word-plugin-precise.hash
@@ -1 +1 @@
-sha256 87be488bdd86ac372ed8013415e9e5e05073b5a7246a65ab5f01809bc1069f8b python-ovos-wake-word-plugin-precise-ad3ced5e4fec11530fc4d065bd446c689e39987a.tar.gz
+sha256 5626531c5eb249bb384a29a540fe5ce1552fb98db593775b93c258425a7b3418 python-ovos-wake-word-plugin-precise-766bc2d1e0a71f9b0e3f6a4f2fe1fbc981f90ae2.tar.gz
diff --git a/buildroot-external/package/python-ovos-wake-word-plugin-precise/python-ovos-wake-word-plugin-precise.mk b/buildroot-external/package/python-ovos-wake-word-plugin-precise/python-ovos-wake-word-plugin-precise.mk
index 449cf275..e4a3a095 100644
--- a/buildroot-external/package/python-ovos-wake-word-plugin-precise/python-ovos-wake-word-plugin-precise.mk
+++ b/buildroot-external/package/python-ovos-wake-word-plugin-precise/python-ovos-wake-word-plugin-precise.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PYTHON_OVOS_WAKE_WORD_PLUGIN_PRECISE_VERSION = ad3ced5e4fec11530fc4d065bd446c689e39987a
+PYTHON_OVOS_WAKE_WORD_PLUGIN_PRECISE_VERSION = 766bc2d1e0a71f9b0e3f6a4f2fe1fbc981f90ae2
PYTHON_OVOS_WAKE_WORD_PLUGIN_PRECISE_SITE = $(call github,OpenVoiceOS,ovos-wake-word-plugin-precise,$(PYTHON_OVOS_WAKE_WORD_PLUGIN_PRECISE_VERSION))
PYTHON_OVOS_WAKE_WORD_PLUGIN_PRECISE_SETUP_TYPE = setuptools
PYTHON_OVOS_WAKE_WORD_PLUGIN_PRECISE_LICENSE_FILES = LICENSE
diff --git a/buildroot-external/package/python-ovos-workshop/python-ovos-workshop.hash b/buildroot-external/package/python-ovos-workshop/python-ovos-workshop.hash
index 62c5986e..60e65d22 100644
--- a/buildroot-external/package/python-ovos-workshop/python-ovos-workshop.hash
+++ b/buildroot-external/package/python-ovos-workshop/python-ovos-workshop.hash
@@ -1 +1 @@
-sha256 8c254b71ca7f715cce12435f2a6657a018f566f877781793538c69b630a99dc3 python-ovos-workshop-379091291119827f52060de49adc1cdcd979af13.tar.gz
+sha256 bd6fcc7f82dd5310ca26b5a7574fb903b2ff8295bf2d548e1f55d251bc835266 python-ovos-workshop-eb8e4081a789144c702cc4cffe9c881379c2f3a8.tar.gz
diff --git a/buildroot-external/package/python-ovos-workshop/python-ovos-workshop.mk b/buildroot-external/package/python-ovos-workshop/python-ovos-workshop.mk
index 33b2284a..90c9e635 100644
--- a/buildroot-external/package/python-ovos-workshop/python-ovos-workshop.mk
+++ b/buildroot-external/package/python-ovos-workshop/python-ovos-workshop.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PYTHON_OVOS_WORKSHOP_VERSION = 379091291119827f52060de49adc1cdcd979af13
+PYTHON_OVOS_WORKSHOP_VERSION = eb8e4081a789144c702cc4cffe9c881379c2f3a8
PYTHON_OVOS_WORKSHOP_SITE = $(call github,OpenVoiceOS,OVOS-workshop,$(PYTHON_OVOS_WORKSHOP_VERSION))
PYTHON_OVOS_WORKSHOP_SETUP_TYPE = setuptools
PYTHON_OVOS_WORKSHOP_LICENSE_FILES = LICENSE
diff --git a/buildroot-external/package/python-padacioso/Config.in b/buildroot-external/package/python-padacioso/Config.in
new file mode 100644
index 00000000..80521042
--- /dev/null
+++ b/buildroot-external/package/python-padacioso/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_PADACIOSO
+ bool "python-padacioso"
+ select BR2_PACKAGE_PYTHON_SIMPLEMATCH # runtime
+ help
+ dead simple intent parser.
+
+ https://github.com/OpenJarbas/padacioso
diff --git a/buildroot-external/package/python-padacioso/python-padacioso.hash b/buildroot-external/package/python-padacioso/python-padacioso.hash
new file mode 100644
index 00000000..27448c14
--- /dev/null
+++ b/buildroot-external/package/python-padacioso/python-padacioso.hash
@@ -0,0 +1,3 @@
+# md5, sha256 from https://pypi.org/pypi/padacioso/json
+md5 8db1031f1822579e37f43480f7f4f8e4 padacioso-0.1.1.tar.gz
+sha256 758083d43662a78b56e5eb25086cc1f702db26bf1bb5dd38e4a7372c86ac90b4 padacioso-0.1.1.tar.gz
diff --git a/buildroot-external/package/python-padacioso/python-padacioso.mk b/buildroot-external/package/python-padacioso/python-padacioso.mk
new file mode 100644
index 00000000..a66affe4
--- /dev/null
+++ b/buildroot-external/package/python-padacioso/python-padacioso.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# python-padacioso
+#
+################################################################################
+
+PYTHON_PADACIOSO_VERSION = 0.1.1
+PYTHON_PADACIOSO_SOURCE = padacioso-$(PYTHON_PADACIOSO_VERSION).tar.gz
+PYTHON_PADACIOSO_SITE = https://files.pythonhosted.org/packages/7f/3d/292f14feaa17d724561d030616920e4dc4163aab13fd4e88d3071c1023a5
+PYTHON_PADACIOSO_SETUP_TYPE = setuptools
+PYTHON_PADACIOSO_LICENSE = apache-2.0
+
+$(eval $(python-package))
diff --git a/buildroot-external/package/python-simplematch/Config.in b/buildroot-external/package/python-simplematch/Config.in
new file mode 100644
index 00000000..5ae5ad9d
--- /dev/null
+++ b/buildroot-external/package/python-simplematch/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_SIMPLEMATCH
+ bool "python-simplematch"
+ help
+ Minimal, super readable string pattern matching.
+
+ https://github.com/tfeldmann/simplematch
diff --git a/buildroot-external/package/python-simplematch/python-simplematch.hash b/buildroot-external/package/python-simplematch/python-simplematch.hash
new file mode 100644
index 00000000..137ddb76
--- /dev/null
+++ b/buildroot-external/package/python-simplematch/python-simplematch.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/simplematch/json
+md5 efc24858198a4c0c117fb96e0ca3c9a7 simplematch-1.3.tar.gz
+sha256 ed1d17d842799ee2222de1ea5f7fc3b4b1317464852214dc7dd197c1332a9f3c simplematch-1.3.tar.gz
+# Locally computed sha256 checksums
+sha256 c6d2fd0b7c573bd1e3db59ec3b4644a217bd137d1170274daef65284eeb70b36 LICENSE.txt
diff --git a/buildroot-external/package/python-simplematch/python-simplematch.mk b/buildroot-external/package/python-simplematch/python-simplematch.mk
new file mode 100644
index 00000000..01b00e44
--- /dev/null
+++ b/buildroot-external/package/python-simplematch/python-simplematch.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-simplematch
+#
+################################################################################
+
+PYTHON_SIMPLEMATCH_VERSION = 1.3
+PYTHON_SIMPLEMATCH_SOURCE = simplematch-$(PYTHON_SIMPLEMATCH_VERSION).tar.gz
+PYTHON_SIMPLEMATCH_SITE = https://files.pythonhosted.org/packages/1a/3d/4504e218fe50c988c8229fe4bfd5633ed43e1fa79de7147c5ddfec270fae
+PYTHON_SIMPLEMATCH_SETUP_TYPE = setuptools
+PYTHON_SIMPLEMATCH_LICENSE = MIT
+PYTHON_SIMPLEMATCH_LICENSE_FILES = LICENSE.txt
+
+$(eval $(python-package))