diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2019-11-17 09:25:11 -0600 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2019-11-18 10:16:54 -0300 |
commit | 66989b7d07f8a1cdd4050fe3e3b088b6ead80786 (patch) | |
tree | 1c3128a787b5fc796d687063fa8daea525685550 /recipes-graphics | |
parent | 152747a8fdf15ce0ea8bbe944d05139875c8223d (diff) | |
download | meta-freescale-66989b7d07f8a1cdd4050fe3e3b088b6ead80786.tar.gz |
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 <tom.hochstein@nxp.com>
Diffstat (limited to 'recipes-graphics')
5 files changed, 50 insertions, 66 deletions
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 @@ | |||
1 | [core] | ||
2 | gbm-format=argb8888 | ||
3 | idle-time=0 | ||
4 | #use-g2d=1 | ||
5 | #xwayland=true | ||
6 | |||
7 | [shell] | ||
8 | size=1920x1080 | ||
9 | |||
10 | #[output] | ||
11 | #name=HDMI-A-1 | ||
12 | #mode=1920x1080@60 | ||
13 | #transform=90 | ||
14 | |||
15 | #[output] | ||
16 | #name=HDMI-A-2 | ||
17 | #mode=off | ||
18 | # WIDTHxHEIGHT Resolution size width and height in pixels | ||
19 | # off Disables the output | ||
20 | # preferred Uses the preferred mode | ||
21 | # current Uses the current crt controller mode | ||
22 | #transform=90 | ||
23 | |||
24 | [screen-share] | ||
25 | 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 @@ | |||
1 | [core] | ||
2 | #gbm-format=argb8888 | ||
3 | idle-time=0 | ||
4 | #use-g2d=1 | ||
5 | #xwayland=true | ||
6 | |||
7 | #[shell] | ||
8 | #size=1920x1080 | ||
9 | |||
10 | #[output] | ||
11 | #name=HDMI-A-1 | ||
12 | #mode=1920x1080@60 | ||
13 | #transform=90 | ||
14 | |||
15 | #[output] | ||
16 | #name=HDMI-A-2 | ||
17 | #mode=off | ||
18 | # WIDTHxHEIGHT Resolution size width and height in pixels | ||
19 | # off Disables the output | ||
20 | # preferred Uses the preferred mode | ||
21 | # current Uses the current crt controller mode | ||
22 | #transform=90 | ||
23 | |||
24 | [screen-share] | ||
25 | 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 @@ | |||
1 | From 186ec0c80410b2120b8f31c211cb44a836c84522 Mon Sep 17 00:00:00 2001 | ||
2 | From: Haihua Hu <jared.hu@nxp.com> | ||
3 | Date: Wed, 4 Jul 2018 16:05:20 +0800 | ||
4 | Subject: [PATCH] weston.ini: using argb8888 as gbm default on mscale 850D | ||
5 | |||
6 | mscale 850D video playback need using pixel alpha for graphic layer | ||
7 | |||
8 | upstream status: imx specific | ||
9 | Signed-off-by: Haihua Hu <jared.hu@nxp.com> | ||
10 | |||
11 | --- | ||
12 | weston.ini.in | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | Index: git/weston.ini.in | ||
16 | =================================================================== | ||
17 | --- git.orig/weston.ini.in | ||
18 | +++ git/weston.ini.in | ||
19 | @@ -2,6 +2,7 @@ | ||
20 | # i.MX: Disable idle timeout | ||
21 | idle-time=0 | ||
22 | #use-g2d=1 | ||
23 | +gbm-format=argb8888 | ||
24 | |||
25 | [libinput] | ||
26 | 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 @@ | |||
1 | From 3012798d7e9c9e624024fc962d749a960289ad8b Mon Sep 17 00:00:00 2001 | ||
2 | From: Haihua Hu <jared.hu@nxp.com> | ||
3 | Date: Wed, 11 Jul 2018 17:47:47 +0800 | ||
4 | Subject: [PATCH] weston.ini: configure desktop shell size in weston configure | ||
5 | file | ||
6 | |||
7 | mscale 850D need set desktop shell to 1080p | ||
8 | |||
9 | upstream status: imx specific | ||
10 | Signed-off-by: Haihua Hu <jared.hu@nxp.com> | ||
11 | |||
12 | --- | ||
13 | weston.ini.in | 2 ++ | ||
14 | 1 file changed, 2 insertions(+) | ||
15 | |||
16 | diff --git a/weston.ini.in b/weston.ini.in | ||
17 | index bd8abe4..077155b 100644 | ||
18 | --- a/weston.ini.in | ||
19 | +++ b/weston.ini.in | ||
20 | @@ -8,6 +8,8 @@ gbm-format=argb8888 | ||
21 | #mode=1920x1080@60 | ||
22 | #transform=90 | ||
23 | |||
24 | +[shell] | ||
25 | +size=1920x1080 | ||
26 | |||
27 | #[output] | ||
28 | #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 | |||
16 | file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ | 16 | file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ |
17 | file://0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch \ | 17 | file://0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch \ |
18 | " | 18 | " |
19 | # Use argb8888 as gbm-format for i.MX8MQ only | ||
20 | SRC_URI_append_mx8mq = " file://0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch \ | ||
21 | file://0002-weston.ini-configure-desktop-shell-size-in-weston-co.patch \ | ||
22 | " | ||
23 | SRCREV = "fb563901657b296c7c7c86d26602a622429e334f" | 19 | SRCREV = "fb563901657b296c7c7c86d26602a622429e334f" |
24 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
25 | 21 | ||
@@ -102,9 +98,6 @@ PACKAGECONFIG[imxg2d] = "--enable-imxg2d,--disable-imxg2d,virtual/libg2d" | |||
102 | # Weston with OpenGL support | 98 | # Weston with OpenGL support |
103 | PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl" | 99 | PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl" |
104 | 100 | ||
105 | # Set to install a default weston.ini file | ||
106 | WESTON_INI_INSTALL_FILE = "${B}/weston.ini" | ||
107 | |||
108 | do_install_append() { | 101 | do_install_append() { |
109 | # Weston doesn't need the .la files to load modules, so wipe them | 102 | # Weston doesn't need the .la files to load modules, so wipe them |
110 | rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la | 103 | rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la |
@@ -121,11 +114,6 @@ do_install_append() { | |||
121 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then | 114 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then |
122 | install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland | 115 | install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland |
123 | fi | 116 | fi |
124 | |||
125 | # install default weston.ini | ||
126 | if [ "${WESTON_INI_INSTALL_FILE}" != "" ]; then | ||
127 | install -D -m 0644 ${WESTON_INI_INSTALL_FILE} ${D}${sysconfdir}/xdg/weston/weston.ini | ||
128 | fi | ||
129 | } | 117 | } |
130 | 118 | ||
131 | PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \ | 119 | PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \ |