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