svn commit: r527044 - in head/graphics/wayland: . files
Jan Beich
jbeich at FreeBSD.org
Mon Feb 24 20:01:21 UTC 2020
Author: jbeich
Date: Mon Feb 24 20:01:19 2020
New Revision: 527044
URL: https://svnweb.freebsd.org/changeset/ports/527044
Log:
graphics/wayland: convert to USES=meson
- Drop autotools patches
- Drop sys/param.h check as __FreeBSD__ is defined by compiler
- Apply upstream fix for tests randomly failing to build
PR: 244071
Tested by: mikael (13.0 powerpc64), pkubaj (12.1/13.0 powerpc64)
Approved by: x11 (manu, zeising)
Differential Revision: https://reviews.freebsd.org/D23644
Added:
head/graphics/wayland/files/patch-meson.build (contents, props changed)
head/graphics/wayland/files/patch-src_meson.build (contents, props changed)
Deleted:
head/graphics/wayland/files/patch-Makefile.am
head/graphics/wayland/files/patch-configure.ac
Modified:
head/graphics/wayland/Makefile (contents, props changed)
head/graphics/wayland/distinfo (contents, props changed)
head/graphics/wayland/files/patch-tests_test-helpers.c (contents, props changed)
head/graphics/wayland/files/patch-tests_test-runner.c (contents, props changed)
Modified: head/graphics/wayland/Makefile
==============================================================================
--- head/graphics/wayland/Makefile Mon Feb 24 20:01:06 2020 (r527043)
+++ head/graphics/wayland/Makefile Mon Feb 24 20:01:19 2020 (r527044)
@@ -7,6 +7,9 @@ PORTREVISION= 1
CATEGORIES= graphics wayland
MASTER_SITES= https://wayland.freedesktop.org/releases/
+PATCH_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/commit/
+PATCHFILES+= 0fc00fff3015.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/60
+
MAINTAINER= x11 at FreeBSD.org
COMMENT= Wayland composite "server"
@@ -19,12 +22,13 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \
CFLAGS+= "-I${LOCALBASE}/include/libepoll-shim"
-USES= autoreconf gmake gnome libtool localbase pathfix pkgconfig tar:xz
+USES= meson pkgconfig tar:xz
USE_GNOME= libxslt:build
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-documentation
-CONFIGURE_ENV= ac_cv_func_posix_fallocate=no # EINVAL on ZFS since FreeBSD 12.0
-INSTALL_TARGET= install-strip
+MESON_ARGS= -Ddocumentation=false
+
+post-patch:
+# posix_fallocate returns EINVAL on ZFS since FreeBSD 12.0
+ @${REINPLACE_CMD} '/posix_fallocate/d' ${WRKSRC}/meson.build
.include <bsd.port.mk>
Modified: head/graphics/wayland/distinfo
==============================================================================
--- head/graphics/wayland/distinfo Mon Feb 24 20:01:06 2020 (r527043)
+++ head/graphics/wayland/distinfo Mon Feb 24 20:01:19 2020 (r527044)
@@ -1,3 +1,5 @@
TIMESTAMP = 1581464763
SHA256 (wayland-1.18.0.tar.xz) = 4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d
SIZE (wayland-1.18.0.tar.xz) = 453968
+SHA256 (0fc00fff3015.patch) = 5e36dc6d5b28bb2062afe8e66e8069555701b3bbf4c7e233903761346e8b3432
+SIZE (0fc00fff3015.patch) = 3868
Added: head/graphics/wayland/files/patch-meson.build
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/wayland/files/patch-meson.build Mon Feb 24 20:01:19 2020 (r527044)
@@ -0,0 +1,33 @@
+--- meson.build.orig 2020-02-11 23:46:03 UTC
++++ meson.build
+@@ -26,7 +26,14 @@ add_project_arguments(
+ language: 'c'
+ )
+
+-foreach h: [ 'sys/prctl.h' ]
++have_headers = [
++ 'signal.h',
++ 'sys/epoll.h',
++ 'sys/prctl.h',
++ 'sys/ucred.h',
++]
++
++foreach h: have_headers
+ config_h.set('HAVE_' + h.underscorify().to_upper(), cc.has_header(h))
+ endforeach
+
+@@ -37,12 +44,14 @@ have_funcs = [
+ 'prctl',
+ 'memfd_create',
+ 'strndup',
++ 'waitid',
+ ]
+ foreach f: have_funcs
+ config_h.set('HAVE_' + f.underscorify().to_upper(), cc.has_function(f))
+ endforeach
+
+ if get_option('libraries')
++ epoll_dep = dependency('epoll-shim', required: false)
+ ffi_dep = dependency('libffi')
+
+ decls = [
Added: head/graphics/wayland/files/patch-src_meson.build
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/wayland/files/patch-src_meson.build Mon Feb 24 20:01:19 2020 (r527044)
@@ -0,0 +1,36 @@
+--- src/meson.build.orig 2020-02-11 23:46:03 UTC
++++ src/meson.build
+@@ -71,7 +71,7 @@ if get_option('libraries')
+ 'connection.c',
+ 'wayland-os.c'
+ ],
+- dependencies: [ ffi_dep, ]
++ dependencies: [ epoll_dep, ffi_dep, ]
+ )
+
+ wayland_private_dep = declare_dependency(
+@@ -145,6 +145,7 @@ if get_option('libraries')
+ ],
+ version: '0.1.0',
+ dependencies: [
++ epoll_dep,
+ ffi_dep,
+ wayland_private_dep,
+ wayland_util_dep,
+@@ -158,7 +159,7 @@ if get_option('libraries')
+ wayland_server_dep = declare_dependency(
+ link_with: wayland_server,
+ include_directories: [ root_inc, include_directories('.') ],
+- dependencies: [ ffi_dep, mathlib_dep, threads_dep ],
++ dependencies: [ epoll_dep, ffi_dep, mathlib_dep, threads_dep ],
+ sources: [
+ wayland_server_protocol_core_h,
+ wayland_server_protocol_h
+@@ -187,6 +188,7 @@ if get_option('libraries')
+ ],
+ version: '0.3.0',
+ dependencies: [
++ epoll_dep,
+ ffi_dep,
+ wayland_private_dep,
+ wayland_util_dep,
Modified: head/graphics/wayland/files/patch-tests_test-helpers.c
==============================================================================
--- head/graphics/wayland/files/patch-tests_test-helpers.c Mon Feb 24 20:01:06 2020 (r527043)
+++ head/graphics/wayland/files/patch-tests_test-helpers.c Mon Feb 24 20:01:19 2020 (r527044)
@@ -1,19 +1,15 @@
--- tests/test-helpers.c.orig 2020-02-11 23:46:03 UTC
+++ tests/test-helpers.c
-@@ -25,6 +25,12 @@
+@@ -25,6 +25,8 @@
#include "config.h"
+#include "../config.h"
+
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
-+
#include <assert.h>
#include <errno.h>
#include <dirent.h>
-@@ -41,6 +47,16 @@
+@@ -41,6 +43,16 @@
#include "test-runner.h"
@@ -30,7 +26,7 @@
int
count_open_fds(void)
{
-@@ -48,8 +64,8 @@ count_open_fds(void)
+@@ -48,8 +60,8 @@ count_open_fds(void)
struct dirent *ent;
int count = 0;
@@ -41,7 +37,7 @@
errno = 0;
while ((ent = readdir(dir))) {
-@@ -58,7 +74,7 @@ count_open_fds(void)
+@@ -58,7 +70,7 @@ count_open_fds(void)
continue;
count++;
}
Modified: head/graphics/wayland/files/patch-tests_test-runner.c
==============================================================================
--- head/graphics/wayland/files/patch-tests_test-runner.c Mon Feb 24 20:01:06 2020 (r527043)
+++ head/graphics/wayland/files/patch-tests_test-runner.c Mon Feb 24 20:01:19 2020 (r527044)
@@ -1,19 +1,15 @@
--- tests/test-runner.c.orig 2020-02-11 23:46:03 UTC
+++ tests/test-runner.c
-@@ -25,6 +25,12 @@
+@@ -25,6 +25,8 @@
#define _GNU_SOURCE
+#include "../config.h"
+
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
-+
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
-@@ -37,13 +43,23 @@
+@@ -37,13 +39,23 @@
#include <errno.h>
#include <limits.h>
#include <sys/ptrace.h>
@@ -37,7 +33,7 @@
/* when set to 1, check if tests are not leaking opened files.
* It is turned on by default. It can be turned off by
* WAYLAND_TEST_NO_LEAK_CHECK environment variable. */
-@@ -51,7 +67,7 @@ int fd_leak_check_enabled;
+@@ -51,7 +63,7 @@ int fd_leak_check_enabled;
/* when this var is set to 0, every call to test_set_timeout() is
* suppressed - handy when debugging the test. Can be set by
@@ -46,7 +42,7 @@
static int timeouts_enabled = 1;
/* set to one if the output goes to the terminal */
-@@ -239,6 +255,8 @@ is_debugger_attached(void)
+@@ -239,6 +251,8 @@ is_debugger_attached(void)
return 0;
}
@@ -55,7 +51,7 @@
pid = fork();
if (pid == -1) {
perror("fork");
-@@ -259,13 +277,14 @@ is_debugger_attached(void)
+@@ -259,13 +273,14 @@ is_debugger_attached(void)
_exit(1);
if (!waitpid(-1, NULL, 0))
_exit(1);
@@ -71,7 +67,7 @@
rc = prctl(PR_SET_PTRACER, pid);
if (rc != 0 && errno != EINVAL) {
/* An error prevents us from telling if a debugger is attached.
-@@ -275,7 +294,9 @@ is_debugger_attached(void)
+@@ -275,7 +290,9 @@ is_debugger_attached(void)
*/
perror("prctl");
write(pipefd[1], "-", 1);
@@ -82,7 +78,7 @@
/* Signal to client that parent is ready by passing '+' */
write(pipefd[1], "+", 1);
}
-@@ -293,7 +314,11 @@ int main(int argc, char *argv[])
+@@ -293,7 +310,11 @@ int main(int argc, char *argv[])
const struct test *t;
pid_t pid;
int total, pass;
@@ -94,7 +90,7 @@
if (isatty(fileno(stderr)))
is_atty = 1;
-@@ -336,7 +361,8 @@ int main(int argc, char *argv[])
+@@ -336,7 +357,8 @@ int main(int argc, char *argv[])
if (pid == 0)
run_test(t); /* never returns */
@@ -104,7 +100,7 @@
stderr_set_color(RED);
fprintf(stderr, "waitid failed: %s\n",
strerror(errno));
-@@ -368,6 +394,25 @@ int main(int argc, char *argv[])
+@@ -368,6 +390,25 @@ int main(int argc, char *argv[])
break;
}
More information about the svn-ports-all
mailing list