mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 21:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

weston: uprev to 7.0.0

Browse Source 
- Adjust patches to comply with weston-7.0.0.
- Also drop the obsolete patch 0001-make-error-portable.patch.

(From OE-Core rev: 1b0ce3ec1d3254afa2cf3ac7ecfd736124d711cc)

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ming Liu
2019-09-06 11:35:20 +08:00
committed by Richard Purdie
parent e77c32d164
commit 45b12bdcb3
3 changed files with 28 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
View File

@@ -1,80 +0,0 @@
From c4677e155736062e75687f1a655732c8902e912b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 May 2015 20:56:00 -0700
Subject: [PATCH] make error() portable
error() is not posix but gnu extension so may not be available on all
kind of systemsi e.g. musl.
Upstream-Status: Submitted
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ming Liu <ming.liu@toradex.com>
---
libweston/weston-error.h | 20 ++++++++++++++++++++
libweston/weston-launch.c | 2 +-
meson.build | 1 +
3 files changed, 22 insertions(+), 1 deletion(-)
create mode 100644 libweston/weston-error.h
diff --git a/libweston/weston-error.h b/libweston/weston-error.h
new file mode 100644
index 0000000..2089d02
--- /dev/null
+++ b/libweston/weston-error.h
@@ -0,0 +1,20 @@
+#ifndef _WESTON_ERROR_H
+#define _WESTON_ERROR_H
+
+#if defined(HAVE_ERROR_H)
+#include <error.h>
+#else
+#include <err.h>
+#include <string.h>
+#define _weston_error(S, E, F, ...) do { \
+ if (E) \
+ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \
+ else \
+ err(S, F, ##__VA_ARGS__); \
+} while(0)
+
+#define error _weston_error
+#endif
+
+#endif
+
diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
index bf73e0d..9064439 100644
--- a/libweston/weston-launch.c
+++ b/libweston/weston-launch.c
@@ -33,7 +33,6 @@
#include <poll.h>
#include <errno.h>
-#include <error.h>
#include <getopt.h>
#include <sys/types.h>
@@ -59,6 +58,7 @@
#endif
#include "weston-launch.h"
+#include "weston-error.h"
#define DRM_MAJOR 226
diff --git a/meson.build b/meson.build
index 2155b7b..baa52d9 100644
--- a/meson.build
+++ b/meson.build
@@ -94,6 +94,7 @@ foreach func : optional_libc_funcs
endforeach
optional_system_headers = [
+ 'error.h',
'linux/sync_file.h'
]
foreach hdr : optional_system_headers
--
2.7.4

47
meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
View File

