From 29057e6537a52623e52aabc451a7e742127de0c6 Mon Sep 17 00:00:00 2001 From: ChanceNCounter Date: Wed, 18 Aug 2021 09:07:00 -0700 Subject: [PATCH 1/2] fix refs to moved packages --- .../package/python-jarbas-stt-plugin-chromium/Config.in | 2 +- .../package/python-jarbas-wake-word-plugin-precise/Config.in | 2 +- .../python-jarbas-wake-word-plugin-precise.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildroot-external/package/python-jarbas-stt-plugin-chromium/Config.in b/buildroot-external/package/python-jarbas-stt-plugin-chromium/Config.in index 00db487f..fd4c87b4 100644 --- a/buildroot-external/package/python-jarbas-stt-plugin-chromium/Config.in +++ b/buildroot-external/package/python-jarbas-stt-plugin-chromium/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_PYTHON_JARBAS_STT_PLUGIN_CHROMIUM A stt plugin for mycroft using the google chrome browser api. - https://github.com/JarbasLingua/jarbas-stt-plugin-chromium + https://github.com/OpenVoiceOS/jarbas-stt-plugin-chromium diff --git a/buildroot-external/package/python-jarbas-wake-word-plugin-precise/Config.in b/buildroot-external/package/python-jarbas-wake-word-plugin-precise/Config.in index 50213284..669d679d 100644 --- a/buildroot-external/package/python-jarbas-wake-word-plugin-precise/Config.in +++ b/buildroot-external/package/python-jarbas-wake-word-plugin-precise/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_PYTHON_JARBAS_WAKE_WORD_PLUGIN_PRECISE official mycroft wake word engine and is supported out of the box by core - https://github.com/JarbasLingua/jarbas-wake-word-plugin-precise + https://github.com/OpenVoiceOS/jarbas-wake-word-plugin-precise diff --git a/buildroot-external/package/python-jarbas-wake-word-plugin-precise/python-jarbas-wake-word-plugin-precise.mk b/buildroot-external/package/python-jarbas-wake-word-plugin-precise/python-jarbas-wake-word-plugin-precise.mk index 0273d579..100932da 100644 --- a/buildroot-external/package/python-jarbas-wake-word-plugin-precise/python-jarbas-wake-word-plugin-precise.mk +++ b/buildroot-external/package/python-jarbas-wake-word-plugin-precise/python-jarbas-wake-word-plugin-precise.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON_JARBAS_WAKE_WORD_PLUGIN_PRECISE_VERSION = ad3ced5e4fec11530fc4d065bd446c689e39987a -PYTHON_JARBAS_WAKE_WORD_PLUGIN_PRECISE_SITE = $(call github,JarbasLingua,jarbas-wake-word-plugin-precise,$(PYTHON_JARBAS_WAKE_WORD_PLUGIN_PRECISE_VERSION)) +PYTHON_JARBAS_WAKE_WORD_PLUGIN_PRECISE_SITE = $(call github,OpenVoiceOS,jarbas-wake-word-plugin-precise,$(PYTHON_JARBAS_WAKE_WORD_PLUGIN_PRECISE_VERSION)) PYTHON_JARBAS_WAKE_WORD_PLUGIN_PRECISE_SETUP_TYPE = setuptools PYTHON_JARBAS_WAKE_WORD_PLUGIN_PRECISE_LICENSE_FILES = LICENSE From 98ac56062a1e0463c2b80cd50641199befc9895a Mon Sep 17 00:00:00 2001 From: ChanceNCounter Date: Wed, 18 Aug 2021 12:29:04 -0700 Subject: [PATCH 2/2] actually move packages --- buildroot-external/Config.in | 4 ++-- buildroot-external/configs/rpi4_64-gui_defconfig | 4 ++-- .../python-jarbas-stt-plugin-chromium/Config.in | 8 -------- .../python-jarbas-stt-plugin-chromium.hash | 3 --- .../python-jarbas-stt-plugin-chromium.mk | 12 ------------ .../python-jarbas-wake-word-plugin-precise/Config.in | 8 -------- .../python-jarbas-wake-word-plugin-precise.hash | 1 - .../python-jarbas-wake-word-plugin-precise.mk | 12 ------------ .../python-ovos-stt-plugin-chromium/Config.in | 8 ++++++++ .../python-ovos-stt-plugin-chromium.hash | 3 +++ .../python-ovos-stt-plugin-chromium.mk | 12 ++++++++++++ .../python-ovos-wake-word-plugin-precise/Config.in | 8 ++++++++ .../python-ovos-wake-word-plugin-precise.hash | 1 + .../python-ovos-wake-word-plugin-precise.mk | 12 ++++++++++++ 14 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 buildroot-external/package/python-jarbas-stt-plugin-chromium/Config.in delete mode 100644 buildroot-external/package/python-jarbas-stt-plugin-chromium/python-jarbas-stt-plugin-chromium.hash delete mode 100644 buildroot-external/package/python-jarbas-stt-plugin-chromium/python-jarbas-stt-plugin-chromium.mk delete mode 100644 buildroot-external/package/python-jarbas-wake-word-plugin-precise/Config.in delete mode 100644 buildroot-external/package/python-jarbas-wake-word-plugin-precise/python-jarbas-wake-word-plugin-precise.hash delete mode 100644 buildroot-external/package/python-jarbas-wake-word-plugin-precise/python-jarbas-wake-word-plugin-precise.mk create mode 100644 buildroot-external/package/python-ovos-stt-plugin-chromium/Config.in create mode 100644 buildroot-external/package/python-ovos-stt-plugin-chromium/python-ovos-stt-plugin-chromium.hash create mode 100644 buildroot-external/package/python-ovos-stt-plugin-chromium/python-ovos-stt-plugin-chromium.mk create mode 100644 buildroot-external/package/python-ovos-wake-word-plugin-precise/Config.in create mode 100644 buildroot-external/package/python-ovos-wake-word-plugin-precise/python-ovos-wake-word-plugin-precise.hash create mode 100644 buildroot-external/package/python-ovos-wake-word-plugin-precise/python-ovos-wake-word-plugin-precise.mk diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index e10dc1c8..de30a1c6 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -202,8 +202,8 @@ menu "Mycroft A.I. Personal Assistant" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-service/Config.in" 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-wake-word-plugin-precise/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-stt-plugin-chromium/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-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" diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index 0306c16f..78cf1260 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -676,8 +676,8 @@ BR2_PACKAGE_MYCROFT_EMBEDDED_SHELL=y 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_WAKE_WORD_PLUGIN_PRECISE=y +BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_CHROMIUM=y +BR2_PACKAGE_PYTHON_OVOS_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 diff --git a/buildroot-external/package/python-jarbas-stt-plugin-chromium/Config.in b/buildroot-external/package/python-jarbas-stt-plugin-chromium/Config.in deleted file mode 100644 index fd4c87b4..00000000 --- a/buildroot-external/package/python-jarbas-stt-plugin-chromium/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_JARBAS_STT_PLUGIN_CHROMIUM - bool "python-jarbas-stt-plugin-chromium" - select BR2_PACKAGE_PYTHON_REQUESTS # runtime - help - A stt plugin for mycroft using the google chrome browser - api. - - https://github.com/OpenVoiceOS/jarbas-stt-plugin-chromium diff --git a/buildroot-external/package/python-jarbas-stt-plugin-chromium/python-jarbas-stt-plugin-chromium.hash b/buildroot-external/package/python-jarbas-stt-plugin-chromium/python-jarbas-stt-plugin-chromium.hash deleted file mode 100644 index 551cc926..00000000 --- a/buildroot-external/package/python-jarbas-stt-plugin-chromium/python-jarbas-stt-plugin-chromium.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/jarbas-stt-plugin-chromium/json -md5 377d95b10e54668742403462e98b0827 jarbas-stt-plugin-chromium-0.1.3.tar.gz -sha256 4e6349aabdfd242dbca085d7dd74d2c27a9d6053642c2cea3e9dff7f3c93a3af jarbas-stt-plugin-chromium-0.1.3.tar.gz diff --git a/buildroot-external/package/python-jarbas-stt-plugin-chromium/python-jarbas-stt-plugin-chromium.mk b/buildroot-external/package/python-jarbas-stt-plugin-chromium/python-jarbas-stt-plugin-chromium.mk deleted file mode 100644 index 9541a9c2..00000000 --- a/buildroot-external/package/python-jarbas-stt-plugin-chromium/python-jarbas-stt-plugin-chromium.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# python-jarbas-stt-plugin-chromium -# -################################################################################ - -PYTHON_JARBAS_STT_PLUGIN_CHROMIUM_VERSION = 0.1.3 -PYTHON_JARBAS_STT_PLUGIN_CHROMIUM_SOURCE = jarbas-stt-plugin-chromium-$(PYTHON_JARBAS_STT_PLUGIN_CHROMIUM_VERSION).tar.gz -PYTHON_JARBAS_STT_PLUGIN_CHROMIUM_SITE = https://files.pythonhosted.org/packages/0c/6c/b7fc257c7cf886d0b9a286682b3631c65adaac64f2f9a7d8d4263ff4664f -PYTHON_JARBAS_STT_PLUGIN_CHROMIUM_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/buildroot-external/package/python-jarbas-wake-word-plugin-precise/Config.in b/buildroot-external/package/python-jarbas-wake-word-plugin-precise/Config.in deleted file mode 100644 index 669d679d..00000000 --- a/buildroot-external/package/python-jarbas-wake-word-plugin-precise/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_JARBAS_WAKE_WORD_PLUGIN_PRECISE - bool "python-jarbas-wake-word-plugin-precise" - help - This adds a plugin for precise, this is the - official mycroft wake word engine and is supported - out of the box by core - - https://github.com/OpenVoiceOS/jarbas-wake-word-plugin-precise diff --git a/buildroot-external/package/python-jarbas-wake-word-plugin-precise/python-jarbas-wake-word-plugin-precise.hash b/buildroot-external/package/python-jarbas-wake-word-plugin-precise/python-jarbas-wake-word-plugin-precise.hash deleted file mode 100644 index aaf561f1..00000000 --- a/buildroot-external/package/python-jarbas-wake-word-plugin-precise/python-jarbas-wake-word-plugin-precise.hash +++ /dev/null @@ -1 +0,0 @@ -sha256 87be488bdd86ac372ed8013415e9e5e05073b5a7246a65ab5f01809bc1069f8b python-jarbas-wake-word-plugin-precise-ad3ced5e4fec11530fc4d065bd446c689e39987a.tar.gz diff --git a/buildroot-external/package/python-jarbas-wake-word-plugin-precise/python-jarbas-wake-word-plugin-precise.mk b/buildroot-external/package/python-jarbas-wake-word-plugin-precise/python-jarbas-wake-word-plugin-precise.mk deleted file mode 100644 index 100932da..00000000 --- a/buildroot-external/package/python-jarbas-wake-word-plugin-precise/python-jarbas-wake-word-plugin-precise.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# python-jarbas-wake-word-plugin-precise -# -################################################################################ - -PYTHON_JARBAS_WAKE_WORD_PLUGIN_PRECISE_VERSION = ad3ced5e4fec11530fc4d065bd446c689e39987a -PYTHON_JARBAS_WAKE_WORD_PLUGIN_PRECISE_SITE = $(call github,OpenVoiceOS,jarbas-wake-word-plugin-precise,$(PYTHON_JARBAS_WAKE_WORD_PLUGIN_PRECISE_VERSION)) -PYTHON_JARBAS_WAKE_WORD_PLUGIN_PRECISE_SETUP_TYPE = setuptools -PYTHON_JARBAS_WAKE_WORD_PLUGIN_PRECISE_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/buildroot-external/package/python-ovos-stt-plugin-chromium/Config.in b/buildroot-external/package/python-ovos-stt-plugin-chromium/Config.in new file mode 100644 index 00000000..6b13aefb --- /dev/null +++ b/buildroot-external/package/python-ovos-stt-plugin-chromium/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_CHROMIUM + bool "python-ovos-stt-plugin-chromium" + select BR2_PACKAGE_PYTHON_REQUESTS # runtime + help + A stt plugin for mycroft using the google chrome browser + api. + + https://github.com/OpenVoiceOS/ovos-stt-plugin-chromium 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 new file mode 100644 index 00000000..dd32aaaf --- /dev/null +++ b/buildroot-external/package/python-ovos-stt-plugin-chromium/python-ovos-stt-plugin-chromium.hash @@ -0,0 +1,3 @@ +# 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 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 new file mode 100644 index 00000000..261fb779 --- /dev/null +++ b/buildroot-external/package/python-ovos-stt-plugin-chromium/python-ovos-stt-plugin-chromium.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# python-ovos-stt-plugin-chromium +# +################################################################################ + +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_SETUP_TYPE = setuptools + +$(eval $(python-package)) diff --git a/buildroot-external/package/python-ovos-wake-word-plugin-precise/Config.in b/buildroot-external/package/python-ovos-wake-word-plugin-precise/Config.in new file mode 100644 index 00000000..262b5c28 --- /dev/null +++ b/buildroot-external/package/python-ovos-wake-word-plugin-precise/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_OVOS_WAKE_WORD_PLUGIN_PRECISE + bool "python-ovos-wake-word-plugin-precise" + help + This adds a plugin for precise, this is the + official mycroft wake word engine and is supported + out of the box by core + + https://github.com/OpenVoiceOS/ovos-wake-word-plugin-precise 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 new file mode 100644 index 00000000..59a791fe --- /dev/null +++ b/buildroot-external/package/python-ovos-wake-word-plugin-precise/python-ovos-wake-word-plugin-precise.hash @@ -0,0 +1 @@ +sha256 87be488bdd86ac372ed8013415e9e5e05073b5a7246a65ab5f01809bc1069f8b python-ovos-wake-word-plugin-precise-ad3ced5e4fec11530fc4d065bd446c689e39987a.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 new file mode 100644 index 00000000..449cf275 --- /dev/null +++ b/buildroot-external/package/python-ovos-wake-word-plugin-precise/python-ovos-wake-word-plugin-precise.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# python-ovos-wake-word-plugin-precise +# +################################################################################ + +PYTHON_OVOS_WAKE_WORD_PLUGIN_PRECISE_VERSION = ad3ced5e4fec11530fc4d065bd446c689e39987a +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 + +$(eval $(python-package))