Attachment #198077 for bug #227423

Lines 94-100 WAYLAND_CFLAGS= -I${LOCALBASE}/include/libepoll-shim Link Here

(-)w/devel/efl/Makefile (-1 / +1 lines)
94	WAYLAND_LDFLAGS= -lepoll-shim	94	WAYLAND_LDFLAGS= -lepoll-shim
95	WAYLAND_CONFIGURE_ENABLE= wayland	95	WAYLAND_CONFIGURE_ENABLE= wayland
96		96
97	WAYLAND_EGL_LIB_DEPENDS= libwayland-egl.so:graphics/mesa-libs	97	WAYLAND_EGL_LIB_DEPENDS= libwayland-egl.so:graphics/wayland
98	WAYLAND_EGL_CONFIGURE_ENABLE= egl	98	WAYLAND_EGL_CONFIGURE_ENABLE= egl
99	WAYLANG_EGL_USE= GL=egl	99	WAYLANG_EGL_USE= GL=egl
100	WAYLAND_EGL_IMPLIES= WAYLAND OPENGLES	100	WAYLAND_EGL_IMPLIES= WAYLAND OPENGLES

Lines 26-33 OPTIONS_EXCLUDE_FreeBSD_10= WAYLAND # needs dev/evdev/input.h Link Here

(-)w/graphics/glfw/Makefile (-2 / +1 lines)
26		26
27	WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols	27	WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols
28	WAYLAND_CMAKE_BOOL= GLFW_USE_WAYLAND	28	WAYLAND_CMAKE_BOOL= GLFW_USE_WAYLAND
29	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \	29	WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland \
30	libwayland-egl.so:graphics/mesa-libs \
31	libxkbcommon.so:x11/libxkbcommon	30	libxkbcommon.so:x11/libxkbcommon
32	WAYLAND_USES= kde:5 pkgconfig	31	WAYLAND_USES= kde:5 pkgconfig
33	WAYLAND_USE= KDE=ecm	32	WAYLAND_USE= KDE=ecm




%%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so.1.0.0
%%INTEL_VDRIVER%%lib/libvulkan_intel.so
%%RADEON_VDRIVER%%lib/libvulkan_radeon.so
@comment lib/libwayland-egl.so
@comment lib/libwayland-egl.so.1
@comment lib/libwayland-egl.so.1.0.0
libdata/pkgconfig/dri.pc
@comment libdata/pkgconfig/egl.pc
@comment libdata/pkgconfig/gbm.pc
@comment libdata/pkgconfig/gl.pc
@comment libdata/pkgconfig/glesv2.pc
@comment libdata/pkgconfig/osmesa.pc
@comment libdata/pkgconfig/wayland-egl.pc
%%INTEL_VDRIVER%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json
%%RADEON_VDRIVER%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json

Lines 3-8 Link Here

(-)w/graphics/mesa-libs/Makefile (+1 lines)
3		3
4	PORTNAME= mesa-libs	4	PORTNAME= mesa-libs
5	PORTVERSION= ${MESAVERSION}	5	PORTVERSION= ${MESAVERSION}
		6	PORTREVISION= 1
6	CATEGORIES= graphics	7	CATEGORIES= graphics
7		8
8	COMMENT= OpenGL libraries that support GLX and EGL clients	9	COMMENT= OpenGL libraries that support GLX and EGL clients

Lines 36-46 lib/libgbm.so.1.0.0 Link Here

(-)w/graphics/mesa-libs/pkg-plist (-4 lines)
36	lib/libglapi.so	36	lib/libglapi.so
37	lib/libglapi.so.0	37	lib/libglapi.so.0
38	lib/libglapi.so.0.0.0	38	lib/libglapi.so.0.0.0
39	%%WAYLAND%%lib/libwayland-egl.so
40	%%WAYLAND%%lib/libwayland-egl.so.1
41	%%WAYLAND%%lib/libwayland-egl.so.1.0.0
42	%%EGL%%libdata/pkgconfig/egl.pc	39	%%EGL%%libdata/pkgconfig/egl.pc
43	libdata/pkgconfig/gbm.pc	40	libdata/pkgconfig/gbm.pc
44	libdata/pkgconfig/gl.pc	41	libdata/pkgconfig/gl.pc
45	libdata/pkgconfig/glesv2.pc	42	libdata/pkgconfig/glesv2.pc
46	%%WAYLAND%%libdata/pkgconfig/wayland-egl.pc





PORTNAME=	wayland
DISTVERSION=	${QT5_VERSION}
PORTREVISION=	1
CATEGORIES=	graphics
PKGNAMEPREFIX=	qt5-



LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		libwayland-egl.so:graphics/wayland \
		libxkbcommon.so:x11/libxkbcommon

USES=		pkgconfig qmake:norecursive qt-dist:5,wayland


USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}

OPTIONS_DEFINE=	WAYLAND
WAYLAND_DESC=		Requires graphics/mesa-libs with WAYLAND on
WAYLAND_IGNORE_OFF=	Cannot be built without wayland support
WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/mesa-libs

.include <bsd.port.mk>




PORTNAME=	vulkan-loader
DISTVERSIONPREFIX=sdk-
DISTVERSION=	1.1.82.0
PORTREVISION=	1
CATEGORIES=	graphics devel

MAINTAINER=	greg@unrelenting.technology

