From: Tom Hochstein Date: Sun, 17 Nov 2019 15:25:11 +0000 (-0600) Subject: weston-init: Move weston.ini install to weston-init X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=66989b7d07f8a1cdd4050fe3e3b088b6ead80786;p=meta-freescale.git weston-init: Move weston.ini install to weston-init OE-core now installs weston.ini from weston-init, so align our recipe to do the same. The IVI dynamic layer now has a copy of the weston.ini file that is normally produced by the weston build. The AGL dynamic layer now uninstalls the weston.ini installed upstream. Signed-off-by: Tom Hochstein --- diff --git a/dynamic-layers/aglprofilegraphical/recipes-graphics/wayland/weston-init.bbappend b/dynamic-layers/aglprofilegraphical/recipes-graphics/wayland/weston-init.bbappend new file mode 100644 index 00000000..10b66c0e --- /dev/null +++ b/dynamic-layers/aglprofilegraphical/recipes-graphics/wayland/weston-init.bbappend @@ -0,0 +1,3 @@ +do_install_append() { + rm -f ${D}${sysconfdir}/xdg/weston/weston.ini +} diff --git a/dynamic-layers/aglprofilegraphical/recipes-graphics/wayland/weston_5.0.0.imx.bbappend b/dynamic-layers/aglprofilegraphical/recipes-graphics/wayland/weston_5.0.0.imx.bbappend deleted file mode 100644 index 1a896a20..00000000 --- a/dynamic-layers/aglprofilegraphical/recipes-graphics/wayland/weston_5.0.0.imx.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# don't install default weston.ini -WESTON_INI_INSTALL_FILE = "" diff --git a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend new file mode 100644 index 00000000..72d991c7 --- /dev/null +++ b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini new file mode 100644 index 00000000..6e8e0140 --- /dev/null +++ b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini @@ -0,0 +1,104 @@ +[core] +shell=ivi-shell.so +modules=hmi-controller.so +#gbm-format=argb8888 +#use-g2d=1 +#xwayland=true + +#[shell] +#size=1920x1080 + +[ivi-shell] +ivi-shell-user-interface=weston-ivi-shell-user-interface + +#developermode=true + +cursor-theme=default +cursor-size=32 + +base-layer-id=1000 +base-layer-id-offset=10000 + +workspace-background-layer-id=2000 +workspace-layer-id=3000 +application-layer-id=4000 + +transition-duration=300 + +background-image=/usr/share/weston/background.png +background-id=1001 +panel-image=/usr/share/weston/panel.png +panel-id=1002 +surface-id-offset=10 +tiling-image=/usr/share/weston/tiling.png +tiling-id=1003 +sidebyside-image=/usr/share/weston/sidebyside.png +sidebyside-id=1004 +fullscreen-image=/usr/share/weston/fullscreen.png +fullscreen-id=1005 +random-image=/usr/share/weston/random.png +random-id=1006 +home-image=/usr/share/weston/home.png +home-id=1007 +workspace-background-color=0x99000000 +workspace-background-id=2001 + +[ivi-launcher] +workspace-id=0 +icon-id=4001 +icon=/usr/share/weston/icon_ivi_flower.png +path=/usr/bin/weston-flower + +[ivi-launcher] +workspace-id=0 +icon-id=4002 +icon=/usr/share/weston/icon_ivi_clickdot.png +path=/usr/bin/weston-clickdot + +[ivi-launcher] +workspace-id=1 +icon-id=4003 +icon=/usr/share/weston/icon_ivi_simple-egl.png +path=/usr/bin/weston-simple-egl + +[ivi-launcher] +workspace-id=1 +icon-id=4004 +icon=/usr/share/weston/icon_ivi_simple-shm.png +path=/usr/bin/weston-simple-shm + +[ivi-launcher] +workspace-id=2 +icon-id=4005 +icon=/usr/share/weston/icon_ivi_smoke.png +path=/usr/bin/weston-smoke + +[ivi-launcher] +workspace-id=3 +icon-id=4006 +icon=/usr/share/weston/icon_ivi_flower.png +path=/usr/bin/weston-flower + +[ivi-launcher] +workspace-id=3 +icon-id=4007 +icon=/usr/share/weston/icon_ivi_clickdot.png +path=/usr/bin/weston-clickdot + +[ivi-launcher] +workspace-id=3 +icon-id=4008 +icon=/usr/share/weston/icon_ivi_simple-egl.png +path=/usr/bin/weston-simple-egl + +[ivi-launcher] +workspace-id=3 +icon-id=4009 +icon=/usr/share/weston/icon_ivi_simple-shm.png +path=/usr/bin/weston-simple-shm + +[ivi-launcher] +workspace-id=3 +icon-id=4010 +icon=/usr/share/weston/icon_ivi_smoke.png +path=/usr/bin/weston-smoke diff --git a/dynamic-layers/ivi/recipes-graphics/wayland/weston_5.0.0.imx.bbappend b/dynamic-layers/ivi/recipes-graphics/wayland/weston_5.0.0.imx.bbappend deleted file mode 100644 index d36fbd4d..00000000 --- a/dynamic-layers/ivi/recipes-graphics/wayland/weston_5.0.0.imx.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# install default weston.ini for IVI -WESTON_INI_INSTALL_FILE = "${B}/ivi-shell/weston.ini" diff --git a/recipes-graphics/wayland/weston-init/mx8mq/weston.ini b/recipes-graphics/wayland/weston-init/mx8mq/weston.ini new file mode 100644 index 00000000..eceb6456 --- /dev/null +++ b/recipes-graphics/wayland/weston-init/mx8mq/weston.ini @@ -0,0 +1,25 @@ +[core] +gbm-format=argb8888 +idle-time=0 +#use-g2d=1 +#xwayland=true + +[shell] +size=1920x1080 + +#[output] +#name=HDMI-A-1 +#mode=1920x1080@60 +#transform=90 + +#[output] +#name=HDMI-A-2 +#mode=off +# WIDTHxHEIGHT Resolution size width and height in pixels +# off Disables the output +# preferred Uses the preferred mode +# current Uses the current crt controller mode +#transform=90 + +[screen-share] +command=@bindir@/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize diff --git a/recipes-graphics/wayland/weston-init/weston.ini b/recipes-graphics/wayland/weston-init/weston.ini new file mode 100644 index 00000000..d9094b1f --- /dev/null +++ b/recipes-graphics/wayland/weston-init/weston.ini @@ -0,0 +1,25 @@ +[core] +#gbm-format=argb8888 +idle-time=0 +#use-g2d=1 +#xwayland=true + +#[shell] +#size=1920x1080 + +#[output] +#name=HDMI-A-1 +#mode=1920x1080@60 +#transform=90 + +#[output] +#name=HDMI-A-2 +#mode=off +# WIDTHxHEIGHT Resolution size width and height in pixels +# off Disables the output +# preferred Uses the preferred mode +# current Uses the current crt controller mode +#transform=90 + +[screen-share] +command=@bindir@/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize diff --git a/recipes-graphics/wayland/weston/0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch b/recipes-graphics/wayland/weston/0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch deleted file mode 100644 index 75589d3b..00000000 --- a/recipes-graphics/wayland/weston/0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 186ec0c80410b2120b8f31c211cb44a836c84522 Mon Sep 17 00:00:00 2001 -From: Haihua Hu -Date: Wed, 4 Jul 2018 16:05:20 +0800 -Subject: [PATCH] weston.ini: using argb8888 as gbm default on mscale 850D - -mscale 850D video playback need using pixel alpha for graphic layer - -upstream status: imx specific -Signed-off-by: Haihua Hu - ---- - weston.ini.in | 1 + - 1 file changed, 1 insertion(+) - -Index: git/weston.ini.in -=================================================================== ---- git.orig/weston.ini.in -+++ git/weston.ini.in -@@ -2,6 +2,7 @@ - # i.MX: Disable idle timeout - idle-time=0 - #use-g2d=1 -+gbm-format=argb8888 - - [libinput] - touchscreen_calibrator=true diff --git a/recipes-graphics/wayland/weston/0002-weston.ini-configure-desktop-shell-size-in-weston-co.patch b/recipes-graphics/wayland/weston/0002-weston.ini-configure-desktop-shell-size-in-weston-co.patch deleted file mode 100644 index 4aa32569..00000000 --- a/recipes-graphics/wayland/weston/0002-weston.ini-configure-desktop-shell-size-in-weston-co.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3012798d7e9c9e624024fc962d749a960289ad8b Mon Sep 17 00:00:00 2001 -From: Haihua Hu -Date: Wed, 11 Jul 2018 17:47:47 +0800 -Subject: [PATCH] weston.ini: configure desktop shell size in weston configure - file - -mscale 850D need set desktop shell to 1080p - -upstream status: imx specific -Signed-off-by: Haihua Hu - ---- - weston.ini.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/weston.ini.in b/weston.ini.in -index bd8abe4..077155b 100644 ---- a/weston.ini.in -+++ b/weston.ini.in -@@ -8,6 +8,8 @@ gbm-format=argb8888 - #mode=1920x1080@60 - #transform=90 - -+[shell] -+size=1920x1080 - - #[output] - #name=HDMI-A-2 diff --git a/recipes-graphics/wayland/weston_5.0.0.imx.bb b/recipes-graphics/wayland/weston_5.0.0.imx.bb index e9f354f0..270aa2ad 100644 --- a/recipes-graphics/wayland/weston_5.0.0.imx.bb +++ b/recipes-graphics/wayland/weston_5.0.0.imx.bb @@ -16,10 +16,6 @@ SRC_URI = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=http file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ file://0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch \ " -# Use argb8888 as gbm-format for i.MX8MQ only -SRC_URI_append_mx8mq = " file://0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch \ - file://0002-weston.ini-configure-desktop-shell-size-in-weston-co.patch \ -" SRCREV = "fb563901657b296c7c7c86d26602a622429e334f" S = "${WORKDIR}/git" @@ -102,9 +98,6 @@ PACKAGECONFIG[imxg2d] = "--enable-imxg2d,--disable-imxg2d,virtual/libg2d" # Weston with OpenGL support PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl" -# Set to install a default weston.ini file -WESTON_INI_INSTALL_FILE = "${B}/weston.ini" - do_install_append() { # Weston doesn't need the .la files to load modules, so wipe them rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la @@ -121,11 +114,6 @@ do_install_append() { if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland fi - - # install default weston.ini - if [ "${WESTON_INI_INSTALL_FILE}" != "" ]; then - install -D -m 0644 ${WESTON_INI_INSTALL_FILE} ${D}${sysconfdir}/xdg/weston/weston.ini - fi } PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \