From 9e6b622d311e6b53af06f5905483981466123d84 Mon Sep 17 00:00:00 2001 From: j1nx Date: Tue, 26 Jan 2021 14:10:03 +0100 Subject: [PATCH] Changes and bumps --- buildroot-external/configs/rpi4_64-gui_defconfig | 2 ++ buildroot-external/package/mycroft-gui/mycroft-gui.hash | 2 +- buildroot-external/package/mycroft-gui/mycroft-gui.mk | 4 ++-- .../package/mycroft-service/mycroft-gui.service | 8 ++++---- .../package/python-mycroft/python-mycroft.hash | 2 +- .../package/python-mycroft/python-mycroft.mk | 2 +- .../rootfs-overlay/opt/mycroft/skills/skill-ovos-pairing | 2 +- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index 9f1b93ed..789287cd 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -183,6 +183,7 @@ BR2_PACKAGE_NFS_UTILS=y BR2_PACKAGE_NTFS_3G=y BR2_PACKAGE_DEJAVU=y BR2_PACKAGE_LIBERATION=y +BR2_PACKAGE_CAGE=y BR2_PACKAGE_GLMARK2=y BR2_PACKAGE_KMSCUBE=y BR2_PACKAGE_MESA3D=y @@ -376,6 +377,7 @@ BR2_PACKAGE_GDK_PIXBUF=y BR2_PACKAGE_GIFLIB=y BR2_PACKAGE_LIBEPOXY=y BR2_PACKAGE_LIBSVG_CAIRO=y +BR2_PACKAGE_LIBWPE=y BR2_PACKAGE_OPENJPEG=y BR2_PACKAGE_TIFF=y BR2_PACKAGE_WAFFLE=y diff --git a/buildroot-external/package/mycroft-gui/mycroft-gui.hash b/buildroot-external/package/mycroft-gui/mycroft-gui.hash index f4c013d5..51ec0556 100644 --- a/buildroot-external/package/mycroft-gui/mycroft-gui.hash +++ b/buildroot-external/package/mycroft-gui/mycroft-gui.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 7d11ef263fc4360b0cb19331704d8f8088dcbd2df2776c2cc1009614ee8227db mycroft-gui-59cebdf574bd7500332ca529d792115520314cb6.tar.gz +sha256 fbe488324a375a51cfdc1df46b3ed2c707b677a20fb9cb592ee4531454c1b7b8 mycroft-gui-424fa92034f1a6b0853b34867fdb66fb6a235fa1.tar.gz diff --git a/buildroot-external/package/mycroft-gui/mycroft-gui.mk b/buildroot-external/package/mycroft-gui/mycroft-gui.mk index ac22ce8e..b3926c59 100644 --- a/buildroot-external/package/mycroft-gui/mycroft-gui.mk +++ b/buildroot-external/package/mycroft-gui/mycroft-gui.mk @@ -4,12 +4,12 @@ # ################################################################################ -MYCROFT_GUI_VERSION = 59cebdf574bd7500332ca529d792115520314cb6 +MYCROFT_GUI_VERSION = 424fa92034f1a6b0853b34867fdb66fb6a235fa1 MYCROFT_GUI_SITE = $(call github,MycroftAI,mycroft-gui,$(MYCROFT_GUI_VERSION)) MYCROFT_GUI_LICENSE = Apache License 2.0 MYCROFT_GUI_INSTALL_STAGING = YES -MYCROFT_GUI_DEPENDENCIES = host-pkgconf +MYCROFT_GUI_DEPENDENCIES = host-pkgconf kf5-kirigami2 lottie-qml MYCROFT_GUI_SUPPORTS_IN_SOURCE_BUILD = NO define MYCROFT_GUI_CHANGE_IMAGE diff --git a/buildroot-external/package/mycroft-service/mycroft-gui.service b/buildroot-external/package/mycroft-service/mycroft-gui.service index 3405635a..b9981d04 100644 --- a/buildroot-external/package/mycroft-service/mycroft-gui.service +++ b/buildroot-external/package/mycroft-service/mycroft-gui.service @@ -14,12 +14,12 @@ Environment=QT_PLUGIN_PATH=/usr/lib/qt/plugins:/usr/lib/plugins:/usr/lib/plugins Environment=QT_LOGGING_RULES='*=false' Environment=QT_IM_MODULE=qtvirtualkeyboard Environment=XDG_RUNTIME_DIR=/tmp/weston -Environment=XDG_DATA_DIRS=/usr/share/icons:/usr/share/kf5:$XDG_DATA_DIRS +Environment=XDG_DATA_DIRS=/usr/share:/usr/local/share:$XDG_DATA_DIRS Environment=LD_LIBRARY_PATH=/usr/lib -Environment=LIBEXEC_PATH=/usr/lib/libexec:/usr/lib/libexec/kf5 -Environment=QML2_IMPORT_PATH=/usr/lib/qml:/usr/qml +Environment=LIBEXEC_PATH=/libexec:/usr/libexec:/usr/lib/libexec +Environment=QML2_IMPORT_PATH=/usr/lib/qml ExecStartPre=/usr/bin/sh -c 'export $(dbus-launch)' -ExecStart=mycroft-embedded-shell --maximize +ExecStart=mycroft-gui-app --hideTextInput --maximize StandardOutput=null Restart=on-failure diff --git a/buildroot-external/package/python-mycroft/python-mycroft.hash b/buildroot-external/package/python-mycroft/python-mycroft.hash index 2c32a67a..529ccae0 100644 --- a/buildroot-external/package/python-mycroft/python-mycroft.hash +++ b/buildroot-external/package/python-mycroft/python-mycroft.hash @@ -1 +1 @@ -sha256 59b79510ef2e45421d9460789447018820e5f409fcc12218f861baa5b078dd94 python-mycroft-8020e54eaff9ab064bf56dac6ff3c67da4574a97.tar.gz +sha256 675db827f6f990ce07ab6e455cb68969dc237be599d877ea2061092306e042fa python-mycroft-73f0299cfa43f499419d3949fe183cb92da1387e.tar.gz diff --git a/buildroot-external/package/python-mycroft/python-mycroft.mk b/buildroot-external/package/python-mycroft/python-mycroft.mk index bd72019a..33d6bee7 100644 --- a/buildroot-external/package/python-mycroft/python-mycroft.mk +++ b/buildroot-external/package/python-mycroft/python-mycroft.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_MYCROFT_VERSION = 8020e54eaff9ab064bf56dac6ff3c67da4574a97 +PYTHON_MYCROFT_VERSION = 73f0299cfa43f499419d3949fe183cb92da1387e PYTHON_MYCROFT_SITE = $(call github,MycroftAI,mycroft-core,$(PYTHON_MYCROFT_VERSION)) PYTHON_MYCROFT_SETUP_TYPE = setuptools PYTHON_MYCROFT_LICENSE_FILES = LICENSE diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/skill-ovos-pairing b/buildroot-external/rootfs-overlay/opt/mycroft/skills/skill-ovos-pairing index 1973ad09..6950c592 160000 --- a/buildroot-external/rootfs-overlay/opt/mycroft/skills/skill-ovos-pairing +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/skill-ovos-pairing @@ -1 +1 @@ -Subproject commit 1973ad0978516f11f5217af9f8303d82831e507d +Subproject commit 6950c592735f4082ce8ac2f7f0be5835d96b0979