diff --git a/graphics/wayland/Makefile b/graphics/wayland/Makefile index 5d0b32cdfd3a..097e1e4cec84 100644 --- a/graphics/wayland/Makefile +++ b/graphics/wayland/Makefile @@ -1,24 +1,24 @@ PORTNAME= wayland -DISTVERSION= 1.23.0 +DISTVERSION= 1.23.1 CATEGORIES= graphics MASTER_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/-/releases/${DISTVERSION}/downloads/ MAINTAINER= x11@FreeBSD.org COMMENT= Core Wayland window system code and protocol WWW= https://wayland.freedesktop.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:textproc/expat2 \ libffi.so:devel/libffi \ libepoll-shim.so:devel/libepoll-shim USES= cpe gnome meson pkgconfig tar:xz USE_GNOME= libxslt:build USE_LDCONFIG= yes MESON_ARGS= -Ddocumentation=false TESTING_UNSAFE= "Assertion failed: (wrapped_calls_fcntl > n), function do_os_wrappers_dupfd_cloexec, file ../tests/os-wrappers-test.c, line 222" .include diff --git a/graphics/wayland/distinfo b/graphics/wayland/distinfo index e47ad41229ee..4dbb978a5d51 100644 --- a/graphics/wayland/distinfo +++ b/graphics/wayland/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1717095591 -SHA256 (wayland-1.23.0.tar.xz) = 05b3e1574d3e67626b5974f862f36b5b427c7ceeb965cb36a4e6c2d342e45ab2 -SIZE (wayland-1.23.0.tar.xz) = 237900 +TIMESTAMP = 1724514235 +SHA256 (wayland-1.23.1.tar.xz) = 864fb2a8399e2d0ec39d56e9d9b753c093775beadc6022ce81f441929a81e5ed +SIZE (wayland-1.23.1.tar.xz) = 238212 diff --git a/graphics/wayland/pkg-plist b/graphics/wayland/pkg-plist index 9e844686ea2c..e7c1e9365b4b 100644 --- a/graphics/wayland/pkg-plist +++ b/graphics/wayland/pkg-plist @@ -1,35 +1,35 @@ bin/wayland-scanner 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 include/wayland-server-protocol.h include/wayland-server.h include/wayland-util.h include/wayland-version.h lib/libwayland-client.so lib/libwayland-client.so.0 -lib/libwayland-client.so.0.23.0 +lib/libwayland-client.so.0.23.1 lib/libwayland-cursor.so lib/libwayland-cursor.so.0 -lib/libwayland-cursor.so.0.23.0 +lib/libwayland-cursor.so.0.23.1 lib/libwayland-egl.so lib/libwayland-egl.so.1 -lib/libwayland-egl.so.1.23.0 +lib/libwayland-egl.so.1.23.1 lib/libwayland-server.so lib/libwayland-server.so.0 -lib/libwayland-server.so.0.23.0 +lib/libwayland-server.so.0.23.1 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 %%DATADIR%%/wayland-scanner.mk %%DATADIR%%/wayland.dtd %%DATADIR%%/wayland.xml diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile index 53a207c0fd97..cb372ae29f14 100644 --- a/x11-toolkits/wlroots/Makefile +++ b/x11-toolkits/wlroots/Makefile @@ -1,78 +1,75 @@ PORTNAME= wlroots DISTVERSION= 0.18.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits MAINTAINER= jbeich@FreeBSD.org COMMENT= Modular Wayland compositor library WWW= https://gitlab.freedesktop.org/wlroots/wlroots LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>=1.35:graphics/wayland-protocols LIB_DEPENDS= libdrm.so:graphics/libdrm \ libwayland-server.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 gl meson pkgconfig xorg USE_GITLAB= yes USE_GL= gbm USE_XORG= pixman USE_LDCONFIG= yes GL_SITE= https://gitlab.freedesktop.org MESON_ARGS= -Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,} PLIST_SUB= SUFFIX=-${DISTVERSION:R} -# XXX Drop after graphics/wayland >= 1.24 update -# https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/401 -MESON_ARGS+= -Dc_std=c11 - OPTIONS_DEFINE= DRM LCMS2 LIBLIFTOFF OPENGL VULKAN X11 OPTIONS_DEFAULT=DRM LCMS2 LIBLIFTOFF OPENGL VULKAN X11 OPTIONS_SUB= yes DRM_DESC= KMS console support DRM_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ hwdata>0:misc/hwdata DRM_LIB_DEPENDS= libudev.so:devel/libudev-devd \ libdisplay-info.so:sysutils/libdisplay-info \ libseat.so:sysutils/seatd \ libinput.so:x11/libinput DRM_MESON_ENABLED= session DRM_VARS= BACKENDS+="drm libinput" LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS2_MESON_ENABLED= color-management LIBLIFTOFF_DESC= libliftoff DRM interface (see WLR_DRM_FORCE_LIBLIFTOFF) LIBLIFTOFF_LIB_DEPENDS= libliftoff.so:graphics/libliftoff LIBLIFTOFF_MESON_ENABLED= libliftoff LIBLIFTOFF_IMPLIES= DRM OPENGL_RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri OPENGL_USE= GL=egl,glesv2 OPENGL_VARS= RENDERERS+=gles2 VULKAN_DESC= Vulkan renderer VULKAN_BUILD_DEPENDS= glslangValidator:graphics/glslang \ vulkan-headers>0:graphics/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri VULKAN_VARS= RENDERERS+=vulkan X11_LIB_DEPENDS= libxcb-errors.so:x11/xcb-util-errors \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-icccm.so:x11/xcb-util-wm X11_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ Xwayland:x11-servers/xwayland X11_RUN_DEPENDS= Xwayland:x11-servers/xwayland X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland X11_VARS= BACKENDS+=x11 post-patch: # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} "/STR/s/meson.project_version()/'${DISTVERSIONFULL}'/" \ ${WRKSRC}/include/wlr/meson.build .include