From b007be76159dde4bd1fa4d3049f6b4c1855cfbc4 Mon Sep 17 00:00:00 2001 From: j1nx Date: Thu, 12 Jan 2023 12:30:32 +0100 Subject: [PATCH] Add vnc-eglfs package for testing purposes --- buildroot-external/Config.in | 1 + .../configs/rpi3_64-gui_defconfig | 1 + .../configs/rpi4_64-gui_defconfig | 1 + .../0001-Use-QT_INSTALL_PREFIX.patch | 43 +++++++++++++++++++ .../package/vnc-eglfs/Config.in | 6 +++ .../package/vnc-eglfs/vnc-eglfs.mk | 11 +++++ 6 files changed, 63 insertions(+) create mode 100644 buildroot-external/package/vnc-eglfs/0001-Use-QT_INSTALL_PREFIX.patch create mode 100644 buildroot-external/package/vnc-eglfs/Config.in create mode 100644 buildroot-external/package/vnc-eglfs/vnc-eglfs.mk diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index 0c639df0..8c94116f 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -119,6 +119,7 @@ endmenu source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/tensorflow-lite/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/userland-tools/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/virtual-touch/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/vnc-eglfs/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/vocalfusion/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/vosk-api/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/whisper-tflite/Config.in" diff --git a/buildroot-external/configs/rpi3_64-gui_defconfig b/buildroot-external/configs/rpi3_64-gui_defconfig index ceded1c7..ce328be3 100644 --- a/buildroot-external/configs/rpi3_64-gui_defconfig +++ b/buildroot-external/configs/rpi3_64-gui_defconfig @@ -600,6 +600,7 @@ BR2_PACKAGE_SNAPCAST_SERVER=y BR2_PACKAGE_SPOTIFYD=y BR2_PACKAGE_TENSORFLOW_LITE=y BR2_PACKAGE_USERLAND_TOOLS=y +BR2_PACKAGE_VNC_EGLFS=y BR2_PACKAGE_VOCALFUSION=y BR2_PACKAGE_WHISPER_TFLITE=y BR2_PACKAGE_WHISPERCPP=y diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index b9e76faf..2b775926 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -600,6 +600,7 @@ BR2_PACKAGE_SNAPCAST_SERVER=y BR2_PACKAGE_SPOTIFYD=y BR2_PACKAGE_TENSORFLOW_LITE=y BR2_PACKAGE_USERLAND_TOOLS=y +BR2_PACKAGE_VNC_EGLFS=y BR2_PACKAGE_VOCALFUSION=y BR2_PACKAGE_WHISPER_TFLITE=y BR2_PACKAGE_WHISPERCPP=y diff --git a/buildroot-external/package/vnc-eglfs/0001-Use-QT_INSTALL_PREFIX.patch b/buildroot-external/package/vnc-eglfs/0001-Use-QT_INSTALL_PREFIX.patch new file mode 100644 index 00000000..1e00e23a --- /dev/null +++ b/buildroot-external/package/vnc-eglfs/0001-Use-QT_INSTALL_PREFIX.patch @@ -0,0 +1,43 @@ +From eb8b398864b7ffef315bcd67b26ccf47499537c4 Mon Sep 17 00:00:00 2001 +From: j1nx +Date: Thu, 12 Jan 2023 12:21:39 +0100 +Subject: [PATCH 1/1] Use QT_INSTALL_PREFIX + +--- + platformproxy/platformproxy.pro | 4 ++-- + src/src.pro | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/platformproxy/platformproxy.pro b/platformproxy/platformproxy.pro +index ef24e8d..464fec2 100644 +--- a/platformproxy/platformproxy.pro ++++ b/platformproxy/platformproxy.pro +@@ -30,8 +30,8 @@ SOURCES += \ + + OTHER_FILES += metadata.json + +-INSTALL_ROOT=/usr/local/vnceglfs +-# INSTALL_ROOT=$$[QT_INSTALL_PREFIX] ++# INSTALL_ROOT=/usr/local/vnceglfs ++INSTALL_ROOT=$$[QT_INSTALL_PREFIX] + + target.path = $${INSTALL_ROOT}/plugins/platforms + INSTALLS += target +diff --git a/src/src.pro b/src/src.pro +index 29e5fad..4c71645 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -61,8 +61,8 @@ SOURCES += \ + VncClient.cpp \ + VncNamespace.cpp \ + +-INSTALL_ROOT=/usr/local/vnceglfs +-# INSTALL_ROOT=$$[QT_INSTALL_PREFIX] ++# INSTALL_ROOT=/usr/local/vnceglfs ++INSTALL_ROOT=$$[QT_INSTALL_PREFIX] + + target.path = $${INSTALL_ROOT}/lib + +-- +2.34.1 + diff --git a/buildroot-external/package/vnc-eglfs/Config.in b/buildroot-external/package/vnc-eglfs/Config.in new file mode 100644 index 00000000..ea0e8e68 --- /dev/null +++ b/buildroot-external/package/vnc-eglfs/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_VNC_EGLFS + bool "vnc-eglfs" + help + VNC server for Qt/Quick on EGLFS + + https://github.com/uwerat/vnc-eglfs diff --git a/buildroot-external/package/vnc-eglfs/vnc-eglfs.mk b/buildroot-external/package/vnc-eglfs/vnc-eglfs.mk new file mode 100644 index 00000000..6283e35f --- /dev/null +++ b/buildroot-external/package/vnc-eglfs/vnc-eglfs.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# vnc-eglfs +# +################################################################################ + +VNC_EGLFS_VERSION = e67ac4431f19e2863abedbbfa1ba76a00fe1ca92 +VNC_EGLFS_SITE = $(call github,uwerat,vnc-eglfs,$(VNC_EGLFS_VERSION)) +VNC_EGLFS_INSTALL_STAGING = YES + +$(eval $(qmake-package))