Received: by mail.netbsd.org (Postfix, from userid 605) id A663484DCF; Sun, 15 Mar 2020 16:03:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2E9B384DC9 for ; Sun, 15 Mar 2020 16:03:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id szlVYpvs_czd for ; Sun, 15 Mar 2020 16:03:27 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 23C3384CDB for ; Sun, 15 Mar 2020 16:03:27 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1D634FB27; Sun, 15 Mar 2020 16:03:27 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158428820764730" MIME-Version: 1.0 Date: Sun, 15 Mar 2020 16:03:27 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/devel/wayland To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200315160327.1D634FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_158428820764730 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sun Mar 15 16:03:27 UTC 2020 Modified Files: pkgsrc/devel/wayland: Makefile distinfo pkgsrc/devel/wayland/files: event-loop-kqueue.c pkgsrc/devel/wayland/patches: patch-Makefile.am patch-configure.ac patch-src_event-loop.c patch-src_wayland-server.c Removed Files: pkgsrc/devel/wayland/patches: patch-cursor_os-compatibility.c patch-cursor_wayland-cursor.c Log Message: wayland: Update to 1.18.0 Based on a patch from wiz@, thanks! The main change I made was tricking autoconf into thinking NetBSD doesn't have posix_fallocate. 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 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/wayland/Makefile \ pkgsrc/devel/wayland/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/wayland/files/event-loop-kqueue.c cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/wayland/patches/patch-Makefile.am \ pkgsrc/devel/wayland/patches/patch-configure.ac \ pkgsrc/devel/wayland/patches/patch-src_event-loop.c \ pkgsrc/devel/wayland/patches/patch-src_wayland-server.c cvs rdiff -u -r1.2 -r0 \ pkgsrc/devel/wayland/patches/patch-cursor_os-compatibility.c \ pkgsrc/devel/wayland/patches/patch-cursor_wayland-cursor.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158428820764730 Content-Disposition: inline Content-Length: 10519 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/wayland/Makefile diff -u pkgsrc/devel/wayland/Makefile:1.7 pkgsrc/devel/wayland/Makefile:1.8 --- pkgsrc/devel/wayland/Makefile:1.7 Sun Mar 8 16:42:26 2020 +++ pkgsrc/devel/wayland/Makefile Sun Mar 15 16:03:26 2020 @@ -1,7 +1,6 @@ -# $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 -PKGREVISION= 5 +DISTNAME= wayland-1.18.0 CATEGORIES= devel MASTER_SITES= https://wayland.freedesktop.org/releases/ EXTRACT_SUFX= .tar.xz @@ -21,8 +20,14 @@ 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 Index: pkgsrc/devel/wayland/distinfo diff -u pkgsrc/devel/wayland/distinfo:1.7 pkgsrc/devel/wayland/distinfo:1.8 --- pkgsrc/devel/wayland/distinfo:1.7 Sun Jan 5 19:30:48 2020 +++ pkgsrc/devel/wayland/distinfo Sun Mar 15 16:03:26 2020 @@ -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 -RMD160 (wayland-1.17.0.tar.xz) = 635494fb0f5d9eb1e782f98e08c3e0e26ff44268 -SHA512 (wayland-1.17.0.tar.xz) = c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946 -Size (wayland-1.17.0.tar.xz) = 437680 bytes -SHA1 (patch-Makefile.am) = cfdf21bb32743590f88b6ab13ca00335f4e30475 -SHA1 (patch-configure.ac) = 57a86b0f77062d475e92123199ee61c0ac6d2443 -SHA1 (patch-cursor_os-compatibility.c) = 04bc63b40ba882dbc6babe8dca9d1619107fafb9 -SHA1 (patch-cursor_wayland-cursor.c) = 6dcb4bd2d241527e9ee62fb6ddad6447cc379ba8 -SHA1 (patch-src_event-loop.c) = 84128ea7ac073acc65d8ae2e6f4ea93f3c5fe9ec +SHA1 (wayland-1.18.0.tar.xz) = 33e5292b32a115e829458ea627201ed1e4ad4f45 +RMD160 (wayland-1.18.0.tar.xz) = 0416292a51e3f2ed9c537a94de60ff8e02273d97 +SHA512 (wayland-1.18.0.tar.xz) = e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc +Size (wayland-1.18.0.tar.xz) = 453968 bytes +SHA1 (patch-Makefile.am) = de9f10054caeb6549187639973418b9039d782ee +SHA1 (patch-configure.ac) = 01b226ecaae6ad07ce20de70e36e68990cf1daed +SHA1 (patch-src_event-loop.c) = d49eab01c973d9d124867e8ab06c091e63e697f9 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 Index: pkgsrc/devel/wayland/files/event-loop-kqueue.c diff -u pkgsrc/devel/wayland/files/event-loop-kqueue.c:1.1 pkgsrc/devel/wayland/files/event-loop-kqueue.c:1.2 --- pkgsrc/devel/wayland/files/event-loop-kqueue.c:1.1 Sun Aug 18 16:05:12 2019 +++ pkgsrc/devel/wayland/files/event-loop-kqueue.c Sun Mar 15 16:03:26 2020 @@ -25,6 +25,12 @@ #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 #include @@ -160,7 +166,7 @@ wl_event_loop_add_fd(struct wl_event_loo 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; } @@ -245,9 +251,6 @@ wl_event_source_timer_dispatch(struct wl { 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); } Index: pkgsrc/devel/wayland/patches/patch-Makefile.am diff -u pkgsrc/devel/wayland/patches/patch-Makefile.am:1.2 pkgsrc/devel/wayland/patches/patch-Makefile.am:1.3 --- pkgsrc/devel/wayland/patches/patch-Makefile.am:1.2 Sun Jan 5 19:30:48 2020 +++ pkgsrc/devel/wayland/patches/patch-Makefile.am Sun Mar 15 16:03:26 2020 @@ -1,10 +1,10 @@ -$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 \ @@ -14,12 +14,3 @@ https://lists.freedesktop.org/archives/w 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 Index: pkgsrc/devel/wayland/patches/patch-configure.ac diff -u pkgsrc/devel/wayland/patches/patch-configure.ac:1.2 pkgsrc/devel/wayland/patches/patch-configure.ac:1.3 --- pkgsrc/devel/wayland/patches/patch-configure.ac:1.2 Sun Jan 5 19:30:48 2020 +++ pkgsrc/devel/wayland/patches/patch-configure.ac Sun Mar 15 16:03:26 2020 @@ -1,12 +1,12 @@ -$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) - AC_CHECK_HEADERS([sys/prctl.h]) - AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl]) +@@ -71,6 +71,17 @@ WESTON_SEARCH_LIBS([DL], [dl], [dlsym]) + # OpenBSD doesn't have librt, but it has its functions in libc + 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 @@ -22,7 +22,7 @@ https://lists.freedesktop.org/archives/w 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]) Index: pkgsrc/devel/wayland/patches/patch-src_event-loop.c diff -u pkgsrc/devel/wayland/patches/patch-src_event-loop.c:1.2 pkgsrc/devel/wayland/patches/patch-src_event-loop.c:1.3 --- pkgsrc/devel/wayland/patches/patch-src_event-loop.c:1.2 Sun Jan 5 19:30:48 2020 +++ pkgsrc/devel/wayland/patches/patch-src_event-loop.c Sun Mar 15 16:03:26 2020 @@ -1,8 +1,8 @@ -$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. @@ -10,10 +10,10 @@ https://lists.freedesktop.org/archives/w +#include "config.h" +#ifdef HAVE_SYS_EPOLL_H + #include #include #include - #include -@@ -702,3 +704,4 @@ wl_event_loop_get_destroy_listener(struc +@@ -1088,3 +1090,4 @@ wl_event_loop_get_destroy_listener(struc { return wl_signal_get(&loop->destroy_signal, notify); } Index: pkgsrc/devel/wayland/patches/patch-src_wayland-server.c diff -u pkgsrc/devel/wayland/patches/patch-src_wayland-server.c:1.2 pkgsrc/devel/wayland/patches/patch-src_wayland-server.c:1.3 --- pkgsrc/devel/wayland/patches/patch-src_wayland-server.c:1.2 Sun Jan 5 19:30:48 2020 +++ pkgsrc/devel/wayland/patches/patch-src_wayland-server.c Sun Mar 15 16:03:26 2020 @@ -1,10 +1,10 @@ -$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 #include @@ -17,8 +17,8 @@ NetBSD support + #include "wayland-util.h" #include "wayland-private.h" - #include "wayland-server.h" -@@ -77,7 +84,17 @@ struct wl_client { + #include "wayland-server-private.h" +@@ -79,7 +86,17 @@ struct wl_client { struct wl_list link; struct wl_map objects; struct wl_priv_signal destroy_signal; @@ -36,7 +36,7 @@ NetBSD support 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) { @@ -48,7 +48,7 @@ NetBSD support 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; @@ -60,7 +60,7 @@ NetBSD support 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) { --_----------=_158428820764730--