summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2019-04-01 15:49:14 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-12 14:05:38 +0100
commite288901123190278f8f92b412a6030d345b287e3 (patch)
tree4d57f1383f9269fd7559fbfd53979ba8648688bd
parentf89421ae24e33a86bc877439a82e863a9ac633b8 (diff)
downloadpoky-e288901123190278f8f92b412a6030d345b287e3.tar.gz
weston: upgrade 5.0.0 -> 6.0.0
Refresh patches. Note: 6.0.0 is the last one to support autotools (needs explicit configure option), newer versions will only support meson. (From OE-Core rev: fe8349dcda28e35b24b5646301c381e7d8a9ec81) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch10
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch33
-rw-r--r--meta/recipes-graphics/wayland/weston_6.0.0.bb (renamed from meta/recipes-graphics/wayland/weston_5.0.0.bb)5
3 files changed, 25 insertions, 23 deletions
diff --git a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
index 09ec1559ec..0eb3d95a6d 100644
--- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
+++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
@@ -1,4 +1,4 @@
1From ad1d2161c811cff25d1684c33611f300adb753bc Mon Sep 17 00:00:00 2001 1From c4677e155736062e75687f1a655732c8902e912b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 May 2015 20:56:00 -0700 3Date: Fri, 29 May 2015 20:56:00 -0700
4Subject: [PATCH] make error() portable 4Subject: [PATCH] make error() portable
@@ -18,12 +18,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
18 create mode 100644 libweston/weston-error.h 18 create mode 100644 libweston/weston-error.h
19 19
20diff --git a/configure.ac b/configure.ac 20diff --git a/configure.ac b/configure.ac
21index 7aebbdb..dc9c802 100644 21index c05ad01..6da6e04 100644
22--- a/configure.ac 22--- a/configure.ac
23+++ b/configure.ac 23+++ b/configure.ac
24@@ -109,6 +109,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], 24@@ -126,6 +126,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
25 [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile weston")],
25 [[#include <time.h>]]) 26 [[#include <time.h>]])
26 AC_CHECK_HEADERS([execinfo.h])
27 27
28+AC_CHECK_HEADERS([error.h]) 28+AC_CHECK_HEADERS([error.h])
29+ 29+
@@ -57,7 +57,7 @@ index 0000000..2089d02
57+#endif 57+#endif
58+ 58+
59diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c 59diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
60index 1adcf21..166bf3b 100644 60index bf73e0d..9064439 100644
61--- a/libweston/weston-launch.c 61--- a/libweston/weston-launch.c
62+++ b/libweston/weston-launch.c 62+++ b/libweston/weston-launch.c
63@@ -33,7 +33,6 @@ 63@@ -33,7 +33,6 @@
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 d648538b89..a2f61bfdd3 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 @@
1From b98b9dbda902225cdd972b5bff6a641c36cc7e90 Mon Sep 17 00:00:00 2001 1From 7d2fea61a95e9498b5a19c8cffcb2ab5631d5685 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 PAM 4Subject: [PATCH] weston-launch: Provide a default version that doesn't require
5 PAM
5 6
6weston-launch requires PAM for starting weston as a non-root user. 7weston-launch requires PAM for starting weston as a non-root user.
7 8
@@ -21,10 +22,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
21 2 files changed, 27 insertions(+), 2 deletions(-) 22 2 files changed, 27 insertions(+), 2 deletions(-)
22 23
23diff --git a/configure.ac b/configure.ac 24diff --git a/configure.ac b/configure.ac
24index dc9c802..48cf5cb 100644 25index 6da6e04..681f7c8 100644
25--- a/configure.ac 26--- a/configure.ac
26+++ b/configure.ac 27+++ b/configure.ac
27@@ -451,13 +451,17 @@ AC_ARG_ENABLE(resize-optimization, 28@@ -515,13 +515,17 @@ AC_ARG_ENABLE(resize-optimization,
28 AS_IF([test "x$enable_resize_optimization" = "xyes"], 29 AS_IF([test "x$enable_resize_optimization" = "xyes"],
29 [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) 30 [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
30 31
@@ -44,7 +45,7 @@ index dc9c802..48cf5cb 100644
44 fi 45 fi
45 46
46 AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes") 47 AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
47@@ -702,6 +706,7 @@ AC_MSG_RESULT([ 48@@ -767,6 +771,7 @@ AC_MSG_RESULT([
48 Enable developer documentation ${enable_devdocs} 49 Enable developer documentation ${enable_devdocs}
49 50
50 weston-launch utility ${enable_weston_launch} 51 weston-launch utility ${enable_weston_launch}
@@ -53,7 +54,7 @@ index dc9c802..48cf5cb 100644
53 systemd notify support ${enable_systemd_notify} 54 systemd notify support ${enable_systemd_notify}
54 55
55diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c 56diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
56index 166bf3b..6fb9232 100644 57index 9064439..c6abe92 100644
57--- a/libweston/weston-launch.c 58--- a/libweston/weston-launch.c
58+++ b/libweston/weston-launch.c 59+++ b/libweston/weston-launch.c
59@@ -51,7 +51,9 @@ 60@@ -51,7 +51,9 @@
@@ -77,7 +78,7 @@ index 166bf3b..6fb9232 100644
77 int tty; 78 int tty;
78 int ttynr; 79 int ttynr;
79 int sock[2]; 80 int sock[2];
80@@ -189,6 +193,7 @@ weston_launch_allowed(struct weston_launch *wl) 81@@ -191,6 +195,7 @@ weston_launch_allowed(struct weston_launch *wl)
81 return false; 82 return false;
82 } 83 }
83 84
@@ -85,7 +86,7 @@ index 166bf3b..6fb9232 100644
85 static int 86 static int
86 pam_conversation_fn(int msg_count, 87 pam_conversation_fn(int msg_count,
87 const struct pam_message **messages, 88 const struct pam_message **messages,
88@@ -229,6 +234,7 @@ setup_pam(struct weston_launch *wl) 89@@ -231,6 +236,7 @@ setup_pam(struct weston_launch *wl)
89 90
90 return 0; 91 return 0;
91 } 92 }
@@ -93,7 +94,7 @@ index 166bf3b..6fb9232 100644
93 94
94 static int 95 static int
95 setup_launcher_socket(struct weston_launch *wl) 96 setup_launcher_socket(struct weston_launch *wl)
96@@ -422,6 +428,7 @@ quit(struct weston_launch *wl, int status) 97@@ -424,6 +430,7 @@ quit(struct weston_launch *wl, int status)
97 close(wl->signalfd); 98 close(wl->signalfd);
98 close(wl->sock[0]); 99 close(wl->sock[0]);
99 100
@@ -101,7 +102,7 @@ index 166bf3b..6fb9232 100644
101 if (wl->new_user) { 102 if (wl->new_user) {
102 err = pam_close_session(wl->ph, 0); 103 err = pam_close_session(wl->ph, 0);
103 if (err) 104 if (err)
104@@ -429,6 +436,7 @@ quit(struct weston_launch *wl, int status) 105@@ -431,6 +438,7 @@ quit(struct weston_launch *wl, int status)
105 err, pam_strerror(wl->ph, err)); 106 err, pam_strerror(wl->ph, err));
106 pam_end(wl->ph, err); 107 pam_end(wl->ph, err);
107 } 108 }
@@ -109,7 +110,7 @@ index 166bf3b..6fb9232 100644
109 110
110 if (ioctl(wl->tty, KDSKBMUTE, 0) && 111 if (ioctl(wl->tty, KDSKBMUTE, 0) &&
111 ioctl(wl->tty, KDSKBMODE, wl->kb_mode)) 112 ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
112@@ -608,6 +616,7 @@ setup_session(struct weston_launch *wl, char **child_argv) 113@@ -610,6 +618,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
113 setenv("HOME", wl->pw->pw_dir, 1); 114 setenv("HOME", wl->pw->pw_dir, 1);
114 setenv("SHELL", wl->pw->pw_shell, 1); 115 setenv("SHELL", wl->pw->pw_shell, 1);
115 116
@@ -117,7 +118,7 @@ index 166bf3b..6fb9232 100644
117 env = pam_getenvlist(wl->ph); 118 env = pam_getenvlist(wl->ph);
118 if (env) { 119 if (env) {
119 for (i = 0; env[i]; ++i) { 120 for (i = 0; env[i]; ++i) {
120@@ -616,6 +625,7 @@ setup_session(struct weston_launch *wl, char **child_argv) 121@@ -618,6 +627,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
121 } 122 }
122 free(env); 123 free(env);
123 } 124 }
@@ -125,7 +126,7 @@ index 166bf3b..6fb9232 100644
125 126
126 /* 127 /*
127 * We open a new session, so it makes sense 128 * We open a new session, so it makes sense
128@@ -683,8 +693,10 @@ static void 129@@ -685,8 +695,10 @@ static void
129 help(const char *name) 130 help(const char *name)
130 { 131 {
131 fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name); 132 fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
@@ -136,7 +137,7 @@ index 166bf3b..6fb9232 100644
136 fprintf(stderr, " -t, --tty Start session on alternative tty,\n" 137 fprintf(stderr, " -t, --tty Start session on alternative tty,\n"
137 " e.g. -t /dev/tty4, requires -u option.\n"); 138 " e.g. -t /dev/tty4, requires -u option.\n");
138 fprintf(stderr, " -v, --verbose Be verbose\n"); 139 fprintf(stderr, " -v, --verbose Be verbose\n");
139@@ -698,7 +710,9 @@ main(int argc, char *argv[]) 140@@ -700,7 +712,9 @@ main(int argc, char *argv[])
140 int i, c; 141 int i, c;
141 char *tty = NULL; 142 char *tty = NULL;
142 struct option opts[] = { 143 struct option opts[] = {
@@ -146,7 +147,7 @@ index 166bf3b..6fb9232 100644
146 { "tty", required_argument, NULL, 't' }, 147 { "tty", required_argument, NULL, 't' },
147 { "verbose", no_argument, NULL, 'v' }, 148 { "verbose", no_argument, NULL, 'v' },
148 { "help", no_argument, NULL, 'h' }, 149 { "help", no_argument, NULL, 'h' },
149@@ -710,9 +724,13 @@ main(int argc, char *argv[]) 150@@ -712,9 +726,13 @@ main(int argc, char *argv[])
150 while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) { 151 while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
151 switch (c) { 152 switch (c) {
152 case 'u': 153 case 'u':
@@ -160,7 +161,7 @@ index 166bf3b..6fb9232 100644
160 break; 161 break;
161 case 't': 162 case 't':
162 tty = optarg; 163 tty = optarg;
163@@ -753,8 +771,10 @@ main(int argc, char *argv[]) 164@@ -755,8 +773,10 @@ main(int argc, char *argv[])
164 if (setup_tty(&wl, tty) < 0) 165 if (setup_tty(&wl, tty) < 0)
165 exit(EXIT_FAILURE); 166 exit(EXIT_FAILURE);
166 167
diff --git a/meta/recipes-graphics/wayland/weston_5.0.0.bb b/meta/recipes-graphics/wayland/weston_6.0.0.bb
index e51710928a..fa08dac91d 100644
--- a/meta/recipes-graphics/wayland/weston_5.0.0.bb
+++ b/meta/recipes-graphics/wayland/weston_6.0.0.bb
@@ -12,8 +12,8 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
12 file://xwayland.weston-start \ 12 file://xwayland.weston-start \
13 file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ 13 file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
14" 14"
15SRC_URI[md5sum] = "752a04ce3c65af4884cfac4e57231bdb" 15SRC_URI[md5sum] = "7c634e262f8a464a076c97fd50ad36b3"
16SRC_URI[sha256sum] = "15a23423bcfa45e31e1dedc0cd524ba71e2930df174fde9c99b71a537c4e4caf" 16SRC_URI[sha256sum] = "546323a90607b3bd7f48809ea9d76e64cd09718102f2deca6d95aa59a882e612"
17 17
18UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" 18UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
19 19
@@ -28,6 +28,7 @@ WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"
28 28
29EXTRA_OECONF = "--enable-setuid-install \ 29EXTRA_OECONF = "--enable-setuid-install \
30 --disable-rdp-compositor \ 30 --disable-rdp-compositor \
31 --enable-autotools \
31 " 32 "
32PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ 33PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
33 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ 34 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \