Date: Mon, 15 Oct 2018 23:59:24 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482189 - in head: devel/efl graphics/glfw graphics/mesa-libs graphics/qt5-wayland graphics/vulkan-loader graphics/wayland graphics/wayland/files graphics/waylandpp www/webkit2-gtk3 x11... Message-ID: <201810152359.w9FNxOHw086078@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Oct 15 23:59:23 2018 New Revision: 482189 URL: https://svnweb.freebsd.org/changeset/ports/482189 Log: 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) Modified: head/devel/efl/Makefile (contents, props changed) head/graphics/glfw/Makefile (contents, props changed) head/graphics/mesa-libs/Makefile (contents, props changed) head/graphics/mesa-libs/pkg-plist (contents, props changed) head/graphics/qt5-wayland/Makefile (contents, props changed) head/graphics/vulkan-loader/Makefile (contents, props changed) head/graphics/wayland/Makefile (contents, props changed) head/graphics/wayland/distinfo (contents, props changed) head/graphics/wayland/files/patch-Makefile.am (contents, props changed) head/graphics/wayland/files/patch-configure.ac (contents, props changed) head/graphics/wayland/files/patch-src_wayland-server.c (contents, props changed) head/graphics/wayland/files/patch-src_wayland-shm.c (contents, props changed) head/graphics/wayland/files/patch-tests_sanity-test.c (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) head/graphics/wayland/pkg-plist (contents, props changed) head/graphics/waylandpp/Makefile (contents, props changed) head/www/webkit2-gtk3/Makefile (contents, props changed) head/x11-toolkits/gtk30/Makefile (contents, props changed) Modified: head/devel/efl/Makefile ============================================================================== --- head/devel/efl/Makefile Mon Oct 15 23:33:05 2018 (r482188) +++ head/devel/efl/Makefile Mon Oct 15 23:59:23 2018 (r482189) @@ -3,7 +3,7 @@ PORTNAME= efl DISTVERSION= 1.20.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel enlightenment MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/ DIST_SUBDIR= enlightenment @@ -94,7 +94,7 @@ WAYLAND_CFLAGS= -I${LOCALBASE}/include/libepoll-shim WAYLAND_LDFLAGS= -lepoll-shim WAYLAND_CONFIGURE_ENABLE= wayland -WAYLAND_EGL_LIB_DEPENDS= libwayland-egl.so:graphics/mesa-libs +WAYLAND_EGL_LIB_DEPENDS= libwayland-egl.so:graphics/wayland WAYLAND_EGL_CONFIGURE_ENABLE= egl WAYLANG_EGL_USE= GL=egl WAYLAND_EGL_IMPLIES= WAYLAND OPENGLES Modified: head/graphics/glfw/Makefile ============================================================================== --- head/graphics/glfw/Makefile Mon Oct 15 23:33:05 2018 (r482188) +++ head/graphics/glfw/Makefile Mon Oct 15 23:59:23 2018 (r482189) @@ -3,7 +3,7 @@ PORTNAME= glfw PORTVERSION= 3.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= SF @@ -26,8 +26,7 @@ OPTIONS_EXCLUDE_FreeBSD_10= WAYLAND # needs dev/evdev/ 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 Modified: head/graphics/mesa-libs/Makefile ============================================================================== --- head/graphics/mesa-libs/Makefile Mon Oct 15 23:33:05 2018 (r482188) +++ head/graphics/mesa-libs/Makefile Mon Oct 15 23:59:23 2018 (r482189) @@ -3,6 +3,7 @@ PORTNAME= mesa-libs PORTVERSION= ${MESAVERSION} +PORTREVISION= 1 CATEGORIES= graphics COMMENT= OpenGL libraries that support GLX and EGL clients Modified: head/graphics/mesa-libs/pkg-plist ============================================================================== --- head/graphics/mesa-libs/pkg-plist Mon Oct 15 23:33:05 2018 (r482188) +++ head/graphics/mesa-libs/pkg-plist Mon Oct 15 23:59:23 2018 (r482189) @@ -36,11 +36,11 @@ 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 +@comment %%WAYLAND%%lib/libwayland-egl.so +@comment %%WAYLAND%%lib/libwayland-egl.so.1 +@comment %%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 +@comment %%WAYLAND%%libdata/pkgconfig/wayland-egl.pc Modified: head/graphics/qt5-wayland/Makefile ============================================================================== --- head/graphics/qt5-wayland/Makefile Mon Oct 15 23:33:05 2018 (r482188) +++ head/graphics/qt5-wayland/Makefile Mon Oct 15 23:59:23 2018 (r482189) @@ -2,6 +2,7 @@ PORTNAME= wayland DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- @@ -10,7 +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/wayland \ libxkbcommon.so:x11/libxkbcommon USES= pkgconfig qmake:norecursive qt-dist:5,wayland @@ -21,10 +22,5 @@ USE_QT= core dbus gui qml quick \ USE_XORG= x11 xcomposite 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> Modified: head/graphics/vulkan-loader/Makefile ============================================================================== --- head/graphics/vulkan-loader/Makefile Mon Oct 15 23:33:05 2018 (r482188) +++ head/graphics/vulkan-loader/Makefile Mon Oct 15 23:59:23 2018 (r482189) @@ -3,6 +3,7 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX=sdk- DISTVERSION= 1.1.82.0 +PORTREVISION= 1 CATEGORIES= graphics devel MAINTAINER= greg@unrelenting.technology @@ -36,7 +37,7 @@ XCB_CMAKE_BOOL= BUILD_WSI_XCB_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/mesa-libs +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) Modified: head/graphics/wayland/Makefile ============================================================================== --- head/graphics/wayland/Makefile Mon Oct 15 23:33:05 2018 (r482188) +++ head/graphics/wayland/Makefile Mon Oct 15 23:59:23 2018 (r482189) @@ -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 Modified: head/graphics/wayland/distinfo ============================================================================== --- head/graphics/wayland/distinfo Mon Oct 15 23:33:05 2018 (r482188) +++ head/graphics/wayland/distinfo Mon Oct 15 23:59:23 2018 (r482189) @@ -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: head/graphics/wayland/files/patch-Makefile.am ============================================================================== --- head/graphics/wayland/files/patch-Makefile.am Mon Oct 15 23:33:05 2018 (r482188) +++ head/graphics/wayland/files/patch-Makefile.am Mon Oct 15 23:59:23 2018 (r482189) @@ -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: head/graphics/wayland/files/patch-configure.ac ============================================================================== --- head/graphics/wayland/files/patch-configure.ac Mon Oct 15 23:33:05 2018 (r482188) +++ head/graphics/wayland/files/patch-configure.ac Mon Oct 15 23:59:23 2018 (r482189) @@ -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: head/graphics/wayland/files/patch-src_wayland-server.c ============================================================================== --- head/graphics/wayland/files/patch-src_wayland-server.c Mon Oct 15 23:33:05 2018 (r482188) +++ head/graphics/wayland/files/patch-src_wayland-server.c Mon Oct 15 23:59:23 2018 (r482189) @@ -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: head/graphics/wayland/files/patch-src_wayland-shm.c ============================================================================== --- head/graphics/wayland/files/patch-src_wayland-shm.c Mon Oct 15 23:33:05 2018 (r482188) +++ head/graphics/wayland/files/patch-src_wayland-shm.c Mon Oct 15 23:59:23 2018 (r482189) @@ -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: head/graphics/wayland/files/patch-tests_sanity-test.c ============================================================================== --- head/graphics/wayland/files/patch-tests_sanity-test.c Mon Oct 15 23:33:05 2018 (r482188) +++ head/graphics/wayland/files/patch-tests_sanity-test.c Mon Oct 15 23:59:23 2018 (r482189) @@ -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: head/graphics/wayland/files/patch-tests_test-helpers.c ============================================================================== --- head/graphics/wayland/files/patch-tests_test-helpers.c Mon Oct 15 23:33:05 2018 (r482188) +++ head/graphics/wayland/files/patch-tests_test-helpers.c Mon Oct 15 23:59:23 2018 (r482189) @@ -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: head/graphics/wayland/files/patch-tests_test-runner.c ============================================================================== --- head/graphics/wayland/files/patch-tests_test-runner.c Mon Oct 15 23:33:05 2018 (r482188) +++ head/graphics/wayland/files/patch-tests_test-runner.c Mon Oct 15 23:59:23 2018 (r482189) @@ -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: head/graphics/wayland/pkg-plist ============================================================================== --- head/graphics/wayland/pkg-plist Mon Oct 15 23:33:05 2018 (r482188) +++ head/graphics/wayland/pkg-plist Mon Oct 15 23:59:23 2018 (r482189) @@ -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 Modified: head/graphics/waylandpp/Makefile ============================================================================== --- head/graphics/waylandpp/Makefile Mon Oct 15 23:33:05 2018 (r482188) +++ head/graphics/waylandpp/Makefile Mon Oct 15 23:59:23 2018 (r482189) @@ -2,6 +2,7 @@ PORTNAME= waylandpp DISTVERSION= 0.2.3 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= tobik@FreeBSD.org @@ -10,19 +11,13 @@ 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 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> Modified: head/www/webkit2-gtk3/Makefile ============================================================================== --- head/www/webkit2-gtk3/Makefile Mon Oct 15 23:33:05 2018 (r482188) +++ head/www/webkit2-gtk3/Makefile Mon Oct 15 23:59:23 2018 (r482189) @@ -3,6 +3,7 @@ PORTNAME= webkit PORTVERSION= 2.20.5 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= 2-gtk3 @@ -93,8 +94,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}|' \ Modified: head/x11-toolkits/gtk30/Makefile ============================================================================== --- head/x11-toolkits/gtk30/Makefile Mon Oct 15 23:33:05 2018 (r482188) +++ head/x11-toolkits/gtk30/Makefile Mon Oct 15 23:59:23 2018 (r482189) @@ -5,7 +5,7 @@ PORTNAME= gtk PORTVERSION= 3.22.30 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMESUFFIX= 3 @@ -79,7 +79,7 @@ WAYLAND_DESC= GDK Wayland backend WAYLAND_CONFIGURE_ENABLE= wayland-backend WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols \ v4l_compat>=0:multimedia/v4l_compat -WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ +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 @@ -89,13 +89,6 @@ 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 @@ -106,12 +99,6 @@ pre-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*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810152359.w9FNxOHw086078>