git: a32695ba5cc9 - main - x11-toolkits/wlroots-devel: update to 0.17.0.378
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 10 Jun 2024 22:51:01 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a32695ba5cc949875a826f017cf51aa0ad430f51
commit a32695ba5cc949875a826f017cf51aa0ad430f51
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-06-06 04:33:05 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-06-10 22:50:53 +0000
x11-toolkits/wlroots-devel: update to 0.17.0.378
Changes: https://gitlab.freedesktop.org/wlroots/wlroots/-/compare/b1b34cd665...385c9ade5f
---
x11-toolkits/wlroots-devel/Makefile | 22 ++++++++++++----------
x11-toolkits/wlroots-devel/distinfo | 10 +++-------
x11-toolkits/wlroots-devel/pkg-plist | 2 ++
x11-wm/sway-devel/Makefile | 2 ++
4 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/x11-toolkits/wlroots-devel/Makefile b/x11-toolkits/wlroots-devel/Makefile
index 168891730dc9..e20b55fff3b5 100644
--- a/x11-toolkits/wlroots-devel/Makefile
+++ b/x11-toolkits/wlroots-devel/Makefile
@@ -1,14 +1,9 @@
PORTNAME= wlroots
-DISTVERSION= 0.17.0-312
-DISTVERSIONSUFFIX= -gb1b34cd665
-PORTREVISION= 4
+DISTVERSION= 0.17.0-378
+DISTVERSIONSUFFIX= -g385c9ade5f
CATEGORIES= x11-toolkits
PKGNAMESUFFIX= -devel
-PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
-PATCHFILES+= cc6a7a04418f.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4697
-PATCHFILES+= 4b4f76cc1357.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4614
-
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Modular Wayland compositor library (development snapshot)
WWW= https://gitlab.freedesktop.org/wlroots/wlroots
@@ -32,21 +27,28 @@ PLIST_SUB= SUFFIX=-0.18
PORTSCOUT= ignore:1
-OPTIONS_DEFINE= DRM OPENGL VULKAN X11
-OPTIONS_DEFAULT=DRM OPENGL VULKAN X11
+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 \
- libliftoff.so:graphics/libliftoff \
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
diff --git a/x11-toolkits/wlroots-devel/distinfo b/x11-toolkits/wlroots-devel/distinfo
index ca99004f22c8..690c3b565b6c 100644
--- a/x11-toolkits/wlroots-devel/distinfo
+++ b/x11-toolkits/wlroots-devel/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1712827443
-SHA256 (wlroots-0.17.0-312-gb1b34cd665.tar.bz2) = e9eb70ecddce0030b26b595d368cee15559febe1b8121de6bc6d5ec8bf95ccef
-SIZE (wlroots-0.17.0-312-gb1b34cd665.tar.bz2) = 458003
-SHA256 (cc6a7a04418f.patch) = eb2bf98b372b668f773dbb1e3108bff16fefcc51be148775e6517ea4c9d35d83
-SIZE (cc6a7a04418f.patch) = 1291
-SHA256 (4b4f76cc1357.patch) = 163500bf90d39365a6ce8a9d24d48b2e65135d2f548c9532d933ed19b1097d53
-SIZE (4b4f76cc1357.patch) = 2512
+TIMESTAMP = 1717648385
+SHA256 (wlroots-0.17.0-378-g385c9ade5f.tar.bz2) = db98957145964ddfb7add630379c307a75ec7baffc05602baf200199e1075448
+SIZE (wlroots-0.17.0-378-g385c9ade5f.tar.bz2) = 466261
diff --git a/x11-toolkits/wlroots-devel/pkg-plist b/x11-toolkits/wlroots-devel/pkg-plist
index 9ce4c4bbb657..72fefeb446a0 100644
--- a/x11-toolkits/wlroots-devel/pkg-plist
+++ b/x11-toolkits/wlroots-devel/pkg-plist
@@ -17,6 +17,7 @@ include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_tablet_pad.h
include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_tablet_tool.h
include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_touch.h
include/wlroots%%SUFFIX%%/wlr/render/allocator.h
+include/wlroots%%SUFFIX%%/wlr/render/color.h
include/wlroots%%SUFFIX%%/wlr/render/dmabuf.h
include/wlroots%%SUFFIX%%/wlr/render/drm_format_set.h
%%OPENGL%%include/wlroots%%SUFFIX%%/wlr/render/egl.h
@@ -28,6 +29,7 @@ include/wlroots%%SUFFIX%%/wlr/render/swapchain.h
%%VULKAN%%include/wlroots%%SUFFIX%%/wlr/render/vulkan.h
include/wlroots%%SUFFIX%%/wlr/render/wlr_renderer.h
include/wlroots%%SUFFIX%%/wlr/render/wlr_texture.h
+include/wlroots%%SUFFIX%%/wlr/types/wlr_alpha_modifier_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_buffer.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_compositor.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_content_type_v1.h
diff --git a/x11-wm/sway-devel/Makefile b/x11-wm/sway-devel/Makefile
index 13f21ce5ae1c..de1f666670be 100644
--- a/x11-wm/sway-devel/Makefile
+++ b/x11-wm/sway-devel/Makefile
@@ -15,6 +15,8 @@ WWW= https://swaywm.org/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
+BROKEN= fails to build after https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/0686666cf5c0
+
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>=1.24:graphics/wayland-protocols
LIB_DEPENDS= libjson-c.so:devel/json-c \