diff --git a/x11-toolkits/wlroots-devel/Makefile b/x11-toolkits/wlroots-devel/Makefile index 6e22292c74f9..cb8dfaa0712a 100644 --- a/x11-toolkits/wlroots-devel/Makefile +++ b/x11-toolkits/wlroots-devel/Makefile @@ -1,84 +1,83 @@ PORTNAME= wlroots -DISTVERSION= 0.17.0-255 -DISTVERSIONSUFFIX= -g50eae512d9 -PORTREVISION= 2 +DISTVERSION= 0.17.0-312 +DISTVERSIONSUFFIX= -gb1b34cd665 CATEGORIES= x11-toolkits PKGNAMESUFFIX= -devel PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ 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,} .ifdef PKGNAMESUFFIX PORTSCOUT= ignore:1 PREFIX= ${LOCALBASE}/${PKGBASE} # avoid conflict with the default MESON_ARGS+= -Ddatadir="${LOCALBASE}/share" .endif OPTIONS_DEFINE= DRM OPENGL VULKAN X11 OPTIONS_DEFAULT=DRM OPENGL VULKAN X11 OPTIONS_SUB= yes DRM_DESC= KMS console support DRM_BUILD_DEPENDS= 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" 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 43a21f47e7c6..99bfc5c2797c 100644 --- a/x11-toolkits/wlroots-devel/distinfo +++ b/x11-toolkits/wlroots-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1709983277 -SHA256 (wlroots-0.17.0-255-g50eae512d9.tar.bz2) = 7b2500218c92dbdc364b8af293d533cf99600692f74bce501e6d469b54fa207c -SIZE (wlroots-0.17.0-255-g50eae512d9.tar.bz2) = 454568 +TIMESTAMP = 1712827443 +SHA256 (wlroots-0.17.0-312-gb1b34cd665.tar.bz2) = e9eb70ecddce0030b26b595d368cee15559febe1b8121de6bc6d5ec8bf95ccef +SIZE (wlroots-0.17.0-312-gb1b34cd665.tar.bz2) = 458003 diff --git a/x11-toolkits/wlroots-devel/pkg-plist b/x11-toolkits/wlroots-devel/pkg-plist index d20d7b609e7b..a2ac1a1b1ce2 100644 --- a/x11-toolkits/wlroots-devel/pkg-plist +++ b/x11-toolkits/wlroots-devel/pkg-plist @@ -1,112 +1,113 @@ 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_ext_foreign_toplevel_list_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_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_output_swapchain_manager.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_transient_seat_v1.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/util/transform.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.13 libdata/pkgconfig/wlroots.pc diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 764d33aa625a..cc830a14d576 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,123 +1,124 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v DISTVERSION= 0.38.1 +PORTREVISION= 1 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Dynamic tiling Wayland compositor that doesn't sacrifice on its looks #' WWW= https://hyprland.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cmake:devel/cmake-core \ evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.25:graphics/wayland-protocols LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ libtomlplusplus.so:devel/tomlplusplus \ libdrm.so:graphics/libdrm \ libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libhyprcursor.so:x11/hyprcursor \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c++11-lib gl gnome meson pkgconfig xorg USE_GITHUB= yes USE_GL= egl opengl USE_GNOME= cairo pango USE_XORG= pixman GH_ACCOUNT= hyprwm GH_PROJECT= Hyprland GH_TUPLE= hyprwm:hyprland-protocols:v0.2-4-g0c2ce70:hyprland_protocols/subprojects/hyprland-protocols \ canihavesomecoffee:udis86:1.7.2-186-g5336633:udis86/subprojects/udis86 MESON_ARGS= -Dsystemd=disabled # Generated by "make update-hash" for commit_pins in hyprpm.toml GH_HASH= 360ede79d124ffdeebbe8401f1ac4bc0dbec2c91 # XXX Drop after FreeBSD 14.0 EOL around 2025-03-01 .if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) CXXFLAGS+= -fexperimental-library .endif 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 "/version.*jq/s/run_command.*/'${DISTVERSIONFULL}',/" \ ${WRKSRC}/meson.build @${REINPLACE_CMD} -i .nogit \ -e '/^HASH/s/=.*/=${GH_HASH}/' \ -e '/^BRANCH/s/=.*/=main/' \ -e '/^MESSAGE/s/=.*/="?"/' \ -e "/^DATE/s/=.*/=\"$$(date -ur $$(${AWK} \ '/TIMESTAMP/ { print $$3 }' ${DISTINFO_FILE}))\"/" \ -e '/^DIRTY/s/=.*/=portbld/' \ -e '/^TAG/s/=.*/=${DISTVERSIONFULL}/' \ ${WRKSRC}/scripts/generateVersion.sh # Respect PREFIX for wallpapers @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/src/render/OpenGL.cpp .ifdef GH_TUPLE post-configure: @${REINPLACE_CMD} 's/meson install/& \ --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja .endif post-install: # Plugin API installs all headers (no private vs. public) @(cd ${STAGEDIR}${PREFIX} && ${FIND} include/${PORTNAME} ! -type d) >>${TMPPLIST} update-hash: # https://docs.github.com/en/rest/commits/commits#get-a-commit # Pretend to be curl(1) for pretty-printed JSON to help parse with sed(1) @${REINPLACE_CMD} -i '' -e "/^GH_HASH=/s/=.*/= $$(\ ${SETENV} HTTP_USER_AGENT=curl ${FETCH_CMD} -qo- \ https://api.github.com/repos/${GH_ACCOUNT}/${GH_PROJECT}/commits/${GH_TAGNAME} | \ ${SED} -n '/sha/ { s/.*\"\([0-9a-f]\{40\}\).*/\1/p; q; }' \ )/" \ ${.CURDIR}/Makefile # XXX Drop after FreeBSD 13.2 EOL around 2024-07-01 (don't forget distinfo) .if ${CXX} == c++ && exists(/usr/lib/libc++.so) .if !exists(/usr/include/c++/v1/__ranges/as_rvalue_view.h) || make(makesum) || make(fetch) USES+= llvm:min=16,build,export PATH:= ${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm* CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CPP="${CPP}" CMAKE_BIN= ${LOCALBASE}/bin/cmake # XXX Move into separate port and standardize via USES GH_TUPLE+= llvm:llvm-project:llvmorg-16.0.1:libcxx CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1 # Don't link against new libc++ as it's not necessary CXXFLAGS+= -D_LIBCPP_HAS_NO_VERBOSE_ABORT_IN_LIBRARY #LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt pre-configure: bundled-libcxx bundled-libcxx: @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \ -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \ -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build .endif .endif # exists(/usr/lib/libc++.so) .include "${.CURDIR:H:H}/x11-toolkits/wlroots-devel/override.mk" post-patch: wlroots-devel-patch wlroots-devel-patch: # Prefer headers (used by ) from wlroots-devel @${REINPLACE_CMD} -i .devel "/subdirs/s|''|'../wlroots-devel/include', &|" \ ${WRKSRC}/meson.build .include # XXX Work around !target(makesum) makesum: update-hash diff --git a/x11-wm/sway-devel/Makefile b/x11-wm/sway-devel/Makefile index a5182c2fc303..b28a185380b1 100644 --- a/x11-wm/sway-devel/Makefile +++ b/x11-wm/sway-devel/Makefile @@ -1,67 +1,70 @@ PORTNAME= sway DISTVERSION= 1.9-103 # git rev-list --count 1.9.. DISTVERSIONSUFFIX= -g2e951163c -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm wayland PKGNAMESUFFIX= -devel +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 9e1465107788.patch:-p1 # wlroots 0.18 + 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 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.so:x11-toolkits/wlroots \ 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 "${.CURDIR:H:H}/x11-toolkits/wlroots-devel/override.mk" .include diff --git a/x11-wm/sway-devel/distinfo b/x11-wm/sway-devel/distinfo index f090f7be272b..032eb0bac5cd 100644 --- a/x11-wm/sway-devel/distinfo +++ b/x11-wm/sway-devel/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1709981262 SHA256 (swaywm-sway-1.9-103-g2e951163c_GH0.tar.gz) = b99f9c59e309f29a4c80a3ee797de1bd497ed3e0657c8d4b0f0d423a35c496a8 SIZE (swaywm-sway-1.9-103-g2e951163c_GH0.tar.gz) = 5573915 +SHA256 (9e1465107788.patch) = cd2d3239002cc3b5fa755426834a8d583d87d07a9014296bb5dad56492884afa +SIZE (9e1465107788.patch) = 1042