Attachment 192393 Details for Bug 227423 – wayland-1.15.patch

[patch] wayland-1.15.patch

wayland-1.15.patch (text/plain), 13.77 KB, created by Val Packett on 2018-04-10 16:03:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2018-04-10 16:03:12 UTC

Size: 13.77 KB

patch

obsolete

>diff --git i/devel/sdl20/Makefile w/devel/sdl20/Makefile
>index 9f451140534b..a43681966896 100644
>--- i/devel/sdl20/Makefile
>+++ w/devel/sdl20/Makefile
>@@ -254,9 +254,7 @@ IGNORE=	option VIDEO_WAYLAND requires VIDEO_OPENGLES2
> .endif
> CONFIGURE_ARGS+=	--enable-video-wayland \
> 			--enable-wayland-shared
>-LIB_DEPENDS+=		libwayland-client.so:graphics/wayland \
>-			libwayland-cursor.so:graphics/wayland \
>-			libwayland-egl.so:graphics/mesa-libs \
>+LIB_DEPENDS+=		libwayland-egl.so:graphics/wayland \
> 			libxkbcommon.so:x11/libxkbcommon
> BUILD_DEPENDS+=	wayland-protocols>=1.7:graphics/wayland-protocols \
> 			wayland-scanner:graphics/wayland \
>diff --git i/graphics/glfw/Makefile w/graphics/glfw/Makefile
>index 6aadcc52e985..3a39675b7509 100644
>--- i/graphics/glfw/Makefile
>+++ w/graphics/glfw/Makefile
>@@ -26,8 +26,7 @@ OPTIONS_EXCLUDE_FreeBSD_10=	WAYLAND # needs dev/evdev/input.h
> 
> WAYLAND_BUILD_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols
> WAYLAND_CMAKE_BOOL=	GLFW_USE_WAYLAND
>-WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
>-			libwayland-egl.so:graphics/mesa-libs \
>+WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland \
> 			libxkbcommon.so:x11/libxkbcommon
> WAYLAND_USES=		kde:5 pkgconfig
> WAYLAND_USE=		KDE=ecm
>diff --git i/graphics/mesa-dri/pkg-plist w/graphics/mesa-dri/pkg-plist
>index 96b9268b3104..14b399177c5b 100644
>--- i/graphics/mesa-dri/pkg-plist
>+++ w/graphics/mesa-dri/pkg-plist
>@@ -83,15 +83,11 @@ include/GL/internal/dri_interface.h
> %%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
>diff --git i/graphics/mesa-libs/Makefile w/graphics/mesa-libs/Makefile
>index 7c3dcc1ffc3f..c1f1c55ff0af 100644
>--- i/graphics/mesa-libs/Makefile
>+++ w/graphics/mesa-libs/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	mesa-libs
> PORTVERSION=	${MESAVERSION}
>+PORTREVISION=	1
> CATEGORIES=	graphics
> 
> COMMENT=	OpenGL libraries that support GLX and EGL clients
>diff --git i/graphics/mesa-libs/pkg-plist w/graphics/mesa-libs/pkg-plist
>index 858600aa6b3c..6438e4a8073c 100644
>--- i/graphics/mesa-libs/pkg-plist
>+++ w/graphics/mesa-libs/pkg-plist
>@@ -36,11 +36,7 @@ lib/libgbm.so.1.0.0
> lib/libglapi.so
> lib/libglapi.so.0
> lib/libglapi.so.0.0.0
>-%%WAYLAND%%lib/libwayland-egl.so
>-%%WAYLAND%%lib/libwayland-egl.so.1
>-%%WAYLAND%%lib/libwayland-egl.so.1.0.0
> %%EGL%%libdata/pkgconfig/egl.pc
> libdata/pkgconfig/gbm.pc
> libdata/pkgconfig/gl.pc
> libdata/pkgconfig/glesv2.pc
>-%%WAYLAND%%libdata/pkgconfig/wayland-egl.pc
>diff --git i/graphics/qt5-wayland/Makefile w/graphics/qt5-wayland/Makefile
>index d2ed13822784..5d0c44b9ab38 100644
>--- i/graphics/qt5-wayland/Makefile
>+++ w/graphics/qt5-wayland/Makefile
>@@ -11,8 +11,7 @@ COMMENT=	Qt5 wrapper for Wayland
> 
> LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
> 		libfreetype.so:print/freetype2 \
>-		libwayland-client.so:graphics/wayland \
>-		libwayland-egl.so:graphics/mesa-libs \
>+		libwayland-egl.so:graphics/wayland \
> 		libxkbcommon.so:x11/libxkbcommon
> 
> USES=		pkgconfig qmake:norecursive
>@@ -26,10 +25,4 @@ QT_CONFIG+=	egl
> 
> USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
> 
>-OPTIONS_DEFINE=	WAYLAND
>-OPTIONS_DEFAULT=	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>
>diff --git i/graphics/wayland/Makefile w/graphics/wayland/Makefile
>index 7736e7fadcf3..97ec38d6985f 100644
>--- i/graphics/wayland/Makefile
>+++ w/graphics/wayland/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	wayland
>-PORTVERSION=	1.14.0
>+PORTVERSION=	1.15.0
> CATEGORIES=	graphics wayland
> MASTER_SITES=	http://wayland.freedesktop.org/releases/
> 
>diff --git i/graphics/wayland/distinfo w/graphics/wayland/distinfo
>index a3e7e4e8c171..3e8ed193d58c 100644
>--- i/graphics/wayland/distinfo
>+++ w/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 = 1523372009
>+SHA256 (wayland-1.15.0.tar.xz) = eb3fbebb8559d56a80ad3753ec3db800f587329067962dbf65e14488b4b7aeb0
>+SIZE (wayland-1.15.0.tar.xz) = 432932
>diff --git i/graphics/wayland/files/patch-Makefile.am w/graphics/wayland/files/patch-Makefile.am
>index 34bf070a5329..e65a6e7ffcd4 100644
>--- i/graphics/wayland/files/patch-Makefile.am
>+++ w/graphics/wayland/files/patch-Makefile.am
>@@ -1,6 +1,6 @@
>---- Makefile.am.orig	2017-11-23 17:10:58 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 i/graphics/wayland/files/patch-configure.ac w/graphics/wayland/files/patch-configure.ac
>index d24a8bd7eb60..17e1db4940b0 100644
>--- i/graphics/wayland/files/patch-configure.ac
>+++ w/graphics/wayland/files/patch-configure.ac
>@@ -1,8 +1,8 @@
>---- configure.ac.orig	2017-08-08 18:20:52 UTC
>+--- configure.ac.orig	2018-04-09 17:19:26 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,17 +119,21 @@ AC_SUBST([ICONDIR])
>  
>  if test "x$enable_libraries" = "xyes"; then
>  	PKG_CHECK_MODULES(FFI, [libffi])
>diff --git i/graphics/wayland/files/patch-src_wayland-server.c w/graphics/wayland/files/patch-src_wayland-server.c
>index 51d25f28e43f..608bab6ca88b 100644
>--- i/graphics/wayland/files/patch-src_wayland-server.c
>+++ w/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 i/graphics/wayland/files/patch-src_wayland-shm.c w/graphics/wayland/files/patch-src_wayland-shm.c
>index 9dfb9c95bb7c..df55cb3f1b60 100644
>--- i/graphics/wayland/files/patch-src_wayland-shm.c
>+++ w/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 i/graphics/wayland/files/patch-tests_sanity-test.c w/graphics/wayland/files/patch-tests_sanity-test.c
>index 8764638bd608..961355aa92ce 100644
>--- i/graphics/wayland/files/patch-tests_sanity-test.c
>+++ w/graphics/wayland/files/patch-tests_sanity-test.c
>@@ -1,6 +1,6 @@
>---- tests/sanity-test.c.orig	2017-08-08 18:20:52 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 i/graphics/wayland/files/patch-tests_test-helpers.c w/graphics/wayland/files/patch-tests_test-helpers.c
>index 69b60b7e73d5..699158642dac 100644
>--- i/graphics/wayland/files/patch-tests_test-helpers.c
>+++ w/graphics/wayland/files/patch-tests_test-helpers.c
>@@ -1,8 +1,8 @@
>---- tests/test-helpers.c.orig	2017-08-08 18:20:52 UTC
>+--- tests/test-helpers.c.orig	2018-04-09 17:19:26 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 i/graphics/wayland/pkg-plist w/graphics/wayland/pkg-plist
>index ccbc459bd7c5..cc92f9a6a551 100644
>--- i/graphics/wayland/pkg-plist
>+++ w/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
>diff --git i/graphics/waylandpp/Makefile w/graphics/waylandpp/Makefile
>index 80d3b1a62ce0..55a11d355e04 100644
>--- i/graphics/waylandpp/Makefile
>+++ w/graphics/waylandpp/Makefile
>@@ -10,6 +10,8 @@ COMMENT=	Wayland C++ bindings
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>+LIB_DEPENDS=	libwayland-egl.so:graphics/wayland
>+
> USES=		cmake:outsource localbase pkgconfig
> USE_GITHUB=	yes
> GH_ACCOUNT=	NilsBrause
>@@ -17,12 +19,4 @@ USE_GL=		egl
> 
> CMAKE_OFF=	BUILD_DOCUMENTATION BUILD_EXAMPLES
> 
>-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-client.so:graphics/wayland \
>-			libwayland-egl.so:graphics/mesa-libs
>-
> .include <bsd.port.mk>
>diff --git i/www/webkit2-gtk3/Makefile w/www/webkit2-gtk3/Makefile
>index 275eaf249861..1e9e672f95ff 100644
>--- i/www/webkit2-gtk3/Makefile
>+++ w/www/webkit2-gtk3/Makefile
>@@ -97,8 +97,7 @@ NPAPI_CMAKE_BOOL=	ENABLE_PLUGIN_PROCESS_GTK2
> NPAPI_USE=		GNOME=gtk20
> 
> WAYLAND_CMAKE_BOOL=	ENABLE_WAYLAND_TARGET
>-WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
>-			libwayland-egl.so:graphics/mesa-libs
>+WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/usr/lib/browser/plugins|${BROWSER_PLUGINS_DIR}|' \
>diff --git i/x11-toolkits/gtk30/Makefile w/x11-toolkits/gtk30/Makefile
>index 3f9008be8913..b3b92d3de8e8 100644
>--- i/x11-toolkits/gtk30/Makefile
>+++ w/x11-toolkits/gtk30/Makefile
>@@ -82,8 +82,7 @@ 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 \
>+WAYLAND_LIB_DEPENDS=		libwayland-egl.so:graphics/wayland \
> 				libxkbcommon.so:x11/libxkbcommon
> WAYLAND_RUN_DEPENDS=		wayland-protocols>=0:graphics/wayland-protocols
>

Actions: View | Diff

Attachments on bug 227423: 192393 | 198077