From f7531129fa8a9702675a15495a242a4243e7b35f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 12 Sep 2019 14:42:25 -0300 Subject: [PATCH] Revert "weston: Drop weston.ini files since the baseline version is now in source" This reverts commit 4cf9997bbaeccf0d280f81265c787ab874c79f80. --- .../wayland/weston-init/imxdrm/weston.config | 1 + .../wayland/weston-init/mx8mm/weston.config | 1 + ...-argb8888-as-gbm-default-on-mscale-8.patch | 26 ----------------- ...gure-desktop-shell-size-in-weston-co.patch | 28 ------------------- .../wayland/weston/imx/weston.ini | 20 +++++++++++++ .../wayland/weston/mx8mq/weston.ini | 24 ++++++++++++++++ recipes-graphics/wayland/weston_5.0.0.imx.bb | 5 +--- 7 files changed, 47 insertions(+), 58 deletions(-) delete mode 100644 recipes-graphics/wayland/weston/0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch delete mode 100644 recipes-graphics/wayland/weston/0002-weston.ini-configure-desktop-shell-size-in-weston-co.patch create mode 100644 recipes-graphics/wayland/weston/imx/weston.ini create mode 100644 recipes-graphics/wayland/weston/mx8mq/weston.ini diff --git a/recipes-graphics/wayland/weston-init/imxdrm/weston.config b/recipes-graphics/wayland/weston-init/imxdrm/weston.config index 7c92cf11..5693d6cb 100644 --- a/recipes-graphics/wayland/weston-init/imxdrm/weston.config +++ b/recipes-graphics/wayland/weston-init/imxdrm/weston.config @@ -1,2 +1,3 @@ #!/bin/sh OPTARGS="--xwayland" +DESKTOP_SHELL_WINDOW=1920x1080 diff --git a/recipes-graphics/wayland/weston-init/mx8mm/weston.config b/recipes-graphics/wayland/weston-init/mx8mm/weston.config index 060aae09..eb990e40 100644 --- a/recipes-graphics/wayland/weston-init/mx8mm/weston.config +++ b/recipes-graphics/wayland/weston-init/mx8mm/weston.config @@ -1,2 +1,3 @@ #!/bin/sh OPTARGS="--xwayland --use-g2d=1" +DESKTOP_SHELL_WINDOW=1920x1080 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 e951ce12..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 4ab82e531d01c3c1f45a4f099d145cde2890a0d5 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 - - #[output] - #name=HDMI-A-1 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/imx/weston.ini b/recipes-graphics/wayland/weston/imx/weston.ini new file mode 100644 index 00000000..d6ad40df --- /dev/null +++ b/recipes-graphics/wayland/weston/imx/weston.ini @@ -0,0 +1,20 @@ +[core] +# i.MX: Disable idle timeout +idle-time=0 + +#[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=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize diff --git a/recipes-graphics/wayland/weston/mx8mq/weston.ini b/recipes-graphics/wayland/weston/mx8mq/weston.ini new file mode 100644 index 00000000..d1597a42 --- /dev/null +++ b/recipes-graphics/wayland/weston/mx8mq/weston.ini @@ -0,0 +1,24 @@ +[core] +# i.MX: Disable idle timeout +idle-time=0 +gbm-format=argb8888 + +#[output] +#name=HDMI-A-1 +#mode=1920x1080@60 +#transform=90 + +[shell] +size=1920x1080 + +#[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=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize diff --git a/recipes-graphics/wayland/weston_5.0.0.imx.bb b/recipes-graphics/wayland/weston_5.0.0.imx.bb index 032972fa..11da2872 100644 --- a/recipes-graphics/wayland/weston_5.0.0.imx.bb +++ b/recipes-graphics/wayland/weston_5.0.0.imx.bb @@ -9,16 +9,13 @@ DEFAULT_PREFERENCE = "-1" SRCBRANCH = "weston-imx-5.0" SRC_URI = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} \ + file://weston.ini \ file://weston.png \ file://weston.desktop \ file://0001-make-error-portable.patch \ file://xwayland.weston-start \ file://0001-weston-launch-Provide-a-default-version-that-doesn-t.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" -- 2.40.1