mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 12:32:12 +02:00
wayland: upgrade 1.17.0 -> 1.18.0
This is the official release for Wayland 1.18. The main new features in this release are: - Add support for the Meson build system (autotools is still supported but will be removed in a future release) - Add API to tag proxy objects to allow applications and toolkits to share the same Wayland connection - Track wayland-server timers in user-space to prevent creating too many FDs - Add wl_global_remove, a new function to mitigate race conditions with globals https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html 2 upstreamed patches are dropped. (From OE-Core rev: c127e7ac7c6da11417a599384002fd7c1420c7c2) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Denys Dmytriyenko
committed by
Richard Purdie
Richard Purdie
parent
dbfc4e6948
commit
3151b0b19c
@@ -1,50 +0,0 @@
|
||||
From 3c8b4467a1ca229e72fb5223787ed400a19c65c0 Mon Sep 17 00:00:00 2001
|
||||
From: Joshua Watt <JPEWhacker@gmail.com>
|
||||
Date: Fri, 25 Oct 2019 21:03:23 -0500
|
||||
Subject: [PATCH] scanner: Add configure check for strndup
|
||||
|
||||
Some platforms may not have strndup() (e.g. MinGW), so provide a
|
||||
equivalent implementation if it's not found.
|
||||
|
||||
Upstream-Status: Accepted [4a1f348c20157db7bd7c759fdeb23fbe8729c571]
|
||||
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
src/scanner.c | 11 +++++++++++
|
||||
2 files changed, 12 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 8d56f2b..1c99e21 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -63,7 +63,7 @@ fi
|
||||
AC_SUBST(GCC_CFLAGS)
|
||||
|
||||
AC_CHECK_HEADERS([sys/prctl.h])
|
||||
-AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl])
|
||||
+AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl strndup])
|
||||
|
||||
AC_ARG_ENABLE([libraries],
|
||||
[AC_HELP_STRING([--disable-libraries],
|
||||
diff --git a/src/scanner.c b/src/scanner.c
|
||||
index a94be5d..27004bc 100644
|
||||
--- a/src/scanner.c
|
||||
+++ b/src/scanner.c
|
||||
@@ -916,6 +916,17 @@ verify_arguments(struct parse_context *ctx,
|
||||
|
||||
}
|
||||
|
||||
+#ifndef HAVE_STRNDUP
|
||||
+char *
|
||||
+strndup(const char *s, size_t size)
|
||||
+{
|
||||
+ char *r = malloc(size + 1);
|
||||
+ strncpy(r, s, size);
|
||||
+ r[size] = '\0';
|
||||
+ return r;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
static void
|
||||
end_element(void *data, const XML_Char *name)
|
||||
{
|
||||
@@ -1,166 +0,0 @@
|
||||
From e746f3bf7c8bb2f5dcf9e93edffc23b56eff12d0 Mon Sep 17 00:00:00 2001
|
||||
From: Joshua Watt <JPEWhacker@gmail.com>
|
||||
Date: Tue, 5 Nov 2019 09:09:50 -0600
|
||||
Subject: [PATCH] Move wl_priv_signal to wayland-server-private.h
|
||||
|
||||
Including wayland-server-core.h in wayland-private.h is problematic
|
||||
because wayland-private.h is included by wayland-scanner which should be
|
||||
able to build against non-POSIX platforms (e.g. MinGW). The only reason
|
||||
that wayland-server-core.h was included in wayland-private.h was for the
|
||||
wl_private_signal definitions, so move those to a
|
||||
wayland-server-private.h file that can be included by both
|
||||
wayland-server.c and the tests.
|
||||
|
||||
Upstream-Status: Accepted [e7d88f35eb89cf0cc77cbddd834cacc63683a9cc]
|
||||
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
|
||||
---
|
||||
Makefile.am | 3 +-
|
||||
src/wayland-private.h | 22 +--------------
|
||||
src/wayland-server-private.h | 53 ++++++++++++++++++++++++++++++++++++
|
||||
src/wayland-server.c | 1 +
|
||||
tests/newsignal-test.c | 2 +-
|
||||
5 files changed, 58 insertions(+), 23 deletions(-)
|
||||
create mode 100644 src/wayland-server-private.h
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index f47d055..026d981 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -56,7 +56,8 @@ libwayland_private_la_SOURCES = \
|
||||
src/connection.c \
|
||||
src/wayland-os.c \
|
||||
src/wayland-os.h \
|
||||
- src/wayland-private.h
|
||||
+ src/wayland-private.h \
|
||||
+ src/wayland-server-private.h
|
||||
|
||||
include_HEADERS = \
|
||||
src/wayland-util.h \
|
||||
diff --git a/src/wayland-private.h b/src/wayland-private.h
|
||||
index 29516ec..dc7d12f 100644
|
||||
--- a/src/wayland-private.h
|
||||
+++ b/src/wayland-private.h
|
||||
@@ -31,11 +31,11 @@
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
+#include <stdbool.h>
|
||||
|
||||
#define WL_HIDE_DEPRECATED 1
|
||||
|
||||
#include "wayland-util.h"
|
||||
-#include "wayland-server-core.h"
|
||||
|
||||
/* Invalid memory address */
|
||||
#define WL_ARRAY_POISON_PTR (void *) 4
|
||||
@@ -236,26 +236,6 @@ zalloc(size_t s)
|
||||
return calloc(1, s);
|
||||
}
|
||||
|
||||
-struct wl_priv_signal {
|
||||
- struct wl_list listener_list;
|
||||
- struct wl_list emit_list;
|
||||
-};
|
||||
-
|
||||
-void
|
||||
-wl_priv_signal_init(struct wl_priv_signal *signal);
|
||||
-
|
||||
-void
|
||||
-wl_priv_signal_add(struct wl_priv_signal *signal, struct wl_listener *listener);
|
||||
-
|
||||
-struct wl_listener *
|
||||
-wl_priv_signal_get(struct wl_priv_signal *signal, wl_notify_func_t notify);
|
||||
-
|
||||
-void
|
||||
-wl_priv_signal_emit(struct wl_priv_signal *signal, void *data);
|
||||
-
|
||||
-void
|
||||
-wl_priv_signal_final_emit(struct wl_priv_signal *signal, void *data);
|
||||
-
|
||||
void
|
||||
wl_connection_close_fds_in(struct wl_connection *connection, int max);
|
||||
|
||||
diff --git a/src/wayland-server-private.h b/src/wayland-server-private.h
|
||||
new file mode 100644
|
||||
index 0000000..23fa458
|
||||
--- /dev/null
|
||||
+++ b/src/wayland-server-private.h
|
||||
@@ -0,0 +1,53 @@
|
||||
+/*
|
||||
+ * Copyright © 2008-2011 Kristian Høgsberg
|
||||
+ * Copyright © 2011 Intel Corporation
|
||||
+ * Copyright © 2013 Jason Ekstrand
|
||||
+ *
|
||||
+ * Permission is hereby granted, free of charge, to any person obtaining
|
||||
+ * a copy of this software and associated documentation files (the
|
||||
+ * "Software"), to deal in the Software without restriction, including
|
||||
+ * without limitation the rights to use, copy, modify, merge, publish,
|
||||
+ * distribute, sublicense, and/or sell copies of the Software, and to
|
||||
+ * permit persons to whom the Software is furnished to do so, subject to
|
||||
+ * the following conditions:
|
||||
+ *
|
||||
+ * The above copyright notice and this permission notice (including the
|
||||
+ * next paragraph) shall be included in all copies or substantial
|
||||
+ * portions of the Software.
|
||||
+ *
|
||||
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
+ * SOFTWARE.
|
||||
+ */
|
||||
+
|
||||
+#ifndef WAYLAND_SERVER_PRIVATE_H
|
||||
+#define WAYLAND_SERVER_PRIVATE_H
|
||||
+
|
||||
+#include "wayland-server-core.h"
|
||||
+
|
||||
+struct wl_priv_signal {
|
||||
+ struct wl_list listener_list;
|
||||
+ struct wl_list emit_list;
|
||||
+};
|
||||
+
|
||||
+void
|
||||
+wl_priv_signal_init(struct wl_priv_signal *signal);
|
||||
+
|
||||
+void
|
||||
+wl_priv_signal_add(struct wl_priv_signal *signal, struct wl_listener *listener);
|
||||
+
|
||||
+struct wl_listener *
|
||||
+wl_priv_signal_get(struct wl_priv_signal *signal, wl_notify_func_t notify);
|
||||
+
|
||||
+void
|
||||
+wl_priv_signal_emit(struct wl_priv_signal *signal, void *data);
|
||||
+
|
||||
+void
|
||||
+wl_priv_signal_final_emit(struct wl_priv_signal *signal, void *data);
|
||||
+
|
||||
+#endif
|
||||
diff --git a/src/wayland-server.c b/src/wayland-server.c
|
||||
index 19f6a76..d6f0206 100644
|
||||
--- a/src/wayland-server.c
|
||||
+++ b/src/wayland-server.c
|
||||
@@ -45,6 +45,7 @@
|
||||
|
||||
#include "wayland-util.h"
|
||||
#include "wayland-private.h"
|
||||
+#include "wayland-server-private.h"
|
||||
#include "wayland-server.h"
|
||||
#include "wayland-os.h"
|
||||
|
||||
diff --git a/tests/newsignal-test.c b/tests/newsignal-test.c
|
||||
index 47c429b..f3a7bd9 100644
|
||||
--- a/tests/newsignal-test.c
|
||||
+++ b/tests/newsignal-test.c
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <assert.h>
|
||||
|
||||
#include "test-runner.h"
|
||||
-#include "wayland-private.h"
|
||||
+#include "wayland-server-private.h"
|
||||
|
||||
static void
|
||||
signal_notify(struct wl_listener *listener, void *data)
|
||||
@@ -13,12 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
|
||||
DEPENDS = "expat libffi wayland-native"
|
||||
|
||||
SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
|
||||
file://fixpathinpcfiles.patch \
|
||||
file://0001-scanner-Add-configure-check-for-strndup.patch \
|
||||
file://0002-Move-wl_priv_signal-to-wayland-server-private.h.patch \
|
||||
file://fixpathinpcfiles.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "d91f970aea11fd549eae023d06f91af3"
|
||||
SRC_URI[sha256sum] = "72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4"
|
||||
SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65"
|
||||
SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
|
||||
|
||||
Reference in New Issue
Block a user