From 6fa4da951cf2a213804b0dde524f30857bf8bed6 Mon Sep 17 00:00:00 2001 From: j1nx Date: Mon, 6 Sep 2021 13:00:14 +0200 Subject: [PATCH] Precise and pocketsphinx ww plugins --- buildroot-external/Config.in | 3 ++- buildroot-external/configs/rpi4_64-gui_defconfig | 3 ++- .../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 ------------ .../python-ovos-ww-plugin-pocketsphinx/Config.in | 8 ++++++++ .../python-ovos-ww-plugin-pocketsphinx.hash | 1 + .../python-ovos-ww-plugin-pocketsphinx.mk | 12 ++++++++++++ .../package/python-ovos-ww-plugin-precise/Config.in | 8 ++++++++ .../python-ovos-wake-word-plugin-precise.hash | 1 + .../python-ovos-wake-word-plugin-precise.mk | 12 ++++++++++++ 11 files changed, 46 insertions(+), 23 deletions(-) delete mode 100644 buildroot-external/package/python-ovos-wake-word-plugin-precise/Config.in delete mode 100644 buildroot-external/package/python-ovos-wake-word-plugin-precise/python-ovos-wake-word-plugin-precise.hash delete mode 100644 buildroot-external/package/python-ovos-wake-word-plugin-precise/python-ovos-wake-word-plugin-precise.mk create mode 100644 buildroot-external/package/python-ovos-ww-plugin-pocketsphinx/Config.in create mode 100644 buildroot-external/package/python-ovos-ww-plugin-pocketsphinx/python-ovos-ww-plugin-pocketsphinx.hash create mode 100644 buildroot-external/package/python-ovos-ww-plugin-pocketsphinx/python-ovos-ww-plugin-pocketsphinx.mk create mode 100644 buildroot-external/package/python-ovos-ww-plugin-precise/Config.in create mode 100644 buildroot-external/package/python-ovos-ww-plugin-precise/python-ovos-wake-word-plugin-precise.hash create mode 100644 buildroot-external/package/python-ovos-ww-plugin-precise/python-ovos-wake-word-plugin-precise.mk diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index e6959524..defb85b2 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -214,7 +214,8 @@ menu "Mycroft A.I. Plugins" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-plugin-mimic/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-plugin-mimic2/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-plugin-pico/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-wake-word-plugin-precise/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-ww-plugin-pocketsphinx/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-ww-plugin-precise/Config.in" endmenu menu "Mycroft A.I. Skills" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skills-repo/Config.in" diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index 1cfb66ad..9c6cb397 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -685,7 +685,8 @@ BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_VOSK=y BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MIMIC=y BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MIMIC2=y BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_PICO=y -BR2_PACKAGE_PYTHON_OVOS_WAKE_WORD_PLUGIN_PRECISE=y +BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_POCKETSPHINX=y +BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_PRECISE=y BR2_PACKAGE_MYCROFT_SKILLS_REPO=y BR2_PACKAGE_MYCROFT_SKILL_ALARM=y BR2_PACKAGE_MYCROFT_SKILL_AUDIO_RECORD=y 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 deleted file mode 100644 index 262b5c28..00000000 --- a/buildroot-external/package/python-ovos-wake-word-plugin-precise/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 51eefb6e..00000000 --- a/buildroot-external/package/python-ovos-wake-word-plugin-precise/python-ovos-wake-word-plugin-precise.hash +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index e4a3a095..00000000 --- a/buildroot-external/package/python-ovos-wake-word-plugin-precise/python-ovos-wake-word-plugin-precise.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# python-ovos-wake-word-plugin-precise -# -################################################################################ - -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 - -$(eval $(python-package)) diff --git a/buildroot-external/package/python-ovos-ww-plugin-pocketsphinx/Config.in b/buildroot-external/package/python-ovos-ww-plugin-pocketsphinx/Config.in new file mode 100644 index 00000000..24c545ee --- /dev/null +++ b/buildroot-external/package/python-ovos-ww-plugin-pocketsphinx/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_POCKETSPHINX + bool "python-ovos-ww-plugin-pocketsphinx" + help + This adds a plugin for pocketsphinx, this is the + fallback mycroft wake word engine and is supported + out of the box by core. + + https://github.com/OpenVoiceOS/ovos-ww-plugin-pocketsphinx diff --git a/buildroot-external/package/python-ovos-ww-plugin-pocketsphinx/python-ovos-ww-plugin-pocketsphinx.hash b/buildroot-external/package/python-ovos-ww-plugin-pocketsphinx/python-ovos-ww-plugin-pocketsphinx.hash new file mode 100644 index 00000000..5a64ee8d --- /dev/null +++ b/buildroot-external/package/python-ovos-ww-plugin-pocketsphinx/python-ovos-ww-plugin-pocketsphinx.hash @@ -0,0 +1 @@ +sha256 87a619b53f1a603e3a14b1253920674006b5ae95f5f034b536da4aac4d3e168c python-ovos-ww-plugin-pocketsphinx-86d22179f5bd85bd55c9ffec1a2f071129d9947c.tar.gz diff --git a/buildroot-external/package/python-ovos-ww-plugin-pocketsphinx/python-ovos-ww-plugin-pocketsphinx.mk b/buildroot-external/package/python-ovos-ww-plugin-pocketsphinx/python-ovos-ww-plugin-pocketsphinx.mk new file mode 100644 index 00000000..c542cdbb --- /dev/null +++ b/buildroot-external/package/python-ovos-ww-plugin-pocketsphinx/python-ovos-ww-plugin-pocketsphinx.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# python-ovos-ww-plugin-pocketsphinx +# +################################################################################ + +PYTHON_OVOS_WW_PLUGIN_POCKETSPHINX_VERSION = 86d22179f5bd85bd55c9ffec1a2f071129d9947c +PYTHON_OVOS_WW_PLUGIN_POCKETSPHINX_SITE = $(call github,OpenVoiceOS,ovos-ww-plugin-pocketsphinx,$(PYTHON_OVOS_WW_PLUGIN_POCKETSPHINX_VERSION)) +PYTHON_OVOS_WW_PLUGIN_POCKETSPHINX_SETUP_TYPE = setuptools +PYTHON_OVOS_WW_PLUGIN_POCKETSPHINX_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot-external/package/python-ovos-ww-plugin-precise/Config.in b/buildroot-external/package/python-ovos-ww-plugin-precise/Config.in new file mode 100644 index 00000000..a26090cb --- /dev/null +++ b/buildroot-external/package/python-ovos-ww-plugin-precise/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_PRECISE + bool "python-ovos-ww-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-ww-plugin-precise diff --git a/buildroot-external/package/python-ovos-ww-plugin-precise/python-ovos-wake-word-plugin-precise.hash b/buildroot-external/package/python-ovos-ww-plugin-precise/python-ovos-wake-word-plugin-precise.hash new file mode 100644 index 00000000..5477847b --- /dev/null +++ b/buildroot-external/package/python-ovos-ww-plugin-precise/python-ovos-wake-word-plugin-precise.hash @@ -0,0 +1 @@ +sha256 5626531c5eb249bb384a29a540fe5ce1552fb98db593775b93c258425a7b3418 python-ovos-ww-plugin-precise-766bc2d1e0a71f9b0e3f6a4f2fe1fbc981f90ae2.tar.gz diff --git a/buildroot-external/package/python-ovos-ww-plugin-precise/python-ovos-wake-word-plugin-precise.mk b/buildroot-external/package/python-ovos-ww-plugin-precise/python-ovos-wake-word-plugin-precise.mk new file mode 100644 index 00000000..9d2bc65d --- /dev/null +++ b/buildroot-external/package/python-ovos-ww-plugin-precise/python-ovos-wake-word-plugin-precise.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# python-ovos-ww-plugin-precise +# +################################################################################ + +PYTHON_OVOS_WW_PLUGIN_PRECISE_VERSION = 766bc2d1e0a71f9b0e3f6a4f2fe1fbc981f90ae2 +PYTHON_OVOS_WW_PLUGIN_PRECISE_SITE = $(call github,OpenVoiceOS,ovos-ww-plugin-precise,$(PYTHON_OVOS_WW_PLUGIN_PRECISE_VERSION)) +PYTHON_OVOS_WW_PLUGIN_PRECISE_SETUP_TYPE = setuptools +PYTHON_OVOS_WW_PLUGIN_PRECISE_LICENSE_FILES = LICENSE + +$(eval $(python-package))