summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2020-01-26 12:51:03 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-28 11:11:20 +0000
commit5c724703c5b411ea0d495c4701f58ae6fd2ec7fd (patch)
tree023fd9e88ffc704c34d8cdbdcfdadd7891cbe5f8 /meta
parent77eb2bac5645183dcfc65485368cf4002b933b4e (diff)
downloadpoky-5c724703c5b411ea0d495c4701f58ae6fd2ec7fd.tar.gz
weston: upgrade 7.0.0 -> 8.0.0
Here are some highlights: - DRM hardware planes should be used more effectively - The DRM backend now supports HDCP - Headless backend now supports OpenGL - DRM backend can now be built without GBM - EGL_KHR_partial_update is now used when available, reducing memory bandwidth usage on some GPUs - Logging framework improvements - Documentation for weston can now be built https://lists.freedesktop.org/archives/wayland-devel/2020-January/041147.html (From OE-Core rev: 1aa123f176f166e8eeaa09dc9b9fda206a92ae87) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch28
-rw-r--r--meta/recipes-graphics/wayland/weston_8.0.0.bb (renamed from meta/recipes-graphics/wayland/weston_7.0.0.bb)7
2 files changed, 17 insertions, 18 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 e50845b17a..62b864c134 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,4 +1,4 @@
1From 682b7d79a7b81ec8e38760381104b24ad549e8c0 Mon Sep 17 00:00:00 2001 1From 5f2d71998eb77068cbaee2d468cbb296a42d5739 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
@@ -16,6 +16,7 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
16Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 16Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
17Signed-off-by: Denys Dmytriyenko <denys@ti.com> 17Signed-off-by: Denys Dmytriyenko <denys@ti.com>
18Signed-off-by: Ming Liu <ming.liu@toradex.com> 18Signed-off-by: Ming Liu <ming.liu@toradex.com>
19
19--- 20---
20 libweston/meson.build | 16 ++++++++++++---- 21 libweston/meson.build | 16 ++++++++++++----
21 libweston/weston-launch.c | 21 +++++++++++++++++++++ 22 libweston/weston-launch.c | 21 +++++++++++++++++++++
@@ -23,10 +24,10 @@ Signed-off-by: Ming Liu <ming.liu@toradex.com>
23 3 files changed, 40 insertions(+), 4 deletions(-) 24 3 files changed, 40 insertions(+), 4 deletions(-)
24 25
25diff --git a/libweston/meson.build b/libweston/meson.build 26diff --git a/libweston/meson.build b/libweston/meson.build
26index d8d3fc0..326683f 100644 27index 08d23ec..cb9fd3f 100644
27--- a/libweston/meson.build 28--- a/libweston/meson.build
28+++ b/libweston/meson.build 29+++ b/libweston/meson.build
29@@ -199,16 +199,24 @@ dep_vertex_clipping = declare_dependency( 30@@ -216,16 +216,24 @@ dep_vertex_clipping = declare_dependency(
30 ) 31 )
31 32
32 if get_option('weston-launch') 33 if get_option('weston-launch')
@@ -52,11 +53,11 @@ index d8d3fc0..326683f 100644
52 'weston-launch.c', 53 'weston-launch.c',
53- dependencies: [dep_pam, systemd_dep, dep_libdrm], 54- dependencies: [dep_pam, systemd_dep, dep_libdrm],
54+ dependencies: deps_weston_launch, 55+ dependencies: deps_weston_launch,
55 include_directories: include_directories('..'), 56 include_directories: common_inc,
56 install: true 57 install: true
57 ) 58 )
58diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c 59diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
59index 4962bd6..fc531c5 100644 60index 8a711b4..54c567a 100644
60--- a/libweston/weston-launch.c 61--- a/libweston/weston-launch.c
61+++ b/libweston/weston-launch.c 62+++ b/libweston/weston-launch.c
62@@ -51,7 +51,9 @@ 63@@ -51,7 +51,9 @@
@@ -112,7 +113,7 @@ index 4962bd6..fc531c5 100644
112 113
113 if (ioctl(wl->tty, KDSKBMUTE, 0) && 114 if (ioctl(wl->tty, KDSKBMUTE, 0) &&
114 ioctl(wl->tty, KDSKBMODE, wl->kb_mode)) 115 ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
115@@ -660,6 +668,7 @@ setup_session(struct weston_launch *wl, char **child_argv) 116@@ -666,6 +674,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
116 setenv("HOME", wl->pw->pw_dir, 1); 117 setenv("HOME", wl->pw->pw_dir, 1);
117 setenv("SHELL", wl->pw->pw_shell, 1); 118 setenv("SHELL", wl->pw->pw_shell, 1);
118 119
@@ -120,7 +121,7 @@ index 4962bd6..fc531c5 100644
120 env = pam_getenvlist(wl->ph); 121 env = pam_getenvlist(wl->ph);
121 if (env) { 122 if (env) {
122 for (i = 0; env[i]; ++i) { 123 for (i = 0; env[i]; ++i) {
123@@ -668,6 +677,7 @@ setup_session(struct weston_launch *wl, char **child_argv) 124@@ -674,6 +683,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
124 } 125 }
125 free(env); 126 free(env);
126 } 127 }
@@ -128,7 +129,7 @@ index 4962bd6..fc531c5 100644
128 129
129 /* 130 /*
130 * We open a new session, so it makes sense 131 * We open a new session, so it makes sense
131@@ -739,8 +749,10 @@ static void 132@@ -745,8 +755,10 @@ static void
132 help(const char *name) 133 help(const char *name)
133 { 134 {
134 fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name); 135 fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
@@ -139,7 +140,7 @@ index 4962bd6..fc531c5 100644
139 fprintf(stderr, " -t, --tty Start session on alternative tty,\n" 140 fprintf(stderr, " -t, --tty Start session on alternative tty,\n"
140 " e.g. -t /dev/tty4, requires -u option.\n"); 141 " e.g. -t /dev/tty4, requires -u option.\n");
141 fprintf(stderr, " -v, --verbose Be verbose\n"); 142 fprintf(stderr, " -v, --verbose Be verbose\n");
142@@ -754,7 +766,9 @@ main(int argc, char *argv[]) 143@@ -760,7 +772,9 @@ main(int argc, char *argv[])
143 int i, c; 144 int i, c;
144 char *tty = NULL; 145 char *tty = NULL;
145 struct option opts[] = { 146 struct option opts[] = {
@@ -149,7 +150,7 @@ index 4962bd6..fc531c5 100644
149 { "tty", required_argument, NULL, 't' }, 150 { "tty", required_argument, NULL, 't' },
150 { "verbose", no_argument, NULL, 'v' }, 151 { "verbose", no_argument, NULL, 'v' },
151 { "help", no_argument, NULL, 'h' }, 152 { "help", no_argument, NULL, 'h' },
152@@ -766,11 +780,16 @@ main(int argc, char *argv[]) 153@@ -772,11 +786,16 @@ main(int argc, char *argv[])
153 while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) { 154 while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
154 switch (c) { 155 switch (c) {
155 case 'u': 156 case 'u':
@@ -166,7 +167,7 @@ index 4962bd6..fc531c5 100644
166 break; 167 break;
167 case 't': 168 case 't':
168 tty = optarg; 169 tty = optarg;
169@@ -822,8 +841,10 @@ main(int argc, char *argv[]) 170@@ -828,8 +847,10 @@ main(int argc, char *argv[])
170 if (setup_tty(&wl, tty) < 0) 171 if (setup_tty(&wl, tty) < 0)
171 exit(EXIT_FAILURE); 172 exit(EXIT_FAILURE);
172 173
@@ -178,7 +179,7 @@ index 4962bd6..fc531c5 100644
178 if (setup_launcher_socket(&wl) < 0) 179 if (setup_launcher_socket(&wl) < 0)
179 exit(EXIT_FAILURE); 180 exit(EXIT_FAILURE);
180diff --git a/meson_options.txt b/meson_options.txt 181diff --git a/meson_options.txt b/meson_options.txt
181index d5bf1d5..254eb2b 100644 182index c862ecc..73ef2c3 100644
182--- a/meson_options.txt 183--- a/meson_options.txt
183+++ b/meson_options.txt 184+++ b/meson_options.txt
184@@ -73,6 +73,13 @@ option( 185@@ -73,6 +73,13 @@ option(
@@ -195,6 +196,3 @@ index d5bf1d5..254eb2b 100644
195 'xwayland', 196 'xwayland',
196 type: 'boolean', 197 type: 'boolean',
197 value: true, 198 value: true,
198--
1992.7.4
200
diff --git a/meta/recipes-graphics/wayland/weston_7.0.0.bb b/meta/recipes-graphics/wayland/weston_8.0.0.bb
index e6548d3541..83aee870aa 100644
--- a/meta/recipes-graphics/wayland/weston_7.0.0.bb
+++ b/meta/recipes-graphics/wayland/weston_8.0.0.bb
@@ -11,8 +11,8 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
11 file://xwayland.weston-start \ 11 file://xwayland.weston-start \
12 file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ 12 file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
13" 13"
14SRC_URI[md5sum] = "cbfda483bc2501d0831af3f33c707850" 14SRC_URI[md5sum] = "53e4810d852df0601d01fd986a5b22b3"
15SRC_URI[sha256sum] = "a00a6d207b6a45f95f4401c604772a307c3767e5e2beecf3d879110c43909a64" 15SRC_URI[sha256sum] = "7518b49b2eaa1c3091f24671bdcc124fd49fc8f1af51161927afa4329c027848"
16 16
17UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" 17UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
18 18
@@ -93,7 +93,8 @@ do_install_append() {
93PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \ 93PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \
94 libweston-${WESTON_MAJOR_VERSION} ${PN}-examples" 94 libweston-${WESTON_MAJOR_VERSION} ${PN}-examples"
95 95
96FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}" 96FILES_${PN}-dev += "${libdir}/${BPN}/libexec_weston.so"
97FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}"
97 98
98FILES_libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" 99FILES_libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so"
99SUMMARY_libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." 100SUMMARY_libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'."