diff options
author | Denys Dmytriyenko <denys@ti.com> | 2020-09-08 22:21:56 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-10 13:48:26 +0100 |
commit | 7c9df041f4830adfca8cea946f5b7e4db5a4799e (patch) | |
tree | 82ff2699997949a4c951c524df2a6eb372539857 /meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch | |
parent | 592a9e75f7453fbc969093a848532b190e389905 (diff) | |
download | poky-7c9df041f4830adfca8cea946f5b7e4db5a4799e.tar.gz |
weston: upgrade 8.0.0 -> 9.0.0
Weston 9.0.0 is released! This release cycle has been pretty quiet,
with just a few new features:
- A new kiosk shell allows to display regular desktop apps in an
always-fullscreen mode
- Improved testing infrastructure: the test harness has been
redesigned, DRM tests are now supported, DRM and OpenGL tests are now
enabled in our CI
- DRM panel orientation property support
As always, a number of bug fixes are included as well.
https://lists.freedesktop.org/archives/wayland-devel/2020-September/041595.html
Add a patch to fix building of tests/weston-test-fixture-compositor.c on musl.
(From OE-Core rev: 3a638fbd81c365d7383ce91d7acb832c46acfb4c)
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch')
-rw-r--r-- | meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch index 62b864c134..3279a728cc 100644 --- a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch +++ b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From 5f2d71998eb77068cbaee2d468cbb296a42d5739 Mon Sep 17 00:00:00 2001 | 1 | From a1548c742bf2dedbb47282d8a00407b60bbab669 Mon Sep 17 00:00:00 2001 |
2 | From: Tom Hochstein <tom.hochstein@nxp.com> | 2 | From: Tom Hochstein <tom.hochstein@nxp.com> |
3 | Date: Wed, 22 Feb 2017 15:53:30 +0200 | 3 | Date: Wed, 22 Feb 2017 15:53:30 +0200 |
4 | Subject: [PATCH] weston-launch: Provide a default version that doesn't require | 4 | Subject: [PATCH] weston-launch: Provide a default version that doesn't require |
5 | |||
5 | PAM | 6 | PAM |
6 | 7 | ||
7 | weston-launch requires PAM for starting weston as a non-root user. | 8 | weston-launch requires PAM for starting weston as a non-root user. |
@@ -57,7 +58,7 @@ index 08d23ec..cb9fd3f 100644 | |||
57 | install: true | 58 | install: true |
58 | ) | 59 | ) |
59 | diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c | 60 | diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c |
60 | index 8a711b4..54c567a 100644 | 61 | index 521cb2c..2d42d33 100644 |
61 | --- a/libweston/weston-launch.c | 62 | --- a/libweston/weston-launch.c |
62 | +++ b/libweston/weston-launch.c | 63 | +++ b/libweston/weston-launch.c |
63 | @@ -51,7 +51,9 @@ | 64 | @@ -51,7 +51,9 @@ |
@@ -97,7 +98,7 @@ index 8a711b4..54c567a 100644 | |||
97 | 98 | ||
98 | static int | 99 | static int |
99 | setup_launcher_socket(struct weston_launch *wl) | 100 | setup_launcher_socket(struct weston_launch *wl) |
100 | @@ -431,6 +437,7 @@ quit(struct weston_launch *wl, int status) | 101 | @@ -466,6 +472,7 @@ quit(struct weston_launch *wl, int status) |
101 | close(wl->signalfd); | 102 | close(wl->signalfd); |
102 | close(wl->sock[0]); | 103 | close(wl->sock[0]); |
103 | 104 | ||
@@ -105,15 +106,15 @@ index 8a711b4..54c567a 100644 | |||
105 | if (wl->new_user) { | 106 | if (wl->new_user) { |
106 | err = pam_close_session(wl->ph, 0); | 107 | err = pam_close_session(wl->ph, 0); |
107 | if (err) | 108 | if (err) |
108 | @@ -438,6 +445,7 @@ quit(struct weston_launch *wl, int status) | 109 | @@ -473,6 +480,7 @@ quit(struct weston_launch *wl, int status) |
109 | err, pam_strerror(wl->ph, err)); | 110 | err, pam_strerror(wl->ph, err)); |
110 | pam_end(wl->ph, err); | 111 | pam_end(wl->ph, err); |
111 | } | 112 | } |
112 | +#endif | 113 | +#endif |
113 | 114 | ||
114 | if (ioctl(wl->tty, KDSKBMUTE, 0) && | 115 | /* |
115 | ioctl(wl->tty, KDSKBMODE, wl->kb_mode)) | 116 | * Get a fresh handle to the tty as the previous one is in |
116 | @@ -666,6 +674,7 @@ setup_session(struct weston_launch *wl, char **child_argv) | 117 | @@ -710,6 +718,7 @@ setup_session(struct weston_launch *wl, char **child_argv) |
117 | setenv("HOME", wl->pw->pw_dir, 1); | 118 | setenv("HOME", wl->pw->pw_dir, 1); |
118 | setenv("SHELL", wl->pw->pw_shell, 1); | 119 | setenv("SHELL", wl->pw->pw_shell, 1); |
119 | 120 | ||
@@ -121,7 +122,7 @@ index 8a711b4..54c567a 100644 | |||
121 | env = pam_getenvlist(wl->ph); | 122 | env = pam_getenvlist(wl->ph); |
122 | if (env) { | 123 | if (env) { |
123 | for (i = 0; env[i]; ++i) { | 124 | for (i = 0; env[i]; ++i) { |
124 | @@ -674,6 +683,7 @@ setup_session(struct weston_launch *wl, char **child_argv) | 125 | @@ -718,6 +727,7 @@ setup_session(struct weston_launch *wl, char **child_argv) |
125 | } | 126 | } |
126 | free(env); | 127 | free(env); |
127 | } | 128 | } |
@@ -129,7 +130,7 @@ index 8a711b4..54c567a 100644 | |||
129 | 130 | ||
130 | /* | 131 | /* |
131 | * We open a new session, so it makes sense | 132 | * We open a new session, so it makes sense |
132 | @@ -745,8 +755,10 @@ static void | 133 | @@ -789,8 +799,10 @@ static void |
133 | help(const char *name) | 134 | help(const char *name) |
134 | { | 135 | { |
135 | fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name); | 136 | fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name); |
@@ -140,7 +141,7 @@ index 8a711b4..54c567a 100644 | |||
140 | fprintf(stderr, " -t, --tty Start session on alternative tty,\n" | 141 | fprintf(stderr, " -t, --tty Start session on alternative tty,\n" |
141 | " e.g. -t /dev/tty4, requires -u option.\n"); | 142 | " e.g. -t /dev/tty4, requires -u option.\n"); |
142 | fprintf(stderr, " -v, --verbose Be verbose\n"); | 143 | fprintf(stderr, " -v, --verbose Be verbose\n"); |
143 | @@ -760,7 +772,9 @@ main(int argc, char *argv[]) | 144 | @@ -804,7 +816,9 @@ main(int argc, char *argv[]) |
144 | int i, c; | 145 | int i, c; |
145 | char *tty = NULL; | 146 | char *tty = NULL; |
146 | struct option opts[] = { | 147 | struct option opts[] = { |
@@ -150,7 +151,7 @@ index 8a711b4..54c567a 100644 | |||
150 | { "tty", required_argument, NULL, 't' }, | 151 | { "tty", required_argument, NULL, 't' }, |
151 | { "verbose", no_argument, NULL, 'v' }, | 152 | { "verbose", no_argument, NULL, 'v' }, |
152 | { "help", no_argument, NULL, 'h' }, | 153 | { "help", no_argument, NULL, 'h' }, |
153 | @@ -772,11 +786,16 @@ main(int argc, char *argv[]) | 154 | @@ -816,11 +830,16 @@ main(int argc, char *argv[]) |
154 | while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) { | 155 | while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) { |
155 | switch (c) { | 156 | switch (c) { |
156 | case 'u': | 157 | case 'u': |
@@ -167,7 +168,7 @@ index 8a711b4..54c567a 100644 | |||
167 | break; | 168 | break; |
168 | case 't': | 169 | case 't': |
169 | tty = optarg; | 170 | tty = optarg; |
170 | @@ -828,8 +847,10 @@ main(int argc, char *argv[]) | 171 | @@ -872,8 +891,10 @@ main(int argc, char *argv[]) |
171 | if (setup_tty(&wl, tty) < 0) | 172 | if (setup_tty(&wl, tty) < 0) |
172 | exit(EXIT_FAILURE); | 173 | exit(EXIT_FAILURE); |
173 | 174 | ||
@@ -179,7 +180,7 @@ index 8a711b4..54c567a 100644 | |||
179 | if (setup_launcher_socket(&wl) < 0) | 180 | if (setup_launcher_socket(&wl) < 0) |
180 | exit(EXIT_FAILURE); | 181 | exit(EXIT_FAILURE); |
181 | diff --git a/meson_options.txt b/meson_options.txt | 182 | diff --git a/meson_options.txt b/meson_options.txt |
182 | index c862ecc..73ef2c3 100644 | 183 | index 239bd2d..99e4ec3 100644 |
183 | --- a/meson_options.txt | 184 | --- a/meson_options.txt |
184 | +++ b/meson_options.txt | 185 | +++ b/meson_options.txt |
185 | @@ -73,6 +73,13 @@ option( | 186 | @@ -73,6 +73,13 @@ option( |