Fix for the splash, pyaudio and OSM

buildroot-external/configs/rpi4_64-gui_defconfig

@@ -357,7 +357,6 @@ BR2_PACKAGE_PYTHON_ARROW=y
 BR2_PACKAGE_PYTHON_AUTOBAHN=y
 BR2_PACKAGE_PYTHON_CHERRYPY=y
 BR2_PACKAGE_PYTHON_COLORAMA=y
-BR2_PACKAGE_PYTHON_COLORZERO=y
 BR2_PACKAGE_PYTHON_CONFIGSHELL_FB=y
 BR2_PACKAGE_PYTHON_DAEMONIZE=y
 BR2_PACKAGE_PYTHON_DBUS_NEXT=y
@@ -368,6 +367,7 @@ BR2_PACKAGE_PYTHON_FLASK_JSONRPC=y
 BR2_PACKAGE_PYTHON_FLASK_LOGIN=y
 BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY=y
 BR2_PACKAGE_PYTHON_FLATBUFFERS=y
+BR2_PACKAGE_PYTHON_GPIOZERO=y
 BR2_PACKAGE_PYTHON_HUMANIZE=y
 BR2_PACKAGE_PYTHON_JSON_SCHEMA_VALIDATOR=y
 BR2_PACKAGE_PYTHON_JSONMODELS=y
@@ -385,7 +385,6 @@ BR2_PACKAGE_PYTHON_PSUTIL=y
 BR2_PACKAGE_PYTHON_PYJWT=y
 BR2_PACKAGE_PYTHON_PYUDEV=y
 BR2_PACKAGE_PYTHON_PYUSB=y
-BR2_PACKAGE_PYTHON_RPI_GPIO=y
 BR2_PACKAGE_PYTHON_SDNOTIFY=y
 BR2_PACKAGE_PYTHON_SERIAL=y
 BR2_PACKAGE_PYTHON_SIP=y

buildroot-external/package/ovos-splash/ovos-splash-start.service

@@ -3,9 +3,10 @@ Description=Starts OVOS splash boot screen
 Wants=dev-dri-card0.device
 After=dev-dri-card0.device
 DefaultDependencies=no
+RequiresMountsFor=/run
 
 [Service]
-Type=oneshot
+Type=notify
 ExecStart=/usr/bin/psplash
 RemainAfterExit=yes
 Restart=no

buildroot-external/package/ovos-splash/ovos-splash-systemd.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Start psplash-systemd progress communication helper
+DefaultDependencies=no
+After=ovos-splash-start.service
+Requires=ovos-splash-start.service
+RequiresMountsFor=/run
+
+[Service]
+ExecStart=/usr/bin/psplash-systemd
+RemainAfterExit=yes
+
+[Install]
+WantedBy=sysinit.target

buildroot-external/package/ovos-splash/ovos-splash.mk

@@ -23,6 +23,9 @@ define OVOS_SPLASH_INSTALL_INIT_SYSTEMD
 
 	$(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/ovos-splash/ovos-splash-quit.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/ovos-splash-quit.service
+
+	$(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/ovos-splash/ovos-splash-systemd.service \
+                $(TARGET_DIR)/usr/lib/systemd/system/ovos-splash-systemd.service
 endef
 
 define OVOS_SPLASH_CHANGE_IMAGE

buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.mk

@@ -8,6 +8,6 @@ PYTHON_OVOS_SKILL_MANAGER_VERSION = 04102cc75c8777085a3304bb0a3023fb46891710
 PYTHON_OVOS_SKILL_MANAGER_SITE = $(call github,OpenVoiceOS,ovos_skill_manager,$(PYTHON_OVOS_SKILL_MANAGER_VERSION))
 PYTHON_OVOS_SKILL_MANAGER_SETUP_TYPE = setuptools
 PYTHON_OVOS_SKILL_MANAGER_LICENSE_FILES = LICENSE
-YTHON_OVOS_SKILL_MANAGER_ENV = MYCROFT_LOOSE_REQUIREMENTS=true
+PYTHON_OVOS_SKILL_MANAGER_ENV = MYCROFT_LOOSE_REQUIREMENTS=true
 
 $(eval $(python-package))

buildroot-external/package/python-pyaudio/0001-No-hardcoded-include-paths.patch

@@ -0,0 +1,27 @@
+From c792514695cf75bfbbc08b2719a3e8415be5b78f Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Wed, 5 Oct 2022 10:46:07 +0200
+Subject: [PATCH 1/1] No hardcoded include paths
+
+---
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 0a7a164..ba01e3e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -98,8 +98,8 @@ def setup_extension():
+     else:
+         # GNU/Linux and other posix-like OSes will dynamically link to
+         # portaudio, installed by the package manager.
+-        include_dirs += ['/usr/local/include', '/usr/include']
+-        external_libraries_path += ['/usr/local/lib', '/usr/lib']
++        include_dirs += []
++        external_libraries_path += []
+ 
+     return Extension(
+         '_portaudio',
+-- 
+2.34.1
+

buildroot-external/package/python-pyaudio/0001-Use-Py_ssize_t-for-tuple-return.patch

@@ -1,30 +0,0 @@
-From 2ee560056ec889ea7cd3ce1801b796b0939dd540 Mon Sep 17 00:00:00 2001
-From: Derek Schmidt <skeh@is.nota.live>
-Date: Tue, 14 Dec 2021 21:46:11 -0700
-Subject: [PATCH] Use Py_ssize_t for tuple return on stream methods
-
----
- src/_portaudiomodule.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/_portaudiomodule.c b/src/_portaudiomodule.c
-index a5bfd60..ca678c2 100644
---- a/src/_portaudiomodule.c
-+++ b/src/_portaudiomodule.c
-@@ -25,6 +25,7 @@
-  */
- 
- #include <stdio.h>
-+#define PY_SSIZE_T_CLEAN
- #include "Python.h"
- #include "portaudio.h"
- #include "_portaudiomodule.h"
-@@ -1291,7 +1292,7 @@ int _stream_callback_cfunction(const void *input, void *output,
-   PyObject *py_status_flags = PyLong_FromUnsignedLong(statusFlags);
-   PyObject *py_input_data = Py_None;
-   const char *pData;
--  unsigned output_len;
-+  Py_ssize_t output_len;
-   PyObject *py_result;
- 
-   if (input) {

buildroot-external/package/python-pyaudio/python-pyaudio.hash

@@ -1,3 +1,2 @@
-# md5, sha256 from https://pypi.org/pypi/pyaudio/json
+# sha256 from https://pypi.org/pypi/pyaudio/json
-md5	7e4c88139284033f67b4336c74eda3b8  PyAudio-0.2.11.tar.gz
+sha256	55ddf5db72bc537bba5f5dbca3ab9f0222ee5b842bda83978eab0b7b8f60fb9e  PyAudio-0.2.12.tar.gz
-sha256	93bfde30e0b64e63a46f2fd77e85c41fd51182a4a3413d9edfaf9ffaa26efb74  PyAudio-0.2.11.tar.gz

buildroot-external/package/python-pyaudio/python-pyaudio.mk

@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PYAUDIO_VERSION = 0.2.11
+PYTHON_PYAUDIO_VERSION = 0.2.12
 PYTHON_PYAUDIO_SOURCE = PyAudio-$(PYTHON_PYAUDIO_VERSION).tar.gz
-PYTHON_PYAUDIO_SITE = https://files.pythonhosted.org/packages/ab/42/b4f04721c5c5bfc196ce156b3c768998ef8c0ae3654ed29ea5020c749a6b
+PYTHON_PYAUDIO_SITE = https://files.pythonhosted.org/packages/3e/2f/67dc1505002ed6a4ef3f5941d6f07209d4c013a0271dd8d18314f54f6bf0
 PYTHON_PYAUDIO_SETUP_TYPE = setuptools
 PYTHON_PYAUDIO_LICENSE = 
 

buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-ovos.preset

@@ -8,8 +8,7 @@ enable avahi-daemon.service
 enable NetworkManager.service
 enable getty@tty2.service
 enable ovos-splash-start.service
-enable ovos-splash-40.service
+enable ovos-splash-systemd.service
-enable ovos-splash-60.service
 enable mycroft.service
 enable mycroft-messagebus.service
 enable mycroft-voice.service
@@ -30,3 +29,4 @@ disable snapserver.service
 disable spotifyd.service
 disable nodered.service
 disable btspeaker.service
+disable telnetd.service

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-gui.service.d/splash.conf

@@ -1,2 +0,0 @@
-[Service]
-ExecStartPre=-/usr/bin/sudo /bin/psplash-write "PROGRESS 100"

buildroot-external/rootfs-overlay/usr/lib/systemd/system/ovos-splash-40.service

@@ -1,11 +0,0 @@
-[Unit]
-Description=Update OVOS splash boot screen to 40%
-Wants=NetworkManager.service
-After=NetworkManager.service
-DefaultDependencies=no
-
-[Service]
-ExecStart=-/usr/bin/psplash-write "PROGRESS 40" 
-
-[Install]
-WantedBy=multi-user.target

buildroot-external/rootfs-overlay/usr/lib/systemd/system/ovos-splash-60.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=Update OVOS splash boot screen to 60%
-Before=mycroft-gui.service
-DefaultDependencies=no
-
-[Service]
-ExecStart=-/usr/bin/psplash-write "PROGRESS 60" 
-
-[Install]
-WantedBy=multi-user.target

buildroot-external/rootfs-overlay/usr/lib/systemd/system/ovos-splash-start.service.d/splash.conf

@@ -1,3 +0,0 @@
-[Service]
-ExecStartPost=-/bin/sleep 2
-ExecStartPost=-/bin/psplash-write "PROGRESS 10"