From f944bc57cc35fe21cba791d6f487573737a78c79 Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Tue, 6 Apr 2021 10:28:53 +0200
Subject: [PATCH] Add and/or Bump of all OVOS related packages and skills

---
 buildroot-external/Config.in                       |  5 +++++
 buildroot-external/configs/rpi4_64-gui_defconfig   |  5 +++++
 .../mycroft-skill-ovos-pairing.mk                  |  2 +-
 .../package/python-ovos-plugin-manager/Config.in   |  7 +++++++
 .../python-ovos-plugin-manager.hash                |  1 +
 .../python-ovos-plugin-manager.mk                  | 12 ++++++++++++
 .../package/python-ovos-skill-installer/Config.in  | 11 +++++++++++
 .../python-ovos-skill-installer.hash               |  1 +
 .../python-ovos-skill-installer.mk                 | 12 ++++++++++++
 .../package/python-ovos-skill-manager/Config.in    | 12 ++++++++++++
 .../python-ovos-skill-manager.hash                 |  1 +
 .../python-ovos-skill-manager.mk                   | 12 ++++++++++++
 .../python-ovos-utils/python-ovos-utils.hash       |  2 +-
 .../package/python-ovos-utils/python-ovos-utils.mk |  2 +-
 .../package/python-ovos-workshop/Config.in         |  7 +++++++
 .../python-ovos-workshop/python-ovos-workshop.hash |  1 +
 .../python-ovos-workshop/python-ovos-workshop.mk   | 12 ++++++++++++
 .../package/python-rapidfuzz/Config.in             |  9 +++++++++
 .../package/python-rapidfuzz/python-rapidfuzz.hash |  2 ++
 .../package/python-rapidfuzz/python-rapidfuzz.mk   | 14 ++++++++++++++
 20 files changed, 127 insertions(+), 3 deletions(-)
 create mode 100644 buildroot-external/package/python-ovos-plugin-manager/Config.in
 create mode 100644 buildroot-external/package/python-ovos-plugin-manager/python-ovos-plugin-manager.hash
 create mode 100644 buildroot-external/package/python-ovos-plugin-manager/python-ovos-plugin-manager.mk
 create mode 100644 buildroot-external/package/python-ovos-skill-installer/Config.in
 create mode 100644 buildroot-external/package/python-ovos-skill-installer/python-ovos-skill-installer.hash
 create mode 100644 buildroot-external/package/python-ovos-skill-installer/python-ovos-skill-installer.mk
 create mode 100644 buildroot-external/package/python-ovos-skill-manager/Config.in
 create mode 100644 buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.hash
 create mode 100644 buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.mk
 create mode 100644 buildroot-external/package/python-ovos-workshop/Config.in
 create mode 100644 buildroot-external/package/python-ovos-workshop/python-ovos-workshop.hash
 create mode 100644 buildroot-external/package/python-ovos-workshop/python-ovos-workshop.mk
 create mode 100644 buildroot-external/package/python-rapidfuzz/Config.in
 create mode 100644 buildroot-external/package/python-rapidfuzz/python-rapidfuzz.hash
 create mode 100644 buildroot-external/package/python-rapidfuzz/python-rapidfuzz.mk

diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in
index 60eb671f..8814e5b4 100644
--- a/buildroot-external/Config.in
+++ b/buildroot-external/Config.in
@@ -130,7 +130,11 @@ menu "Additional external python modules"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-oauth2client/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-olefile/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-local-backend/Config.in"
+	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-plugin-manager/Config.in"
+	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-skill-installer/Config.in"
+	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-skill-manager/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-utils/Config.in"
+	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-workshop/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-pako/Config.in"
@@ -147,6 +151,7 @@ menu "Additional external python modules"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-pymeeus/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-pymplayer/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-pyxdg/Config.in"
+	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-rapidfuzz/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ratelim/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-requests-cache/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-requests-futures/Config.in"
diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig
index ebad5810..a35034cb 100644
--- a/buildroot-external/configs/rpi4_64-gui_defconfig
+++ b/buildroot-external/configs/rpi4_64-gui_defconfig
@@ -558,7 +558,11 @@ BR2_PACKAGE_PYTHON_MYCROFT_MESSAGEBUS_CLIENT=y
 BR2_PACKAGE_PYTHON_OAUTH2CLIENT=y
 BR2_PACKAGE_PYTHON_OLEFILE=y
 BR2_PACKAGE_PYTHON_OVOS_LOCAL_BACKEND=y
