 @@ -1,38 +1,43 @@
-# $NetBSD: Makefile,v 1.7 2020/03/08 16:42:26 bsiegert Exp $
+# $NetBSD: Makefile,v 1.8 2020/03/15 16:03:26 nia Exp $
-DISTNAME=	wayland-1.17.0
+DISTNAME=	wayland-1.18.0
 PKGREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	https://wayland.freedesktop.org/releases/
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	nia@NetBSD.org
 HOMEPAGE=	https://wayland.freedesktop.org/
 COMMENT=	Display server protocol - development libraries
 LICENSE=	mit
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 USE_TOOLS+=	autoconf automake autoreconf
 USE_TOOLS+=	gmake pkg-config
 USE_LANGUAGES=	c c++
 CONFIGURE_ARGS+=	--disable-documentation
 # No support in the kernel yet, always fails.
 # Make sure wayland falls back to ftruncate.
 CONFIGURE_ENV.NetBSD+=	ac_cv_func_posix_fallocate=no
 PKGCONFIG_OVERRIDE+=	cursor/wayland-cursor.pc.in
 PKGCONFIG_OVERRIDE+=	egl/wayland-egl-backend.pc.in
 PKGCONFIG_OVERRIDE+=	egl/wayland-egl.pc.in
 PKGCONFIG_OVERRIDE+=	src/wayland-client.pc.in
 PKGCONFIG_OVERRIDE+=	src/wayland-cursor.pc.in
 PKGCONFIG_OVERRIDE+=	src/wayland-scanner.pc.in
 PKGCONFIG_OVERRIDE+=	src/wayland-server.pc.in
 pre-configure:
 	# https://lists.freedesktop.org/archives/wayland-devel/2019-February/040024.html
 	${CP} ${FILESDIR}/event-loop-kqueue.c ${WRKSRC}/src
 	cd ${WRKSRC} && autoreconf -fvi
 .include "platform.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,17 +1,15 @@
-$NetBSD: distinfo,v 1.7 2020/01/05 19:30:48 nia Exp $
+$NetBSD: distinfo,v 1.8 2020/03/15 16:03:26 nia Exp $
-SHA1 (wayland-1.17.0.tar.xz) = 4d9e08a7a4a07fa37a25d7aa3ef83f08edec0600
+SHA1 (wayland-1.18.0.tar.xz) = 33e5292b32a115e829458ea627201ed1e4ad4f45
-RMD160 (wayland-1.17.0.tar.xz) = 635494fb0f5d9eb1e782f98e08c3e0e26ff44268
+RMD160 (wayland-1.18.0.tar.xz) = 0416292a51e3f2ed9c537a94de60ff8e02273d97
-SHA512 (wayland-1.17.0.tar.xz) = c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946
+SHA512 (wayland-1.18.0.tar.xz) = e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc
-Size (wayland-1.17.0.tar.xz) = 437680 bytes
+Size (wayland-1.18.0.tar.xz) = 453968 bytes
-SHA1 (patch-Makefile.am) = cfdf21bb32743590f88b6ab13ca00335f4e30475
+SHA1 (patch-Makefile.am) = de9f10054caeb6549187639973418b9039d782ee
-SHA1 (patch-configure.ac) = 57a86b0f77062d475e92123199ee61c0ac6d2443
+SHA1 (patch-configure.ac) = 01b226ecaae6ad07ce20de70e36e68990cf1daed
-SHA1 (patch-cursor_os-compatibility.c) = 04bc63b40ba882dbc6babe8dca9d1619107fafb9
+SHA1 (patch-src_event-loop.c) = d49eab01c973d9d124867e8ab06c091e63e697f9
 SHA1 (patch-cursor_wayland-cursor.c) = 6dcb4bd2d241527e9ee62fb6ddad6447cc379ba8
 SHA1 (patch-src_event-loop.c) = 84128ea7ac073acc65d8ae2e6f4ea93f3c5fe9ec
 SHA1 (patch-src_wayland-os.c) = eb51bf1dc539926a14848097d04bb762cf1fe962
 SHA1 (patch-src_wayland-os.h) = d07a731f081c1600c3041cc1349120031d28337f
