From: Matthieu Herrb Subject: Re: wayland/wlroots : introduce mod_wlroots To: Antoine Jacoutot Cc: ports@openbsd.org Date: Tue, 5 Aug 2025 08:04:51 +0200 On Mon, Aug 04, 2025 at 12:16:28PM +0200, Antoine Jacoutot wrote: > On August 4, 2025 11:37:56 AM GMT+02:00, Matthieu Herrb wrote: > >On Mon, Aug 04, 2025 at 11:24:28AM +0200, Antoine Jacoutot wrote: > >> On Mon, Aug 04, 2025 at 10:55:10AM +0200, Matthieu Herrb wrote: > >> > Hi, > >> > > >> > Since wlroots upstreams has decided to include the library version > >> > number in its name, managing dependencies on wlroots over updates > >> > (and 0.19.0 is ready) has become a bit annoying. > >> > > >> > The diff below intruduces a wlroots module and uses it in the current > >> > ports depending on wlroots. > >> > > >> > Comments? Ok? > >> > >> I think you could simplify this by making it explicit in the module instead of > >> its consumers. > >> > >> + wayland/wlroots>=${MODWLR_VERSION_MAIN} > >> > >> Also that will not prevent having to bump all consumers when wlroots > >> is updated. > > > >Generally the consumers needs to be updated to catch up with wlroots > >API breakage anyways. But I'd like to simplify the work. > > Sure. But I still think managing LIB_DEPENDS in the module would simplify things. > And as a matter of fact we should do the same with WANTLIB. > New version, provinding automatic LIB_DEPENDS and WANTLIB handling: Index: wlroots/Makefile =================================================================== RCS file: /local/cvs/ports/wayland/wlroots/Makefile,v diff -u -p -u -r1.11 Makefile --- wlroots/Makefile 16 Dec 2024 18:25:23 -0000 1.11 +++ wlroots/Makefile 5 Aug 2025 06:03:16 -0000 @@ -1,6 +1,7 @@ COMMENT = modular Wayland compositor library -V = 0.18.2 +V = ${MODWLR_VERSION} +REVISION = 0 EPOCH = 0 DISTNAME = wlroots-${V} CATEGORIES = wayland @@ -14,7 +15,7 @@ PERMIT_PACKAGE = Yes SHARED_LIBS += wlroots-0.18 0.0 # 0.0 -MODULES = devel/meson +MODULES = devel/meson wayland/wlroots WANTLIB += EGL GLESv2 drm gbm m pixman-1 WANTLIB += display-info lcms2 liftoff udev Index: wlroots/wlroots.port.mk =================================================================== RCS file: wlroots/wlroots.port.mk diff -N wlroots/wlroots.port.mk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ wlroots/wlroots.port.mk 5 Aug 2025 06:03:16 -0000 @@ -0,0 +1,9 @@ +MODWLR_VERSION_MAIN = 0.18 +MODWLR_VERSION_MINOR = 2 +MODWLR_VERSION = ${MODWLR_VERSION_MAIN}.${MODWLR_VERSION_MINOR} + +WANTLIB += wlroots-${MODWLR_VERSION_MAIN} +LIB_DEPENDS += wayland/wlroots>=${MODWLR_VERSION_MAIN} + +SUBST_VARS += MODWLR_VERSION MODWLR_VERSION_MAIN + Index: wlroots/pkg/PLIST =================================================================== RCS file: /local/cvs/ports/wayland/wlroots/pkg/PLIST,v diff -u -p -u -r1.4 PLIST --- wlroots/pkg/PLIST 7 Nov 2024 09:44:27 -0000 1.4 +++ wlroots/pkg/PLIST 5 Aug 2025 06:03:16 -0000 @@ -1,124 +1,124 @@ -include/wlroots-0.18/ -include/wlroots-0.18/wlr/ -include/wlroots-0.18/wlr/backend/ -include/wlroots-0.18/wlr/backend.h -include/wlroots-0.18/wlr/backend/drm.h -include/wlroots-0.18/wlr/backend/headless.h -include/wlroots-0.18/wlr/backend/interface.h -include/wlroots-0.18/wlr/backend/libinput.h -include/wlroots-0.18/wlr/backend/multi.h -include/wlroots-0.18/wlr/backend/session.h -include/wlroots-0.18/wlr/backend/wayland.h -include/wlroots-0.18/wlr/backend/x11.h -include/wlroots-0.18/wlr/config.h -include/wlroots-0.18/wlr/interfaces/ -include/wlroots-0.18/wlr/interfaces/wlr_buffer.h -include/wlroots-0.18/wlr/interfaces/wlr_keyboard.h -include/wlroots-0.18/wlr/interfaces/wlr_output.h -include/wlroots-0.18/wlr/interfaces/wlr_pointer.h -include/wlroots-0.18/wlr/interfaces/wlr_switch.h -include/wlroots-0.18/wlr/interfaces/wlr_tablet_pad.h -include/wlroots-0.18/wlr/interfaces/wlr_tablet_tool.h -include/wlroots-0.18/wlr/interfaces/wlr_touch.h -include/wlroots-0.18/wlr/render/ -include/wlroots-0.18/wlr/render/allocator.h -include/wlroots-0.18/wlr/render/color.h -include/wlroots-0.18/wlr/render/dmabuf.h -include/wlroots-0.18/wlr/render/drm_format_set.h -include/wlroots-0.18/wlr/render/drm_syncobj.h -include/wlroots-0.18/wlr/render/egl.h -include/wlroots-0.18/wlr/render/gles2.h -include/wlroots-0.18/wlr/render/interface.h -include/wlroots-0.18/wlr/render/pass.h -include/wlroots-0.18/wlr/render/pixman.h -include/wlroots-0.18/wlr/render/swapchain.h -include/wlroots-0.18/wlr/render/vulkan.h -include/wlroots-0.18/wlr/render/wlr_renderer.h -include/wlroots-0.18/wlr/render/wlr_texture.h -include/wlroots-0.18/wlr/types/ -include/wlroots-0.18/wlr/types/wlr_alpha_modifier_v1.h -include/wlroots-0.18/wlr/types/wlr_buffer.h -include/wlroots-0.18/wlr/types/wlr_compositor.h -include/wlroots-0.18/wlr/types/wlr_content_type_v1.h -include/wlroots-0.18/wlr/types/wlr_cursor.h -include/wlroots-0.18/wlr/types/wlr_cursor_shape_v1.h -include/wlroots-0.18/wlr/types/wlr_damage_ring.h -include/wlroots-0.18/wlr/types/wlr_data_control_v1.h -include/wlroots-0.18/wlr/types/wlr_data_device.h -include/wlroots-0.18/wlr/types/wlr_drm.h -include/wlroots-0.18/wlr/types/wlr_drm_lease_v1.h -include/wlroots-0.18/wlr/types/wlr_export_dmabuf_v1.h -include/wlroots-0.18/wlr/types/wlr_ext_foreign_toplevel_list_v1.h -include/wlroots-0.18/wlr/types/wlr_foreign_toplevel_management_v1.h -include/wlroots-0.18/wlr/types/wlr_fractional_scale_v1.h -include/wlroots-0.18/wlr/types/wlr_fullscreen_shell_v1.h -include/wlroots-0.18/wlr/types/wlr_gamma_control_v1.h -include/wlroots-0.18/wlr/types/wlr_idle_inhibit_v1.h -include/wlroots-0.18/wlr/types/wlr_idle_notify_v1.h -include/wlroots-0.18/wlr/types/wlr_input_device.h -include/wlroots-0.18/wlr/types/wlr_input_method_v2.h -include/wlroots-0.18/wlr/types/wlr_keyboard.h -include/wlroots-0.18/wlr/types/wlr_keyboard_group.h -include/wlroots-0.18/wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h -include/wlroots-0.18/wlr/types/wlr_layer_shell_v1.h -include/wlroots-0.18/wlr/types/wlr_linux_dmabuf_v1.h -include/wlroots-0.18/wlr/types/wlr_linux_drm_syncobj_v1.h -include/wlroots-0.18/wlr/types/wlr_matrix.h -include/wlroots-0.18/wlr/types/wlr_output.h -include/wlroots-0.18/wlr/types/wlr_output_layer.h -include/wlroots-0.18/wlr/types/wlr_output_layout.h -include/wlroots-0.18/wlr/types/wlr_output_management_v1.h -include/wlroots-0.18/wlr/types/wlr_output_power_management_v1.h -include/wlroots-0.18/wlr/types/wlr_output_swapchain_manager.h -include/wlroots-0.18/wlr/types/wlr_pointer.h -include/wlroots-0.18/wlr/types/wlr_pointer_constraints_v1.h -include/wlroots-0.18/wlr/types/wlr_pointer_gestures_v1.h -include/wlroots-0.18/wlr/types/wlr_presentation_time.h -include/wlroots-0.18/wlr/types/wlr_primary_selection.h -include/wlroots-0.18/wlr/types/wlr_primary_selection_v1.h -include/wlroots-0.18/wlr/types/wlr_region.h -include/wlroots-0.18/wlr/types/wlr_relative_pointer_v1.h -include/wlroots-0.18/wlr/types/wlr_scene.h -include/wlroots-0.18/wlr/types/wlr_screencopy_v1.h -include/wlroots-0.18/wlr/types/wlr_seat.h -include/wlroots-0.18/wlr/types/wlr_security_context_v1.h -include/wlroots-0.18/wlr/types/wlr_server_decoration.h -include/wlroots-0.18/wlr/types/wlr_session_lock_v1.h -include/wlroots-0.18/wlr/types/wlr_shm.h -include/wlroots-0.18/wlr/types/wlr_single_pixel_buffer_v1.h -include/wlroots-0.18/wlr/types/wlr_subcompositor.h -include/wlroots-0.18/wlr/types/wlr_switch.h -include/wlroots-0.18/wlr/types/wlr_tablet_pad.h -include/wlroots-0.18/wlr/types/wlr_tablet_tool.h -include/wlroots-0.18/wlr/types/wlr_tablet_v2.h -include/wlroots-0.18/wlr/types/wlr_tearing_control_v1.h -include/wlroots-0.18/wlr/types/wlr_text_input_v3.h -include/wlroots-0.18/wlr/types/wlr_touch.h -include/wlroots-0.18/wlr/types/wlr_transient_seat_v1.h -include/wlroots-0.18/wlr/types/wlr_viewporter.h -include/wlroots-0.18/wlr/types/wlr_virtual_keyboard_v1.h -include/wlroots-0.18/wlr/types/wlr_virtual_pointer_v1.h -include/wlroots-0.18/wlr/types/wlr_xcursor_manager.h -include/wlroots-0.18/wlr/types/wlr_xdg_activation_v1.h -include/wlroots-0.18/wlr/types/wlr_xdg_decoration_v1.h -include/wlroots-0.18/wlr/types/wlr_xdg_foreign_registry.h -include/wlroots-0.18/wlr/types/wlr_xdg_foreign_v1.h -include/wlroots-0.18/wlr/types/wlr_xdg_foreign_v2.h -include/wlroots-0.18/wlr/types/wlr_xdg_output_v1.h -include/wlroots-0.18/wlr/types/wlr_xdg_shell.h -include/wlroots-0.18/wlr/util/ -include/wlroots-0.18/wlr/util/addon.h -include/wlroots-0.18/wlr/util/box.h -include/wlroots-0.18/wlr/util/edges.h -include/wlroots-0.18/wlr/util/log.h -include/wlroots-0.18/wlr/util/region.h -include/wlroots-0.18/wlr/util/transform.h -include/wlroots-0.18/wlr/version.h -include/wlroots-0.18/wlr/xcursor.h -include/wlroots-0.18/wlr/xwayland/ -include/wlroots-0.18/wlr/xwayland.h -include/wlroots-0.18/wlr/xwayland/server.h -include/wlroots-0.18/wlr/xwayland/shell.h -include/wlroots-0.18/wlr/xwayland/xwayland.h -@lib lib/libwlroots-0.18.so.${LIBwlroots-0.18_VERSION} -lib/pkgconfig/wlroots-0.18.pc +include/wlroots-${MODWLR_VERSION_MAIN}/ +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/ +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/backend/ +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/backend.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/backend/drm.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/backend/headless.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/backend/interface.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/backend/libinput.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/backend/multi.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/backend/session.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/backend/wayland.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/backend/x11.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/config.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/interfaces/ +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/interfaces/wlr_buffer.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/interfaces/wlr_keyboard.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/interfaces/wlr_output.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/interfaces/wlr_pointer.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/interfaces/wlr_switch.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/interfaces/wlr_tablet_pad.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/interfaces/wlr_tablet_tool.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/interfaces/wlr_touch.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/render/ +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/render/allocator.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/render/color.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/render/dmabuf.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/render/drm_format_set.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/render/drm_syncobj.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/render/egl.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/render/gles2.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/render/interface.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/render/pass.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/render/pixman.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/render/swapchain.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/render/vulkan.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/render/wlr_renderer.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/render/wlr_texture.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/ +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_alpha_modifier_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_buffer.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_compositor.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_content_type_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_cursor.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_cursor_shape_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_damage_ring.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_data_control_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_data_device.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_drm.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_drm_lease_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_export_dmabuf_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_ext_foreign_toplevel_list_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_foreign_toplevel_management_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_fractional_scale_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_fullscreen_shell_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_gamma_control_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_idle_inhibit_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_idle_notify_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_input_device.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_input_method_v2.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_keyboard.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_keyboard_group.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_layer_shell_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_linux_dmabuf_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_linux_drm_syncobj_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_matrix.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_output.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_output_layer.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_output_layout.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_output_management_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_output_power_management_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_output_swapchain_manager.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_pointer.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_pointer_constraints_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_pointer_gestures_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_presentation_time.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_primary_selection.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_primary_selection_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_region.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_relative_pointer_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_scene.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_screencopy_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_seat.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_security_context_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_server_decoration.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_session_lock_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_shm.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_single_pixel_buffer_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_subcompositor.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_switch.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_tablet_pad.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_tablet_tool.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_tablet_v2.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_tearing_control_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_text_input_v3.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_touch.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_transient_seat_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_viewporter.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_virtual_keyboard_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_virtual_pointer_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_xcursor_manager.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_xdg_activation_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_xdg_decoration_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_xdg_foreign_registry.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_xdg_foreign_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_xdg_foreign_v2.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_xdg_output_v1.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/types/wlr_xdg_shell.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/util/ +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/util/addon.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/util/box.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/util/edges.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/util/log.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/util/region.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/util/transform.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/version.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/xcursor.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/xwayland/ +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/xwayland.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/xwayland/server.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/xwayland/shell.h +include/wlroots-${MODWLR_VERSION_MAIN}/wlr/xwayland/xwayland.h +@lib lib/libwlroots-${MODWLR_VERSION_MAIN}.so.${LIBwlroots-${MODWLR_VERSION_MAIN}_VERSION} +lib/pkgconfig/wlroots-${MODWLR_VERSION_MAIN}.pc Index: sway/Makefile =================================================================== RCS file: /local/cvs/ports/wayland/sway/Makefile,v diff -u -p -u -r1.14 Makefile --- sway/Makefile 2 Mar 2025 09:21:55 -0000 1.14 +++ sway/Makefile 5 Aug 2025 06:03:16 -0000 @@ -3,6 +3,7 @@ COMMENT = i3-compatible Wayland composit GH_ACCOUNT = swaywm GH_PROJECT = sway GH_TAGNAME = 1.10.1 +REVISION = 0 CATEGORIES = wayland @@ -11,12 +12,12 @@ HOMEPAGE = https://swaywm.org/ # MIT PERMIT_PACKAGE = Yes -MODULES = devel/meson +MODULES = devel/meson wayland/wlroots WANTLIB = cairo drm evdev gdk_pixbuf-2.0 glib-2.0 gobject-2.0 input WANTLIB += json-c pango-1.0 pangocairo-1.0 pcre2-8 pixman-1 pthread WANTLIB += udev wayland-client wayland-cursor -WANTLIB += wayland-server wlroots-0.18 +WANTLIB += wayland-server WANTLIB += xcb-icccm xcb xkbcommon WANTLIB += c m @@ -30,7 +31,6 @@ LIB_DEPENDS = devel/json-c \ wayland/libevdev-openbsd \ wayland/libinput-openbsd>=1.26 \ wayland/wayland \ - wayland/wlroots \ x11/xkbcommon RUN_DEPENDS = wayland/wmenu>=0.1.9 \ Index: labwc/Makefile =================================================================== RCS file: /local/cvs/ports/wayland/labwc/Makefile,v diff -u -p -u -r1.6 Makefile --- labwc/Makefile 15 May 2025 06:52:01 -0000 1.6 +++ labwc/Makefile 5 Aug 2025 06:03:16 -0000 @@ -3,6 +3,7 @@ COMMENT = window-stacking Wayland compos GH_ACCOUNT = labwc GH_PROJECT = labwc GH_TAGNAME = 0.8.4 +REVISION = 0 CATEGORIES = wayland @@ -11,7 +12,7 @@ HOMEPAGE = https://labwc.github.io/ # GPLv2 PERMIT_PACKAGE = Yes -MODULES = devel/meson +MODULES = devel/meson wayland/wlroots DEBUG_PACKAGES = ${BUILD_PACKAGES} @@ -28,12 +29,11 @@ RUN_DEPENDS += x11/gtk+4,-guic \ LIB_DEPENDS = sysutils/libsfdo \ x11/gnome/librsvg \ wayland/wayland \ - wayland/wlroots>=0.18 \ x11/xkbcommon WANTLIB += c cairo glib-2.0 gobject-2.0 input intl m pango-1.0 WANTLIB += pangocairo-1.0 pixman-1 png rsvg-2 sfdo-basedir sfdo-desktop -WANTLIB += sfdo-icon wayland-server wlroots-0.18 xcb xkbcommon +WANTLIB += sfdo-icon wayland-server xcb xkbcommon WANTLIB += xml2 .include Index: wayfire/Makefile =================================================================== RCS file: /local/cvs/ports/wayland/wayfire/Makefile,v diff -u -p -u -r1.11 Makefile --- wayfire/Makefile 28 Jun 2025 06:16:18 -0000 1.11 +++ wayfire/Makefile 5 Aug 2025 06:03:16 -0000 @@ -5,7 +5,7 @@ GH_ACCOUNT = WayfireWM GH_PROJECT = wayfire GH_COMMIT = 3d3f426f7de8a24117f6c1d33c8dead1bc80b7e9 DISTNAME = wayfire-${V} -REVISION = 0 +REVISION = 1 SHARED_LIBS += wf-utils 0.0 # 0.0 CATEGORIES = wayland @@ -24,7 +24,7 @@ DIST_TUPLE += github ${GH_ACCOUNT} wf-to #EXTRACT_SUFX = .tar.xz HOMEPAGE = https://wayfire.org -MODULES = devel/meson +MODULES = devel/meson wayland/wlroots BUILD_DEPENDS = graphics/glm \ devel/cmake/core \ textproc/nlohmann-json \ @@ -46,12 +46,11 @@ LIB_DEPENDS = devel/pango \ wayland/libinput-openbsd \ wayland/wayland \ wayland/wf-config \ - wayland/wlroots>=0.18 \ x11/xkbcommon WANTLIB += ${COMPILER_LIBCXX} EGL GLESv2 c cairo evdev execinfo WANTLIB += gobject-2.0 input jpeg m pango-1.0 pangocairo-1.0 pixman-1 -WANTLIB += png wayland-client wayland-server wf-config wlroots-0.18 xcb xkbcommon +WANTLIB += png wayland-client wayland-server wf-config xcb xkbcommon WANTLIB += lib/inotify/inotify # hack for gbm getting -I/usr/local/lib and failing build in wf-touch ? -- Matthieu Herrb