CMAKE_OFF=	BUILD_TESTS BUILD_WSI_MIR_SUPPORT

OPTIONS_DEFINE=	XLIB XCB WAYLAND
OPTIONS_DEFAULT=XLIB XCB WAYLAND

XLIB_DESC=	Build Xlib WSI (Window System Integration) support
XCB_DESC=	Build XCB WSI (Window System Integration) support

XCB_LIB_DEPENDS=	libX11-xcb.so:x11/libX11 \
			libxcb.so:x11/libxcb
WAYLAND_CMAKE_BOOL=	BUILD_WSI_WAYLAND_SUPPORT
WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland

post-patch:
# Non-x86 targets use C code, so don't abort without GNU as (e.g., on aarch64)

Lines 13-18 libdata/pkgconfig/wayland-protocols.pc Link Here

(-)w/graphics/wayland-protocols/pkg-plist (+2 lines)
13	%%DATADIR%%/unstable/tablet/tablet-unstable-v1.xml	13	%%DATADIR%%/unstable/tablet/tablet-unstable-v1.xml
14	%%DATADIR%%/unstable/tablet/tablet-unstable-v2.xml	14	%%DATADIR%%/unstable/tablet/tablet-unstable-v2.xml
15	%%DATADIR%%/unstable/text-input/text-input-unstable-v1.xml	15	%%DATADIR%%/unstable/text-input/text-input-unstable-v1.xml
		16	%%DATADIR%%/unstable/text-input/text-input-unstable-v3.xml
		17	%%DATADIR%%/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
16	%%DATADIR%%/unstable/xdg-foreign/xdg-foreign-unstable-v1.xml	18	%%DATADIR%%/unstable/xdg-foreign/xdg-foreign-unstable-v1.xml
17	%%DATADIR%%/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml	19	%%DATADIR%%/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml
18	%%DATADIR%%/unstable/xdg-output/xdg-output-unstable-v1.xml	20	%%DATADIR%%/unstable/xdg-output/xdg-output-unstable-v1.xml




# $FreeBSD$

PORTNAME=	wayland
PORTVERSION=	1.16.0
CATEGORIES=	graphics wayland
MASTER_SITES=	http://wayland.freedesktop.org/releases/


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


WITH_DEBUG=	1

USES=		autoreconf gnome gmake libtool localbase pathfix pkgconfig tar:xz
USE_GNOME=	libxslt:build
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes

Lines 1-3 Link Here

(-)w/graphics/wayland/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1507715269	1	TIMESTAMP = 1539381179
2	SHA256 (wayland-1.14.0.tar.xz) = ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8	2	SHA256 (wayland-1.16.0.tar.xz) = 4e72c2b56109ccfb6610d776e465f4ca0af2280c9c2f7d5cc23f0ed2548752f5
3	SIZE (wayland-1.14.0.tar.xz) = 413960	3	SIZE (wayland-1.16.0.tar.xz) = 435216




--- Makefile.am.orig	2018-04-10 14:53:32 UTC
+++ Makefile.am
@@ -71,7 +71,7 @@ nodist_include_HEADERS =			\
 	protocol/wayland-client-protocol.h
 
 libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread

 libwayland_server_la_LDFLAGS = -version-info 1:0:1
 libwayland_server_la_SOURCES =			\
 	src/wayland-server.c			\
@@ -83,7 +83,7 @@ nodist_libwayland_server_la_SOURCES =		\
 	protocol/wayland-protocol.c
 
 libwayland_client_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread

 libwayland_client_la_LDFLAGS = -version-info 3:0:3
 libwayland_client_la_SOURCES =			\
 	src/wayland-client.c
@@ -223,7 +223,7 @@ libtest_runner_la_LIBADD =			\
 	libwayland-util.la			\
 	libwayland-client.la			\
 	libwayland-server.la			\




--- configure.ac.orig	2018-08-24 18:04:36 UTC
+++ configure.ac
@@ -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])
+

 AC_ARG_ENABLE([libraries],
 	      [AC_HELP_STRING([--disable-libraries],
 			      [Disable compilation of wayland libraries])],
@@ -100,16 +119,20 @@ AC_SUBST([ICONDIR])
 
 if test "x$enable_libraries" = "xyes"; then
 	PKG_CHECK_MODULES(FFI, [libffi])

 	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])
 




--- src/wayland-server.c.orig	2018-04-09 17:19:26 UTC
+++ src/wayland-server.c
@@ -25,6 +25,8 @@
 

 	int error;
 	struct wl_priv_signal resource_created_signal;
 };
@@ -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;
 

 
 	client->connection = wl_connection_create(fd);
 	if (client->connection == NULL)
