graphics/wayland: update to 1.16.0

- New libwayland-egl home for consumers as Mesa 18.2 dropped it

Changes:	https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html
Changes:	https://lists.freedesktop.org/archives/wayland-devel/2018-August/039358.html
PR:		227423
Submitted by:	Greg V <greg@unrelenting.technology>
Approved by:	maintainer timeout (5 months)

10 files changed, 76 insertions, 46 deletions

diff --git a/graphics/wayland/Makefile b/graphics/wayland/Makefile
index 9b080a722cb8..0792e79d44c5 100644
--- a/graphics/wayland/Makefile
+++ b/graphics/wayland/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wayland
-PORTVERSION=	1.14.0
+PORTVERSION=	1.16.0
 CATEGORIES=	graphics wayland
 MASTER_SITES=	http://wayland.freedesktop.org/releases/
 
@@ -12,10 +12,6 @@ COMMENT=	Wayland composite "server"
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_mips=		fails to compile: tests/test-runner.c:349: undefined reference to prctl
-BROKEN_mips64=		fails to compile: tests/test-runner.c:349: undefined reference to prctl
-BROKEN_powerpc64=	fails to compile: tests/test-runner.c:349: undefined reference to prctl
-
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libffi.so:devel/libffi \
 		libepoll-shim.so:devel/libepoll-shim
@@ -24,7 +20,7 @@ CFLAGS+=	"-I${LOCALBASE}/include/libepoll-shim"
 
 WITH_DEBUG=	1
 
-USES=		autoreconf gmake libtool localbase pathfix pkgconfig tar:xz
+USES=		autoreconf gnome gmake libtool localbase pathfix pkgconfig tar:xz
 USE_GNOME=	libxslt:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/wayland/distinfo b/graphics/wayland/distinfo
index a3e7e4e8c171..832c30b75ffe 100644
--- a/graphics/wayland/distinfo
+++ b/graphics/wayland/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1507715269
-SHA256 (wayland-1.14.0.tar.xz) = ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8
-SIZE (wayland-1.14.0.tar.xz) = 413960
+TIMESTAMP = 1539381179
+SHA256 (wayland-1.16.0.tar.xz) = 4e72c2b56109ccfb6610d776e465f4ca0af2280c9c2f7d5cc23f0ed2548752f5
+SIZE (wayland-1.16.0.tar.xz) = 435216
diff --git a/graphics/wayland/files/patch-Makefile.am b/graphics/wayland/files/patch-Makefile.am
index c25dd8f2752b..e65a6e7ffcd4 100644
--- a/graphics/wayland/files/patch-Makefile.am
+++ b/graphics/wayland/files/patch-Makefile.am
@@ -1,6 +1,6 @@
---- Makefile.am.orig	2017-05-05 11:54:01 UTC
+--- Makefile.am.orig	2018-04-10 14:53:32 UTC
 +++ Makefile.am
-@@ -73,7 +73,7 @@ nodist_include_HEADERS =			\
+@@ -71,7 +71,7 @@ nodist_include_HEADERS =			\
  	protocol/wayland-client-protocol.h
  
  libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread
@@ -9,7 +9,7 @@
  libwayland_server_la_LDFLAGS = -version-info 1:0:1
  libwayland_server_la_SOURCES =			\
  	src/wayland-server.c			\
-@@ -85,7 +85,7 @@ nodist_libwayland_server_la_SOURCES =		\
+@@ -83,7 +83,7 @@ nodist_libwayland_server_la_SOURCES =		\
  	protocol/wayland-protocol.c
  
  libwayland_client_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread
@@ -18,7 +18,7 @@
  libwayland_client_la_LDFLAGS = -version-info 3:0:3
  libwayland_client_la_SOURCES =			\
  	src/wayland-client.c
-@@ -198,7 +198,7 @@ libtest_runner_la_LIBADD =			\
+@@ -223,7 +223,7 @@ libtest_runner_la_LIBADD =			\
  	libwayland-util.la			\
  	libwayland-client.la			\
  	libwayland-server.la			\