+BR2_PACKAGE_PYTHON_OVOS_PLUGIN_MANAGER=y
+BR2_PACKAGE_PYTHON_OVOS_SKILL_INSTALLER=y
+BR2_PACKAGE_PYTHON_OVOS_SKILL_MANAGER=y
 BR2_PACKAGE_PYTHON_OVOS_UTILS=y
+BR2_PACKAGE_PYTHON_OVOS_WORKSHOP=y
 BR2_PACKAGE_PYTHON_PADATIOUS=y
 BR2_PACKAGE_PYTHON_PAKO=y
 BR2_PACKAGE_PYTHON_PEP8=y
@@ -568,6 +572,7 @@ BR2_PACKAGE_PYTHON_POCKETSPHINX=y
 BR2_PACKAGE_PYTHON_PRECISE_RUNNER=y
 BR2_PACKAGE_PYTHON_PYCHROMECAST=y
 BR2_PACKAGE_PYTHON_PYMPLAYER=y
+BR2_PACKAGE_PYTHON_RAPIDFUZZ=y
 BR2_PACKAGE_PYTHON_REQUESTS_CACHE=y
 BR2_PACKAGE_PYTHON_REQUESTS_FUTURES=y
 BR2_PACKAGE_PYTHON_SGMLLIB3K=y
diff --git a/buildroot-external/package/mycroft-skill-ovos-pairing/mycroft-skill-ovos-pairing.mk b/buildroot-external/package/mycroft-skill-ovos-pairing/mycroft-skill-ovos-pairing.mk
index 482a73b1..66d33f95 100644
--- a/buildroot-external/package/mycroft-skill-ovos-pairing/mycroft-skill-ovos-pairing.mk
+++ b/buildroot-external/package/mycroft-skill-ovos-pairing/mycroft-skill-ovos-pairing.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MYCROFT_SKILL_OVOS_PAIRING_VERSION = 9f9b37f169edd7387f4a73909bf1d9360b9fa7e1
+MYCROFT_SKILL_OVOS_PAIRING_VERSION = e3dde6f5a227ecaef6746c2b05510be1aeb4e53f
 MYCROFT_SKILL_OVOS_PAIRING_SITE = git://github.com/OpenVoiceOS/skill-ovos-pairing
 MYCROFT_SKILL_OVOS_PAIRING_SITE_METHOD = git
 MYCROFT_SKILL_OVOS_PAIRING_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