@@ -574,12 +603,23 @@ WL_EXPORT void
 wl_client_get_credentials(struct wl_client *client,
 			  pid_t *pid, uid_t *uid, gid_t *gid)
 {

Lines 1-4 Link Here

(-)w/graphics/wayland/files/patch-src_wayland-shm.c (-2 / +2 lines)
1	--- src/wayland-shm.c.orig 2017-08-08 18:20:52 UTC	1	--- src/wayland-shm.c.orig 2018-04-09 17:19:26 UTC
2	+++ src/wayland-shm.c	2	+++ src/wayland-shm.c
3	@@ -30,6 +30,8 @@	3	@@ -30,6 +30,8 @@
4		4
Lines 131-137 Link Here
131	shm_pool_resize(struct wl_client client, struct wl_resource resource,	131	shm_pool_resize(struct wl_client client, struct wl_resource resource,
132	int32_t size)	132	int32_t size)
133	@@ -284,7 +369,14 @@ shm_create_pool(struct wl_client *client, struct wl_re	133	@@ -284,7 +369,14 @@ shm_create_pool(struct wl_client *client, struct wl_re
134	"failed mmap fd %d", fd);	134	"failed mmap fd %d: %m", fd);
135	goto err_free;	135	goto err_free;
136	}	136	}
137	+	137	+

Lines 1-6 Link Here

