diff options
| author |   Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp> | 2024-09-27 01:54:59 +0900 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-10-09 14:03:15 +0000 |
| commit | fa3c4993e42293fe65253341c009f722e303f2ff (patch) | |
| tree | 3b22fef209d9624c8e1470c5c06de38e4ae8fb10 | |
| parent | 9aaf29f1b8522d701b59d0da89ae6fb9e77b4792 (diff) | |
Change cluster-refgui to Qt6 supported version
The cluster-refgui was ported to Qt6 by Jiu Shanheng <shanheng.jiu@qt.io>.
This patch changes to that version.
Bug-AGL: SPEC-5162
Change-Id: I07a5424ef7f14c5b560d18cc696358a0ebe82295
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
3 files changed, 7 insertions, 13 deletions
diff --git a/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster b/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster index 53a662be..8eb37365 100644 --- a/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster +++ b/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster @@ -1,9 +1,6 @@ -XDG_RUNTIME_DIR=/run/user/0 -QT_QPA_PLATFORM=wayland-egl +QT_QPA_PLATFORM=eglfs +QT_QPA_EGLFS_DRMLEASE=lease +DLM_RUNTIME_PATH=/var/display/drm-lease-manager QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ QT_WAYLAND_DISABLE_WINDOWDECORATION=1 QT_QPA_FONTDIR=/usr/share/fonts/truetype -QT_WAYLAND_SHELL_INTEGRATION=xdg-shell -QML_IMPORT_PATH=/usr/lib/qml/ -QML2_IMPORT_PATH=/usr/lib/qml/ -WAYLAND_DISPLAY=wayland-1 diff --git a/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster.service b/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster.service index 83e957e5..9696d48a 100644 --- a/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster.service +++ b/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster.service @@ -1,7 +1,7 @@ [Unit] Description=AGL Cluster Reference GUI -After=multi-user.target weston.service -PartOf=cluster-service.service weston.service +After=multi-user.target +PartOf=cluster-service.service [Service] EnvironmentFile=/etc/default/cluster diff --git a/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui_git.bb b/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui_git.bb index d7cb85f9..7ab65235 100644 --- a/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui_git.bb +++ b/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui_git.bb @@ -13,11 +13,11 @@ SRC_URI = "git://git.automotivelinux.org/src/cluster-refgui;protocol=https;branc file://cluster.service \ file://cluster \ " -SRCREV = "cbb63f0e45340f6dd2cc9f360ed4da15c745186f" +SRCREV = "5c8f09d2c3c99f621b467ed5c1be4fac3a708e85" S = "${WORKDIR}/git" -inherit cmake cmake_qt5 systemd pkgconfig +inherit cmake qt6-cmake systemd pkgconfig # NOTE: # The app currently assumes the mp4 video file is in the same @@ -42,9 +42,6 @@ RDEPENDS:${PN} = " \ qtbase \ qtdeclarative \ qt3d \ - qtgraphicaleffects \ qtmultimedia \ - qtquickcontrols \ - qtquickcontrols2 \ qtwayland \ " |