diff --git a/x11-toolkits/wlroots-devel/Makefile b/x11-toolkits/wlroots-devel/Makefile index 168891730dc9..e20b55fff3b5 100644 --- a/x11-toolkits/wlroots-devel/Makefile +++ b/x11-toolkits/wlroots-devel/Makefile @@ -1,84 +1,86 @@ PORTNAME= wlroots -DISTVERSION= 0.17.0-312 -DISTVERSIONSUFFIX= -gb1b34cd665 -PORTREVISION= 4 +DISTVERSION= 0.17.0-378 +DISTVERSIONSUFFIX= -g385c9ade5f CATEGORIES= x11-toolkits PKGNAMESUFFIX= -devel -PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ -PATCHFILES+= cc6a7a04418f.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4697 -PATCHFILES+= 4b4f76cc1357.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4614 - MAINTAINER= jbeich@FreeBSD.org COMMENT= Modular Wayland compositor library (development snapshot) WWW= https://gitlab.freedesktop.org/wlroots/wlroots LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>=1.33: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=-0.18 PORTSCOUT= ignore:1 -OPTIONS_DEFINE= DRM OPENGL VULKAN X11 -OPTIONS_DEFAULT=DRM OPENGL VULKAN X11 +OPTIONS_DEFINE= DRM LCMS2 LIBLIFTOFF OPENGL VULKAN X11 +OPTIONS_DEFAULT=DRM LCMS2 LIBLIFTOFF OPENGL VULKAN X11 OPTIONS_SUB= yes DRM_DESC= KMS console support DRM_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ hwdata>0:misc/hwdata DRM_LIB_DEPENDS= libudev.so:devel/libudev-devd \ - libliftoff.so:graphics/libliftoff \ libdisplay-info.so:sysutils/libdisplay-info \ libseat.so:sysutils/seatd \ libinput.so:x11/libinput DRM_MESON_ENABLED= session DRM_VARS= BACKENDS+="drm libinput" +LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 +LCMS2_MESON_ENABLED= color-management + +LIBLIFTOFF_DESC= libliftoff DRM interface (see WLR_DRM_FORCE_LIBLIFTOFF) +LIBLIFTOFF_LIB_DEPENDS= libliftoff.so:graphics/libliftoff +LIBLIFTOFF_MESON_ENABLED= libliftoff +LIBLIFTOFF_IMPLIES= DRM + OPENGL_RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri OPENGL_USE= GL=egl,glesv2 OPENGL_VARS= RENDERERS+=gles2 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 # 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 diff --git a/x11-toolkits/wlroots-devel/distinfo b/x11-toolkits/wlroots-devel/distinfo index ca99004f22c8..690c3b565b6c 100644 --- a/x11-toolkits/wlroots-devel/distinfo +++ b/x11-toolkits/wlroots-devel/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1712827443 -SHA256 (wlroots-0.17.0-312-gb1b34cd665.tar.bz2) = e9eb70ecddce0030b26b595d368cee15559febe1b8121de6bc6d5ec8bf95ccef -SIZE (wlroots-0.17.0-312-gb1b34cd665.tar.bz2) = 458003 -SHA256 (cc6a7a04418f.patch) = eb2bf98b372b668f773dbb1e3108bff16fefcc51be148775e6517ea4c9d35d83 -SIZE (cc6a7a04418f.patch) = 1291 -SHA256 (4b4f76cc1357.patch) = 163500bf90d39365a6ce8a9d24d48b2e65135d2f548c9532d933ed19b1097d53 -SIZE (4b4f76cc1357.patch) = 2512 +TIMESTAMP = 1717648385 +SHA256 (wlroots-0.17.0-378-g385c9ade5f.tar.bz2) = db98957145964ddfb7add630379c307a75ec7baffc05602baf200199e1075448 +SIZE (wlroots-0.17.0-378-g385c9ade5f.tar.bz2) = 466261 diff --git a/x11-toolkits/wlroots-devel/pkg-plist b/x11-toolkits/wlroots-devel/pkg-plist index 9ce4c4bbb657..72fefeb446a0 100644 --- a/x11-toolkits/wlroots-devel/pkg-plist +++ b/x11-toolkits/wlroots-devel/pkg-plist @@ -1,112 +1,114 @@ 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 %%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_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/sway-devel/Makefile b/x11-wm/sway-devel/Makefile index 13f21ce5ae1c..de1f666670be 100644 --- a/x11-wm/sway-devel/Makefile +++ b/x11-wm/sway-devel/Makefile @@ -1,69 +1,71 @@ PORTNAME= sway DISTVERSION= 1.9-125 # git rev-list --count 1.9.. DISTVERSIONSUFFIX= -g087226d99 PORTREVISION= 1 CATEGORIES= x11-wm wayland PKGNAMESUFFIX= -devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 2e9139df664f.patch:-p1 # https://github.com/swaywm/sway/pull/8070 MAINTAINER= jbeich@FreeBSD.org COMMENT= i3-compatible Wayland compositor (development snapshot) WWW= https://swaywm.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +BROKEN= fails to build after https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/0686666cf5c0 + BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.24:graphics/wayland-protocols LIB_DEPENDS= libjson-c.so:devel/json-c \ libevdev.so:devel/libevdev \ libudev.so:devel/libudev-devd \ libpcre2-8.so:devel/pcre2 \ libdrm.so:graphics/libdrm \ libwayland-egl.so:graphics/wayland \ libwlroots-0.18.so:x11-toolkits/wlroots-devel \ 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} ${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