@@ -1,4 +1,4 @@
From 7d2fea61a95e9498b5a19c8cffcb2ab5631d5685 Mon Sep 17 00:00:00 2001
From 682b7d79a7b81ec8e38760381104b24ad549e8c0 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
@@ -18,16 +18,16 @@ 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 | 20 ++++++++++++++++++++
libweston/weston-launch.c | 21 +++++++++++++++++++++
meson_options.txt | 7 +++++++
3 files changed, 39 insertions(+), 4 deletions(-)
3 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/libweston/meson.build b/libweston/meson.build
index 33ab970..32f495a 100644
index d8d3fc0..326683f 100644
--- a/libweston/meson.build
+++ b/libweston/meson.build
@@ -472,16 +472,24 @@ if get_option('renderer-gl')
endif
@@ -199,16 +199,24 @@ dep_vertex_clipping = declare_dependency(
)
if get_option('weston-launch')
- dep_pam = cc.find_library('pam')
@@ -56,7 +56,7 @@ index 33ab970..32f495a 100644
install: true
)
diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
index 9064439..c6abe92 100644
index 4962bd6..fc531c5 100644
--- a/libweston/weston-launch.c
+++ b/libweston/weston-launch.c
@@ -51,7 +51,9 @@
@@ -69,7 +69,7 @@ index 9064439..c6abe92 100644
#ifdef HAVE_SYSTEMD_LOGIN
#include <systemd/sd-login.h>
@@ -101,8 +103,10 @@ drmSetMaster(int drm_fd)
@@ -100,8 +102,10 @@ drmSetMaster(int drm_fd)
#endif
struct weston_launch {
@@ -80,7 +80,7 @@ index 9064439..c6abe92 100644
int tty;
int ttynr;
int sock[2];
@@ -191,6 +195,7 @@ weston_launch_allowed(struct weston_launch *wl)
@@ -192,6 +196,7 @@ weston_launch_allowed(struct weston_launch *wl)
return false;
}
@@ -88,7 +88,7 @@ index 9064439..c6abe92 100644
static int
pam_conversation_fn(int msg_count,
const struct pam_message **messages,
@@ -231,6 +236,7 @@ setup_pam(struct weston_launch *wl)
@@ -232,6 +237,7 @@ setup_pam(struct weston_launch *wl)
return 0;
}
@@ -96,7 +96,7 @@ index 9064439..c6abe92 100644
static int
setup_launcher_socket(struct weston_launch *wl)
@@ -424,6 +430,7 @@ quit(struct weston_launch *wl, int status)
@@ -431,6 +437,7 @@ quit(struct weston_launch *wl, int status)
close(wl->signalfd);
close(wl->sock[0]);
@@ -104,7 +104,7 @@ index 9064439..c6abe92 100644
if (wl->new_user) {
err = pam_close_session(wl->ph, 0);
if (err)
@@ -431,6 +438,7 @@ quit(struct weston_launch *wl, int status)
@@ -438,6 +445,7 @@ quit(struct weston_launch *wl, int status)
err, pam_strerror(wl->ph, err));
pam_end(wl->ph, err);
}
@@ -112,7 +112,7 @@ index 9064439..c6abe92 100644
if (ioctl(wl->tty, KDSKBMUTE, 0) &&
ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
@@ -610,6 +618,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
@@ -660,6 +668,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 +120,7 @@ index 9064439..c6abe92 100644
env = pam_getenvlist(wl->ph);
if (env) {
for (i = 0; env[i]; ++i) {
@@ -618,6 +627,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
@@ -668,6 +677,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
}
free(env);
}
@@ -128,7 +128,7 @@ index 9064439..c6abe92 100644
/*
* We open a new session, so it makes sense
@@ -685,8 +695,10 @@ static void
@@ -739,8 +749,10 @@ static void
help(const char *name)
{
fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
@@ -139,7 +139,7 @@ index 9064439..c6abe92 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");
@@ -700,7 +712,9 @@ main(int argc, char *argv[])
@@ -754,7 +766,9 @@ main(int argc, char *argv[])
int i, c;
char *tty = NULL;
struct option opts[] = {
@@ -149,21 +149,24 @@ index 9064439..c6abe92 100644
{ "tty", required_argument, NULL, 't' },
{ "verbose", no_argument, NULL, 'v' },
{ "help", no_argument, NULL, 'h' },
@@ -712,9 +726,13 @@ main(int argc, char *argv[])
@@ -766,11 +780,16 @@ main(int argc, char *argv[])
while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
switch (c) {
case 'u':
+#ifdef HAVE_PAM
wl.new_user = optarg;
if (getuid() != 0)
error(1, 0, "Permission denied. -u allowed for root only");
if (getuid() != 0) {
fprintf(stderr, "weston: Permission denied. -u allowed for root only\n");
exit(EXIT_FAILURE);
}
+#else
+ error(1, 0, "-u is unsupported in this weston-launch build");
+ fprintf(stderr, "weston: -u is unsupported in this weston-launch build\n");
+ exit(EXIT_FAILURE);
+#endif
break;
case 't':
tty = optarg;
@@ -755,8 +773,10 @@ main(int argc, char *argv[])
@@ -822,8 +841,10 @@ main(int argc, char *argv[])
if (setup_tty(&wl, tty) < 0)
exit(EXIT_FAILURE);
@@ -175,7 +178,7 @@ index 9064439..c6abe92 100644
if (setup_launcher_socket(&wl) < 0)
exit(EXIT_FAILURE);
diff --git a/meson_options.txt b/meson_options.txt
index 0e1d183..9a5c3d5 100644
index d5bf1d5..254eb2b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -73,6 +73,13 @@ option(

7
meta/recipes-graphics/wayland/weston_6.0.1.bb → meta/recipes-graphics/wayland/weston_7.0.0.bb
View File

@@ -9,11 +9,10 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
file://weston.png \
file://weston.desktop \
file://xwayland.weston-start \
file://0001-make-error-portable.patch \
file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
"
SRC_URI[md5sum] = "e7b10710ef1eac82258f97bfd41fe534"
SRC_URI[sha256sum] = "bf2f6d5aae2e11cabb6bd69a76bcf9edb084f8c3e14ca769bea7234a513155b4"
SRC_URI[md5sum] = "cbfda483bc2501d0831af3f33c707850"
SRC_URI[sha256sum] = "a00a6d207b6a45f95f4401c604772a307c3767e5e2beecf3d879110c43909a64"
UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
@@ -26,7 +25,7 @@ DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native"
WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"
EXTRA_OEMESON += "-Dbackend-default=auto -Dbackend-rdp=false"
EXTRA_OEMESON += "-Dbackend-default=auto -Dbackend-rdp=false -Dpipewire=false"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \