diff --git a/x11-toolkits/wlroots-devel/Makefile b/x11-toolkits/wlroots-devel/Makefile index b832169204ca..1f038768f878 100644 --- a/x11-toolkits/wlroots-devel/Makefile +++ b/x11-toolkits/wlroots-devel/Makefile @@ -1,82 +1,84 @@ PORTNAME= wlroots -DISTVERSION= 0.15.0-498 +DISTVERSION= 0.16.0 DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/} CATEGORIES= x11-toolkits PKGNAMESUFFIX= -devel PATCH_SITES+= https://github.com/swaywm/${GL_PROJECT}/commit/:github -PATCHFILES+= 7c0e2a271a4c.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 -PATCHFILES+= a5df0a02a2d9.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 +PATCHFILES+= fc0854d5f256.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 +PATCHFILES+= 29cb694655db.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 +PATCHFILES+= 91a8ff42d26e.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3318 PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ -PATCHFILES+= 347b32642fb6.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3318 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= hwdata>0:misc/hwdata LIB_DEPENDS= libudev.so:devel/libudev-devd \ libdrm.so:graphics/libdrm \ libwayland-server.so:graphics/wayland \ libseat.so:sysutils/seatd \ libxkbcommon.so:x11/libxkbcommon +RUN_DEPENDS= hwdata>0:misc/hwdata 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 -GL_COMMIT= a75f9be2e8c63608ab64b9b93a10fdc25600501b +GL_COMMIT= 1712a7d27444d62f8da8eeedf0840b386a810e96 GL_TUPLE= wayland:wayland-protocols:e631010ab7b96988e7c64c24b7d90f64717eaeee:wlproto/subprojects/wayland-protocols MESON_ARGS= -Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,} .ifdef PKGNAMESUFFIX PORTSCOUT= ignore:1 PREFIX= ${LOCALBASE}/${PKGBASE} # avoid conflict with the default MESON_ARGS+= -Ddatadir="${LOCALBASE}/share" post-install: post-install${PKGNAMESUFFIX} post-install${PKGNAMESUFFIX}: # XXX USES=meson invokes ninja directly, so doesn't support --skip-subprojects @${RM} -r ${STAGEDIR}${LOCALBASE}/share/pkgconfig @${RM} -r ${STAGEDIR}${LOCALBASE}/share/wayland-protocols .endif OPTIONS_DEFINE= DRM OPENGL VULKAN X11 OPTIONS_DEFAULT=DRM OPENGL VULKAN X11 OPTIONS_SUB= yes DRM_DESC= KMS console support DRM_LIB_DEPENDS= libinput.so:x11/libinput DRM_VARS= BACKENDS+="drm libinput" 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-devel>0:x11-servers/xwayland-devel X11_RUN_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel 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-devel/distinfo b/x11-toolkits/wlroots-devel/distinfo index 28b782e38d3b..360bbf1d8ca9 100644 --- a/x11-toolkits/wlroots-devel/distinfo +++ b/x11-toolkits/wlroots-devel/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1666957566 -SHA256 (wlroots-wlroots-a75f9be2e8c63608ab64b9b93a10fdc25600501b_GL0.tar.gz) = afb32e0d82fbebd585296997034668b07e167def7002fd67c1cf4ba6e509bda3 -SIZE (wlroots-wlroots-a75f9be2e8c63608ab64b9b93a10fdc25600501b_GL0.tar.gz) = 587840 +TIMESTAMP = 1668187337 +SHA256 (wlroots-wlroots-1712a7d27444d62f8da8eeedf0840b386a810e96_GL0.tar.gz) = af7c43f14a1836dd7e6d8c06d1f1c3a0b2e6b8b5edf4d335a449f698c2bbe8cc +SIZE (wlroots-wlroots-1712a7d27444d62f8da8eeedf0840b386a810e96_GL0.tar.gz) = 588773 SHA256 (wayland-wayland-protocols-e631010ab7b96988e7c64c24b7d90f64717eaeee_GL0.tar.gz) = d6700f08259e7aabbd376e6f8dd2d85260452d0b05eac94150ad1219f714c28d SIZE (wayland-wayland-protocols-e631010ab7b96988e7c64c24b7d90f64717eaeee_GL0.tar.gz) = 115303 -SHA256 (7c0e2a271a4c.patch) = 2b92d3dde7640061ed85ab1690031f7627bebc2366e8c4da217017188ba7195e -SIZE (7c0e2a271a4c.patch) = 5729 -SHA256 (a5df0a02a2d9.patch) = df5deb1714001870b846501cbee1e775468ac9c61e735ee3b4ad3a2b83c5573e -SIZE (a5df0a02a2d9.patch) = 4233 -SHA256 (347b32642fb6.patch) = 56804ce34cd02cb3b2b11a0dbf27c2820c2c0d112f351cdaed5d160e0536d418 -SIZE (347b32642fb6.patch) = 3810 +SHA256 (fc0854d5f256.patch) = ceaa947fd7f64b773c61d7a5a4bdcfe85a083a686d4356ff58d3666aa182e2a9 +SIZE (fc0854d5f256.patch) = 6013 +SHA256 (29cb694655db.patch) = ef36e6b7a0bea0b82469c395feac303f50bf940ae651d91370ef052f5d97938c +SIZE (29cb694655db.patch) = 4233 +SHA256 (91a8ff42d26e.patch) = 5c48b35841a3614fe589d8f31323deceaf6be2209b9350a128315cdfc6c95d2c +SIZE (91a8ff42d26e.patch) = 3659 diff --git a/x11-toolkits/wlroots-devel/pkg-plist b/x11-toolkits/wlroots-devel/pkg-plist index 978d7a2ee898..da12f6318c33 100644 --- a/x11-toolkits/wlroots-devel/pkg-plist +++ b/x11-toolkits/wlroots-devel/pkg-plist @@ -1,101 +1,103 @@ 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 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/pixman.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_cursor.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_fullscreen_shell_v1.h include/wlr/types/wlr_gamma_control_v1.h include/wlr/types/wlr_idle.h include/wlr/types/wlr_idle_inhibit_v1.h include/wlr/types/wlr_idle_notify_v1.h include/wlr/types/wlr_input_device.h 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_damage.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_server_decoration.h include/wlr/types/wlr_session_lock_v1.h include/wlr/types/wlr_single_pixel_buffer_v1.h include/wlr/types/wlr_subcompositor.h include/wlr/types/wlr_surface.h include/wlr/types/wlr_switch.h include/wlr/types/wlr_tablet_pad.h include/wlr/types/wlr_tablet_tool.h include/wlr/types/wlr_tablet_v2.h include/wlr/types/wlr_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/xwayland.h lib/libwlroots.so lib/libwlroots.so.11 libdata/pkgconfig/wlroots.pc diff --git a/x11-wm/sway-devel/Makefile b/x11-wm/sway-devel/Makefile index a594d0f34750..ab6db661cceb 100644 --- a/x11-wm/sway-devel/Makefile +++ b/x11-wm/sway-devel/Makefile @@ -1,69 +1,70 @@ PORTNAME= sway DISTVERSION= 1.7-141 DISTVERSIONSUFFIX= -g9d99bb956 +PORTREVISION= 1 CATEGORIES= x11-wm wayland PKGNAMESUFFIX= -devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090 PATCHFILES+= f98ca3ab7ca1.patch:-p1 # https://github.com/swaywm/sway/pull/5090 MAINTAINER= jbeich@FreeBSD.org COMMENT= i3-compatible Wayland compositor (development snapshot) 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 \ wlroots>=0.15.0.478<0.17.0:x11-toolkits/wlroots 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 \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= swaybg:x11/swaybg CONFLICTS_INSTALL= ${PORTNAME} USES= compiler:c11 gl gnome meson pkgconfig xorg USE_GITHUB= yes USE_GL= glesv2 USE_GNOME= cairo pango USE_XORG= pixman GH_ACCOUNT= swaywm MESON_ARGS= -Dsd-bus-provider=basu OPTIONS_DEFINE= BASU MANPAGES PIXBUF X11 OPTIONS_DEFAULT=BASU MANPAGES PIXBUF 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 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 "${.CURDIR:H:H}/x11-toolkits/wlroots-devel/override.mk" .include