git: 1b744b687e87 - main - x11-toolkits/wlroots: update to 0.17.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 21 Nov 2023 17:25:00 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1b744b687e87a63e58f21a30c2cf8005335494a4
commit 1b744b687e87a63e58f21a30c2cf8005335494a4
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-11-21 16:06:13 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-11-21 17:24:00 +0000
x11-toolkits/wlroots: update to 0.17.0
Changes: https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.17.0
Reported by: GitLab (notify releases)
---
x11-toolkits/wlroots/Makefile | 29 +++++++++++++++++++----------
x11-toolkits/wlroots/distinfo | 16 +++++++---------
x11-toolkits/wlroots/pkg-plist | 17 ++++++++++++-----
x11-wm/cage/Makefile | 2 ++
x11-wm/cagebreak/Makefile | 2 ++
x11-wm/dwl/Makefile | 2 ++
x11-wm/gamescope/Makefile | 2 ++
x11-wm/kwinft/Makefile | 3 ++-
x11-wm/labwc/Makefile | 2 ++
x11-wm/phoc/Makefile | 2 ++
x11-wm/river/Makefile | 2 ++
x11-wm/sway/Makefile | 3 ++-
x11-wm/swayfx/Makefile | 2 +-
x11-wm/wayfire-plugins-extra/Makefile | 2 ++
x11-wm/wayfire/Makefile | 2 ++
15 files changed, 61 insertions(+), 27 deletions(-)
diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile
index 600fdf5930cc..19e19e866370 100644
--- a/x11-toolkits/wlroots/Makefile
+++ b/x11-toolkits/wlroots/Makefile
@@ -1,13 +1,11 @@
PORTNAME= wlroots
-DISTVERSION= 0.16.2
-PORTREVISION= 1
+DISTVERSION= 0.17.0
CATEGORIES= x11-toolkits
PATCH_SITES+= https://github.com/swaywm/${GL_PROJECT}/commit/:github
-PATCHFILES+= fc0854d5f256.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
-PATCHFILES+= 29cb694655db.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
+PATCHFILES+= 10f80a8f1bb2.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
+PATCHFILES+= 3196c73d487f.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
-PATCHFILES+= f3ba14e49133.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3850
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Modular Wayland compositor library
@@ -16,11 +14,9 @@ WWW= https://gitlab.freedesktop.org/wlroots/wlroots
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= wayland-protocols>=1.27:graphics/wayland-protocols
-LIB_DEPENDS= libudev.so:devel/libudev-devd \
- libdrm.so:graphics/libdrm \
+BUILD_DEPENDS= wayland-protocols>=1.32:graphics/wayland-protocols
+LIB_DEPENDS= libdrm.so:graphics/libdrm \
libwayland-server.so:graphics/wayland \
- libseat.so:sysutils/seatd \
libxkbcommon.so:x11/libxkbcommon
USES= compiler:c11 gl meson pkgconfig xorg
@@ -37,7 +33,12 @@ OPTIONS_SUB= yes
DRM_DESC= KMS console support
DRM_BUILD_DEPENDS= hwdata>0:misc/hwdata
-DRM_LIB_DEPENDS= libinput.so:x11/libinput
+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"
OPENGL_RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri
@@ -65,5 +66,13 @@ 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
+# XXX Drop after FreeBSD 12.4 EOL around 2023-12-31
+# https://cgit.freebsd.org/src/commit/?id=d7535fb3e3cb
+ @if [ ${OPSYS} = FreeBSD -a ${OSVERSION} -lt 1300515 ]; then \
+ ${REINPLACE_CMD} -e '/POSIX/s/199309/200112/' \
+ ${WRKSRC}/render/gles2/pass.c \
+ ${WRKSRC}/render/gles2/renderer.c \
+ ${WRKSRC}/types/wlr_presentation_time.c; \
+ fi
.include <bsd.port.mk>
diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo
index 5918d9a27d2e..5673d9671f93 100644
--- a/x11-toolkits/wlroots/distinfo
+++ b/x11-toolkits/wlroots/distinfo
@@ -1,9 +1,7 @@
-TIMESTAMP = 1676068199
-SHA256 (wlroots-0.16.2.tar.bz2) = afea2cc740344c4e86749cf4908e07692e183cb14a3db854d24dec454c664b88
-SIZE (wlroots-0.16.2.tar.bz2) = 437628
-SHA256 (fc0854d5f256.patch) = ceaa947fd7f64b773c61d7a5a4bdcfe85a083a686d4356ff58d3666aa182e2a9
-SIZE (fc0854d5f256.patch) = 6013
-SHA256 (29cb694655db.patch) = ef36e6b7a0bea0b82469c395feac303f50bf940ae651d91370ef052f5d97938c
-SIZE (29cb694655db.patch) = 4233
-SHA256 (f3ba14e49133.patch) = fb61329725f9482eae15100ae46c59159f39abc3324937e92fdf5065155944a9
-SIZE (f3ba14e49133.patch) = 1976
+TIMESTAMP = 1700582773
+SHA256 (wlroots-0.17.0.tar.bz2) = 0f0bb100b2277e6a0622bfe2594e4139b8462cb4c49ae883f042e8c4b1bdbc3e
+SIZE (wlroots-0.17.0.tar.bz2) = 452069
+SHA256 (10f80a8f1bb2.patch) = ca65f8eecf32e7364d5ba43cd9ee91060710a6fb8392892c86ad71e4f2a4c0b5
+SIZE (10f80a8f1bb2.patch) = 6097
+SHA256 (3196c73d487f.patch) = 69c6bc4658852bb45a24b129f625a7faaed8035dab0d79c388ae74d650beacdc
+SIZE (3196c73d487f.patch) = 4243
diff --git a/x11-toolkits/wlroots/pkg-plist b/x11-toolkits/wlroots/pkg-plist
index 0698d8a43fcb..453bcf649184 100644
--- a/x11-toolkits/wlroots/pkg-plist
+++ b/x11-toolkits/wlroots/pkg-plist
@@ -4,7 +4,7 @@ include/wlr/backend/headless.h
include/wlr/backend/interface.h
%%DRM%%include/wlr/backend/libinput.h
include/wlr/backend/multi.h
-include/wlr/backend/session.h
+%%DRM%%include/wlr/backend/session.h
include/wlr/backend/wayland.h
%%X11%%include/wlr/backend/x11.h
include/wlr/config.h
@@ -22,13 +22,17 @@ include/wlr/render/drm_format_set.h
%%OPENGL%%include/wlr/render/egl.h
%%OPENGL%%include/wlr/render/gles2.h
include/wlr/render/interface.h
+include/wlr/render/pass.h
include/wlr/render/pixman.h
+include/wlr/render/swapchain.h
%%VULKAN%%include/wlr/render/vulkan.h
include/wlr/render/wlr_renderer.h
include/wlr/render/wlr_texture.h
include/wlr/types/wlr_buffer.h
include/wlr/types/wlr_compositor.h
+include/wlr/types/wlr_content_type_v1.h
include/wlr/types/wlr_cursor.h
+include/wlr/types/wlr_cursor_shape_v1.h
include/wlr/types/wlr_damage_ring.h
include/wlr/types/wlr_data_control_v1.h
include/wlr/types/wlr_data_device.h
@@ -36,9 +40,9 @@ include/wlr/types/wlr_drm.h
%%DRM%%include/wlr/types/wlr_drm_lease_v1.h
include/wlr/types/wlr_export_dmabuf_v1.h
include/wlr/types/wlr_foreign_toplevel_management_v1.h
+include/wlr/types/wlr_fractional_scale_v1.h
include/wlr/types/wlr_fullscreen_shell_v1.h
include/wlr/types/wlr_gamma_control_v1.h
-include/wlr/types/wlr_idle.h
include/wlr/types/wlr_idle_inhibit_v1.h
include/wlr/types/wlr_idle_notify_v1.h
include/wlr/types/wlr_input_device.h
@@ -51,7 +55,7 @@ include/wlr/types/wlr_layer_shell_v1.h
include/wlr/types/wlr_linux_dmabuf_v1.h
include/wlr/types/wlr_matrix.h
include/wlr/types/wlr_output.h
-include/wlr/types/wlr_output_damage.h
+include/wlr/types/wlr_output_layer.h
include/wlr/types/wlr_output_layout.h
include/wlr/types/wlr_output_management_v1.h
include/wlr/types/wlr_output_power_management_v1.h
@@ -66,15 +70,17 @@ include/wlr/types/wlr_relative_pointer_v1.h
include/wlr/types/wlr_scene.h
include/wlr/types/wlr_screencopy_v1.h
include/wlr/types/wlr_seat.h
+include/wlr/types/wlr_security_context_v1.h
include/wlr/types/wlr_server_decoration.h
include/wlr/types/wlr_session_lock_v1.h
+include/wlr/types/wlr_shm.h
include/wlr/types/wlr_single_pixel_buffer_v1.h
include/wlr/types/wlr_subcompositor.h
-include/wlr/types/wlr_surface.h
include/wlr/types/wlr_switch.h
include/wlr/types/wlr_tablet_pad.h
include/wlr/types/wlr_tablet_tool.h
include/wlr/types/wlr_tablet_v2.h
+include/wlr/types/wlr_tearing_control_v1.h
include/wlr/types/wlr_text_input_v3.h
include/wlr/types/wlr_touch.h
include/wlr/types/wlr_viewporter.h
@@ -97,7 +103,8 @@ include/wlr/version.h
include/wlr/xcursor.h
%%X11%%include/wlr/xwayland.h
%%X11%%include/wlr/xwayland/server.h
+%%X11%%include/wlr/xwayland/shell.h
%%X11%%include/wlr/xwayland/xwayland.h
lib/libwlroots.so
-lib/libwlroots.so.11
+lib/libwlroots.so.12
libdata/pkgconfig/wlroots.pc
diff --git a/x11-wm/cage/Makefile b/x11-wm/cage/Makefile
index 78b1231b8388..58dc491cb322 100644
--- a/x11-wm/cage/Makefile
+++ b/x11-wm/cage/Makefile
@@ -1,6 +1,7 @@
PORTNAME= cage
DISTVERSIONPREFIX= v
DISTVERSION= 0.1.5
+PORTREVISION= 1
CATEGORIES= x11-wm wayland
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -42,4 +43,5 @@ post-patch:
-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
${WRKSRC}/meson.build
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
.include <bsd.port.mk>
diff --git a/x11-wm/cagebreak/Makefile b/x11-wm/cagebreak/Makefile
index 51939e4f9a19..38fb75b08a81 100644
--- a/x11-wm/cagebreak/Makefile
+++ b/x11-wm/cagebreak/Makefile
@@ -1,5 +1,6 @@
PORTNAME= cagebreak
DISTVERSION= 2.2.1
+PORTREVISION= 1
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -48,4 +49,5 @@ post-patch:
@${REINPLACE_CMD} -e '/install.*licenses/d' \
${WRKSRC}/meson.build
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
.include <bsd.port.mk>
diff --git a/x11-wm/dwl/Makefile b/x11-wm/dwl/Makefile
index 46dd4375201f..3c7cc93e3366 100644
--- a/x11-wm/dwl/Makefile
+++ b/x11-wm/dwl/Makefile
@@ -1,6 +1,7 @@
PORTNAME= dwl
DISTVERSIONPREFIX= v
DISTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -68,4 +69,5 @@ do-install:
(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" \
${STAGEDIR}${DOCSDIR})
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
.include <bsd.port.mk>
diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile
index 0877fa0897ae..b84f318656fd 100644
--- a/x11-wm/gamescope/Makefile
+++ b/x11-wm/gamescope/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gamescope
DISTVERSION= 3.13.7
+PORTREVISION= 1
CATEGORIES= x11-wm wayland
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -87,4 +88,5 @@ bundled-libcxx:
.endif
.endif # exists(/usr/lib/libc++.so)
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
.include <bsd.port.mk>
diff --git a/x11-wm/kwinft/Makefile b/x11-wm/kwinft/Makefile
index 7535d04701aa..41dbf3b41b0f 100644
--- a/x11-wm/kwinft/Makefile
+++ b/x11-wm/kwinft/Makefile
@@ -1,7 +1,7 @@
PORTNAME= kwinft
DISTVERSIONPREFIX= ${PORTNAME}@
DISTVERSION= 5.27.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -68,4 +68,5 @@ post-patch:
@${REINPLACE_CMD} -e '/mounts/s,/proc,/compat/linux&,' \
${WRKSRC}/debug/perf/ftrace_impl.cpp
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
.include <bsd.port.mk>
diff --git a/x11-wm/labwc/Makefile b/x11-wm/labwc/Makefile
index ac5cd42b9479..1f4465530d45 100644
--- a/x11-wm/labwc/Makefile
+++ b/x11-wm/labwc/Makefile
@@ -1,5 +1,6 @@
PORTNAME= labwc
DISTVERSION= 0.6.5
+PORTREVISION= 1
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -70,4 +71,5 @@ post-patch:
@${REINPLACE_CMD} '/datadir/s/doc/examples/' \
${WRKSRC}/docs/meson.build
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
.include <bsd.port.mk>
diff --git a/x11-wm/phoc/Makefile b/x11-wm/phoc/Makefile
index 2e540d58feee..cef3d2020747 100644
--- a/x11-wm/phoc/Makefile
+++ b/x11-wm/phoc/Makefile
@@ -1,6 +1,7 @@
PORTNAME= phoc
DISTVERSIONPREFIX= v
DISTVERSION= 0.33.0
+PORTREVISION= 1
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -42,4 +43,5 @@ MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils
MANPAGES_MESON_TRUE= man
MANPAGES_PLIST_FILES= man/man1/${PORTNAME}.1.gz
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
.include <bsd.port.mk>
diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile
index 63428caba36f..9f00bb25adaa 100644
--- a/x11-wm/river/Makefile
+++ b/x11-wm/river/Makefile
@@ -1,6 +1,7 @@
PORTNAME= river
DISTVERSIONPREFIX= v
DISTVERSION= 0.2.4
+PORTREVISION= 1
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -77,4 +78,5 @@ do-build:
do-test:
@(cd ${WRKSRC} && ${TEST_ENV} zig build test ${CONFIGURE_ARGS})
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
.include <bsd.port.mk>
diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile
index 6555cc8d30ad..3f5e75a792ff 100644
--- a/x11-wm/sway/Makefile
+++ b/x11-wm/sway/Makefile
@@ -1,6 +1,6 @@
PORTNAME= sway
DISTVERSION?= 1.8.1
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= x11-wm wayland
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -69,4 +69,5 @@ post-patch:
-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
${WRKSRC}/meson.build
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
.include <bsd.port.mk>
diff --git a/x11-wm/swayfx/Makefile b/x11-wm/swayfx/Makefile
index e368f3c454b2..ad5556bc24cd 100644
--- a/x11-wm/swayfx/Makefile
+++ b/x11-wm/swayfx/Makefile
@@ -1,5 +1,5 @@
DISTVERSION= 0.3.2
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= ${GH_PROJECT:S/${PORTNAME}//}
PATCHFILES+= c47aa61c6492.patch:-p1 # https://github.com/WillPower3309/swayfx/pull/209
diff --git a/x11-wm/wayfire-plugins-extra/Makefile b/x11-wm/wayfire-plugins-extra/Makefile
index 66439e7aa4be..c14b4017334d 100644
--- a/x11-wm/wayfire-plugins-extra/Makefile
+++ b/x11-wm/wayfire-plugins-extra/Makefile
@@ -1,6 +1,7 @@
PORTNAME= wayfire-plugins-extra
DISTVERSIONPREFIX= v
DISTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -40,4 +41,5 @@ post-patch:
@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
${WRKSRC}/subprojects/windecor/deco-icontheme.cpp
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
.include <bsd.port.mk>
diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile
index 0e17853684e0..3aeaa42b99b0 100644
--- a/x11-wm/wayfire/Makefile
+++ b/x11-wm/wayfire/Makefile
@@ -1,6 +1,7 @@
PORTNAME= wayfire
DISTVERSIONPREFIX= v
DISTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= x11-wm wayland
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -64,4 +65,5 @@ pre-test:
${TOUCH} ${WRKDIR}/.meson_build_tests; \
fi
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
.include <bsd.port.mk>