Merge branch 'develop' of https://github.com/OpenVoiceOS/OpenVoiceOS into develop

buildroot-external/Config.in

@@ -202,8 +202,8 @@ menu "Mycroft A.I. Personal Assistant"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-splash/Config.in"
 menu "Mycroft A.I. Plugins"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-jarbas-stt-plugin-chromium/Config.in"
-	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-jarbas-stt-plugin-vosk/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-jarbas-wake-word-plugin-precise/Config.in"
+	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-stt-plugin-vosk/Config.in"
 endmenu
 menu "Mycroft A.I. Skills"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skills-repo/Config.in"

buildroot-external/configs/rpi4_64-gui_defconfig

@@ -676,8 +676,8 @@ BR2_PACKAGE_MYCROFT_GUI=y
 BR2_PACKAGE_PYTHON_HOLMESV=y
 BR2_PACKAGE_MYCROFT_SERVICE=y
 BR2_PACKAGE_PYTHON_JARBAS_STT_PLUGIN_CHROMIUM=y
-BR2_PACKAGE_PYTHON_JARBAS_STT_PLUGIN_VOSK=y
 BR2_PACKAGE_PYTHON_JARBAS_WAKE_WORD_PLUGIN_PRECISE=y
+BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_VOSK=y
 BR2_PACKAGE_MYCROFT_SKILLS_REPO=y
 BR2_PACKAGE_MYCROFT_SKILL_ALARM=y
 BR2_PACKAGE_MYCROFT_SKILL_AUDIO_RECORD=y

buildroot-external/package/python-jarbas-stt-plugin-vosk/Config.in

@@ -1,6 +0,0 @@
-config BR2_PACKAGE_PYTHON_JARBAS_STT_PLUGIN_VOSK
-	bool "python-jarbas-stt-plugin-vosk"
-	help
-	  Mycroft STT plugin for Vosk
-
-	  https://github.com/JarbasLingua/jarbas-stt-plugin-vosk

buildroot-external/package/python-jarbas-stt-plugin-vosk/python-jarbas-stt-plugin-vosk.hash

@@ -1,2 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/jarbas-stt-plugin-vosk/json
-sha256  2f662ab79d512380748e20fe82852970a570d6029a52e6f62a2ae01d3056137f  jarbas-stt-plugin-vosk-0.1.3.tar.gz

buildroot-external/package/python-jarbas-stt-plugin-vosk/python-jarbas-stt-plugin-vosk.mk

@@ -1,12 +0,0 @@
-################################################################################
-#
-# python-jarbas-stt-plugin-vosk
-#
-################################################################################
-
-PYTHON_JARBAS_STT_PLUGIN_VOSK_VERSION = 0.1.3
-PYTHON_JARBAS_STT_PLUGIN_VOSK_SOURCE = jarbas-stt-plugin-vosk-$(PYTHON_JARBAS_STT_PLUGIN_VOSK_VERSION).tar.gz
-PYTHON_JARBAS_STT_PLUGIN_VOSK_SITE = https://files.pythonhosted.org/packages/c1/82/5a3a041d602c511cd9a611d274b9e8ce38272bb2e03a67c0aff299d7a689
-PYTHON_JARBAS_STT_PLUGIN_VOSK_SETUP_TYPE = setuptools
-
-$(eval $(python-package))

buildroot-external/package/python-ovos-stt-plugin-vosk/Config.in

@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_VOSK
+	bool "python-ovos-stt-plugin-vosk"
+	help
+	  OVOS STT plugin for Vosk
+
+	  https://github.com/OpenVoiceOS/ovos-stt-plugin-vosk

buildroot-external/package/python-ovos-stt-plugin-vosk/python-ovos-stt-plugin-vosk.hash

@@ -0,0 +1,2 @@
+# md5, sha256 from https://pypi.org/pypi/ovos-stt-plugin-vosk/json
+sha256  1914db2e5bd768ec031e2317f64af447b0e8553366fa7177c434bf06582c8c42  ovos-stt-plugin-vosk-0.1.0.tar.gz

buildroot-external/package/python-ovos-stt-plugin-vosk/python-ovos-stt-plugin-vosk.mk

@@ -0,0 +1,12 @@
+################################################################################
+#
+# python-ovos-stt-plugin-vosk
+#
+################################################################################
+
+PYTHON_OVOS_STT_PLUGIN_VOSK_VERSION = 0.1.0
+PYTHON_OVOS_STT_PLUGIN_VOSK_SOURCE = ovos-stt-plugin-vosk-$(PYTHON_OVOS_STT_PLUGIN_VOSK_VERSION).tar.gz
+PYTHON_OVOS_STT_PLUGIN_VOSK_SITE = https://files.pythonhosted.org/packages/2c/fa/fd30cced0c7defd817c1da7234488ad0f4233fb4500d7df60d6930921f07
+PYTHON_OVOS_STT_PLUGIN_VOSK_SETUP_TYPE = setuptools
+
+$(eval $(python-package))

buildroot-patches/0116-update-htop-3.0.5-with-upstream-changes.patch

@@ -0,0 +1,44 @@
+From af86c67b797775c20c41c6c6aae4596231c1cd08 Mon Sep 17 00:00:00 2001
+From: Ciaran O'Reilly <ciaran@oreilly.cat>
+Date: Tue, 27 Jul 2021 08:18:56 +0200
+Subject: [PATCH] Patch htop with upstream changes
+
+---
+ package/htop/htop.hash |  2 +-
+ package/htop/htop.mk   | 10 ++++++++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/package/htop/htop.hash b/package/htop/htop.hash
+index 647feabb8e..34d95eb7a1 100644
+--- a/package/htop/htop.hash
++++ b/package/htop/htop.hash
+@@ -1,3 +1,3 @@
+ # Locally calculated
+-sha256  19535f8f01ac08be2df880c93c9cedfc50fa92320d48e3ef92a30b6edc4d1917  htop-3.0.5.tar.gz
++sha256  123476d56a5e6a219654eebb6b2ec747dfa364f39c01a6475bf8030a25c81bff  htop-ce6d60e7def146c13d0b8bca4642e7401a0a8995.tar.gz
+ sha256  c228cc14df980a23ea0c3c9ac957b904dd6a8514f6283db403de22e9179471be  COPYING
+diff --git a/package/htop/htop.mk b/package/htop/htop.mk
+index aa2ff24750..bb2bcb29ae 100644
+--- a/package/htop/htop.mk
++++ b/package/htop/htop.mk
+@@ -4,9 +4,15 @@
+ #
+ ################################################################################
+ 
+-HTOP_VERSION = 3.0.5
+-HTOP_SITE = https://dl.bintray.com/htop/source
++# This commit hash corresponds to version 3.0.5.
++# htop sources were moved from bintray to github and the sources tar archive
++# was also changed (the build process requires `HTOP_AUTORECONF = YES` now). We
++# use commit hash instead of git tag here to avoid breaking existing source
++# caches
++HTOP_VERSION = ce6d60e7def146c13d0b8bca4642e7401a0a8995
++HTOP_SITE = $(call github,htop-dev,htop,$(HTOP_VERSION))
+ HTOP_DEPENDENCIES = ncurses
++HTOP_AUTORECONF = YES
+ # Prevent htop build system from searching the host paths
+ HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
+ HTOP_LICENSE = GPL-2.0
+-- 
+2.23.0
+