diff --git a/buildroot-external/package/python-ovos-plugin-manager/Config.in b/buildroot-external/package/python-ovos-plugin-manager/Config.in
new file mode 100644
index 00000000..851fb84f
--- /dev/null
+++ b/buildroot-external/package/python-ovos-plugin-manager/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_OVOS_PLUGIN_MANAGER
+	bool "python-ovos-plugin-manager"
+	help
+	  OPM can be used to search, install, load 
+	  and create plugins for the OpenVoiceOS ecosystem!
+
+	  https://github.com/OpenVoiceOS/OVOS-plugin-manager
diff --git a/buildroot-external/package/python-ovos-plugin-manager/python-ovos-plugin-manager.hash b/buildroot-external/package/python-ovos-plugin-manager/python-ovos-plugin-manager.hash
new file mode 100644
index 00000000..d80ac68b
--- /dev/null
+++ b/buildroot-external/package/python-ovos-plugin-manager/python-ovos-plugin-manager.hash
@@ -0,0 +1 @@
+sha256  4806fc7724d8a8f2e404f28dbccaf2d0e6001ceb1c11a2d3bf2882edd7a3927c  python-ovos-plugin-manager-2362602adf0574c42882504127474258409012c5.tar.gz
diff --git a/buildroot-external/package/python-ovos-plugin-manager/python-ovos-plugin-manager.mk b/buildroot-external/package/python-ovos-plugin-manager/python-ovos-plugin-manager.mk
new file mode 100644
index 00000000..21bc7426
--- /dev/null
+++ b/buildroot-external/package/python-ovos-plugin-manager/python-ovos-plugin-manager.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# python-ovos-plugin-manager
+#
+################################################################################
+
+PYTHON_OVOS_PLUGIN_MANAGER_VERSION = 2362602adf0574c42882504127474258409012c5
+PYTHON_OVOS_PLUGIN_MANAGER_SITE = $(call github,OpenVoiceOS,OVOS-plugin-manager,$(PYTHON_OVOS_PLUGIN_MANAGER_VERSION))
+PYTHON_OVOS_PLUGIN_MANAGER_SETUP_TYPE = setuptools
+PYTHON_OVOS_PLUGIN_MANAGER_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/buildroot-external/package/python-ovos-skill-installer/Config.in b/buildroot-external/package/python-ovos-skill-installer/Config.in
new file mode 100644
index 00000000..2c70d88a
--- /dev/null
+++ b/buildroot-external/package/python-ovos-skill-installer/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_PYTHON_OVOS_SKILL_INSTALLER
+	bool "python-ovos-skill-installer"
+	help
+	  Skills can be installed from github branches or 
+	  releases, from .zip or .tar.gz urls
+
+	  This tool is meant to be used internally by 
+	  ovos_skills_manager, as an end user your probably 
+	  should be using that and not this repository directly.
+
+	  https://github.com/OpenVoiceOS/ovos_skill_installer
diff --git a/buildroot-external/package/python-ovos-skill-installer/python-ovos-skill-installer.hash b/buildroot-external/package/python-ovos-skill-installer/python-ovos-skill-installer.hash
new file mode 100644
index 00000000..e28efa9a
--- /dev/null
+++ b/buildroot-external/package/python-ovos-skill-installer/python-ovos-skill-installer.hash
@@ -0,0 +1 @@
+sha256  b26ffc7b42abbd02bda9fccd692dde633576a2479bd0cfc07b5e5a22fc39a336  python-ovos-skill-installer-79db45e21bdf06cfa6f93a3dcf6a78cefaea1554.tar.gz
diff --git a/buildroot-external/package/python-ovos-skill-installer/python-ovos-skill-installer.mk b/buildroot-external/package/python-ovos-skill-installer/python-ovos-skill-installer.mk
new file mode 100644
index 00000000..9978b848
--- /dev/null
+++ b/buildroot-external/package/python-ovos-skill-installer/python-ovos-skill-installer.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# python-ovos-skill-installer
+#
+################################################################################
+
+PYTHON_OVOS_SKILL_INSTALLER_VERSION = 79db45e21bdf06cfa6f93a3dcf6a78cefaea1554
+PYTHON_OVOS_SKILL_INSTALLER_SITE = $(call github,OpenVoiceOS,ovos_skill_installer,$(PYTHON_OVOS_SKILL_INSTALLER_VERSION))
+PYTHON_OVOS_SKILL_INSTALLER_SETUP_TYPE = setuptools
+PYTHON_OVOS_SKILL_INSTALLER_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/buildroot-external/package/python-ovos-skill-manager/Config.in b/buildroot-external/package/python-ovos-skill-manager/Config.in
new file mode 100644
index 00000000..6214e028
--- /dev/null
+++ b/buildroot-external/package/python-ovos-skill-manager/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_PYTHON_OVOS_SKILL_MANAGER
+	bool "python-ovos-skill-manager"
+	help
+	  Skill installer for OVOS. Install skills from any appstore!
+	  
+	  The mycroft-skills-manager alternative that is not vendor locked, 
+	  this means you must use it responsibly!
+
+	  Do not install random skills, different appstores have 
+	  different policies!
+
+	  https://github.com/OpenVoiceOS/ovos_skill_manager
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
new file mode 100644
index 00000000..9c8936a5
--- /dev/null
+++ b/buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.hash
@@ -0,0 +1 @@
+sha256  5602973992c560b979479bc423fcac0766d63bbf884d044f2cfe13b26dc421fe  python-ovos-skill-manager-a36eb3d730e21275c4b9601f9a7acf37ffde1069.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
new file mode 100644
index 00000000..d55b0d33
--- /dev/null
+++ b/buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# python-ovos-skill-manager
+#
+################################################################################
+
+PYTHON_OVOS_SKILL_MANAGER_VERSION = a36eb3d730e21275c4b9601f9a7acf37ffde1069
+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
+
+$(eval $(python-package))
diff --git a/buildroot-external/package/python-ovos-utils/python-ovos-utils.hash b/buildroot-external/package/python-ovos-utils/python-ovos-utils.hash
index 38574c14..22310c12 100644
--- a/buildroot-external/package/python-ovos-utils/python-ovos-utils.hash
+++ b/buildroot-external/package/python-ovos-utils/python-ovos-utils.hash
@@ -1 +1 @@
-sha256	f05d420f11b38bb295af251739bf8b4d1c503f2dabc255ea704b737c9b74d43f  python-ovos-utils-8d87353defd0d8fff26e031a33879ed5938bf372.tar.gz
+sha256	c0016a72fa6bb78eb1214a67985168a7c4e93ce2551d006833e5f707e509fa6f  python-ovos-utils-e970e42e00d5e3084e4fc8bfbe96376a8608a5f9.tar.gz
diff --git a/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk b/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk
index 4258b925..4f38db5a 100644
--- a/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk
+++ b/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_OVOS_UTILS_VERSION = 8d87353defd0d8fff26e031a33879ed5938bf372
+PYTHON_OVOS_UTILS_VERSION = e970e42e00d5e3084e4fc8bfbe96376a8608a5f9
 PYTHON_OVOS_UTILS_SITE = $(call github,OpenVoiceOS,ovos_utils,$(PYTHON_OVOS_UTILS_VERSION))
 PYTHON_OVOS_UTILS_SETUP_TYPE = setuptools
 PYTHON_OVOS_UTILS_LICENSE_FILES = LICENSE
