Revert "weston: Drop weston.ini files since the baseline version is now in source"

This reverts commit 4cf9997bbaeccf0d280f81265c787ab874c79f80.

diff --git a/recipes-graphics/wayland/weston-init/imxdrm/weston.config b/recipes-graphics/wayland/weston-init/imxdrm/weston.config
index 7c92cf1105e031f95fb94803461fdde033dded42..5693d6cbfe9084e13652198386cb63446d1eda0e 100644 (file)
--- 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 060aae0994ab92a9c6b262f6b2a08fecb12e3ca3..eb990e4093bf99603dc08ca34e8d7ace719bc6e5 100644 (file)
--- 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 (file)
index e951ce1..0000000
--- 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 <jared.hu@nxp.com>
-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 <jared.hu@nxp.com>
-
----
- 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 (file)
index 4aa3256..0000000
--- 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 <jared.hu@nxp.com>
-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 <jared.hu@nxp.com>
-
----
- 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 (file)
index 0000000..d6ad40d
--- /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 (file)
index 0000000..d1597a4
--- /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 032972faa66581ee8b8b160be69b4b3069939f56..11da28728ed95626a4803778a18aadf7a0733b76 100644 (file)
--- 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"