diff options
author | Fathi Boudra <fathi.boudra@linaro.org> | 2016-10-29 17:47:52 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-06 23:35:33 +0000 |
commit | cd08dce163b4122c44deb51fc7b9cb2baa383f17 (patch) | |
tree | 351a5a40fc8dd7b9503faec704b5f43d6a38e761 /meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch | |
parent | 3a6612a81197d2e1ebefcfd5cd9576d91d2ea08b (diff) | |
download | poky-cd08dce163b4122c44deb51fc7b9cb2baa383f17.tar.gz |
weston: upgrade from 1.11.0 to 1.11.1
* Refresh patches to apply cleanly without hunk on 1.11.1 (no changes):
- 0001-make-error-portable.patch
- 0001-configure.ac-Fix-wayland-protocols-path.patch
- 0001-shared-include-stdint.h-for-int32_t.patch
- 0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
* Remove make-weston-launch-exit-for-unrecognized-option.patch
applied upstream
https://cgit.freedesktop.org/wayland/weston/commit/?h=1.11&id=fc3dd183
* Add 0001-Add-configuration-option-for-no-input-device.patch
backported from upstream
https://cgit.freedesktop.org/wayland/weston/commit/?id=75b7197f
(From OE-Core rev: b6864b13b01f466dcb8602a08f99d6d2a7a3d48b)
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.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 | 19 |
1 files changed, 6 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 5542036be2..d684b1c1bc 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 | |||
@@ -14,12 +14,10 @@ Upstream-Status: Pending | |||
14 | 14 | ||
15 | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> | 15 | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> |
16 | --- | 16 | --- |
17 | configure.ac | 9 +++++++-- | 17 | configure.ac | 9 +++++++-- |
18 | src/weston-launch.c | 20 ++++++++++++++++++++ | 18 | src/weston-launch.c | 20 ++++++++++++++++++++ |
19 | 2 files changed, 27 insertions(+), 2 deletions(-) | 19 | 2 files changed, 27 insertions(+), 2 deletions(-) |
20 | 20 | ||
21 | diff --git a/configure.ac b/configure.ac | ||
22 | index 32fdde7..240966f 100644 | ||
23 | --- a/configure.ac | 21 | --- a/configure.ac |
24 | +++ b/configure.ac | 22 | +++ b/configure.ac |
25 | @@ -416,13 +416,17 @@ AC_ARG_ENABLE(resize-optimization, | 23 | @@ -416,13 +416,17 @@ AC_ARG_ENABLE(resize-optimization, |
@@ -50,8 +48,6 @@ index 32fdde7..240966f 100644 | |||
50 | systemd-login support ${have_systemd_login} | 48 | systemd-login support ${have_systemd_login} |
51 | systemd notify support ${enable_systemd_notify} | 49 | systemd notify support ${enable_systemd_notify} |
52 | 50 | ||
53 | diff --git a/src/weston-launch.c b/src/weston-launch.c | ||
54 | index b8b2ba0..a865061 100644 | ||
55 | --- a/src/weston-launch.c | 51 | --- a/src/weston-launch.c |
56 | +++ b/src/weston-launch.c | 52 | +++ b/src/weston-launch.c |
57 | @@ -51,7 +51,9 @@ | 53 | @@ -51,7 +51,9 @@ |
@@ -75,7 +71,7 @@ index b8b2ba0..a865061 100644 | |||
75 | int tty; | 71 | int tty; |
76 | int ttynr; | 72 | int ttynr; |
77 | int sock[2]; | 73 | int sock[2]; |
78 | @@ -181,6 +185,7 @@ weston_launch_allowed(struct weston_launch *wl) | 74 | @@ -181,6 +185,7 @@ weston_launch_allowed(struct weston_laun |
79 | return false; | 75 | return false; |
80 | } | 76 | } |
81 | 77 | ||
@@ -91,7 +87,7 @@ index b8b2ba0..a865061 100644 | |||
91 | 87 | ||
92 | static int | 88 | static int |
93 | setup_launcher_socket(struct weston_launch *wl) | 89 | setup_launcher_socket(struct weston_launch *wl) |
94 | @@ -414,6 +420,7 @@ quit(struct weston_launch *wl, int status) | 90 | @@ -414,6 +420,7 @@ quit(struct weston_launch *wl, int statu |
95 | close(wl->signalfd); | 91 | close(wl->signalfd); |
96 | close(wl->sock[0]); | 92 | close(wl->sock[0]); |
97 | 93 | ||
@@ -99,7 +95,7 @@ index b8b2ba0..a865061 100644 | |||
99 | if (wl->new_user) { | 95 | if (wl->new_user) { |
100 | err = pam_close_session(wl->ph, 0); | 96 | err = pam_close_session(wl->ph, 0); |
101 | if (err) | 97 | if (err) |
102 | @@ -421,6 +428,7 @@ quit(struct weston_launch *wl, int status) | 98 | @@ -421,6 +428,7 @@ quit(struct weston_launch *wl, int statu |
103 | err, pam_strerror(wl->ph, err)); | 99 | err, pam_strerror(wl->ph, err)); |
104 | pam_end(wl->ph, err); | 100 | pam_end(wl->ph, err); |
105 | } | 101 | } |
@@ -157,7 +153,7 @@ index b8b2ba0..a865061 100644 | |||
157 | break; | 153 | break; |
158 | case 't': | 154 | case 't': |
159 | tty = optarg; | 155 | tty = optarg; |
160 | @@ -730,8 +748,10 @@ main(int argc, char *argv[]) | 156 | @@ -732,8 +750,10 @@ main(int argc, char *argv[]) |
161 | if (setup_tty(&wl, tty) < 0) | 157 | if (setup_tty(&wl, tty) < 0) |
162 | exit(EXIT_FAILURE); | 158 | exit(EXIT_FAILURE); |
163 | 159 | ||
@@ -168,6 +164,3 @@ index b8b2ba0..a865061 100644 | |||
168 | 164 | ||
169 | if (setup_launcher_socket(&wl) < 0) | 165 | if (setup_launcher_socket(&wl) < 0) |
170 | exit(EXIT_FAILURE); | 166 | exit(EXIT_FAILURE); |
171 | -- | ||
172 | 2.1.4 | ||
173 | |||