From d8750257d5bda4e9ae90c2d5af6a09e416e8ee11 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen Date: Thu, 23 Sep 2021 20:48:13 +0200 Subject: [PATCH] Bump packages and skills (again) --- buildroot-external/Config.in | 2 +- buildroot-external/configs/rpi4_64-gui_defconfig | 2 +- .../mycroft-skill-ovos-common-play.mk | 2 +- .../mycroft-skill-simple-youtube.mk | 2 +- .../package/python-ovos-guiplayer-plugin/Config.in | 6 ------ .../python-ovos-guiplayer-plugin.hash | 1 - .../python-ovos-guiplayer-plugin.mk | 12 ------------ .../package/python-ovos-ocp-audio-plugin/Config.in | 6 ++++++ .../python-ovos-ocp-audio-plugin.hash | 1 + .../python-ovos-ocp-audio-plugin.mk | 12 ++++++++++++ .../python-ovos-utils/python-ovos-utils.hash | 2 +- .../package/python-ovos-utils/python-ovos-utils.mk | 2 +- .../python-ovos-workshop/python-ovos-workshop.hash | 2 +- .../python-ovos-workshop/python-ovos-workshop.mk | 2 +- .../rootfs-overlay/etc/mycroft/mycroft.conf | 13 +++++++------ 15 files changed, 34 insertions(+), 33 deletions(-) delete mode 100644 buildroot-external/package/python-ovos-guiplayer-plugin/Config.in delete mode 100644 buildroot-external/package/python-ovos-guiplayer-plugin/python-ovos-guiplayer-plugin.hash delete mode 100644 buildroot-external/package/python-ovos-guiplayer-plugin/python-ovos-guiplayer-plugin.mk create mode 100644 buildroot-external/package/python-ovos-ocp-audio-plugin/Config.in create mode 100644 buildroot-external/package/python-ovos-ocp-audio-plugin/python-ovos-ocp-audio-plugin.hash create mode 100644 buildroot-external/package/python-ovos-ocp-audio-plugin/python-ovos-ocp-audio-plugin.mk diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index bc87f26e..4f3f173f 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -151,8 +151,8 @@ menu "Additional external python modules" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-num2words/Config.in" 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-guiplayer-plugin/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-local-backend/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-ocp-audio-plugin/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" diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index 8dd7b911..6d827c89 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -643,8 +643,8 @@ BR2_PACKAGE_PYTHON_MULTI_KEY_DICT=y BR2_PACKAGE_PYTHON_MYCROFT_MESSAGEBUS_CLIENT=y BR2_PACKAGE_PYTHON_OAUTH2CLIENT=y BR2_PACKAGE_PYTHON_OLEFILE=y -BR2_PACKAGE_PYTHON_OVOS_GUIPLAYER_PLUGIN=y BR2_PACKAGE_PYTHON_OVOS_LOCAL_BACKEND=y +BR2_PACKAGE_PYTHON_OVOS_OCP_AUDIO_PLUGIN=y BR2_PACKAGE_PYTHON_OVOS_PLUGIN_MANAGER=y BR2_PACKAGE_PYTHON_OVOS_SKILL_INSTALLER=y BR2_PACKAGE_PYTHON_OVOS_SKILL_MANAGER=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 48180096..b502df18 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 = 5809b9787ece57d82625e6f81b9907abe3b73e4b +MYCROFT_SKILL_OVOS_COMMON_PLAY_VERSION = 23e85e42ba133d8c49ae4f5eebda10886c87a1bb 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-simple-youtube/mycroft-skill-simple-youtube.mk b/buildroot-external/package/mycroft-skill-simple-youtube/mycroft-skill-simple-youtube.mk index 5168c16a..c644ec34 100644 --- a/buildroot-external/package/mycroft-skill-simple-youtube/mycroft-skill-simple-youtube.mk +++ b/buildroot-external/package/mycroft-skill-simple-youtube/mycroft-skill-simple-youtube.mk @@ -4,7 +4,7 @@ # ################################################################################ -MYCROFT_SKILL_SIMPLE_YOUTUBE_VERSION = 6427d5c27ebfdbd92048d1812ead827f434c516f +MYCROFT_SKILL_SIMPLE_YOUTUBE_VERSION = 262e654ad731b1188842d8c8a07c76a65ffb046b MYCROFT_SKILL_SIMPLE_YOUTUBE_SITE = git://github.com/JarbasSkills/skill-simple-youtube MYCROFT_SKILL_SIMPLE_YOUTUBE_SITE_METHOD = git MYCROFT_SKILL_SIMPLE_YOUTUBE_DIRLOCATION = home/mycroft/.local/share/mycroft/skills diff --git a/buildroot-external/package/python-ovos-guiplayer-plugin/Config.in b/buildroot-external/package/python-ovos-guiplayer-plugin/Config.in deleted file mode 100644 index 4a077908..00000000 --- a/buildroot-external/package/python-ovos-guiplayer-plugin/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_OVOS_GUIPLAYER_PLUGIN - bool "python-ovos-guiplayer-plugin" - help - OVOS GUI mediaplayer plugin - - https://github.com/OpenVoiceOS/ovos-guiplayer-plugin diff --git a/buildroot-external/package/python-ovos-guiplayer-plugin/python-ovos-guiplayer-plugin.hash b/buildroot-external/package/python-ovos-guiplayer-plugin/python-ovos-guiplayer-plugin.hash deleted file mode 100644 index 53954ef6..00000000 --- a/buildroot-external/package/python-ovos-guiplayer-plugin/python-ovos-guiplayer-plugin.hash +++ /dev/null @@ -1 +0,0 @@ -sha256 6fa9a5001d1f4b73ae5648fd068057634aa9ce4e5d0c632234e3304be77c9b2b python-ovos-guiplayer-plugin-4f9896def4ae4b619a9dd979d9b159a4dbf4fb3b.tar.gz diff --git a/buildroot-external/package/python-ovos-guiplayer-plugin/python-ovos-guiplayer-plugin.mk b/buildroot-external/package/python-ovos-guiplayer-plugin/python-ovos-guiplayer-plugin.mk deleted file mode 100644 index 429d96cb..00000000 --- a/buildroot-external/package/python-ovos-guiplayer-plugin/python-ovos-guiplayer-plugin.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# python-ovos-guiplayer-plugin -# -################################################################################ - -PYTHON_OVOS_GUIPLAYER_PLUGIN_VERSION = 4f9896def4ae4b619a9dd979d9b159a4dbf4fb3b -PYTHON_OVOS_GUIPLAYER_PLUGIN_SITE = $(call github,OpenVoiceOS,ovos-guiplayer-plugin,$(PYTHON_OVOS_GUIPLAYER_PLUGIN_VERSION)) -PYTHON_OVOS_GUIPLAYER_PLUGIN_SETUP_TYPE = setuptools -PYTHON_OVOS_GUIPLAYER_PLUGIN_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/buildroot-external/package/python-ovos-ocp-audio-plugin/Config.in b/buildroot-external/package/python-ovos-ocp-audio-plugin/Config.in new file mode 100644 index 00000000..78c03025 --- /dev/null +++ b/buildroot-external/package/python-ovos-ocp-audio-plugin/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_OVOS_OCP_AUDIO_PLUGIN + bool "python-ovos-ocp-audio-plugin" + help + OVOS GUI mediaplayer plugin + + https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin diff --git a/buildroot-external/package/python-ovos-ocp-audio-plugin/python-ovos-ocp-audio-plugin.hash b/buildroot-external/package/python-ovos-ocp-audio-plugin/python-ovos-ocp-audio-plugin.hash new file mode 100644 index 00000000..e4920221 --- /dev/null +++ b/buildroot-external/package/python-ovos-ocp-audio-plugin/python-ovos-ocp-audio-plugin.hash @@ -0,0 +1 @@ +sha256 863f26cdb715cc92fa5dd31d31e9c71db8cd51582edc491ed9a4b904a13b86b5 python-ovos-ocp-audio-plugin-58a22a24cf71b62f9cc0daaec873f01f545edfa8.tar.gz diff --git a/buildroot-external/package/python-ovos-ocp-audio-plugin/python-ovos-ocp-audio-plugin.mk b/buildroot-external/package/python-ovos-ocp-audio-plugin/python-ovos-ocp-audio-plugin.mk new file mode 100644 index 00000000..a6e8bf30 --- /dev/null +++ b/buildroot-external/package/python-ovos-ocp-audio-plugin/python-ovos-ocp-audio-plugin.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# python-ovos-ocp-audio-plugin +# +################################################################################ + +PYTHON_OVOS_OCP_AUDIO_PLUGIN_VERSION = 58a22a24cf71b62f9cc0daaec873f01f545edfa8 +PYTHON_OVOS_OCP_AUDIO_PLUGIN_SITE = $(call github,OpenVoiceOS,ovos-ocp-audio-plugin,$(PYTHON_OVOS_OCP_AUDIO_PLUGIN_VERSION)) +PYTHON_OVOS_OCP_AUDIO_PLUGIN_SETUP_TYPE = setuptools +PYTHON_OVOS_OCP_AUDIO_PLUGIN_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 c1d387f1..6a6f7d8b 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 f342bbe9b67bee846b6ffb10c683265a4d940fc295c91bad914ff28acade8816 python-ovos-utils-d450c012f3a8def4770da6ff7d60d864a248af77.tar.gz +sha256 00a37f169da8c1712eaafae9b4cd3735bd91d4eb5ca2ad813d46bc5b2513f3d1 python-ovos-utils-b4fba3732e99b5e41a5e0f0043fed24f6c8d9f84.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 59588a45..327e1c57 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 = d450c012f3a8def4770da6ff7d60d864a248af77 +PYTHON_OVOS_UTILS_VERSION = b4fba3732e99b5e41a5e0f0043fed24f6c8d9f84 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/python-ovos-workshop.hash b/buildroot-external/package/python-ovos-workshop/python-ovos-workshop.hash index 69157cd3..a6cadd4d 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 77791746ef9b9d1bc0a2fbd73eacba562e13c455b3ba67376f6ddc9cc5a2c07b python-ovos-workshop-b714a667575ec4356afe7ee5b94b0ad082c19aee.tar.gz +sha256 1b59001897c5b68e6f9a6f2c3adfb62cea51a068f5a82cc699fad724d834f833 python-ovos-workshop-79e42ad0b07d2ef9f7e3aea01911b1da613dadec.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 409d56c8..07fbb199 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 = b714a667575ec4356afe7ee5b94b0ad082c19aee +PYTHON_OVOS_WORKSHOP_VERSION = 79e42ad0b07d2ef9f7e3aea01911b1da613dadec 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/rootfs-overlay/etc/mycroft/mycroft.conf b/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf index 6badeaef..1c04d8a3 100644 --- a/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf +++ b/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf @@ -64,16 +64,17 @@ }, "Audio": { "backends": { - "vlc": { - "type": "ovos_vlc", + "local": { + "type": "ovos_common_play", "active": true }, - "mycroft_mediaplayer": { - "type": "ovos_guiplayer", - "active": true + "vlc": { + "type": "ovos_vlc", + "active": true, + "duck": true } }, - "default-backend": "vlc" + "default-backend": "local" }, "log_level": "INFO" }