diff --git a/buildroot-external/package/python-ovos-workshop/Config.in b/buildroot-external/package/python-ovos-workshop/Config.in
new file mode 100644
index 00000000..4553a389
--- /dev/null
+++ b/buildroot-external/package/python-ovos-workshop/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_OVOS_WORKSHOP
+	bool "python-ovos-workshop"
+	help
+	  frameworks, templates and patches for the 
+	  mycroft universe
+
+	  https://github.com/OpenVoiceOS/OVOS-workshop
diff --git a/buildroot-external/package/python-ovos-workshop/python-ovos-workshop.hash b/buildroot-external/package/python-ovos-workshop/python-ovos-workshop.hash
new file mode 100644
index 00000000..c5ecd949
--- /dev/null
+++ b/buildroot-external/package/python-ovos-workshop/python-ovos-workshop.hash
@@ -0,0 +1 @@
+sha256  ad8f7dec07780c7b89957e4d127e8b0e5cbc9f0346a3a92dc00667f70e85cb12  python-ovos-workshop-a9d1c8585ae967e9a8f2f4e2a5f855f9f40998e4.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
new file mode 100644
index 00000000..af58c028
--- /dev/null
+++ b/buildroot-external/package/python-ovos-workshop/python-ovos-workshop.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# python-ovos-workshop
+#
+################################################################################
+
+PYTHON_OVOS_WORKSHOP_VERSION = a9d1c8585ae967e9a8f2f4e2a5f855f9f40998e4
+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
+
+$(eval $(python-package))
diff --git a/buildroot-external/package/python-rapidfuzz/Config.in b/buildroot-external/package/python-rapidfuzz/Config.in
new file mode 100644
index 00000000..975dc62e
--- /dev/null
+++ b/buildroot-external/package/python-rapidfuzz/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PYTHON_RAPIDFUZZ
+	bool "python-rapidfuzz"
+	help
+	  RapidFuzz is a fast string matching 
+	  library for Python and C++, which is 
+	  using the string similarity calculations 
+	  from FuzzyWuzzy.
+
+	  https://github.com/maxbachmann/rapidfuzz
diff --git a/buildroot-external/package/python-rapidfuzz/python-rapidfuzz.hash b/buildroot-external/package/python-rapidfuzz/python-rapidfuzz.hash
new file mode 100644
index 00000000..2ea88d7e
--- /dev/null
+++ b/buildroot-external/package/python-rapidfuzz/python-rapidfuzz.hash
@@ -0,0 +1,2 @@
+# md5, sha256 from https://pypi.org/pypi
+sha256	de20550178376d21bfe1b34a7dc42ab107bb282ef82069cf6dfe2805a0029e26  rapidfuzz-1.4.1.tar.gz
diff --git a/buildroot-external/package/python-rapidfuzz/python-rapidfuzz.mk b/buildroot-external/package/python-rapidfuzz/python-rapidfuzz.mk
new file mode 100644
index 00000000..584df3dc
--- /dev/null
+++ b/buildroot-external/package/python-rapidfuzz/python-rapidfuzz.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-rapidfuzz
+#
+################################################################################
+
+PYTHON_RAPIDFUZZ_VERSION = 1.4.1
+PYTHON_RAPIDFUZZ_SOURCE = rapidfuzz-$(PYTHON_RAPIDFUZZ_VERSION).tar.gz
+PYTHON_RAPIDFUZZ_SITE = https://files.pythonhosted.org/packages/2f/86/cc342a061f0ae579b31376f23afd737a4a7cf34dfa9199859646cb4a941b
+PYTHON_RAPIDFUZZ_SETUP_TYPE = setuptools
+PYTHON_RAPIDFUZZ_LICENSE = Apache-2.0
+PYTHON_RAPIDFUZZ_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))