(-)w/graphics/wayland/files/patch-tests_sanity-test.c (-3 / +3 lines)
1	--- tests/sanity-test.c.orig 2016-02-17 01:13:16 UTC	1	--- tests/sanity-test.c.orig 2018-04-09 17:19:26 UTC
2	+++ tests/sanity-test.c	2	+++ tests/sanity-test.c
3	@@ -92,7 +92,8 @@ FAIL_TEST(sanity_malloc_direct)	3	@@ -97,7 +97,8 @@ FAIL_TEST(sanity_malloc_direct)
4	TEST(disable_leak_checks)	4	TEST(disable_leak_checks)
5	{	5	{
6	volatile void *mem;	6	volatile void *mem;
Lines 10-16 Link Here
10	/* normally this should be on the beginning of the test.	10	/* normally this should be on the beginning of the test.
11	* Here we need to be sure, that the leak checks are	11	* Here we need to be sure, that the leak checks are
12	* turned on */	12	* turned on */
13	@@ -171,7 +172,8 @@ sanity_fd_no_leak(void)	13	@@ -183,7 +184,8 @@ sanity_fd_no_leak(void)
14	{	14	{
15	int fd[2];	15	int fd[2];
16		16




--- tests/test-helpers.c.orig	2018-08-24 18:04:36 UTC
+++ tests/test-helpers.c
@@ -25,6 +25,12 @@
 
 #include "config.h"
 
+#include "../config.h"
+

 #include <assert.h>
 #include <errno.h>
 #include <dirent.h>
@@ -40,6 +46,16 @@
 
 #include "test-runner.h"
 

 int
 count_open_fds(void)
 {
@@ -47,8 +63,8 @@ count_open_fds(void)
 	struct dirent *ent;
 	int count = 0;
 

 
 	errno = 0;
 	while ((ent = readdir(dir))) {
@@ -57,7 +73,7 @@ count_open_fds(void)
 			continue;
 		count++;
 	}

Lines 1-4 Link Here

(-)w/graphics/wayland/files/patch-tests_test-runner.c (-7 / +25 lines)
1	--- tests/test-runner.c.orig 2017-08-08 18:20:52 UTC	1	--- tests/test-runner.c.orig 2018-08-24 18:04:36 UTC
2	+++ tests/test-runner.c	2	+++ tests/test-runner.c
3	@@ -25,6 +25,12 @@	3	@@ -25,6 +25,12 @@
4		4
Lines 17-23 Link Here
17	#include <errno.h>	17	#include <errno.h>
18	#include <limits.h>	18	#include <limits.h>
19	#include <sys/ptrace.h>	19	#include <sys/ptrace.h>
20	+#ifdef __linux__	20	+#ifdef HAVE_SYS_PRCTL_H
21	#include <sys/prctl.h>	21	#include <sys/prctl.h>
22	+#endif	22	+#endif
23	#ifndef PR_SET_PTRACER	23	#ifndef PR_SET_PTRACER
Lines 84-90 Link Here
84	pid = fork();	84	pid = fork();
85	if (pid == -1) {	85	if (pid == -1) {
86	perror("fork");	86	perror("fork");
87	@@ -312,7 +339,7 @@ is_debugger_attached(void)	87	@@ -312,13 +339,14 @@ is_debugger_attached(void)
88	_exit(1);	88	_exit(1);
89	if (!waitpid(-1, NULL, 0))	89	if (!waitpid(-1, NULL, 0))
90	_exit(1);	90	_exit(1);
Lines 93-99 Link Here
93	ptrace(PTRACE_DETACH, ppid, NULL, NULL);	93	ptrace(PTRACE_DETACH, ppid, NULL, NULL);
94	_exit(0);	94	_exit(0);
95	} else {	95	} else {
96	@@ -346,17 +373,19 @@ int main(int argc, char *argv[])	96	close(pipefd[0]);
		97
		98	/* Enable child to ptrace the parent process */
		99	+#if defined(HAVE_PRCTL)
		100	rc = prctl(PR_SET_PTRACER, pid);
		101	if (rc != 0 && errno != EINVAL) {
		102	/* An error prevents us from telling if a debugger is attached.
		103	@@ -328,7 +356,9 @@ is_debugger_attached(void)
		104	*/
		105	perror("prctl");
		106	write(pipefd[1], "-", 1);
		107	- } else {
		108	+ } else
		109	+#endif
		110	+ {
		111	/* Signal to client that parent is ready by passing '+' */
		112	write(pipefd[1], "+", 1);
		113	}
		114	@@ -346,17 +376,19 @@ int main(int argc, char *argv[])
97	const struct test *t;	115	const struct test *t;
98	pid_t pid;	116	pid_t pid;
99	int total, pass;	117	int total, pass;
Lines 116-122 Link Here
116	if (is_debugger_attached()) {	134	if (is_debugger_attached()) {
117	leak_check_enabled = 0;	135	leak_check_enabled = 0;
118	timeouts_enabled = 0;	136	timeouts_enabled = 0;
119	@@ -364,7 +393,17 @@ int main(int argc, char *argv[])	137	@@ -364,7 +396,17 @@ int main(int argc, char *argv[])
120	leak_check_enabled = !getenv("WAYLAND_TEST_NO_LEAK_CHECK");	138	leak_check_enabled = !getenv("WAYLAND_TEST_NO_LEAK_CHECK");
121	timeouts_enabled = !getenv("WAYLAND_TEST_NO_TIMEOUTS");	139	timeouts_enabled = !getenv("WAYLAND_TEST_NO_TIMEOUTS");
122	}	140	}
Lines 134-140 Link Here
134	if (argc == 2 && strcmp(argv[1], "--help") == 0)	152	if (argc == 2 && strcmp(argv[1], "--help") == 0)
135	usage(argv[0], EXIT_SUCCESS);	153	usage(argv[0], EXIT_SUCCESS);
136		154
137	@@ -395,7 +434,8 @@ int main(int argc, char *argv[])	155	@@ -395,7 +437,8 @@ int main(int argc, char *argv[])
138	if (pid == 0)	156	if (pid == 0)
139	run_test(t); /* never returns */	157	run_test(t); /* never returns */
140		158
Lines 144-150 Link Here
144	stderr_set_color(RED);	162	stderr_set_color(RED);
145	fprintf(stderr, "waitid failed: %m\n");	163	fprintf(stderr, "waitid failed: %m\n");
146	stderr_reset_color();	164	stderr_reset_color();
147	@@ -426,6 +466,25 @@ int main(int argc, char *argv[])	165	@@ -426,6 +469,25 @@ int main(int argc, char *argv[])
148		166
149	break;	167	break;
150	}	168	}




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

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-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

Lines 10-15 COMMENT= Wayland C++ bindings Link Here

(-)w/graphics/waylandpp/Makefile (-8 / +2 lines)
10	LICENSE= MIT	10	LICENSE= MIT
11	LICENSE_FILE= ${WRKSRC}/LICENSE	11	LICENSE_FILE= ${WRKSRC}/LICENSE
12		12
		13	LIB_DEPENDS= libwayland-egl.so:graphics/wayland
		14
13	USES= cmake:outsource localbase pkgconfig	15	USES= cmake:outsource localbase pkgconfig
14	USE_GITHUB= yes	16	USE_GITHUB= yes
15	GH_ACCOUNT= NilsBrause	17	GH_ACCOUNT= NilsBrause
Lines 17-28 USE_GL= egl Link Here
17		19
18	CMAKE_OFF= BUILD_DOCUMENTATION BUILD_EXAMPLES	20	CMAKE_OFF= BUILD_DOCUMENTATION BUILD_EXAMPLES
19		21
20	OPTIONS_DEFINE= WAYLAND
21
22	WAYLAND_DESC= Requires graphics/mesa-libs with WAYLAND on
23
24	WAYLAND_IGNORE_OFF= Cannot be built without Wayland support
25	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
26	libwayland-egl.so:graphics/mesa-libs
27
28	.include <bsd.port.mk>	22	.include <bsd.port.mk>

Lines 93-100 NPAPI_CMAKE_BOOL= ENABLE_PLUGIN_PROCESS_GTK2 Link Here

(-)w/www/webkit2-gtk3/Makefile (-2 / +1 lines)
93	NPAPI_USE= GNOME=gtk20	93	NPAPI_USE= GNOME=gtk20
94		94
95	WAYLAND_CMAKE_BOOL= ENABLE_WAYLAND_TARGET	95	WAYLAND_CMAKE_BOOL= ENABLE_WAYLAND_TARGET
96	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \	96	WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland
97	libwayland-egl.so:graphics/mesa-libs
98		97
99	post-patch:	98	post-patch:
100	@${REINPLACE_CMD} -e 's\|/usr/lib/browser/plugins\|${BROWSER_PLUGINS_DIR}\|' \	99	@${REINPLACE_CMD} -e 's\|/usr/lib/browser/plugins\|${BROWSER_PLUGINS_DIR}\|' \




WAYLAND_CONFIGURE_ENABLE=	wayland-backend
WAYLAND_BUILD_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols \
			v4l_compat>=0:multimedia/v4l_compat
WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland \
			libxkbcommon.so:x11/libxkbcommon
WAYLAND_RUN_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols
WAYLAND_USE=		GL=egl

# don't explicitly disable debug, this causes segfaults. ports r437293
DEBUG_CONFIGURE_ON=	--enable-debug=yes

WAYLAND_BUILD_DEPENDS=		wayland-protocols>=0:graphics/wayland-protocols
WAYLAND_CONFIGURE_ENABLE=	wayland-backend
WAYLAND_LIB_DEPENDS=		libwayland-client.so:graphics/wayland \
				libwayland-egl.so:graphics/mesa-libs \
				libxkbcommon.so:x11/libxkbcommon
WAYLAND_RUN_DEPENDS=		wayland-protocols>=0:graphics/wayland-protocols

post-patch:
	@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
		${WRKSRC}/configure

		${ECHO_MSG} "${PKGNAME}: Needs cairo with X11 support enabled."; \
		${FALSE}; \
	fi
.if ${PORT_OPTIONS:MWAYLAND}
	@if ! pkg-config --exists wayland-egl; then \
		${ECHO_MSG} "${PKGNAME}: Needs mesa-libs with wayland support enabled."; \
		${FALSE}; \
	fi
.endif

pre-build:
	@${RM} -r ${WRKSRC}/docs/gtk.info*

Return to bug 227423

Lines 83-97 include/GL/internal/dri_interface.h Link Here

(-)w/graphics/mesa-dri/pkg-plist (-4 lines)
83	%%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so.1.0.0	83	%%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so.1.0.0
84	%%INTEL_VDRIVER%%lib/libvulkan_intel.so	84	%%INTEL_VDRIVER%%lib/libvulkan_intel.so
85	%%RADEON_VDRIVER%%lib/libvulkan_radeon.so	85	%%RADEON_VDRIVER%%lib/libvulkan_radeon.so
86	@comment lib/libwayland-egl.so
87	@comment lib/libwayland-egl.so.1
88	@comment lib/libwayland-egl.so.1.0.0
89	libdata/pkgconfig/dri.pc	86	libdata/pkgconfig/dri.pc
90	@comment libdata/pkgconfig/egl.pc	87	@comment libdata/pkgconfig/egl.pc
91	@comment libdata/pkgconfig/gbm.pc	88	@comment libdata/pkgconfig/gbm.pc
92	@comment libdata/pkgconfig/gl.pc	89	@comment libdata/pkgconfig/gl.pc
93	@comment libdata/pkgconfig/glesv2.pc	90	@comment libdata/pkgconfig/glesv2.pc
94	@comment libdata/pkgconfig/osmesa.pc	91	@comment libdata/pkgconfig/osmesa.pc
95	@comment libdata/pkgconfig/wayland-egl.pc
96	%%INTEL_VDRIVER%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json	92	%%INTEL_VDRIVER%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json
97	%%RADEON_VDRIVER%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json	93	%%RADEON_VDRIVER%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json

Lines 2-7 Link Here

(-)w/graphics/qt5-wayland/Makefile (-6 / +2 lines)
2		2
3	PORTNAME= wayland	3	PORTNAME= wayland
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
		5	PORTREVISION= 1
5	CATEGORIES= graphics	6	CATEGORIES= graphics
6	PKGNAMEPREFIX= qt5-	7	PKGNAMEPREFIX= qt5-
7		8
Lines 10-16 COMMENT= Qt5 wrapper for Wayland Link Here
10		11
11	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \	12	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
12	libfreetype.so:print/freetype2 \	13	libfreetype.so:print/freetype2 \
13	libwayland-client.so:graphics/wayland \	14	libwayland-egl.so:graphics/wayland \
14	libxkbcommon.so:x11/libxkbcommon	15	libxkbcommon.so:x11/libxkbcommon
15		16
16	USES= pkgconfig qmake:norecursive qt-dist:5,wayland	17	USES= pkgconfig qmake:norecursive qt-dist:5,wayland
Lines 22-30 USE_XORG= x11 xcomposite Link Here
22		23
23	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	24	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
24		25
25	OPTIONS_DEFINE= WAYLAND
26	WAYLAND_DESC= Requires graphics/mesa-libs with WAYLAND on
27	WAYLAND_IGNORE_OFF= Cannot be built without wayland support
28	WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/mesa-libs
29
30	.include <bsd.port.mk>	26	.include <bsd.port.mk>

Lines 3-8 Link Here

(-)w/graphics/vulkan-loader/Makefile (-2 / +3 lines)
3	PORTNAME= vulkan-loader	3	PORTNAME= vulkan-loader
4	DISTVERSIONPREFIX=sdk-	4	DISTVERSIONPREFIX=sdk-
5	DISTVERSION= 1.1.82.0	5	DISTVERSION= 1.1.82.0
		6	PORTREVISION= 1
6	CATEGORIES= graphics devel	7	CATEGORIES= graphics devel
7		8
8	MAINTAINER= greg@unrelenting.technology	9	MAINTAINER= greg@unrelenting.technology
Lines 23-29 CMAKE_ON= CMAKE_SKIP_RPATH Link Here
23	CMAKE_OFF= BUILD_TESTS BUILD_WSI_MIR_SUPPORT	24	CMAKE_OFF= BUILD_TESTS BUILD_WSI_MIR_SUPPORT
24		25
25	OPTIONS_DEFINE= XLIB XCB WAYLAND	26	OPTIONS_DEFINE= XLIB XCB WAYLAND
26	OPTIONS_DEFAULT=XLIB XCB	27	OPTIONS_DEFAULT=XLIB XCB WAYLAND
27		28
28	XLIB_DESC= Build Xlib WSI (Window System Integration) support	29	XLIB_DESC= Build Xlib WSI (Window System Integration) support
29	XCB_DESC= Build XCB WSI (Window System Integration) support	30	XCB_DESC= Build XCB WSI (Window System Integration) support
Lines 36-42 XCB_CMAKE_BOOL= BUILD_WSI_XCB_SUPPORT Link Here
36	XCB_LIB_DEPENDS= libX11-xcb.so:x11/libX11 \	37	XCB_LIB_DEPENDS= libX11-xcb.so:x11/libX11 \
37	libxcb.so:x11/libxcb	38	libxcb.so:x11/libxcb
38	WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT	39	WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT
39	WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/mesa-libs	40	WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland
40		41
41	post-patch:	42	post-patch:
42	# Non-x86 targets use C code, so don't abort without GNU as (e.g., on aarch64)	43	# Non-x86 targets use C code, so don't abort without GNU as (e.g., on aarch64)

Lines 2-8 Link Here

(-)w/graphics/wayland/Makefile (-6 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= wayland	4	PORTNAME= wayland
5	PORTVERSION= 1.14.0	5	PORTVERSION= 1.16.0
6	CATEGORIES= graphics wayland	6	CATEGORIES= graphics wayland
7	MASTER_SITES= http://wayland.freedesktop.org/releases/	7	MASTER_SITES= http://wayland.freedesktop.org/releases/
8		8
Lines 12-21 COMMENT= Wayland composite "server" Link Here
12	LICENSE= MIT	12	LICENSE= MIT
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	BROKEN_mips= fails to compile: tests/test-runner.c:349: undefined reference to prctl
16	BROKEN_mips64= fails to compile: tests/test-runner.c:349: undefined reference to prctl
17	BROKEN_powerpc64= fails to compile: tests/test-runner.c:349: undefined reference to prctl
18
19	LIB_DEPENDS= libexpat.so:textproc/expat2 \	15	LIB_DEPENDS= libexpat.so:textproc/expat2 \
20	libffi.so:devel/libffi \	16	libffi.so:devel/libffi \
21	libepoll-shim.so:devel/libepoll-shim	17	libepoll-shim.so:devel/libepoll-shim
Lines 24-30 CFLAGS+= "-I${LOCALBASE}/include/libepoll-shim" Link Here
24		20
25	WITH_DEBUG= 1	21	WITH_DEBUG= 1
26		22
27	USES= autoreconf gmake libtool localbase pathfix pkgconfig tar:xz	23	USES= autoreconf gnome gmake libtool localbase pathfix pkgconfig tar:xz
28	USE_GNOME= libxslt:build	24	USE_GNOME= libxslt:build
29	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
30	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes

Lines 1-6 Link Here

(-)w/graphics/wayland/files/patch-Makefile.am (-4 / +4 lines)
1	--- Makefile.am.orig 2017-05-05 11:54:01 UTC	1	--- Makefile.am.orig 2018-04-10 14:53:32 UTC
2	+++ Makefile.am	2	+++ Makefile.am
3	@@ -73,7 +73,7 @@ nodist_include_HEADERS = \	3	@@ -71,7 +71,7 @@ nodist_include_HEADERS = \
4	protocol/wayland-client-protocol.h	4	protocol/wayland-client-protocol.h
5		5
6	libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread	6	libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread
Lines 9-15 Link Here
9	libwayland_server_la_LDFLAGS = -version-info 1:0:1	9	libwayland_server_la_LDFLAGS = -version-info 1:0:1
10	libwayland_server_la_SOURCES = \	10	libwayland_server_la_SOURCES = \
11	src/wayland-server.c \	11	src/wayland-server.c \
12	@@ -85,7 +85,7 @@ nodist_libwayland_server_la_SOURCES = \	12	@@ -83,7 +83,7 @@ nodist_libwayland_server_la_SOURCES = \
13	protocol/wayland-protocol.c	13	protocol/wayland-protocol.c
14		14
15	libwayland_client_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread	15	libwayland_client_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread
Lines 18-24 Link Here
18	libwayland_client_la_LDFLAGS = -version-info 3:0:3	18	libwayland_client_la_LDFLAGS = -version-info 3:0:3
19	libwayland_client_la_SOURCES = \	19	libwayland_client_la_SOURCES = \
20	src/wayland-client.c	20	src/wayland-client.c
21	@@ -198,7 +198,7 @@ libtest_runner_la_LIBADD = \	21	@@ -223,7 +223,7 @@ libtest_runner_la_LIBADD = \
22	libwayland-util.la \	22	libwayland-util.la \
23	libwayland-client.la \	23	libwayland-client.la \
24	libwayland-server.la \	24	libwayland-server.la \

Lines 1-8 Link Here

(-)w/graphics/wayland/files/patch-configure.ac (-8 / +7 lines)
1	--- configure.ac.orig 2017-08-08 18:20:52 UTC	1	--- configure.ac.orig 2018-08-24 18:04:36 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -63,6 +63,25 @@ AC_SUBST(GCC_CFLAGS)	3	@@ -65,6 +65,25 @@ AC_SUBST(GCC_CFLAGS)
4		4	AC_CHECK_HEADERS([sys/prctl.h])
5	AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate])	5	AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl])
6		6
7	+AC_CHECK_HEADERS([sys/signalfd.h sys/timerfd.h])	7	+AC_CHECK_HEADERS([sys/signalfd.h sys/timerfd.h])
8	+	8	+
Lines 26-32 Link Here
26	AC_ARG_ENABLE([libraries],	26	AC_ARG_ENABLE([libraries],
27	[AC_HELP_STRING([--disable-libraries],	27	[AC_HELP_STRING([--disable-libraries],
28	[Disable compilation of wayland libraries])],	28	[Disable compilation of wayland libraries])],
29	@@ -98,17 +117,21 @@ AC_SUBST([ICONDIR])	29	@@ -100,16 +119,20 @@ AC_SUBST([ICONDIR])
30		30
31	if test "x$enable_libraries" = "xyes"; then	31	if test "x$enable_libraries" = "xyes"; then
32	PKG_CHECK_MODULES(FFI, [libffi])	32	PKG_CHECK_MODULES(FFI, [libffi])
Lines 42-52 Link Here
42	AC_CHECK_DECL(CLOCK_MONOTONIC,[],	42	AC_CHECK_DECL(CLOCK_MONOTONIC,[],
43	[AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland libraries")],	43	[AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland libraries")],
44	[[#include <time.h>]])	44	[[#include <time.h>]])
45	AC_CHECK_HEADERS([execinfo.h])
46	fi	45	fi
47	+	46	+
48	+EPOLLSHIM_LIBS="-lepoll-shim"	47	+EPOLLSHIM_LIBS="-lepoll-shim"
49	+AC_SUBST(EPOLLSHIM_LIBS)	48	+AC_SUBST(EPOLLSHIM_LIBS)
50		49
51	PKG_CHECK_MODULES(EXPAT, [expat], [],	50	PKG_CHECK_MODULES(EXPAT, [expat])
52	[AC_CHECK_HEADERS(expat.h, [],	51

Lines 1-4 Link Here

(-)w/graphics/wayland/files/patch-src_wayland-server.c (-3 / +17 lines)
1	--- src/wayland-server.c.orig 2017-08-08 18:20:52 UTC	1	--- src/wayland-server.c.orig 2018-04-09 17:19:26 UTC
2	+++ src/wayland-server.c	2	+++ src/wayland-server.c
3	@@ -25,6 +25,8 @@	3	@@ -25,6 +25,8 @@
4		4
Lines 35-41 Link Here
35	int error;	35	int error;
36	struct wl_priv_signal resource_created_signal;	36	struct wl_priv_signal resource_created_signal;
37	};	37	};
38	@@ -501,10 +514,20 @@ wl_client_create(struct wl_display *display, int fd)	38	@@ -303,7 +316,13 @@ wl_resource_post_error(struct wl_resource *resource,
		39	static void
		40	destroy_client_with_error(struct wl_client client, const char reason)
		41	{
		42	+#ifdef HAVE_SYS_UCRED_H
		43	+ /* FreeBSD */
		44	+ wl_log("%s\n", reason);
		45	+#else
		46	+ /* Linux */
		47	wl_log("%s (pid %u)\n", reason, client->ucred.pid);
		48	+#endif
		49	wl_client_destroy(client);
		50	}
		51
		52	@@ -517,10 +536,20 @@ wl_client_create(struct wl_display *display, int fd)
39	if (!client->source)	53	if (!client->source)
40	goto err_client;	54	goto err_client;
41		55
Lines 56-62 Link Here
56		70
57	client->connection = wl_connection_create(fd);	71	client->connection = wl_connection_create(fd);
58	if (client->connection == NULL)	72	if (client->connection == NULL)
59	@@ -558,12 +581,23 @@ WL_EXPORT void	73	@@ -574,12 +603,23 @@ WL_EXPORT void
60	wl_client_get_credentials(struct wl_client *client,	74	wl_client_get_credentials(struct wl_client *client,
61	pid_t pid, uid_t uid, gid_t *gid)	75	pid_t pid, uid_t uid, gid_t *gid)
62	{	76	{

Lines 1-8 Link Here

(-)w/graphics/wayland/files/patch-tests_test-helpers.c (-7 / +7 lines)
1	--- tests/test-helpers.c.orig 2015-07-06 19:38:51 UTC	1	--- tests/test-helpers.c.orig 2018-08-24 18:04:36 UTC
2	+++ tests/test-helpers.c	2	+++ tests/test-helpers.c
3	@@ -23,6 +23,12 @@	3	@@ -25,6 +25,12 @@
4	* SOFTWARE.	4
5	*/	5	#include "config.h"
6		6
7	+#include "../config.h"	7	+#include "../config.h"
8	+	8	+
Lines 13-19 Link Here
13	#include <assert.h>	13	#include <assert.h>
14	#include <errno.h>	14	#include <errno.h>
15	#include <dirent.h>	15	#include <dirent.h>
16	@@ -32,6 +38,16 @@	16	@@ -40,6 +46,16 @@
17		17
18	#include "test-runner.h"	18	#include "test-runner.h"
19		19
Lines 30-36 Link Here
30	int	30	int
31	count_open_fds(void)	31	count_open_fds(void)
32	{	32	{
33	@@ -39,8 +55,8 @@ count_open_fds(void)	33	@@ -47,8 +63,8 @@ count_open_fds(void)
34	struct dirent *ent;	34	struct dirent *ent;
35	int count = 0;	35	int count = 0;
36		36
Lines 41-47 Link Here
41		41
42	errno = 0;	42	errno = 0;
43	while ((ent = readdir(dir))) {	43	while ((ent = readdir(dir))) {
44	@@ -49,7 +65,7 @@ count_open_fds(void)	44	@@ -57,7 +73,7 @@ count_open_fds(void)
45	continue;	45	continue;
46	count++;	46	count++;
47	}	47	}

Lines 3-8 include/wayland-client-core.h Link Here

(-)w/graphics/wayland/pkg-plist (-3 / +6 lines)
3	include/wayland-client-protocol.h	3	include/wayland-client-protocol.h
4	include/wayland-client.h	4	include/wayland-client.h
5	include/wayland-cursor.h	5	include/wayland-cursor.h
		6	include/wayland-egl-backend.h
6	include/wayland-egl-core.h	7	include/wayland-egl-core.h
7	include/wayland-egl.h	8	include/wayland-egl.h
8	include/wayland-server-core.h	9	include/wayland-server-core.h
Lines 10-29 include/wayland-server-protocol.h Link Here
10	include/wayland-server.h	11	include/wayland-server.h
11	include/wayland-util.h	12	include/wayland-util.h
12	include/wayland-version.h	13	include/wayland-version.h
13	lib/libwayland-client.a
14	lib/libwayland-client.so	14	lib/libwayland-client.so
15	lib/libwayland-client.so.0	15	lib/libwayland-client.so.0
16	lib/libwayland-client.so.0.3.0	16	lib/libwayland-client.so.0.3.0
17	lib/libwayland-cursor.a
18	lib/libwayland-cursor.so	17	lib/libwayland-cursor.so
19	lib/libwayland-cursor.so.0	18	lib/libwayland-cursor.so.0
20	lib/libwayland-cursor.so.0.0.0	19	lib/libwayland-cursor.so.0.0.0
21	lib/libwayland-server.a	20	lib/libwayland-egl.so
		21	lib/libwayland-egl.so.1
		22	lib/libwayland-egl.so.1.0.0
22	lib/libwayland-server.so	23	lib/libwayland-server.so
23	lib/libwayland-server.so.0	24	lib/libwayland-server.so.0
24	lib/libwayland-server.so.0.1.0	25	lib/libwayland-server.so.0.1.0
25	libdata/pkgconfig/wayland-client.pc	26	libdata/pkgconfig/wayland-client.pc
26	libdata/pkgconfig/wayland-cursor.pc	27	libdata/pkgconfig/wayland-cursor.pc
		28	libdata/pkgconfig/wayland-egl-backend.pc
		29	libdata/pkgconfig/wayland-egl.pc
27	libdata/pkgconfig/wayland-scanner.pc	30	libdata/pkgconfig/wayland-scanner.pc
28	libdata/pkgconfig/wayland-server.pc	31	libdata/pkgconfig/wayland-server.pc
29	share/aclocal/wayland-scanner.m4	32	share/aclocal/wayland-scanner.m4

Lines 79-85 WAYLAND_DESC= GDK Wayland backend Link Here

(-)w/x11-toolkits/gtk30/Makefile (-14 / +1 lines)
79	WAYLAND_CONFIGURE_ENABLE= wayland-backend	79	WAYLAND_CONFIGURE_ENABLE= wayland-backend
80	WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols \	80	WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols \
81	v4l_compat>=0:multimedia/v4l_compat	81	v4l_compat>=0:multimedia/v4l_compat
82	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \	82	WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland \
83	libxkbcommon.so:x11/libxkbcommon	83	libxkbcommon.so:x11/libxkbcommon
84	WAYLAND_RUN_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols	84	WAYLAND_RUN_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols
85	WAYLAND_USE= GL=egl	85	WAYLAND_USE= GL=egl
Lines 89-101 WAYLAND_USE= GL=egl Link Here
89	# don't explicitly disable debug, this causes segfaults. ports r437293	89	# don't explicitly disable debug, this causes segfaults. ports r437293
90	DEBUG_CONFIGURE_ON= --enable-debug=yes	90	DEBUG_CONFIGURE_ON= --enable-debug=yes
91		91
92	WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols
93	WAYLAND_CONFIGURE_ENABLE= wayland-backend
94	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
95	libwayland-egl.so:graphics/mesa-libs \
96	libxkbcommon.so:x11/libxkbcommon
97	WAYLAND_RUN_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols
98
99	post-patch:	92	post-patch:
100	@${REINPLACE_CMD} -e 's\|[{]libdir[}]/locale\|{datadir}/locale\|g' \	93	@${REINPLACE_CMD} -e 's\|[{]libdir[}]/locale\|{datadir}/locale\|g' \
101	${WRKSRC}/configure	94	${WRKSRC}/configure
Lines 106-117 pre-configure: Link Here
106	${ECHO_MSG} "${PKGNAME}: Needs cairo with X11 support enabled."; \	99	${ECHO_MSG} "${PKGNAME}: Needs cairo with X11 support enabled."; \
107	${FALSE}; \	100	${FALSE}; \
108	fi	101	fi
109	.if ${PORT_OPTIONS:MWAYLAND}
110	@if ! pkg-config --exists wayland-egl; then \
111	${ECHO_MSG} "${PKGNAME}: Needs mesa-libs with wayland support enabled."; \
112	${FALSE}; \
113	fi
114	.endif
115		102
116	pre-build:	103	pre-build:
117	@${RM} -r ${WRKSRC}/docs/gtk.info*	104	@${RM} -r ${WRKSRC}/docs/gtk.info*