From e1fa904b38767e4cbe3c6c16dc76045024ed450f Mon Sep 17 00:00:00 2001
From: Tatiana Leon <Tatiana.Leon@digi.com>
Date: Fri, 24 Feb 2023 19:00:40 +0100
Subject: [PATCH] qt5: qt6: cinematicexperience: add shortcut to the demo in
 the desktop toolbar

This commit creates a new launcher group in the '/etc/xdg/weston/weston.ini' to
have access to the QT cinematicexperience.

This is done for QT5 (ccmp15, ccimx8mm, ccim8mn) and QT6 (ccimx93).

https://onedigi.atlassian.net/browse/DEL-8379

Signed-off-by: Tatiana Leon <Tatiana.Leon@digi.com>
---
 .../wayland/weston-init.bbappend                 |   1 +
 .../wayland/weston-init.bbappend                 |   2 ++
 .../examples/cinematicexperience-rhi/icon_qt.png | Bin 0 -> 1119 bytes
 .../examples/cinematicexperience-rhi_%.bbappend  |  12 ++++++++++++
 .../examples/cinematicexperience-rhi/icon_qt.png | Bin 0 -> 1119 bytes
 .../examples/cinematicexperience-rhi_%.bbappend  |  12 ++++++++++++
 .../recipes-core/images/dey-image-qt.bb          |  11 ++++++++++-
 7 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 meta-digi-dey/dynamic-layers/qt5-layer/recipes-qt/examples/cinematicexperience-rhi/icon_qt.png
 create mode 100644 meta-digi-dey/dynamic-layers/qt5-layer/recipes-qt/examples/cinematicexperience-rhi_%.bbappend
 create mode 100644 meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/examples/cinematicexperience-rhi/icon_qt.png
 create mode 100644 meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/examples/cinematicexperience-rhi_%.bbappend

diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init.bbappend
index 0bc05df42..68ea572ce 100644
--- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init.bbappend
@@ -35,6 +35,7 @@ do_install:append() {
     install -m 0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston
 
     install -m 0644 ${WORKDIR}/digi_background.png ${D}${datadir}/weston/backgrounds/digi_background.png
+    printf "\n[launcher]\nicon=${datadir}/weston/terminal.png\npath=${bindir}/weston-terminal\n" >> ${D}${sysconfdir}/xdg/weston/weston.ini
 
     install -d ${D}${systemd_system_unitdir} ${D}${sbindir}
 
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend
index 9b3b458f5..5e3c1bb6e 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend
@@ -34,6 +34,8 @@ do_install:append() {
 do_install:append() {
     install -Dm0755 ${WORKDIR}/profile ${D}${sysconfdir}/profile.d/weston.sh
     install -Dm0644 ${WORKDIR}/digi_background.png ${D}${datadir}/weston/digi_background.png
+
+    printf "\n[launcher]\nicon=${datadir}/weston/terminal.png\npath=${bindir}/weston-terminal\n" >> ${D}${sysconfdir}/xdg/weston/weston.ini
 }
 
 do_install:append:ccimx93() {
diff --git a/meta-digi-dey/dynamic-layers/qt5-layer/recipes-qt/examples/cinematicexperience-rhi/icon_qt.png b/meta-digi-dey/dynamic-layers/qt5-layer/recipes-qt/examples/cinematicexperience-rhi/icon_qt.png
new file mode 100644
index 0000000000000000000000000000000000000000..720fbe29871e136b3167dd3aafa82ac13115bd84
GIT binary patch
literal 1119
zcmV-l1fctgP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>CR;9PCiUAwzYtASxobXcdZ3A=C=3I+$Gg1x*@~
z78ggswcy~#V%5RLSyu;FK@j`^admN0bdeJOmlRsWcyQd0clRE5?*O4$VVc!5255TC
zOeYg!Hn%DUULhcgAZ8GfnPtpLQVO2q>mEM7-o<&A_qjhupPIKA;1h{wnPJw5H;AV;
zYX;|i;s`6rD)Bk-s7V(je&o91@*C%(!vfEYn3?oEafDbbcCpgMtYm7$lf*Gq(<xub
zx~y{E;;dEbtbI@Z!f;++S>`&;AtbSgB}fpVppG&ss3A_PPKt#z?I%3^gN|P!mqM;G
z7&#VDg$CL2ga5(rZmq(^xSJGC0KG4^{V@y#c7ayIw!e>UyLAHipMfjA<F7V>=}*!d
z9W8bQ^lt+f*BwpS11@)f=#wFvvLpFv3WWmjen#Jv0|st^(3;y@dmpC{K!&<X-2exN
zz(|p@*FD}H?C$N~GwuF<0CP2Rr*A8)2mk;824YJ`L;(K){{a7>y{D4^000SaNLh0L
z01ejw01ejxLMWSf00007bV*G`2j>D92?7_E%yB>f00LV{L_t(Y$L*C(NR&|+g`fNV
z&5w?bj*U5*qQPK@2<9?v2tve#L}5^Eq84r1MFl}c5o8+|(V{4daFs<-;3^FS7tx|c
zV9-eZk2s1pn)By3-)*5LI*Kz<wDBz8d+s^B?|ZlxcCiD5l#+J3)xnYAb0InPSH&Tu
z{44P_XkUke&jeeGw-{yA>OM3@VSIU>SMeZGtn3T~9Fd!fg+k|{x1DNd#fJL1WQ6O}
z-SnGb06Ghr(S*vyxt{F}wklq82dH*dFc=--P2>|xR)RoIHAmeIT-wu0|I||eYMqrB
zLWeoBGdP&z$CN29&%9>TiUII8IYy78oJxBM^=bi4wo06e9aSjY%xlEL;?}}InwFC8
zC~#{oLW$Ym;%gX+PXbV*dueeu;L@BpRXfK$jT|dHlvxKgY96XkShC`2<cJvsz^l1v
z4n5+1=>-g-(=>5^+YzO8ps$uBGL4*CO^_k9j8l|mFqn!UkvJ7w8rh{f09Z`L|J)#o
z#e%tn&nTi$=o`+eY$X7EPOj`iN{J#wb_M`nqQe-9PG?aYZAJwFy_nnihpDpr7*B*5
zFlPXW$ppEogC@<(0mYShOz+M2Qf_#u&-GKE>tF9K6{jQoZhf4wF)Hmo9_%}hB`xYk
z?q+5%Y(;6EdcsNDe*Cs#1cHF84v(IXM|FU?!n^vTkD=r=Wm*BV=1(*P=B99n+V6KJ
zCHQt)))|MND|=5ckqFZgdYtKwyE4vOSL_?5v%U1if|*`<Q8c=IR?FsP>{$Gm=|Aw&
lGrD~GL*RzF`{n+B`~n<?z_G3JtULe!002ovPDHLkV1fc0{zU))

literal 0
HcmV?d00001

diff --git a/meta-digi-dey/dynamic-layers/qt5-layer/recipes-qt/examples/cinematicexperience-rhi_%.bbappend b/meta-digi-dey/dynamic-layers/qt5-layer/recipes-qt/examples/cinematicexperience-rhi_%.bbappend
new file mode 100644
index 000000000..ed6fdadb7
--- /dev/null
+++ b/meta-digi-dey/dynamic-layers/qt5-layer/recipes-qt/examples/cinematicexperience-rhi_%.bbappend
@@ -0,0 +1,12 @@
+# Copyright (C) 2023 Digi International.
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://icon_qt.png"
+
+do_install:append() {
+	install -d ${D}${datadir}/icons/hicolor/24x24
+	install -m 0644 ${WORKDIR}/icon_qt.png ${D}${datadir}/icons/hicolor/24x24/
+
+	ln -sf qt5-cinematic-experience ${D}${bindir}/cinematic-experience
+}
diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/examples/cinematicexperience-rhi/icon_qt.png b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/examples/cinematicexperience-rhi/icon_qt.png
new file mode 100644
index 0000000000000000000000000000000000000000..720fbe29871e136b3167dd3aafa82ac13115bd84
GIT binary patch
literal 1119
zcmV-l1fctgP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>CR;9PCiUAwzYtASxobXcdZ3A=C=3I+$Gg1x*@~
z78ggswcy~#V%5RLSyu;FK@j`^admN0bdeJOmlRsWcyQd0clRE5?*O4$VVc!5255TC
zOeYg!Hn%DUULhcgAZ8GfnPtpLQVO2q>mEM7-o<&A_qjhupPIKA;1h{wnPJw5H;AV;
zYX;|i;s`6rD)Bk-s7V(je&o91@*C%(!vfEYn3?oEafDbbcCpgMtYm7$lf*Gq(<xub
zx~y{E;;dEbtbI@Z!f;++S>`&;AtbSgB}fpVppG&ss3A_PPKt#z?I%3^gN|P!mqM;G
z7&#VDg$CL2ga5(rZmq(^xSJGC0KG4^{V@y#c7ayIw!e>UyLAHipMfjA<F7V>=}*!d
z9W8bQ^lt+f*BwpS11@)f=#wFvvLpFv3WWmjen#Jv0|st^(3;y@dmpC{K!&<X-2exN
zz(|p@*FD}H?C$N~GwuF<0CP2Rr*A8)2mk;824YJ`L;(K){{a7>y{D4^000SaNLh0L
z01ejw01ejxLMWSf00007bV*G`2j>D92?7_E%yB>f00LV{L_t(Y$L*C(NR&|+g`fNV
z&5w?bj*U5*qQPK@2<9?v2tve#L}5^Eq84r1MFl}c5o8+|(V{4daFs<-;3^FS7tx|c
zV9-eZk2s1pn)By3-)*5LI*Kz<wDBz8d+s^B?|ZlxcCiD5l#+J3)xnYAb0InPSH&Tu
z{44P_XkUke&jeeGw-{yA>OM3@VSIU>SMeZGtn3T~9Fd!fg+k|{x1DNd#fJL1WQ6O}
z-SnGb06Ghr(S*vyxt{F}wklq82dH*dFc=--P2>|xR)RoIHAmeIT-wu0|I||eYMqrB
zLWeoBGdP&z$CN29&%9>TiUII8IYy78oJxBM^=bi4wo06e9aSjY%xlEL;?}}InwFC8
zC~#{oLW$Ym;%gX+PXbV*dueeu;L@BpRXfK$jT|dHlvxKgY96XkShC`2<cJvsz^l1v
z4n5+1=>-g-(=>5^+YzO8ps$uBGL4*CO^_k9j8l|mFqn!UkvJ7w8rh{f09Z`L|J)#o
z#e%tn&nTi$=o`+eY$X7EPOj`iN{J#wb_M`nqQe-9PG?aYZAJwFy_nnihpDpr7*B*5
zFlPXW$ppEogC@<(0mYShOz+M2Qf_#u&-GKE>tF9K6{jQoZhf4wF)Hmo9_%}hB`xYk
z?q+5%Y(;6EdcsNDe*Cs#1cHF84v(IXM|FU?!n^vTkD=r=Wm*BV=1(*P=B99n+V6KJ
zCHQt)))|MND|=5ckqFZgdYtKwyE4vOSL_?5v%U1if|*`<Q8c=IR?FsP>{$Gm=|Aw&
lGrD~GL*RzF`{n+B`~n<?z_G3JtULe!002ovPDHLkV1fc0{zU))

literal 0
HcmV?d00001

diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/examples/cinematicexperience-rhi_%.bbappend b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/examples/cinematicexperience-rhi_%.bbappend
new file mode 100644
index 000000000..a683b1ad3
--- /dev/null
+++ b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/examples/cinematicexperience-rhi_%.bbappend
@@ -0,0 +1,12 @@
+# Copyright (C) 2023 Digi International.
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://icon_qt.png"
+
+do_install:append() {
+	install -d ${D}${datadir}/icons/hicolor/24x24
+	install -m 0644 ${WORKDIR}/icon_qt.png ${D}${datadir}/icons/hicolor/24x24/
+
+	ln -sf qt6-cinematic-experience ${D}${bindir}/cinematic-experience
+}
diff --git a/meta-digi-dey/recipes-core/images/dey-image-qt.bb b/meta-digi-dey/recipes-core/images/dey-image-qt.bb
index 0842c0daa..b1e9f4e71 100644
--- a/meta-digi-dey/recipes-core/images/dey-image-qt.bb
+++ b/meta-digi-dey/recipes-core/images/dey-image-qt.bb
@@ -1,8 +1,17 @@
 #
-# Copyright (C) 2016-2020 Digi International.
+# Copyright (C) 2016-2023 Digi International.
 #
 require dey-image-graphical.inc
 
 DESCRIPTION = "DEY image with QT graphical libraries"
 
 GRAPHICAL_CORE = "qt"
+
+add_cinematicexperience_shortcut() {
+	if [ -f ${IMAGE_ROOTFS}${datadir}/icons/hicolor/24x24/icon_qt.png ] && [ -f ${IMAGE_ROOTFS}${sysconfdir}/xdg/weston/weston.ini ]; then
+		printf "\n[launcher]\nicon=${datadir}/icons/hicolor/24x24/icon_qt.png\npath=${bindir}/cinematic-experience\n" >> ${IMAGE_ROOTFS}${sysconfdir}/xdg/weston/weston.ini
+	fi
+}
+ROOTFS_POSTPROCESS_COMMAND:imxgpu += "add_cinematicexperience_shortcut; "
+ROOTFS_POSTPROCESS_COMMAND:ccmp15 += "add_cinematicexperience_shortcut; "
+ROOTFS_POSTPROCESS_COMMAND:ccimx93 += "add_cinematicexperience_shortcut; "