Hi
This updates wlroots to 0.18.1. It will be needed for sway
0.10. Wayfire will need an update too (landry is working on it)
Index: Makefile
===================================================================
RCS file: /local/cvs/ports/wayland/wlroots/Makefile,v
diff -u -p -u -r1.9 Makefile
--- Makefile 30 Jun 2024 13:22:53 -0000 1.9
+++ Makefile 5 Nov 2024 09:57:39 -0000
@@ -1,6 +1,6 @@
COMMENT = modular Wayland compositor library
-V = 0.17.4
+V = 0.18.1
EPOCH = 0
DISTNAME = wlroots-${V}
CATEGORIES = wayland
@@ -12,12 +12,12 @@ HOMEPAGE = https://gitlab.freedesktop.or
# MIT
PERMIT_PACKAGE = Yes
-SHARED_LIBS += wlroots 0.1 # 0.0
+SHARED_LIBS += wlroots-0.18 0.0 # 0.0
MODULES = devel/meson
WANTLIB += EGL GLESv2 drm gbm m pixman-1
-WANTLIB += display-info liftoff udev
+WANTLIB += display-info lcms2 liftoff udev
WANTLIB += input seat
WANTLIB += vulkan wayland-client wayland-server
WANTLIB += xcb xcb-composite xcb-dri3 xcb-errors xcb-ewmh
@@ -37,6 +37,7 @@ BUILD_DEPENDS = \
wayland/xwayland
LIB_DEPENDS = \
+ graphics/lcms2 \
graphics/libliftoff \
graphics/vulkan-loader \
sysutils/libdisplay-info \
Index: distinfo
===================================================================
RCS file: /local/cvs/ports/wayland/wlroots/distinfo,v
diff -u -p -u -r1.6 distinfo
--- distinfo 30 Jun 2024 13:22:53 -0000 1.6
+++ distinfo 5 Nov 2024 09:57:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (wlroots-0.17.4.tar.gz) = 0xkNGdA0RpVeaKksd9THSveDhLDbOahaCxWCrcgPNtE=
-SIZE (wlroots-0.17.4.tar.gz) = 609179
+SHA256 (wlroots-0.18.1.tar.gz) = ucS/70Ej/p+GYigLhR48V0GSdFcXQxWCaCe/u3BhKHg=
+SIZE (wlroots-0.18.1.tar.gz) = 628648
Index: patches/patch-meson_build
===================================================================
RCS file: /local/cvs/ports/wayland/wlroots/patches/patch-meson_build,v
diff -u -p -u -r1.1 patch-meson_build
--- patches/patch-meson_build 25 Nov 2023 11:16:14 -0000 1.1
+++ patches/patch-meson_build 5 Nov 2024 09:57:39 -0000
@@ -1,7 +1,9 @@
+No librt on OpenBSD
+
Index: meson.build
--- meson.build.orig
+++ meson.build
-@@ -145,7 +145,6 @@ pixman = dependency('pixman-1',
+@@ -134,7 +134,6 @@ pixman = dependency('pixman-1',
default_options: ['werror=false'],
)
math = cc.find_library('m')
@@ -9,7 +11,7 @@ Index: meson.build
wlr_files = []
wlr_deps = [
-@@ -154,7 +153,6 @@ wlr_deps = [
+@@ -143,7 +142,6 @@ wlr_deps = [
xkbcommon,
pixman,
math,
Index: patches/patch-render_vulkan_vulkan_c
===================================================================
RCS file:
/local/cvs/ports/wayland/wlroots/patches/patch-render_vulkan_vulkan_c,v
diff -u -p -u -r1.1 patch-render_vulkan_vulkan_c
--- patches/patch-render_vulkan_vulkan_c 25 Nov 2023 11:16:14 -0000
1.1
+++ patches/patch-render_vulkan_vulkan_c 5 Nov 2024 09:57:39 -0000
@@ -4,8 +4,8 @@ Index: render/vulkan/vulkan.c
--- render/vulkan/vulkan.c.orig
+++ render/vulkan/vulkan.c
@@ -1,4 +1,4 @@
--#if !defined(__FreeBSD__)
-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
- #define _POSIX_C_SOURCE 200809L
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #undef _POSIX_C_SOURCE
#endif
#include <assert.h>
Index: patches/patch-xcursor_xcursor_c
===================================================================
RCS file: /local/cvs/ports/wayland/wlroots/patches/patch-xcursor_xcursor_c,v
diff -u -p -u -r1.1 patch-xcursor_xcursor_c
--- patches/patch-xcursor_xcursor_c 25 Nov 2023 11:16:14 -0000 1.1
+++ patches/patch-xcursor_xcursor_c 5 Nov 2024 09:57:39 -0000
@@ -1,7 +1,7 @@
Index: xcursor/xcursor.c
--- xcursor/xcursor.c.orig
+++ xcursor/xcursor.c
-@@ -489,7 +489,7 @@ xcursor_xc_file_load_images(FILE *file, int size)
+@@ -490,7 +490,7 @@ xcursor_xc_file_load_images(FILE *file, int size)
#endif
#ifndef XCURSORPATH
Index: pkg/PLIST
===================================================================
RCS file: /local/cvs/ports/wayland/wlroots/pkg/PLIST,v
diff -u -p -u -r1.3 PLIST
--- pkg/PLIST 25 Nov 2023 11:16:14 -0000 1.3
+++ pkg/PLIST 5 Nov 2024 09:57:39 -0000
@@ -1,116 +1,124 @@
-include/wlr/
-include/wlr/backend/
-include/wlr/backend.h
-include/wlr/backend/drm.h
-include/wlr/backend/headless.h
-include/wlr/backend/interface.h
-include/wlr/backend/libinput.h
-include/wlr/backend/multi.h
-include/wlr/backend/session.h
-include/wlr/backend/wayland.h
-include/wlr/backend/x11.h
-include/wlr/config.h
-include/wlr/interfaces/
-include/wlr/interfaces/wlr_buffer.h
-include/wlr/interfaces/wlr_keyboard.h
-include/wlr/interfaces/wlr_output.h
-include/wlr/interfaces/wlr_pointer.h
-include/wlr/interfaces/wlr_switch.h
-include/wlr/interfaces/wlr_tablet_pad.h
-include/wlr/interfaces/wlr_tablet_tool.h
-include/wlr/interfaces/wlr_touch.h
-include/wlr/render/
-include/wlr/render/allocator.h
-include/wlr/render/dmabuf.h
-include/wlr/render/drm_format_set.h
-include/wlr/render/egl.h
-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
-include/wlr/render/vulkan.h
-include/wlr/render/wlr_renderer.h
-include/wlr/render/wlr_texture.h
-include/wlr/types/
-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
-include/wlr/types/wlr_drm.h
-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_inhibit_v1.h
-include/wlr/types/wlr_idle_notify_v1.h
-include/wlr/types/wlr_input_device.h
-include/wlr/types/wlr_input_inhibitor.h
-include/wlr/types/wlr_input_method_v2.h
-include/wlr/types/wlr_keyboard.h
-include/wlr/types/wlr_keyboard_group.h
-include/wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h
-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_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
-include/wlr/types/wlr_pointer.h
-include/wlr/types/wlr_pointer_constraints_v1.h
-include/wlr/types/wlr_pointer_gestures_v1.h
-include/wlr/types/wlr_presentation_time.h
-include/wlr/types/wlr_primary_selection.h
-include/wlr/types/wlr_primary_selection_v1.h
-include/wlr/types/wlr_region.h
-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_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
-include/wlr/types/wlr_virtual_keyboard_v1.h
-include/wlr/types/wlr_virtual_pointer_v1.h
-include/wlr/types/wlr_xcursor_manager.h
-include/wlr/types/wlr_xdg_activation_v1.h
-include/wlr/types/wlr_xdg_decoration_v1.h
-include/wlr/types/wlr_xdg_foreign_registry.h
-include/wlr/types/wlr_xdg_foreign_v1.h
-include/wlr/types/wlr_xdg_foreign_v2.h
-include/wlr/types/wlr_xdg_output_v1.h
-include/wlr/types/wlr_xdg_shell.h
-include/wlr/util/
-include/wlr/util/addon.h
-include/wlr/util/box.h
-include/wlr/util/edges.h
-include/wlr/util/log.h
-include/wlr/util/region.h
-include/wlr/version.h
-include/wlr/xcursor.h
-include/wlr/xwayland/
-include/wlr/xwayland.h
-include/wlr/xwayland/server.h
-include/wlr/xwayland/shell.h
-include/wlr/xwayland/xwayland.h
-@lib lib/libwlroots.so.${LIBwlroots_VERSION}
-lib/pkgconfig/wlroots.pc
+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
--
Matthieu Herrb
