diff --git a/x11-toolkits/como/Makefile b/x11-toolkits/como/Makefile index e09bb66f8035..a358a1b0718c 100644 --- a/x11-toolkits/como/Makefile +++ b/x11-toolkits/como/Makefile @@ -1,68 +1,69 @@ PORTNAME= como DISTVERSIONPREFIX= v DISTVERSION= 0.2.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 325e41b02b58.patch:-p1 # https://github.com/winft/como/pull/22 PATCHFILES+= d250e3a81b91.patch:-p1 # https://github.com/winft/como/pull/22 MAINTAINER= jbeich@FreeBSD.org COMMENT= Compositor Modules for Wayland and X11 WWW= https://github.com/winft/como LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libwayland-server.so:graphics/wayland \ libWraplandServer.so:graphics/wrapland \ - libwlroots.so:x11-toolkits/wlroots \ + libwlroots.so:x11-toolkits/wlroots017 \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon \ libxcb-image.so:x11/xcb-util-image \ libxcb-keysyms.so:x11/xcb-util-keysyms RUN_DEPENDS= evdev-proto>0:devel/evdev-proto TEST_DEPENDS= catch2>0:devel/catch2 USES= cmake:testing gettext-tools kde:6 pkgconfig \ python:build qt:6 shebangfix xorg USE_GITHUB= yes USE_KDE= auth colorscheme config configwidgets coreaddons \ decoration ecm:build globalaccel i18n idletime kcmutils \ kscreenlocker newstuff:build package service svg \ widgetsaddons windowsystem USE_LDCONFIG= yes USE_QT= base declarative tools USE_XORG= x11 xcb GH_ACCOUNT= winft SHEBANG_FILES= plugins/effects/*.py PLIST_SUB= VERSION=${PORTVERSION} LDFLAGS+= -Wl,--as-needed # fontconfig/freetype, GL, ICE/SM/Xext/Xi, pixman OPTIONS_DEFINE= BREEZE DOCS QA11Y OPTIONS_DEFAULT=BREEZE QA11Y BREEZE_DESC= Default window decoration plugin BREEZE_USE= KDE=breeze BREEZE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Breeze DOCS_USE= KDE=doctools:build DOCS_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_KF6DocTools QA11Y_DESC= Accessibility (focus tracking) for Zoom effect QA11Y_LIB_DEPENDS= libqaccessibilityclient-qt6.so:accessibility/libqaccessibilityclient@qt6 QA11Y_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_QAccessibilityClient6 post-patch: # Convert nodes from linprocfs(5) to procfs(5) # XXX como lacks https://invent.kde.org/plasma/kwin/-/commit/1bc7afe8aaa9 @${REINPLACE_CMD} -e '/proc/,+1s,/exe,/file,' \ ${WRKSRC}/${PORTNAME}/base/wayland/filtered_display.cpp \ ${WRKSRC}/${PORTNAME}/desktop/kde/service_utils.h # Generic nodes are not supported by procfs(5) @${REINPLACE_CMD} -e '/mounts/s,/proc,${LINUXBASE}&,' \ ${WRKSRC}/${PORTNAME}/debug/perf/ftrace_impl.cpp .include diff --git a/x11-toolkits/scenefx/Makefile b/x11-toolkits/scenefx/Makefile index 8486bf5816fa..dc10e9018d30 100644 --- a/x11-toolkits/scenefx/Makefile +++ b/x11-toolkits/scenefx/Makefile @@ -1,32 +1,33 @@ PORTNAME= scenefx DISTVERSION= 0.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits MAINTAINER= jbeich@FreeBSD.org COMMENT= wlroots scene API, but with eye candy! WWW= https://github.com/wlrfx/scenefx LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>=1.27:graphics/wayland-protocols LIB_DEPENDS= libdrm.so:graphics/libdrm \ libwayland-server.so:graphics/wayland \ - libwlroots.so:x11-toolkits/wlroots + libwlroots.so:x11-toolkits/wlroots017 USES= compiler:c11 meson pkgconfig xorg USE_GITHUB= yes USE_LDCONFIG= yes USE_XORG= pixman GH_ACCOUNT= wlrfx MESON_ARGS= -Dexamples=false -Drenderers=${RENDERERS:ts,} OPTIONS_DEFINE= OPENGL OPTIONS_DEFAULT=OPENGL OPTIONS_SLAVE= OPENGL # XXX Remove after adding VULKAN OPENGL_USES= gl OPENGL_USE= GL=egl,gbm,glesv2 OPENGL_VARS= RENDERERS+=gles2 .include diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile index 7fb7972f4de7..53a207c0fd97 100644 --- a/x11-toolkits/wlroots/Makefile +++ b/x11-toolkits/wlroots/Makefile @@ -1,65 +1,78 @@ PORTNAME= wlroots -DISTVERSION= 0.17.4 +DISTVERSION= 0.18.0 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.32:graphics/wayland-protocols +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} -OPTIONS_DEFINE= DRM OPENGL VULKAN X11 -OPTIONS_DEFAULT=DRM OPENGL VULKAN X11 +# 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= hwdata>0:misc/hwdata +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 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 diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo index c97bf46ee8a9..47e5e06c115c 100644 --- a/x11-toolkits/wlroots/distinfo +++ b/x11-toolkits/wlroots/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1719512708 -SHA256 (wlroots-0.17.4.tar.bz2) = 76cea5143c966640000efad32d5961b1d2303744497d30ef5e78aaf50360288d -SIZE (wlroots-0.17.4.tar.bz2) = 454301 +TIMESTAMP = 1720820390 +SHA256 (wlroots-0.18.0.tar.bz2) = 5d46f6a4734ca659ad144c2bcab5da781987091dcbb0744c8aa05940eb73d372 +SIZE (wlroots-0.18.0.tar.bz2) = 469529 diff --git a/x11-toolkits/wlroots/pkg-plist b/x11-toolkits/wlroots/pkg-plist index 453bcf649184..c27cc09b89a4 100644 --- a/x11-toolkits/wlroots/pkg-plist +++ b/x11-toolkits/wlroots/pkg-plist @@ -1,110 +1,116 @@ -include/wlr/backend.h -%%DRM%%include/wlr/backend/drm.h -include/wlr/backend/headless.h -include/wlr/backend/interface.h -%%DRM%%include/wlr/backend/libinput.h -include/wlr/backend/multi.h -%%DRM%%include/wlr/backend/session.h -include/wlr/backend/wayland.h -%%X11%%include/wlr/backend/x11.h -include/wlr/config.h -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/allocator.h -include/wlr/render/dmabuf.h -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 -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_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/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 -%%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.12 -libdata/pkgconfig/wlroots.pc +include/wlroots%%SUFFIX%%/wlr/backend.h +%%DRM%%include/wlroots%%SUFFIX%%/wlr/backend/drm.h +include/wlroots%%SUFFIX%%/wlr/backend/headless.h +include/wlroots%%SUFFIX%%/wlr/backend/interface.h +%%DRM%%include/wlroots%%SUFFIX%%/wlr/backend/libinput.h +include/wlroots%%SUFFIX%%/wlr/backend/multi.h +%%DRM%%include/wlroots%%SUFFIX%%/wlr/backend/session.h +include/wlroots%%SUFFIX%%/wlr/backend/wayland.h +%%X11%%include/wlroots%%SUFFIX%%/wlr/backend/x11.h +include/wlroots%%SUFFIX%%/wlr/config.h +include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_buffer.h +include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_keyboard.h +include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_output.h +include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_pointer.h +include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_switch.h +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 +include/wlroots%%SUFFIX%%/wlr/render/drm_syncobj.h +%%OPENGL%%include/wlroots%%SUFFIX%%/wlr/render/egl.h +%%OPENGL%%include/wlroots%%SUFFIX%%/wlr/render/gles2.h +include/wlroots%%SUFFIX%%/wlr/render/interface.h +include/wlroots%%SUFFIX%%/wlr/render/pass.h +include/wlroots%%SUFFIX%%/wlr/render/pixman.h +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 +include/wlroots%%SUFFIX%%/wlr/types/wlr_cursor.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_cursor_shape_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_damage_ring.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_data_control_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_data_device.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_drm.h +%%DRM%%include/wlroots%%SUFFIX%%/wlr/types/wlr_drm_lease_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_export_dmabuf_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_ext_foreign_toplevel_list_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_foreign_toplevel_management_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_fractional_scale_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_fullscreen_shell_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_gamma_control_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_idle_inhibit_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_idle_notify_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_input_device.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_input_method_v2.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_keyboard.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_keyboard_group.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_layer_shell_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_linux_dmabuf_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_linux_drm_syncobj_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_matrix.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_output.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_output_layer.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_output_layout.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_output_management_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_output_power_management_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_output_swapchain_manager.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_pointer.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_pointer_constraints_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_pointer_gestures_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_presentation_time.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_primary_selection.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_primary_selection_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_region.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_relative_pointer_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_scene.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_screencopy_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_seat.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_security_context_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_server_decoration.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_session_lock_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_shm.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_single_pixel_buffer_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_subcompositor.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_switch.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_tablet_pad.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_tablet_tool.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_tablet_v2.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_tearing_control_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_text_input_v3.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_touch.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_transient_seat_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_viewporter.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_virtual_keyboard_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_virtual_pointer_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_xcursor_manager.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_activation_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_decoration_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_foreign_registry.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_foreign_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_foreign_v2.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_output_v1.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_shell.h +include/wlroots%%SUFFIX%%/wlr/util/addon.h +include/wlroots%%SUFFIX%%/wlr/util/box.h +include/wlroots%%SUFFIX%%/wlr/util/edges.h +include/wlroots%%SUFFIX%%/wlr/util/log.h +include/wlroots%%SUFFIX%%/wlr/util/region.h +include/wlroots%%SUFFIX%%/wlr/util/transform.h +include/wlroots%%SUFFIX%%/wlr/version.h +include/wlroots%%SUFFIX%%/wlr/xcursor.h +%%X11%%include/wlroots%%SUFFIX%%/wlr/xwayland.h +%%X11%%include/wlroots%%SUFFIX%%/wlr/xwayland/server.h +%%X11%%include/wlroots%%SUFFIX%%/wlr/xwayland/shell.h +%%X11%%include/wlroots%%SUFFIX%%/wlr/xwayland/xwayland.h +lib/libwlroots%%SUFFIX%%.so +libdata/pkgconfig/wlroots%%SUFFIX%%.pc diff --git a/x11-wm/cagebreak/Makefile b/x11-wm/cagebreak/Makefile index cbfa0a09d8f1..0c5e0603e39a 100644 --- a/x11-wm/cagebreak/Makefile +++ b/x11-wm/cagebreak/Makefile @@ -1,50 +1,51 @@ PORTNAME= cagebreak DISTVERSION= 2.3.1 +PORTREVISION= 1 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Wayland tiling compositor inspired by ratpoison WWW= https://github.com/project-repo/cagebreak LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.14:graphics/wayland-protocols LIB_DEPENDS= libevdev.so:devel/libevdev \ libudev.so:devel/libudev-devd \ libwayland-server.so:graphics/wayland \ libfontconfig.so:x11-fonts/fontconfig \ - libwlroots.so:x11-toolkits/wlroots \ + libwlroots.so:x11-toolkits/wlroots017 \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 gnome meson pkgconfig USE_GITHUB= yes USE_GNOME= cairo pango GH_ACCOUNT= project-repo MESON_ARGS= -Dversion_override="${DISTVERSIONFULL}" # if snapshot PLIST_FILES= bin/${PORTNAME} \ etc/xdg/${PORTNAME}/config OPTIONS_DEFINE= MANPAGES X11 OPTIONS_DEFAULT=MANPAGES X11 MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc MANPAGES_MESON_TRUE= man-pages MANPAGES_PLIST_FILES= share/man/man1/${PORTNAME}.1.gz \ share/man/man5/${PORTNAME}-config.5.gz \ share/man/man7/${PORTNAME}-socket.7.gz X11_MESON_TRUE= xwayland post-patch: # Respect PREFIX for system-wide config @${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \ ${WRKSRC}/${PORTNAME}.c \ ${WRKSRC}/meson.build # Drop duplicate LICENSE installation @${REINPLACE_CMD} -e '/install.*licenses/d' \ ${WRKSRC}/meson.build .include diff --git a/x11-wm/dwl/Makefile b/x11-wm/dwl/Makefile index 42d471e31a8f..834e402a0318 100644 --- a/x11-wm/dwl/Makefile +++ b/x11-wm/dwl/Makefile @@ -1,75 +1,76 @@ PORTNAME= dwl DISTVERSIONPREFIX= v DISTVERSION= 0.5 +PORTREVISION= 1 CATEGORIES= x11-wm wayland MASTER_SITES= https://codeberg.org/${PORTNAME}/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ MAINTAINER= jbeich@FreeBSD.org COMMENT= dwm for Wayland WWW= https://codeberg.org/dwl/dwl LICENSE= CC0-1.0 GPLv3+ MIT LICENSE_COMB= multi LICENSE_FILE_CC0-1.0= ${WRKSRC}/LICENSE.tinywl LICENSE_FILE_GPLv3+ = ${WRKSRC}/LICENSE LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.dwm BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libwayland-server.so:graphics/wayland \ - libwlroots.so:x11-toolkits/wlroots \ + libwlroots.so:x11-toolkits/wlroots017 \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 gmake pkgconfig WRKSRC= ${WRKDIR}/${PORTNAME} EXTRA_PATCHES= ${${PORTNAME:tu}_PATCHES} MAKE_ARGS= VERSION="${DISTVERSIONFULL}" PLIST_FILES= bin/${PORTNAME} \ share/man/man1/${PORTNAME}.1.gz \ share/wayland-sessions/${PORTNAME}.desktop PORTDOCS= README.md OPTIONS_DEFINE= ADDONS DOCS X11 OPTIONS_DEFAULT=ADDONS X11 ADDONS_DESC= Install extra applications: ${ADDONS_RUN_DEPENDS:C/\:.*//} ADDONS_RUN_DEPENDS?= foot:x11/foot \ bemenu-run:x11/bemenu X11_LIB_DEPENDS= libxcb-icccm.so:x11/xcb-util-wm X11_USES= xorg X11_USE= XORG=xcb X11_MAKE_ARGS= XWAYLAND="-DXWAYLAND" XLIBS="xcb xcb-icccm" pre-everything:: @${ECHO_MSG} "To build ${PORTNAME} with your own config.h set ${PORTNAME:tu}_CONF variable" @${ECHO_MSG} "either in ${.CURDIR:T}/Makefile.local, make.conf(5), environ(7) or command line e.g.," @${ECHO_MSG} "\$$ make install clean ${PORTNAME:tu}_CONF=/path/to/${PORTNAME}/config.h" @${ECHO_MSG} @${ECHO_MSG} "To apply your own patches set ${PORTNAME:tu}_PATCHES (like ${PORTNAME:tu}_CONF)" @${ECHO_MSG} "to a list of files separated by space with optional -pX suffix e.g.," @${ECHO_MSG} "\$$ make install clean ${PORTNAME:tu}_PATCHES='/path/to/foo.patch:-p1'" post-extract: # .if exists(...) before bsd.port.mk ignores *_CONF in make.conf(5) and Makefile.local @if [ -e "${${PORTNAME:tu}_CONF}" ]; then \ ${ECHO_MSG} "Creating symlink: config.h -> ${${PORTNAME:tu}_CONF}"; \ ${LN} -fs "${${PORTNAME:tu}_CONF}" ${WRKSRC}/config.h; \ fi post-patch: # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275328 @${REINPLACE_CMD} -e 's/_POSIX_C_SOURCE=200809L/_XOPEN_SOURCE=700/' \ ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1 ${MKDIR} ${STAGEDIR}${PREFIX}/share/wayland-sessions ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop \ ${STAGEDIR}${PREFIX}/share/wayland-sessions (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" \ ${STAGEDIR}${DOCSDIR}) .include diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index 67046267c8ea..038b1859a1d1 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -1,80 +1,80 @@ PORTNAME= gamescope DISTVERSION= 3.13.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= a618ea074660.patch:-p1 # https://github.com/ValveSoftware/gamescope/issues/120 PATCHFILES+= 4a067fb4ebe2.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/678 PATCHFILES+= 243582c0c762.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/1057 PATCHFILES+= 4a4fb1b53133.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/1296 PATCHFILES+= a9199c2097ff.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/1323 MAINTAINER= jbeich@FreeBSD.org COMMENT= SteamOS session compositing window manager WWW= https://github.com/ValveSoftware/gamescope LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ glslangValidator:graphics/glslang \ vulkan-headers>0:graphics/vulkan-headers \ wayland-protocols>=1.17:graphics/wayland-protocols \ glm>0:math/glm \ hwdata>0:misc/hwdata LIB_DEPENDS= libdrm.so:graphics/libdrm \ libliftoff.so:graphics/libliftoff \ libvulkan.so:graphics/vulkan-loader \ libwayland-server.so:graphics/wayland \ libdisplay-info.so:sysutils/libdisplay-info \ - libwlroots.so:x11-toolkits/wlroots \ + libwlroots.so:x11-toolkits/wlroots017 \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= hwdata>0:misc/hwdata USES= cmake:indirect compiler:c++11-lib meson pkgconfig sdl xorg USE_GITHUB= yes USE_SDL= sdl2 USE_XORG= x11 xcb xcomposite xdamage xext xfixes xmu xrender xres xtst xxf86vm GH_ACCOUNT= ValveSoftware GH_TUPLE= nothings:stb:5736b15:stb/subprojects/stb \ KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-316-gd790ced:spirv_headers/thirdparty/SPIRV-Headers \ Joshua-Ashton:reshade:v4.4.2-2572-g9fdbea68:reshade/src/reshade \ Joshua-Ashton:vkroots:d5ef31a:vkroots/subprojects/vkroots MESON_ARGS= --force-fallback-for= # allow system wlroots + libliftoff MESON_ARGS+= -Dbenchmark=disabled # gamescope_color_microbench isn't installed MESON_ARGS+= -Denable_openvr_support=false # https://github.com/ValveSoftware/openvr/pull/564 MESON_ARCH_FAMILY= ${ARCH:S/amd/x86_/:S/i3/x/:C/v[67]//:S/power/p/:S/le$//} PLIST_FILES= bin/${PORTNAME} \ lib/libVkLayer_FROG_${PORTNAME}_wsi_${MESON_ARCH_FAMILY}.so \ share/vulkan/implicit_layer.d/VkLayer_FROG_${PORTNAME}_wsi.${MESON_ARCH_FAMILY}.json CXXFLAGS+= -DGLM_ENABLE_EXPERIMENTAL # GLM_GTX_string_cast is an experimental extension # https://github.com/freebsd/drm-kmod/issues/271 PORTSCOUT= ignore:1 OPTIONS_DEFINE= PIPEWIRE OPTIONS_DEFAULT=PIPEWIRE PIPEWIRE_DESC= Screen capture via PipeWire PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire PIPEWIRE_MESON_ENABLED= pipewire post-extract: # Merge patch_directory for subprojects without meson.build @(cd ${WRKSRC}/subprojects/packagefiles && ${COPYTREE_SHARE} . ..) .if defined(PATCHFILES) && ${PATCHFILES:M4a067fb4ebe2*} # Pretend to be a regular file for vendor patch to apply as is @${RMDIR} ${WRKSRC}/subprojects/wlroots @${ECHO_CMD} "Subproject commit 1712a7d27444d62f8da8eeedf0840b386a810e96" \ >${WRKSRC}/subprojects/wlroots .endif .ifdef GH_TUPLE post-configure: @${REINPLACE_CMD} 's/meson install/& \ --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja .endif .include diff --git a/x11-wm/labwc/Makefile b/x11-wm/labwc/Makefile index 5842fbd490b5..8dd44ffd47ea 100644 --- a/x11-wm/labwc/Makefile +++ b/x11-wm/labwc/Makefile @@ -1,94 +1,95 @@ PORTNAME= labwc DISTVERSION= 0.7.3 +PORTREVISION= 1 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Wayland stacking compositor WWW= https://github.com/labwc/labwc LICENSE= GPLv2 BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libpng.so:graphics/png \ libwayland-server.so:graphics/wayland \ - libwlroots.so:x11-toolkits/wlroots \ + libwlroots.so:x11-toolkits/wlroots017 \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 gnome meson pkgconfig xorg USE_GITHUB= yes USE_GNOME= cairo libxml2 pango USE_XORG= pixman PLIST_FILES= bin/${PORTNAME} \ share/icons/hicolor/scalable/apps/${PORTNAME}-symbolic.svg \ share/icons/hicolor/scalable/apps/${PORTNAME}.svg \ share/wayland-sessions/${PORTNAME}.desktop PORTEXAMPLES= * OPTIONS_DEFINE= EXAMPLES LIBRSVG2 MANPAGES NLS X11 OPTIONS_DEFAULT=EXAMPLES LIBRSVG2 MANPAGES NLS X11 OPTIONS_EXCLUDE=${LIBRSVG2_DEFAULT:Mlegacy:C/.+/LIBRSVG2/} LIBRSVG2_USE= GNOME=librsvg2 LIBRSVG2_MESON_ENABLED= svg MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc MANPAGES_MESON_ENABLED= man-pages MANPAGES_PLIST_FILES= share/man/man1/${PORTNAME}.1.gz \ share/man/man5/${PORTNAME}-actions.5.gz \ share/man/man5/${PORTNAME}-config.5.gz \ share/man/man5/${PORTNAME}-menu.5.gz \ share/man/man5/${PORTNAME}-theme.5.gz NLS_USES= gettext NLS_MESON_ENABLED= nls NLS_PLIST_FILES= share/locale/ar/LC_MESSAGES/${PORTNAME}.mo \ share/locale/cs/LC_MESSAGES/${PORTNAME}.mo \ share/locale/de/LC_MESSAGES/${PORTNAME}.mo \ share/locale/el/LC_MESSAGES/${PORTNAME}.mo \ share/locale/es/LC_MESSAGES/${PORTNAME}.mo \ share/locale/et/LC_MESSAGES/${PORTNAME}.mo \ share/locale/eu/LC_MESSAGES/${PORTNAME}.mo \ share/locale/fa/LC_MESSAGES/${PORTNAME}.mo \ share/locale/fi/LC_MESSAGES/${PORTNAME}.mo \ share/locale/fr/LC_MESSAGES/${PORTNAME}.mo \ share/locale/gl/LC_MESSAGES/${PORTNAME}.mo \ share/locale/hu/LC_MESSAGES/${PORTNAME}.mo \ share/locale/id/LC_MESSAGES/${PORTNAME}.mo \ share/locale/it/LC_MESSAGES/${PORTNAME}.mo \ share/locale/ja/LC_MESSAGES/${PORTNAME}.mo \ share/locale/ka/LC_MESSAGES/${PORTNAME}.mo \ share/locale/ko/LC_MESSAGES/${PORTNAME}.mo \ share/locale/lt/LC_MESSAGES/${PORTNAME}.mo \ share/locale/nl/LC_MESSAGES/${PORTNAME}.mo \ share/locale/pa/LC_MESSAGES/${PORTNAME}.mo \ share/locale/pl/LC_MESSAGES/${PORTNAME}.mo \ share/locale/pt/LC_MESSAGES/${PORTNAME}.mo \ share/locale/ru/LC_MESSAGES/${PORTNAME}.mo \ share/locale/sv/LC_MESSAGES/${PORTNAME}.mo \ share/locale/tr/LC_MESSAGES/${PORTNAME}.mo \ share/locale/uk/LC_MESSAGES/${PORTNAME}.mo \ share/locale/zh_CN/LC_MESSAGES/${PORTNAME}.mo X11_LIB_DEPENDS= libxcb-icccm.so:x11/xcb-util-wm X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland post-patch: # Force system dependencies @${RM} ${WRKSRC}/subprojects/*.wrap # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \ -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build # Respect PREFIX for system-wide config and Openbox themes @${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \ -e 's,/usr/local,${PREFIX},' \ ${WRKSRC}/docs/${PORTNAME}-config.5.scd \ ${WRKSRC}/src/common/dir.c # Respect hier(7) for examples @${REINPLACE_CMD} '/datadir/s/doc/examples/' \ ${WRKSRC}/docs/meson.build .include diff --git a/x11-wm/phoc/Makefile b/x11-wm/phoc/Makefile index 1564ae415de2..7bd64b365eb3 100644 --- a/x11-wm/phoc/Makefile +++ b/x11-wm/phoc/Makefile @@ -1,52 +1,53 @@ PORTNAME= phoc DISTVERSIONPREFIX= v DISTVERSION= 0.40.1 +PORTREVISION= 1 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Phone compositor WWW= https://gitlab.gnome.org/World/Phosh/phoc LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-3.0-or-later.txt BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.15:graphics/wayland-protocols LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \ libudev.so:devel/libudev-devd \ libwayland-server.so:graphics/wayland \ - libwlroots.so:x11-toolkits/wlroots \ + libwlroots.so:x11-toolkits/wlroots017 \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= ${LOCALBASE}/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml:x11-wm/mutter USES= compiler:c11 gettext gl gnome meson pkgconfig xorg USE_GITLAB= yes USE_GL= glesv2 USE_GNOME= cairo gnomedesktop3 USE_XORG= pixman xcb GL_SITE= https://gitlab.gnome.org GL_ACCOUNT= World/Phosh GL_TUPLE= World/Phosh:gmobile:v0.2.0:gmobile/subprojects/gmobile MESON_ARGS= -Dembed-wlroots=disabled PLIST_FILES= bin/${PORTNAME} \ share/man/man5/${PORTNAME}.ini.5.gz \ share/applications/mobi.phosh.Phoc.desktop \ share/icons/hicolor/symbolic/apps/mobi.phosh.Phoc.svg GLIB_SCHEMAS= sm.puri.phoc.gschema.xml OPTIONS_DEFINE= MANPAGES OPTIONS_DEFAULT=MANPAGES MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils MANPAGES_MESON_TRUE= man MANPAGES_PLIST_FILES= share/man/man1/${PORTNAME}.1.gz \ share/man/man5/${PORTNAME}.gsettings.5.gz .ifdef GL_TUPLE post-configure: @${REINPLACE_CMD} 's/meson install/& \ --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja .endif .include diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile index 754fc3924bac..a4035a4d3288 100644 --- a/x11-wm/river/Makefile +++ b/x11-wm/river/Makefile @@ -1,77 +1,77 @@ PORTNAME= river DISTVERSIONPREFIX= v DISTVERSION= 0.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Dynamic tiling Wayland compositor WWW= https://isaacfreund.com/software/river/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>0:graphics/wayland-protocols \ zig>=0.12.0:lang/zig LIB_DEPENDS= libevdev.so:devel/libevdev \ libwayland-server.so:graphics/wayland \ - libwlroots.so:x11-toolkits/wlroots \ + libwlroots.so:x11-toolkits/wlroots017 \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon USES= pkgconfig xorg USE_GITHUB= yes USE_XORG= pixman GH_ACCOUNT= riverwm GH_TUPLE= ifreund:zig-pixman:v0.1.0:zig_pixman/../.cache/zig/p/122014eeb4600a059bdcfe1c864862f17e6d5e4237e3bb7d6818f2a5583f6f4eb843 \ ifreund:zig-wayland:v0.1.0:zig_wayland/../.cache/zig/p/1220b0f8f822c1625af7aae4cb3ab2c4ec1a4c0e99ef32867b2a8d88bb070b3e7f6d \ ifreund:zig-xkbcommon:v0.1.0:zig_xkbcommon/../.cache/zig/p/1220840390382c88caf9b0887f6cebbba3a7d05960b8b2ee6d80567b2950b71e5017 \ swaywm:zig-wlroots:v0.17.0:zig_wlroots/../.cache/zig/p/1220714d1cc39c3abb1d9c22a0b838d847ead099cb7d9931821490483f30c022e827 MAKE_ENV= DESTDIR="${STAGEDIR}" CONFIGURE_ARGS= --prefix "${PREFIX}" \ ${WITH_DEBUG:D:U-Doptimize=ReleaseFast} \ ${WITH_PIE:D-Dpie} \ ${STRIP:C/.+/-Dstrip/} \ -Dcpu=${CPUTYPE:Ubaseline} \ --verbose NO_INSTALL= yes # strip(1) breaks runtime PLIST_FILES= bin/${PORTNAME} \ bin/${PORTNAME}ctl \ bin/${PORTNAME}tile \ libdata/pkgconfig/${PORTNAME}-protocols.pc \ share/${PORTNAME}-protocols/${PORTNAME}-layout-v3.xml \ share/bash-completion/completions/${PORTNAME}ctl \ share/fish/vendor_completions.d/${PORTNAME}ctl.fish \ share/zsh/site-functions/_${PORTNAME}ctl \ ${NULL} OPTIONS_DEFINE= MANPAGES X11 OPTIONS_DEFAULT=MANPAGES X11 MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc MANPAGES_CONFIGURE_ON= -Dman-pages=true MANPAGES_CONFIGURE_OFF= -Dman-pages=false MANPAGES_PLIST_FILES= share/man/man1/${PORTNAME}.1.gz \ share/man/man1/${PORTNAME}ctl.1.gz \ share/man/man1/${PORTNAME}tile.1.gz \ ${NULL} X11_CONFIGURE_ON= -Dxwayland=true X11_CONFIGURE_OFF= -Dxwayland=false post-patch: # Respect devel/pkgconf default search @${REINPLACE_CMD} -e '/pkgconfig/s/share/libdata/' \ ${WRKSRC}/build.zig # Respect PREFIX in path references @${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \ ${WRKSRC}/doc/${PORTNAME}ctl.1.scd do-build: @(cd ${WRKSRC} && ${MAKE_ENV} zig build ${CONFIGURE_ARGS}) do-test: @(cd ${WRKSRC} && ${TEST_ENV} zig build test ${CONFIGURE_ARGS}) .include diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile index da912d049dab..64cabed1ba71 100644 --- a/x11-wm/sway/Makefile +++ b/x11-wm/sway/Makefile @@ -1,63 +1,63 @@ PORTNAME= sway DISTVERSION= 1.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= i3-compatible Wayland compositor WWW= https://swaywm.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.24:graphics/wayland-protocols LIB_DEPENDS= libjson-c.so:devel/json-c \ libevdev.so:devel/libevdev \ libudev.so:devel/libudev-devd \ libpcre2-8.so:devel/pcre2 \ libwayland-egl.so:graphics/wayland \ - libwlroots.so:x11-toolkits/wlroots \ + libwlroots.so:x11-toolkits/wlroots017 \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 gnome meson pkgconfig xorg USE_GITHUB= yes USE_GNOME= cairo pango USE_XORG= pixman GH_ACCOUNT= swaywm MESON_ARGS= -Dsd-bus-provider=basu CONFLICTS_INSTALL= ${PORTNAME}-devel ${PORTNAME}fx OPTIONS_DEFINE= BASU MANPAGES PIXBUF SWAYBG X11 OPTIONS_DEFAULT=BASU MANPAGES PIXBUF SWAYBG X11 OPTIONS_SUB= yes BASU_DESC= Tray in swaybar via basu BASU_LIB_DEPENDS= libbasu.so:devel/basu BASU_MESON_ENABLED= tray MANPAGES_BUILD_DEPENDS= scdoc>=1.9.2:textproc/scdoc MANPAGES_MESON_ENABLED= man-pages PIXBUF_USE= GNOME=gdkpixbuf2 PIXBUF_MESON_ENABLED= gdk-pixbuf SWAYBG_DESC= Default command to set background SWAYBG_RUN_DEPENDS= swaybg:x11/swaybg X11_USE= XORG=xcb X11_LIB_DEPENDS= libxcb-icccm.so:x11/xcb-util-wm X11_MESON_ENABLED= xwayland post-patch: # Let @sample handle default files under etc/ @${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \ ${WRKSRC}/meson.build # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \ -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build .include diff --git a/x11-wm/swayfx/Makefile b/x11-wm/swayfx/Makefile index 85351981b7c3..05da83031af0 100644 --- a/x11-wm/swayfx/Makefile +++ b/x11-wm/swayfx/Makefile @@ -1,66 +1,66 @@ PORTNAME= sway DISTVERSION= 0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm wayland PKGNAMESUFFIX= ${GH_PROJECT:S/${PORTNAME}//} MAINTAINER= jbeich@FreeBSD.org COMMENT= Sway, but with eye candy! WWW= https://github.com/WillPower3309/swayfx LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.24:graphics/wayland-protocols LIB_DEPENDS= libjson-c.so:devel/json-c \ libevdev.so:devel/libevdev \ libudev.so:devel/libudev-devd \ libpcre2-8.so:devel/pcre2 \ libwayland-egl.so:graphics/wayland \ libscenefx.so:x11-toolkits/scenefx \ - libwlroots.so:x11-toolkits/wlroots \ + libwlroots.so:x11-toolkits/wlroots017 \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 gnome meson pkgconfig xorg USE_GITHUB= yes USE_GNOME= cairo pango USE_XORG= pixman GH_ACCOUNT= WillPower3309 GH_PROJECT= swayfx MESON_ARGS= -Dsd-bus-provider=basu CONFLICTS_INSTALL= ${PORTNAME} ${PORTNAME}-devel OPTIONS_DEFINE= BASU MANPAGES PIXBUF SWAYBG X11 OPTIONS_DEFAULT=BASU MANPAGES PIXBUF SWAYBG X11 OPTIONS_SUB= yes BASU_DESC= Tray in swaybar via basu BASU_LIB_DEPENDS= libbasu.so:devel/basu BASU_MESON_ENABLED= tray MANPAGES_BUILD_DEPENDS= scdoc>=1.9.2:textproc/scdoc MANPAGES_MESON_ENABLED= man-pages PIXBUF_USE= GNOME=gdkpixbuf2 PIXBUF_MESON_ENABLED= gdk-pixbuf SWAYBG_DESC= Default command to set background SWAYBG_RUN_DEPENDS= swaybg:x11/swaybg X11_USE= XORG=xcb X11_LIB_DEPENDS= libxcb-icccm.so:x11/xcb-util-wm X11_MESON_ENABLED= xwayland post-patch: # Let @sample handle default files under etc/ @${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \ ${WRKSRC}/meson.build # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \ -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build .include diff --git a/x11-wm/theseus-ship/Makefile b/x11-wm/theseus-ship/Makefile index e1272e2bb38b..77aefebe0245 100644 --- a/x11-wm/theseus-ship/Makefile +++ b/x11-wm/theseus-ship/Makefile @@ -1,45 +1,46 @@ PORTNAME= theseus-ship DISTVERSIONPREFIX= v DISTVERSION= 6.1.0 +PORTREVISION= 1 CATEGORIES= x11-wm # wayland: https://github.com/winft/theseus-ship/issues/9 MAINTAINER= jbeich@FreeBSD.org COMMENT= Wayland and X11 compositor for KDE Plasma Desktop WWW= https://github.com/winft/theseus-ship LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libwayland-server.so:graphics/wayland \ libWraplandServer.so:graphics/wrapland \ libcomo-script.so.0:x11-toolkits/como \ - libwlroots.so:x11-toolkits/wlroots \ + libwlroots.so:x11-toolkits/wlroots017 \ libxkbcommon.so:x11/libxkbcommon \ libxcb-cursor.so:x11/xcb-util-cursor \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxcb-icccm.so:x11/xcb-util-wm CONFLICTS_INSTALL= plasma6-kwin # bin/kwin_wayland USES= cmake:testing gettext-tools kde:6 pkgconfig qt:6 xorg USE_GITHUB= yes USE_KDE= colorscheme config coreaddons crash dbusaddons decoration \ ecm:build globalaccel i18n kcmutils kscreenlocker newstuff:build \ notifications package svg widgetsaddons windowsystem xmlgui USE_LDCONFIG= yes USE_QT= base declarative tools USE_XORG= pixman x11 xcb xi GH_ACCOUNT= winft GH_PROJECT= theseus-ship PLIST_SUB= VERSION=${PORTVERSION} LDFLAGS+= -Wl,--as-needed # GL, ICE/SM/Xext, input, KF6Service OPTIONS_DEFINE= BREEZE OPTIONS_DEFAULT=BREEZE BREEZE_DESC= Default window decoration plugin BREEZE_USE= KDE=breeze BREEZE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Breeze .include diff --git a/x11-wm/wayfire-plugins-extra/Makefile b/x11-wm/wayfire-plugins-extra/Makefile index e9c7a54291d4..eea4d6041520 100644 --- a/x11-wm/wayfire-plugins-extra/Makefile +++ b/x11-wm/wayfire-plugins-extra/Makefile @@ -1,44 +1,45 @@ PORTNAME= wayfire-plugins-extra DISTVERSIONPREFIX= v DISTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Additional plugins for Wayfire WWW= https://wayfire.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-scanner:graphics/wayland \ wayland-protocols>0:graphics/wayland-protocols \ wayfire>0:x11-wm/wayfire LIB_DEPENDS= libevdev.so:devel/libevdev \ libwf-config.so:devel/wf-config \ libwayland-server.so:graphics/wayland \ - libwlroots.so:x11-toolkits/wlroots + libwlroots.so:x11-toolkits/wlroots017 USES= compiler:c++17-lang gnome meson pkgconfig USE_GITHUB= yes USE_GITLAB= nodefault USE_GNOME= cairo glibmm GH_ACCOUNT= WayfireWM GH_TUPLE= timgott:wayfire-shadows:de32395:wayfire_shadows/subprojects/wayfire-shadows GL_TUPLE= wayfireplugins:focus-request:bc41d54:focus_request/subprojects/focus-request \ wayfireplugins:windecor:f609ac0:windecor/subprojects/windecor MESON_ARGS= -Denable_focus_request=true -Denable_wayfire_shadows=true OPTIONS_DEFINE= LIBRSVG2 OPTIONS_DEFAULT=LIBRSVG2 OPTIONS_SUB= yes LIBRSVG2_USE= GNOME=librsvg2 LIBRSVG2_MESON_TRUE= enable_windecor post-patch: # Respect PREFIX for icons @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/subprojects/windecor/deco-icontheme.cpp .include diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile index 2cf293215ffe..340ca4461e51 100644 --- a/x11-wm/wayfire/Makefile +++ b/x11-wm/wayfire/Makefile @@ -1,72 +1,72 @@ PORTNAME= wayfire DISTVERSIONPREFIX= v DISTVERSION= 0.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= 3D Wayland compositor WWW= https://wayfire.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ nlohmann-json>0:devel/nlohmann-json \ wf-config>=0.8.0<0.9.0:devel/wf-config \ ${LOCALBASE}/include/xf86drmMode.h:graphics/libdrm \ wayland-protocols>=1.12:graphics/wayland-protocols \ glm>=0.9.8:math/glm LIB_DEPENDS= libevdev.so:devel/libevdev \ libinotify.so:devel/libinotify \ libwf-config.so:devel/wf-config \ libpng.so:graphics/png \ libwayland-server.so:graphics/wayland \ - libwlroots.so:x11-toolkits/wlroots \ + libwlroots.so:x11-toolkits/wlroots017 \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon TEST_DEPENDS= doctest>0:devel/doctest USES= cmake:indirect compiler:c++17-lang gl gnome jpeg meson pkgconfig xorg USE_GITHUB= yes USE_GL= egl glesv2 USE_GNOME= cairo pango USE_XORG= pixman GH_ACCOUNT= WayfireWM GH_TUPLE= WayfireWM:wf-touch:8974eb0:wftouch/subprojects/wf-touch \ WayfireWM:wf-utils:15f8e16:wfutils/subprojects/wf-utils MESON_ARGS= -Dtests=disabled \ -Dwf-touch:tests=disabled \ -Dwf-utils:default_library=static \ ${NULL} OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland post-patch: # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \ -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build .ifdef GH_TUPLE post-configure: @${REINPLACE_CMD} 's/meson install/& \ --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja .endif post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${EXAMPLESDIR} pre-test: @if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \ ${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \ ${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=enabled"; \ ${TOUCH} ${WRKDIR}/.meson_build_tests; \ fi .include diff --git a/x11-wm/wlmaker/Makefile b/x11-wm/wlmaker/Makefile index 67af60321dc6..d43e4c5a10e3 100644 --- a/x11-wm/wlmaker/Makefile +++ b/x11-wm/wlmaker/Makefile @@ -1,49 +1,50 @@ PORTNAME= wlmaker DISTVERSIONPREFIX= v DISTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Wayland compositor inspired by Window Maker WWW= https://github.com/phkaeser/wlmaker LICENSE= APACHE20 BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.31:graphics/wayland-protocols LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libwayland-server.so:graphics/wayland \ - libwlroots.so:x11-toolkits/wlroots \ + libwlroots.so:x11-toolkits/wlroots017 \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= foot:x11/foot USES= bison cmake compiler:c11 gnome pkgconfig xorg USE_GITHUB= yes USE_GNOME= cairo USE_XORG= xcb GH_ACCOUNT= phkaeser GH_TUPLE= phkaeser:libbase:df7ce2a:libbase/submodules/libbase PLIST_FILES= bin/${PORTNAME} \ bin/wlmclock \ share/icons/${PORTNAME}/chrome-48x48.png \ share/icons/${PORTNAME}/clip-48x48.png \ share/icons/${PORTNAME}/firefox-48x48.png \ share/icons/${PORTNAME}/terminal-48x48.png \ share/wayland-sessions/${PORTNAME}.desktop \ ${NULL} post-patch: # Respect PREFIX for icons @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/src/clip.c \ ${WRKSRC}/src/launcher.c # Respect LOCALBASE for apps and use open source Chrome @${REINPLACE_CMD} -e 's,/usr/bin,${LOCALBASE}/bin,' \ -e 's/google-chrome/chrome/' \ ${WRKSRC}/src/action.c \ ${WRKSRC}/etc/*.plist # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276743 @${GREP} -Flr _POSIX_C_SOURCE ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ '/_POSIX_C_SOURCE/d' .include