[Midnightbsd-cvs] mports [24936] trunk/graphics: update wayland
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Feb 9 12:33:43 EST 2019
Revision: 24936
http://svnweb.midnightbsd.org/mports/?rev=24936
Author: laffer1
Date: 2019-02-09 12:33:42 -0500 (Sat, 09 Feb 2019)
Log Message:
-----------
update wayland
Modified Paths:
--------------
trunk/graphics/wayland/Makefile
trunk/graphics/wayland/distinfo
trunk/graphics/wayland/files/patch-Makefile.am
trunk/graphics/wayland/files/patch-configure.ac
trunk/graphics/wayland/files/patch-src_wayland-server.c
trunk/graphics/wayland/files/patch-src_wayland-shm.c
trunk/graphics/wayland/files/patch-tests_sanity-test.c
trunk/graphics/wayland/files/patch-tests_test-helpers.c
trunk/graphics/wayland/files/patch-tests_test-runner.c
trunk/graphics/wayland/pkg-plist
trunk/graphics/wayland-protocols/Makefile
trunk/graphics/wayland-protocols/distinfo
trunk/graphics/wayland-protocols/pkg-plist
Modified: trunk/graphics/wayland/Makefile
===================================================================
--- trunk/graphics/wayland/Makefile 2019-02-09 17:33:24 UTC (rev 24935)
+++ trunk/graphics/wayland/Makefile 2019-02-09 17:33:42 UTC (rev 24936)
@@ -1,9 +1,9 @@
# $MidnightBSD$
PORTNAME= wayland
-PORTVERSION= 1.14.0
+PORTVERSION= 1.16.0
CATEGORIES= graphics wayland
-MASTER_SITES= http://wayland.freedesktop.org/releases/
+MASTER_SITES= https://wayland.freedesktop.org/releases/
MAINTAINER= ports at MidnightBSD.org
COMMENT= Wayland composite "server"
@@ -11,10 +11,6 @@
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
@@ -23,7 +19,7 @@
WITH_DEBUG= 1
-USES= autoreconf gmake libtool localbase pathfix pkgconfig tar:xz
+USES= autoreconf gmake gnome libtool localbase pathfix pkgconfig tar:xz
USE_GNOME= libxslt:build
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
Modified: trunk/graphics/wayland/distinfo
===================================================================
--- trunk/graphics/wayland/distinfo 2019-02-09 17:33:24 UTC (rev 24935)
+++ trunk/graphics/wayland/distinfo 2019-02-09 17:33:42 UTC (rev 24936)
@@ -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
Modified: trunk/graphics/wayland/files/patch-Makefile.am
===================================================================
--- trunk/graphics/wayland/files/patch-Makefile.am 2019-02-09 17:33:24 UTC (rev 24935)
+++ trunk/graphics/wayland/files/patch-Makefile.am 2019-02-09 17:33:42 UTC (rev 24936)
@@ -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 \
Modified: trunk/graphics/wayland/files/patch-configure.ac
===================================================================
--- trunk/graphics/wayland/files/patch-configure.ac 2019-02-09 17:33:24 UTC (rev 24935)
+++ trunk/graphics/wayland/files/patch-configure.ac 2019-02-09 17:33:42 UTC (rev 24936)
@@ -1,9 +1,9 @@
---- 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)
+@@ -65,6 +65,25 @@ 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])
-
+AC_CHECK_HEADERS([sys/signalfd.h sys/timerfd.h])
+
+# Use epoll on Linux and epoll-shim (kqueue) on BSD
@@ -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])
+
Modified: trunk/graphics/wayland/files/patch-src_wayland-server.c
===================================================================
--- trunk/graphics/wayland/files/patch-src_wayland-server.c 2019-02-09 17:33:24 UTC (rev 24935)
+++ trunk/graphics/wayland/files/patch-src_wayland-server.c 2019-02-09 17:33:42 UTC (rev 24936)
@@ -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)
{
Modified: trunk/graphics/wayland/files/patch-src_wayland-shm.c
===================================================================
--- trunk/graphics/wayland/files/patch-src_wayland-shm.c 2019-02-09 17:33:24 UTC (rev 24935)
+++ trunk/graphics/wayland/files/patch-src_wayland-shm.c 2019-02-09 17:33:42 UTC (rev 24936)
@@ -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;
}
+
Modified: trunk/graphics/wayland/files/patch-tests_sanity-test.c
===================================================================
--- trunk/graphics/wayland/files/patch-tests_sanity-test.c 2019-02-09 17:33:24 UTC (rev 24935)
+++ trunk/graphics/wayland/files/patch-tests_sanity-test.c 2019-02-09 17:33:42 UTC (rev 24936)
@@ -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];
Modified: trunk/graphics/wayland/files/patch-tests_test-helpers.c
===================================================================
--- trunk/graphics/wayland/files/patch-tests_test-helpers.c 2019-02-09 17:33:24 UTC (rev 24935)
+++ trunk/graphics/wayland/files/patch-tests_test-helpers.c 2019-02-09 17:33:42 UTC (rev 24936)
@@ -1,9 +1,9 @@
---- 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"
+
+#ifdef HAVE_SYS_PARAM_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++;
}
Modified: trunk/graphics/wayland/files/patch-tests_test-runner.c
===================================================================
--- trunk/graphics/wayland/files/patch-tests_test-runner.c 2019-02-09 17:33:24 UTC (rev 24935)
+++ trunk/graphics/wayland/files/patch-tests_test-runner.c 2019-02-09 17:33:42 UTC (rev 24936)
@@ -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;
}
Modified: trunk/graphics/wayland/pkg-plist
===================================================================
--- trunk/graphics/wayland/pkg-plist 2019-02-09 17:33:24 UTC (rev 24935)
+++ trunk/graphics/wayland/pkg-plist 2019-02-09 17:33:42 UTC (rev 24936)
@@ -3,6 +3,7 @@
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.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
Modified: trunk/graphics/wayland-protocols/Makefile
===================================================================
--- trunk/graphics/wayland-protocols/Makefile 2019-02-09 17:33:24 UTC (rev 24935)
+++ trunk/graphics/wayland-protocols/Makefile 2019-02-09 17:33:42 UTC (rev 24936)
@@ -2,7 +2,7 @@
# $FreeBSD: head/graphics/wayland-protocols/Makefile 457191 2017-12-24 18:50:24Z swills $
PORTNAME= wayland-protocols
-PORTVERSION= 1.12
+PORTVERSION= 1.16
CATEGORIES= graphics wayland
MASTER_SITES= https://wayland.freedesktop.org/releases/
Modified: trunk/graphics/wayland-protocols/distinfo
===================================================================
--- trunk/graphics/wayland-protocols/distinfo 2019-02-09 17:33:24 UTC (rev 24935)
+++ trunk/graphics/wayland-protocols/distinfo 2019-02-09 17:33:42 UTC (rev 24936)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512813750
-SHA256 (wayland-protocols-1.12.tar.xz) = 3b19e8a9e1e19474756a7069db23b90ca9b8ebb438448c6063b4a7fc89b7c8b2
-SIZE (wayland-protocols-1.12.tar.xz) = 98920
+TIMESTAMP = 1539381001
+SHA256 (wayland-protocols-1.16.tar.xz) = 6b1485951fdcd36a960c870c46f28b03a3e5121fb46246916333ed07f78c98c5
+SIZE (wayland-protocols-1.16.tar.xz) = 104156
Modified: trunk/graphics/wayland-protocols/pkg-plist
===================================================================
--- trunk/graphics/wayland-protocols/pkg-plist 2019-02-09 17:33:24 UTC (rev 24935)
+++ trunk/graphics/wayland-protocols/pkg-plist 2019-02-09 17:33:42 UTC (rev 24936)
@@ -5,6 +5,7 @@
%%DATADIR%%/unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml
%%DATADIR%%/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml
%%DATADIR%%/unstable/input-method/input-method-unstable-v1.xml
+%%DATADIR%%/unstable/input-timestamps/input-timestamps-unstable-v1.xml
%%DATADIR%%/unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml
%%DATADIR%%/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml
%%DATADIR%%/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml
@@ -13,6 +14,8 @@
%%DATADIR%%/unstable/tablet/tablet-unstable-v1.xml
%%DATADIR%%/unstable/tablet/tablet-unstable-v2.xml
%%DATADIR%%/unstable/text-input/text-input-unstable-v1.xml
+%%DATADIR%%/unstable/text-input/text-input-unstable-v3.xml
+%%DATADIR%%/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
%%DATADIR%%/unstable/xdg-foreign/xdg-foreign-unstable-v1.xml
%%DATADIR%%/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml
%%DATADIR%%/unstable/xdg-output/xdg-output-unstable-v1.xml
More information about the Midnightbsd-cvs
mailing list