mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
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>
This commit is contained in:
Denys Dmytriyenko
Richard Purdie
parent
77eb2bac56
commit
5c724703c5
|
|
@ -1,4 +1,4 @@
|
|||
From 682b7d79a7b81ec8e38760381104b24ad549e8c0 Mon Sep 17 00:00:00 2001
|
||||
From 5f2d71998eb77068cbaee2d468cbb296a42d5739 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Hochstein <tom.hochstein@nxp.com>
|
||||
Date: Wed, 22 Feb 2017 15:53:30 +0200
|
||||
Subject: [PATCH] weston-launch: Provide a default version that doesn't require
|
||||
|
|
@ -16,6 +16,7 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
|
||||
Signed-off-by: Ming Liu <ming.liu@toradex.com>
|
||||
|
||||
---
|
||||
libweston/meson.build | 16 ++++++++++++----
|
||||
libweston/weston-launch.c | 21 +++++++++++++++++++++
|
||||
|
|
@ -23,10 +24,10 @@ Signed-off-by: Ming Liu <ming.liu@toradex.com>
|
|||
3 files changed, 40 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/libweston/meson.build b/libweston/meson.build
|
||||
index d8d3fc0..326683f 100644
|
||||
index 08d23ec..cb9fd3f 100644
|
||||
--- a/libweston/meson.build
|
||||
+++ b/libweston/meson.build
|
||||
@@ -199,16 +199,24 @@ dep_vertex_clipping = declare_dependency(
|
||||
@@ -216,16 +216,24 @@ dep_vertex_clipping = declare_dependency(
|
||||
)
|
||||
|
||||
if get_option('weston-launch')
|
||||
|
|
@ -52,11 +53,11 @@ index d8d3fc0..326683f 100644
|
|||
'weston-launch.c',
|
||||
- dependencies: [dep_pam, systemd_dep, dep_libdrm],
|
||||
+ dependencies: deps_weston_launch,
|
||||
include_directories: include_directories('..'),
|
||||
include_directories: common_inc,
|
||||
install: true
|
||||
)
|
||||
diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
|
||||
index 4962bd6..fc531c5 100644
|
||||
index 8a711b4..54c567a 100644
|
||||
--- a/libweston/weston-launch.c
|
||||
+++ b/libweston/weston-launch.c
|
||||
@@ -51,7 +51,9 @@
|
||||
|
|
@ -112,7 +113,7 @@ index 4962bd6..fc531c5 100644
|
|||
|
||||
if (ioctl(wl->tty, KDSKBMUTE, 0) &&
|
||||
ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
|
||||
@@ -660,6 +668,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
|
||||
@@ -666,6 +674,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
|
||||
setenv("HOME", wl->pw->pw_dir, 1);
|
||||
setenv("SHELL", wl->pw->pw_shell, 1);
|
||||
|
||||
|
|
@ -120,7 +121,7 @@ index 4962bd6..fc531c5 100644
|
|||
env = pam_getenvlist(wl->ph);
|
||||
if (env) {
|
||||
for (i = 0; env[i]; ++i) {
|
||||
@@ -668,6 +677,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
|
||||
@@ -674,6 +683,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
|
||||
}
|
||||
free(env);
|
||||
}
|
||||
|
|
@ -128,7 +129,7 @@ index 4962bd6..fc531c5 100644
|
|||
|
||||
/*
|
||||
* We open a new session, so it makes sense
|
||||
@@ -739,8 +749,10 @@ static void
|
||||
@@ -745,8 +755,10 @@ static void
|
||||
help(const char *name)
|
||||
{
|
||||
fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
|
||||
|
|
@ -139,7 +140,7 @@ index 4962bd6..fc531c5 100644
|
|||
fprintf(stderr, " -t, --tty Start session on alternative tty,\n"
|
||||
" e.g. -t /dev/tty4, requires -u option.\n");
|
||||
fprintf(stderr, " -v, --verbose Be verbose\n");
|
||||
@@ -754,7 +766,9 @@ main(int argc, char *argv[])
|
||||
@@ -760,7 +772,9 @@ main(int argc, char *argv[])
|
||||
int i, c;
|
||||
char *tty = NULL;
|
||||
struct option opts[] = {
|
||||
|
|
@ -149,7 +150,7 @@ index 4962bd6..fc531c5 100644
|
|||
{ "tty", required_argument, NULL, 't' },
|
||||
{ "verbose", no_argument, NULL, 'v' },
|
||||
{ "help", no_argument, NULL, 'h' },
|
||||
@@ -766,11 +780,16 @@ main(int argc, char *argv[])
|
||||
@@ -772,11 +786,16 @@ main(int argc, char *argv[])
|
||||
while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
|
||||
switch (c) {
|
||||
case 'u':
|
||||
|
|
@ -166,7 +167,7 @@ index 4962bd6..fc531c5 100644
|
|||
break;
|
||||
case 't':
|
||||
tty = optarg;
|
||||
@@ -822,8 +841,10 @@ main(int argc, char *argv[])
|
||||
@@ -828,8 +847,10 @@ main(int argc, char *argv[])
|
||||
if (setup_tty(&wl, tty) < 0)
|
||||
exit(EXIT_FAILURE);
|
||||
|
||||
|
|
@ -178,7 +179,7 @@ index 4962bd6..fc531c5 100644
|
|||
if (setup_launcher_socket(&wl) < 0)
|
||||
exit(EXIT_FAILURE);
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index d5bf1d5..254eb2b 100644
|
||||
index c862ecc..73ef2c3 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -73,6 +73,13 @@ option(
|
||||
|
|
@ -195,6 +196,3 @@ index d5bf1d5..254eb2b 100644
|
|||
'xwayland',
|
||||
type: 'boolean',
|
||||
value: true,
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
|
|||
file://xwayland.weston-start \
|
||||
file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "cbfda483bc2501d0831af3f33c707850"
|
||||
SRC_URI[sha256sum] = "a00a6d207b6a45f95f4401c604772a307c3767e5e2beecf3d879110c43909a64"
|
||||
SRC_URI[md5sum] = "53e4810d852df0601d01fd986a5b22b3"
|
||||
SRC_URI[sha256sum] = "7518b49b2eaa1c3091f24671bdcc124fd49fc8f1af51161927afa4329c027848"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
|
||||
|
||||
|
|
@ -93,7 +93,8 @@ do_install_append() {
|
|||
PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \
|
||||
libweston-${WESTON_MAJOR_VERSION} ${PN}-examples"
|
||||
|
||||
FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}"
|
||||
FILES_${PN}-dev += "${libdir}/${BPN}/libexec_weston.so"
|
||||
FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}"
|
||||
|
||||
FILES_libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so"
|
||||
SUMMARY_libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'."
|
||||
Loading…
Reference in New Issue
Block a user