-SHA1 (patch-src_wayland-server.c) = 25c884c08a229f2e5fe56e4b864a68ffcce2eda5
+SHA1 (patch-src_wayland-server.c) = 5d30f67968b2516f3335fb2da559883a952ed355
 SHA1 (patch-src_wayland-shm.c) = 8a2e5ae22bc400cd2c5c9dec421d536229b2943f
 SHA1 (patch-tests_os-wrappers-test.c) = a17a2e3cbab039becc8c4cb2f1be379b3bffba0e
 SHA1 (patch-tests_test-runner.c) = e97cfc48340b0de1c2642cb7cc48d9acf0a533eb

 @@ -15,26 +15,32 @@
+ *
  * 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.
  */
 #include "config.h"
 #ifndef container_of
 #define container_of(ptr, type, member) ({ \
     const typeof(((type *)0)->member) * __mptr = (ptr); \
     (type *)((char *)__mptr - offsetof(type, member)); })
 #endif
 #ifdef HAVE_SYS_EVENT_H
 #include <stddef.h>
 #include <stdio.h>
 #include <err.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 @@ -150,27 +156,27 @@ wl_event_loop_add_fd(struct wl_event_loo
 	unsigned int num_events = 0;
 	source = malloc(sizeof *source);
 	if (source == NULL)
 		return NULL;
 	source->base.interface = &fd_source_interface;
 	source->base.fd = wl_os_dupfd_cloexec(fd, 0);
 	source->func = func;
 	source->fd = fd;
 	add_source(loop, &source->base, mask, data);
 	if (source->base.fd < 0) {
-		fprintf(stderr, "could not add source\n: %m");
+		fprintf(stderr, "could not add source\n: %s", strerror(errno));
 		free(source);
 		return NULL;
+	}
 	if (mask & WL_EVENT_READABLE) {
 		EV_SET(&events[num_events], source->base.fd, EVFILT_READ,
 		      EV_ADD | EV_ENABLE, 0, 0, &source->base);
 		num_events++;
+	}
 	if (mask & WL_EVENT_WRITABLE) {
 		EV_SET(&events[num_events], source->base.fd, EVFILT_WRITE,
 		      EV_ADD | EV_ENABLE, 0, 0, &source->base);
 @@ -235,29 +241,26 @@ wl_event_source_fd_update(struct wl_even
 struct wl_event_source_timer {
 	struct wl_event_source base;
 	wl_event_loop_timer_func_t func;
 };
 /** \endcond */
 static int
 wl_event_source_timer_dispatch(struct wl_event_source *source,
 			       struct kevent *ev)
+{
 	struct wl_event_source_timer *timer_source =
 		(struct wl_event_source_timer *) source;
 	uint64_t expires;
 	expires = ev->data;    /* XXX unused?! */
 	return timer_source->func(timer_source->base.data);
+}
 struct wl_event_source_interface timer_source_interface = {
 	wl_event_source_timer_dispatch,
 };
 /** Create a timer event source
+ *
  * \param loop The event loop that will process the new source.
  * \param func The timer dispatch function.
  * \param data User data.
  * \return A new timer event source.

 @@ -1,25 +1,16 @@
-$NetBSD: patch-Makefile.am,v 1.2 2020/01/05 19:30:48 nia Exp $
+$NetBSD: patch-Makefile.am,v 1.3 2020/03/15 16:03:26 nia Exp $
 https://lists.freedesktop.org/archives/wayland-devel/2019-February/040024.html
---- Makefile.am.orig	2019-03-21 00:55:25.000000000 +0000
+--- Makefile.am.orig	2020-02-11 23:46:03.000000000 +0000
 +++ Makefile.am
-@@ -76,7 +76,8 @@ libwayland_server_la_LDFLAGS = -version-
+@@ -78,7 +78,8 @@ libwayland_server_la_LDFLAGS = -version-
  libwayland_server_la_SOURCES =			\
  	src/wayland-server.c			\
  	src/wayland-shm.c			\
 -	src/event-loop.c
 +	src/event-loop.c			\
 +	src/event-loop-kqueue.c
  nodist_libwayland_server_la_SOURCES =		\
  	protocol/wayland-server-protocol.h	\
@@ -227,7 +228,7 @@ libtest_runner_la_LIBADD =			\
  	libwayland-client.la			\
  	libwayland-server.la			\
  	libtest-helpers.la			\
 -	-lrt -ldl $(FFI_LIBS)
 +	-lrt $(DL_LIBS) $(FFI_LIBS)
  array_test_SOURCES = tests/array-test.c
  array_test_LDADD = libtest-runner.la

 @@ -1,38 +1,38 @@
-$NetBSD: patch-configure.ac,v 1.2 2020/01/05 19:30:48 nia Exp $
+$NetBSD: patch-configure.ac,v 1.3 2020/03/15 16:03:26 nia Exp $
 https://lists.freedesktop.org/archives/wayland-devel/2019-February/040024.html
---- configure.ac.orig	2019-03-21 00:55:25.000000000 +0000
+--- configure.ac.orig	2020-02-11 23:46:03.000000000 +0000
 +++ configure.ac
-@@ -65,6 +65,17 @@ AC_SUBST(GCC_CFLAGS)
+@@ -71,6 +71,17 @@ WESTON_SEARCH_LIBS([DL], [dl], [dlsym])
- AC_CHECK_HEADERS([sys/prctl.h])
+ # OpenBSD doesn't have librt, but it has its functions in libc
- AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl])
+ WESTON_SEARCH_LIBS([RT], [rt], [clock_gettime])
 +AC_CHECK_HEADERS([sys/epoll.h sys/event.h])
 +if test "x$ac_cv_header_sys_epoll_h" != "xyes" && test "x$ac_cv_header_sys_event_h" != "xyes"; then
 +	AC_MSG_ERROR([Can't find sys/epoll.h or sys/event.h. Please ensure either epoll or kqueue is available.])
 +fi
++
 +AC_CHECK_HEADERS([sys/ucred.h])
++
 +# dlopen()
 +AC_CHECK_LIB([dl], [dlsym], [DL_LIBS=-ldl])
 +AC_SUBST([DL_LIBS])
++
  AC_ARG_ENABLE([libraries],
  	      [AC_HELP_STRING([--disable-libraries],
  			      [Disable compilation of wayland libraries])],
-@@ -100,12 +111,14 @@ AC_SUBST([ICONDIR])
+@@ -106,12 +117,14 @@ AC_SUBST([ICONDIR])
  if test "x$enable_libraries" = "xyes"; then
  	PKG_CHECK_MODULES(FFI, [libffi])
 -	AC_CHECK_DECL(SFD_CLOEXEC,[],
 -		      [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland libraries")],
 -		      [[#include <sys/signalfd.h>]])
 -	AC_CHECK_DECL(TFD_CLOEXEC,[],
 -		      [AC_MSG_ERROR("TFD_CLOEXEC is needed to compile wayland libraries")],
 -		      [[#include <sys/timerfd.h>]])
 +	if test "x$ac_cv_header_sys_epoll_h" = "xyes"; then
 +		AC_CHECK_DECL(SFD_CLOEXEC,[],
 +			      [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland libraries")],
 +			      [[#include <sys/signalfd.h>]])

 @@ -1,20 +1,20 @@
-$NetBSD: patch-src_event-loop.c,v 1.2 2020/01/05 19:30:48 nia Exp $
+$NetBSD: patch-src_event-loop.c,v 1.3 2020/03/15 16:03:26 nia Exp $
 https://lists.freedesktop.org/archives/wayland-devel/2019-February/040024.html
---- src/event-loop.c.orig	2019-03-21 00:55:25.000000000 +0000
+--- src/event-loop.c.orig	2020-02-11 23:46:03.000000000 +0000
 +++ src/event-loop.c
 @@ -23,6 +23,8 @@
   * SOFTWARE.
   */
 +#include "config.h"
 +#ifdef HAVE_SYS_EPOLL_H
  #include <assert.h>
  #include <stddef.h>
  #include <stdio.h>
- #include <errno.h>
+@@ -1088,3 +1090,4 @@ wl_event_loop_get_destroy_listener(struc
@@ -702,3 +704,4 @@ wl_event_loop_get_destroy_listener(struc
+ {
  	return wl_signal_get(&loop->destroy_signal, notify);
+ }
 +#endif /* HAVE_SYS_EPOLL_H */

 @@ -1,76 +1,76 @@
-$NetBSD: patch-src_wayland-server.c,v 1.2 2020/01/05 19:30:48 nia Exp $
+$NetBSD: patch-src_wayland-server.c,v 1.3 2020/03/15 16:03:26 nia Exp $
 NetBSD support
---- src/wayland-server.c.orig	2019-03-21 00:55:25.000000000 +0000
+--- src/wayland-server.c.orig	2020-02-11 23:46:03.000000000 +0000
 +++ src/wayland-server.c
-@@ -43,6 +43,13 @@
+@@ -44,6 +44,13 @@
  #include <sys/file.h>
  #include <sys/stat.h>
 +#include "../config.h"
++
 +#ifdef HAVE_SYS_UCRED_H
 +#include <sys/types.h>
 +#include <sys/ucred.h>
 +#endif
++
  #include "wayland-util.h"
  #include "wayland-private.h"
- #include "wayland-server.h"
+ #include "wayland-server-private.h"
-@@ -77,7 +84,17 @@ struct wl_client {
+@@ -79,7 +86,17 @@ struct wl_client {
  	struct wl_list link;
  	struct wl_map objects;
  	struct wl_priv_signal destroy_signal;
 +#ifdef HAVE_SYS_UCRED_H
 +#ifdef __NetBSD__
 +	struct uucred ucred;
 +#else
 +	/* FreeBSD */
 +	struct xucred ucred;
 +#endif
 +#else
 +	/* Linux */
  	struct ucred ucred;
 +#endif
  	int error;
  	struct wl_priv_signal resource_created_signal;
  };
-@@ -312,7 +329,11 @@ wl_resource_post_error(struct wl_resourc
+@@ -315,7 +332,11 @@ wl_resource_post_error(struct wl_resourc
  static void
  destroy_client_with_error(struct wl_client *client, const char *reason)
+ {
 +#ifdef __linux__
  	wl_log("%s (pid %u)\n", reason, client->ucred.pid);
 +#else
 +	wl_log("Destroying with error: %s\n", reason);
 +#endif
  	wl_client_destroy(client);
+ }
-@@ -527,9 +548,11 @@ wl_client_create(struct wl_display *disp
+@@ -530,9 +551,11 @@ wl_client_create(struct wl_display *disp
  		goto err_client;
  	len = sizeof client->ucred;
 +#ifdef SO_PEERCRED
  	if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED,
  		       &client->ucred, &len) < 0)
  		goto err_source;
 +#endif
  	client->connection = wl_connection_create(fd);
  	if (client->connection == NULL)
-@@ -583,12 +606,23 @@ WL_EXPORT void
+@@ -586,12 +609,23 @@ WL_EXPORT void
  wl_client_get_credentials(struct wl_client *client,
  			  pid_t *pid, uid_t *uid, gid_t *gid)
+ {
 +#ifdef HAVE_SYS_UCRED_H
 +	/* BSD */
 +	if (pid)
 +		*pid = 0; /* FIXME: should be set*/
 +	if (uid)
 +		*uid = client->ucred.cr_uid;
 +	if (gid)
 +		*gid = client->ucred.cr_gid;
 +#else
 +	/* Linux */