summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2018-04-11 14:03:19 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:04 +0100
commit1b0340b3b888696cb3c0600884686678535a4e5b (patch)
tree9e8b70f1f4a8bcfbe391bb8b2ecda073d584b979 /meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
parent8097bf7012a0d97d3b8b48eceb5dc20cc4ae7ca9 (diff)
downloadpoky-1b0340b3b888696cb3c0600884686678535a4e5b.tar.gz
weston: upgrade to 4.0.0
Official announcement: https://lists.freedesktop.org/archives/wayland-devel/2018-April/037768.html Dropped previously backported fix-missing-header.patch and weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch Refresh remaining local patches. Modify 0001-weston-launch-Provide-a-default-version-that-doesn-t.patch with changes to apply against the new code base. Support for libunwind was dropped in bb707dc0fe331c9af112a0552b7aa6fde755dd83: https://cgit.freedesktop.org/wayland/weston/commit/?id=bb707dc0fe331c9af112a0552b7aa6fde755dd83 Extract major version for referring to libweston-4 helper libraries. (From OE-Core rev: 0cc82a9158f58a37865f3ccc56156c987706f735) Signed-off-by: Denys Dmytriyenko <denys@ti.com> 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.patch49
1 files changed, 24 insertions, 25 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 70b988898c..d648538b89 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,8 +1,7 @@
1From 8ff6ed03ec4079f32e9b34085414e57be4730e04 Mon Sep 17 00:00:00 2001 1From b98b9dbda902225cdd972b5bff6a641c36cc7e90 Mon Sep 17 00:00:00 2001
2From: Tom Hochstein <tom.hochstein@nxp.com> 2From: Tom Hochstein <tom.hochstein@nxp.com>
3Date: Wed, 22 Feb 2017 15:53:30 +0200 3Date: Wed, 22 Feb 2017 15:53:30 +0200
4Subject: [PATCH] weston-launch: Provide a default version that doesn't require 4Subject: [PATCH] weston-launch: Provide a default version that doesn't require PAM
5 PAM
6 5
7weston-launch requires PAM for starting weston as a non-root user. 6weston-launch requires PAM for starting weston as a non-root user.
8 7
@@ -14,16 +13,18 @@ Upstream-Status: Pending
14 13
15Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> 14Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
16Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 15Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
16Signed-off-by: Denys Dmytriyenko <denys@ti.com>
17
17--- 18---
18 configure.ac | 9 +++++++-- 19 configure.ac | 9 +++++++--
19 libweston/weston-launch.c | 20 ++++++++++++++++++++ 20 libweston/weston-launch.c | 20 ++++++++++++++++++++
20 2 files changed, 27 insertions(+), 2 deletions(-) 21 2 files changed, 27 insertions(+), 2 deletions(-)
21 22
22diff --git a/configure.ac b/configure.ac 23diff --git a/configure.ac b/configure.ac
23index 46cb2c7..bb45f46 100644 24index dc9c802..48cf5cb 100644
24--- a/configure.ac 25--- a/configure.ac
25+++ b/configure.ac 26+++ b/configure.ac
26@@ -435,13 +435,17 @@ AC_ARG_ENABLE(resize-optimization, 27@@ -451,13 +451,17 @@ AC_ARG_ENABLE(resize-optimization,
27 AS_IF([test "x$enable_resize_optimization" = "xyes"], 28 AS_IF([test "x$enable_resize_optimization" = "xyes"],
28 [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) 29 [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
29 30
@@ -43,7 +44,7 @@ index 46cb2c7..bb45f46 100644
43 fi 44 fi
44 45
45 AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes") 46 AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
46@@ -701,6 +705,7 @@ AC_MSG_RESULT([ 47@@ -702,6 +706,7 @@ AC_MSG_RESULT([
47 Enable developer documentation ${enable_devdocs} 48 Enable developer documentation ${enable_devdocs}
48 49
49 weston-launch utility ${enable_weston_launch} 50 weston-launch utility ${enable_weston_launch}
@@ -52,7 +53,7 @@ index 46cb2c7..bb45f46 100644
52 systemd notify support ${enable_systemd_notify} 53 systemd notify support ${enable_systemd_notify}
53 54
54diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c 55diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
55index 0491896..07e7469 100644 56index 166bf3b..6fb9232 100644
56--- a/libweston/weston-launch.c 57--- a/libweston/weston-launch.c
57+++ b/libweston/weston-launch.c 58+++ b/libweston/weston-launch.c
58@@ -51,7 +51,9 @@ 59@@ -51,7 +51,9 @@
@@ -65,7 +66,7 @@ index 0491896..07e7469 100644
65 66
66 #ifdef HAVE_SYSTEMD_LOGIN 67 #ifdef HAVE_SYSTEMD_LOGIN
67 #include <systemd/sd-login.h> 68 #include <systemd/sd-login.h>
68@@ -93,8 +95,10 @@ drmSetMaster(int drm_fd) 69@@ -101,8 +103,10 @@ drmSetMaster(int drm_fd)
69 #endif 70 #endif
70 71
71 struct weston_launch { 72 struct weston_launch {
@@ -76,7 +77,7 @@ index 0491896..07e7469 100644
76 int tty; 77 int tty;
77 int ttynr; 78 int ttynr;
78 int sock[2]; 79 int sock[2];
79@@ -181,6 +185,7 @@ weston_launch_allowed(struct weston_launch *wl) 80@@ -189,6 +193,7 @@ weston_launch_allowed(struct weston_launch *wl)
80 return false; 81 return false;
81 } 82 }
82 83
@@ -84,7 +85,7 @@ index 0491896..07e7469 100644
84 static int 85 static int
85 pam_conversation_fn(int msg_count, 86 pam_conversation_fn(int msg_count,
86 const struct pam_message **messages, 87 const struct pam_message **messages,
87@@ -221,6 +226,7 @@ setup_pam(struct weston_launch *wl) 88@@ -229,6 +234,7 @@ setup_pam(struct weston_launch *wl)
88 89
89 return 0; 90 return 0;
90 } 91 }
@@ -92,7 +93,7 @@ index 0491896..07e7469 100644
92 93
93 static int 94 static int
94 setup_launcher_socket(struct weston_launch *wl) 95 setup_launcher_socket(struct weston_launch *wl)
95@@ -414,6 +420,7 @@ quit(struct weston_launch *wl, int status) 96@@ -422,6 +428,7 @@ quit(struct weston_launch *wl, int status)
96 close(wl->signalfd); 97 close(wl->signalfd);
97 close(wl->sock[0]); 98 close(wl->sock[0]);
98 99
@@ -100,7 +101,7 @@ index 0491896..07e7469 100644
100 if (wl->new_user) { 101 if (wl->new_user) {
101 err = pam_close_session(wl->ph, 0); 102 err = pam_close_session(wl->ph, 0);
102 if (err) 103 if (err)
103@@ -421,6 +428,7 @@ quit(struct weston_launch *wl, int status) 104@@ -429,6 +436,7 @@ quit(struct weston_launch *wl, int status)
104 err, pam_strerror(wl->ph, err)); 105 err, pam_strerror(wl->ph, err));
105 pam_end(wl->ph, err); 106 pam_end(wl->ph, err);
106 } 107 }
@@ -108,7 +109,7 @@ index 0491896..07e7469 100644
108 109
109 if (ioctl(wl->tty, KDSKBMUTE, 0) && 110 if (ioctl(wl->tty, KDSKBMUTE, 0) &&
110 ioctl(wl->tty, KDSKBMODE, wl->kb_mode)) 111 ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
111@@ -600,6 +608,7 @@ setup_session(struct weston_launch *wl, char **child_argv) 112@@ -608,6 +616,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
112 setenv("HOME", wl->pw->pw_dir, 1); 113 setenv("HOME", wl->pw->pw_dir, 1);
113 setenv("SHELL", wl->pw->pw_shell, 1); 114 setenv("SHELL", wl->pw->pw_shell, 1);
114 115
@@ -116,7 +117,7 @@ index 0491896..07e7469 100644
116 env = pam_getenvlist(wl->ph); 117 env = pam_getenvlist(wl->ph);
117 if (env) { 118 if (env) {
118 for (i = 0; env[i]; ++i) { 119 for (i = 0; env[i]; ++i) {
119@@ -608,6 +617,7 @@ setup_session(struct weston_launch *wl, char **child_argv) 120@@ -616,6 +625,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
120 } 121 }
121 free(env); 122 free(env);
122 } 123 }
@@ -124,17 +125,18 @@ index 0491896..07e7469 100644
124 125
125 /* 126 /*
126 * We open a new session, so it makes sense 127 * We open a new session, so it makes sense
127@@ -675,7 +685,9 @@ static void 128@@ -683,8 +693,10 @@ static void
128 help(const char *name) 129 help(const char *name)
129 { 130 {
130 fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name); 131 fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
131+#ifdef HAVE_PAM 132+#ifdef HAVE_PAM
132 fprintf(stderr, " -u, --user Start session as specified username\n"); 133 fprintf(stderr, " -u, --user Start session as specified username,\n"
134 " e.g. -u joe, requires root.\n");
133+#endif 135+#endif
134 fprintf(stderr, " -t, --tty Start session on alternative tty\n"); 136 fprintf(stderr, " -t, --tty Start session on alternative tty,\n"
137 " e.g. -t /dev/tty4, requires -u option.\n");
135 fprintf(stderr, " -v, --verbose Be verbose\n"); 138 fprintf(stderr, " -v, --verbose Be verbose\n");
136 fprintf(stderr, " -h, --help Display this help message\n"); 139@@ -698,7 +710,9 @@ main(int argc, char *argv[])
137@@ -688,7 +700,9 @@ main(int argc, char *argv[])
138 int i, c; 140 int i, c;
139 char *tty = NULL; 141 char *tty = NULL;
140 struct option opts[] = { 142 struct option opts[] = {
@@ -144,8 +146,8 @@ index 0491896..07e7469 100644
144 { "tty", required_argument, NULL, 't' }, 146 { "tty", required_argument, NULL, 't' },
145 { "verbose", no_argument, NULL, 'v' }, 147 { "verbose", no_argument, NULL, 'v' },
146 { "help", no_argument, NULL, 'h' }, 148 { "help", no_argument, NULL, 'h' },
147@@ -700,9 +714,13 @@ main(int argc, char *argv[]) 149@@ -710,9 +724,13 @@ main(int argc, char *argv[])
148 while ((c = getopt_long(argc, argv, "u:t::vh", opts, &i)) != -1) { 150 while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
149 switch (c) { 151 switch (c) {
150 case 'u': 152 case 'u':
151+#ifdef HAVE_PAM 153+#ifdef HAVE_PAM
@@ -158,7 +160,7 @@ index 0491896..07e7469 100644
158 break; 160 break;
159 case 't': 161 case 't':
160 tty = optarg; 162 tty = optarg;
161@@ -740,8 +758,10 @@ main(int argc, char *argv[]) 163@@ -753,8 +771,10 @@ main(int argc, char *argv[])
162 if (setup_tty(&wl, tty) < 0) 164 if (setup_tty(&wl, tty) < 0)
163 exit(EXIT_FAILURE); 165 exit(EXIT_FAILURE);
164 166
@@ -169,6 +171,3 @@ index 0491896..07e7469 100644
169 171
170 if (setup_launcher_socket(&wl) < 0) 172 if (setup_launcher_socket(&wl) < 0)
171 exit(EXIT_FAILURE); 173 exit(EXIT_FAILURE);
172--
1732.1.4
174