diff --git a/graphics/wayland/files/patch-configure.ac b/graphics/wayland/files/patch-configure.ac
index d24a8bd7eb60..7139fff12da1 100644
--- a/graphics/wayland/files/patch-configure.ac
+++ b/graphics/wayland/files/patch-configure.ac
@@ -1,8 +1,8 @@
---- configure.ac.orig	2017-08-08 18:20:52 UTC
+--- configure.ac.orig	2018-08-24 18:04:36 UTC
 +++ configure.ac
-@@ -63,6 +63,25 @@ AC_SUBST(GCC_CFLAGS)
- 
- AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate])
+@@ -65,6 +65,25 @@ AC_SUBST(GCC_CFLAGS)
+ AC_CHECK_HEADERS([sys/prctl.h])
+ AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl])
  
 +AC_CHECK_HEADERS([sys/signalfd.h sys/timerfd.h])
 +
@@ -26,7 +26,7 @@
  AC_ARG_ENABLE([libraries],
  	      [AC_HELP_STRING([--disable-libraries],
  			      [Disable compilation of wayland libraries])],
-@@ -98,17 +117,21 @@ AC_SUBST([ICONDIR])
+@@ -100,16 +119,20 @@ AC_SUBST([ICONDIR])
  
  if test "x$enable_libraries" = "xyes"; then
  	PKG_CHECK_MODULES(FFI, [libffi])
@@ -42,11 +42,10 @@
  	AC_CHECK_DECL(CLOCK_MONOTONIC,[],
  		      [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland libraries")],
  		      [[#include <time.h>]])
- 	AC_CHECK_HEADERS([execinfo.h])
  fi
 +
 +EPOLLSHIM_LIBS="-lepoll-shim"
 +AC_SUBST(EPOLLSHIM_LIBS)
  
- PKG_CHECK_MODULES(EXPAT, [expat], [],
- 	[AC_CHECK_HEADERS(expat.h, [],
+ PKG_CHECK_MODULES(EXPAT, [expat])
+ 
diff --git a/graphics/wayland/files/patch-src_wayland-server.c b/graphics/wayland/files/patch-src_wayland-server.c
index 51d25f28e43f..608bab6ca88b 100644
--- a/graphics/wayland/files/patch-src_wayland-server.c
+++ b/graphics/wayland/files/patch-src_wayland-server.c
@@ -1,4 +1,4 @@
---- src/wayland-server.c.orig	2017-08-08 18:20:52 UTC
+--- src/wayland-server.c.orig	2018-04-09 17:19:26 UTC
 +++ src/wayland-server.c
 @@ -25,6 +25,8 @@
  
@@ -35,7 +35,21 @@
  	int error;
  	struct wl_priv_signal resource_created_signal;
  };
-@@ -501,10 +514,20 @@ wl_client_create(struct wl_display *display, int fd)
+@@ -303,7 +316,13 @@ wl_resource_post_error(struct wl_resource *resource,
+ static void
+ destroy_client_with_error(struct wl_client *client, const char *reason)
+ {
++#ifdef HAVE_SYS_UCRED_H
++	/* FreeBSD */
++	wl_log("%s\n", reason);
++#else
++	/* Linux */
+ 	wl_log("%s (pid %u)\n", reason, client->ucred.pid);
++#endif
+ 	wl_client_destroy(client);
+ }
+ 
+@@ -517,10 +536,20 @@ wl_client_create(struct wl_display *display, int fd)
  	if (!client->source)
  		goto err_client;
  
@@ -56,7 +70,7 @@
  
  	client->connection = wl_connection_create(fd);
  	if (client->connection == NULL)
-@@ -558,12 +581,23 @@ WL_EXPORT void
+@@ -574,12 +603,23 @@ WL_EXPORT void
  wl_client_get_credentials(struct wl_client *client,
  			  pid_t *pid, uid_t *uid, gid_t *gid)
  {
diff --git a/graphics/wayland/files/patch-src_wayland-shm.c b/graphics/wayland/files/patch-src_wayland-shm.c
index 9dfb9c95bb7c..df55cb3f1b60 100644
--- a/graphics/wayland/files/patch-src_wayland-shm.c
+++ b/graphics/wayland/files/patch-src_wayland-shm.c
@@ -1,4 +1,4 @@
---- src/wayland-shm.c.orig	2017-08-08 18:20:52 UTC
+--- src/wayland-shm.c.orig	2018-04-09 17:19:26 UTC
 +++ src/wayland-shm.c
 @@ -30,6 +30,8 @@
  
@@ -131,7 +131,7 @@
  shm_pool_resize(struct wl_client *client, struct wl_resource *resource,
  		int32_t size)
 @@ -284,7 +369,14 @@ shm_create_pool(struct wl_client *client, struct wl_re
- 				       "failed mmap fd %d", fd);
+ 				       "failed mmap fd %d: %m", fd);
  		goto err_free;
  	}
 +
diff --git a/graphics/wayland/files/patch-tests_sanity-test.c b/graphics/wayland/files/patch-tests_sanity-test.c
index fab1eaec289a..961355aa92ce 100644
--- a/graphics/wayland/files/patch-tests_sanity-test.c
+++ b/graphics/wayland/files/patch-tests_sanity-test.c
@@ -1,6 +1,6 @@
---- tests/sanity-test.c.orig	2016-02-17 01:13:16 UTC
+--- tests/sanity-test.c.orig	2018-04-09 17:19:26 UTC
 +++ tests/sanity-test.c
-@@ -92,7 +92,8 @@ FAIL_TEST(sanity_malloc_direct)
+@@ -97,7 +97,8 @@ FAIL_TEST(sanity_malloc_direct)
  TEST(disable_leak_checks)
  {
  	volatile void *mem;
@@ -10,7 +10,7 @@
  	/* normally this should be on the beginning of the test.
  	 * Here we need to be sure, that the leak checks are
  	 * turned on */
-@@ -171,7 +172,8 @@ sanity_fd_no_leak(void)
+@@ -183,7 +184,8 @@ sanity_fd_no_leak(void)
  {
  	int fd[2];
  
diff --git a/graphics/wayland/files/patch-tests_test-helpers.c b/graphics/wayland/files/patch-tests_test-helpers.c
index 8be22e6e9052..1e275db0574a 100644
--- a/graphics/wayland/files/patch-tests_test-helpers.c
+++ b/graphics/wayland/files/patch-tests_test-helpers.c
@@ -1,8 +1,8 @@
---- tests/test-helpers.c.orig	2015-07-06 19:38:51 UTC
+--- tests/test-helpers.c.orig	2018-08-24 18:04:36 UTC
 +++ tests/test-helpers.c
-@@ -23,6 +23,12 @@
-  * SOFTWARE.
-  */
+@@ -25,6 +25,12 @@
+ 
+ #include "config.h"
  
 +#include "../config.h"
 +
@@ -13,7 +13,7 @@
  #include <assert.h>
  #include <errno.h>
  #include <dirent.h>
-@@ -32,6 +38,16 @@
+@@ -40,6 +46,16 @@
  
  #include "test-runner.h"
  
@@ -30,7 +30,7 @@
  int
  count_open_fds(void)
  {
-@@ -39,8 +55,8 @@ count_open_fds(void)
+@@ -47,8 +63,8 @@ count_open_fds(void)
  	struct dirent *ent;
  	int count = 0;
  
@@ -41,7 +41,7 @@
  
  	errno = 0;
  	while ((ent = readdir(dir))) {
-@@ -49,7 +65,7 @@ count_open_fds(void)
+@@ -57,7 +73,7 @@ count_open_fds(void)
  			continue;
  		count++;
  	}
diff --git a/graphics/wayland/files/patch-tests_test-runner.c b/graphics/wayland/files/patch-tests_test-runner.c
index 27f2523bf86d..a020c1e8ff16 100644
--- a/graphics/wayland/files/patch-tests_test-runner.c
+++ b/graphics/wayland/files/patch-tests_test-runner.c
@@ -1,4 +1,4 @@
---- tests/test-runner.c.orig	2017-08-08 18:20:52 UTC
+--- tests/test-runner.c.orig	2018-08-24 18:04:36 UTC
 +++ tests/test-runner.c
 @@ -25,6 +25,12 @@
  
@@ -17,7 +17,7 @@
  #include <errno.h>
  #include <limits.h>
  #include <sys/ptrace.h>
-+#ifdef __linux__
++#ifdef HAVE_SYS_PRCTL_H
  #include <sys/prctl.h>
 +#endif
  #ifndef PR_SET_PTRACER
@@ -84,7 +84,7 @@
  	pid = fork();
  	if (pid == -1) {
  		perror("fork");
-@@ -312,7 +339,7 @@ is_debugger_attached(void)
+@@ -312,13 +339,14 @@ is_debugger_attached(void)
  			_exit(1);
  		if (!waitpid(-1, NULL, 0))
  			_exit(1);
@@ -93,7 +93,25 @@
  		ptrace(PTRACE_DETACH, ppid, NULL, NULL);
  		_exit(0);
  	} else {
-@@ -346,17 +373,19 @@ int main(int argc, char *argv[])
+ 		close(pipefd[0]);
+ 
+ 		/* Enable child to ptrace the parent process */
++#if defined(HAVE_PRCTL)
+ 		rc = prctl(PR_SET_PTRACER, pid);
+ 		if (rc != 0 && errno != EINVAL) {
+ 			/* An error prevents us from telling if a debugger is attached.
+@@ -328,7 +356,9 @@ is_debugger_attached(void)
+ 			 */
+ 			perror("prctl");
+ 			write(pipefd[1], "-", 1);
+-		} else {
++		} else
++#endif
++		{
+ 			/* Signal to client that parent is ready by passing '+' */
+ 			write(pipefd[1], "+", 1);
+ 		}
+@@ -346,17 +376,19 @@ int main(int argc, char *argv[])
  	const struct test *t;
  	pid_t pid;
  	int total, pass;
@@ -116,7 +134,7 @@
  	if (is_debugger_attached()) {
  		leak_check_enabled = 0;
  		timeouts_enabled = 0;
-@@ -364,7 +393,17 @@ int main(int argc, char *argv[])
+@@ -364,7 +396,17 @@ int main(int argc, char *argv[])
  		leak_check_enabled = !getenv("WAYLAND_TEST_NO_LEAK_CHECK");
  		timeouts_enabled = !getenv("WAYLAND_TEST_NO_TIMEOUTS");
  	}
@@ -134,7 +152,7 @@
  	if (argc == 2 && strcmp(argv[1], "--help") == 0)
  		usage(argv[0], EXIT_SUCCESS);
  
-@@ -395,7 +434,8 @@ int main(int argc, char *argv[])
+@@ -395,7 +437,8 @@ int main(int argc, char *argv[])
  		if (pid == 0)
  			run_test(t); /* never returns */
  
@@ -144,7 +162,7 @@
  			stderr_set_color(RED);
  			fprintf(stderr, "waitid failed: %m\n");
  			stderr_reset_color();
-@@ -426,6 +466,25 @@ int main(int argc, char *argv[])
+@@ -426,6 +469,25 @@ int main(int argc, char *argv[])
  
  			break;
  		}
diff --git a/graphics/wayland/pkg-plist b/graphics/wayland/pkg-plist
index ccbc459bd7c5..cc92f9a6a551 100644
--- a/graphics/wayland/pkg-plist
+++ b/graphics/wayland/pkg-plist
@@ -3,6 +3,7 @@ include/wayland-client-core.h
 include/wayland-client-protocol.h
 include/wayland-client.h
 include/wayland-cursor.h
+include/wayland-egl-backend.h
 include/wayland-egl-core.h
 include/wayland-egl.h
 include/wayland-server-core.h
@@ -10,20 +11,22 @@ include/wayland-server-protocol.h
 include/wayland-server.h
 include/wayland-util.h
 include/wayland-version.h
-lib/libwayland-client.a
 lib/libwayland-client.so
 lib/libwayland-client.so.0
 lib/libwayland-client.so.0.3.0
-lib/libwayland-cursor.a
 lib/libwayland-cursor.so
 lib/libwayland-cursor.so.0
 lib/libwayland-cursor.so.0.0.0
-lib/libwayland-server.a
+lib/libwayland-egl.so
+lib/libwayland-egl.so.1
+lib/libwayland-egl.so.1.0.0
 lib/libwayland-server.so
 lib/libwayland-server.so.0
 lib/libwayland-server.so.0.1.0
 libdata/pkgconfig/wayland-client.pc
 libdata/pkgconfig/wayland-cursor.pc
+libdata/pkgconfig/wayland-egl-backend.pc
+libdata/pkgconfig/wayland-egl.pc
 libdata/pkgconfig/wayland-scanner.pc
 libdata/pkgconfig/wayland-server.pc
 share/aclocal/wayland-scanner.m4