diff --git a/x11-toolkits/aquamarine/Makefile b/x11-toolkits/aquamarine/Makefile index c21b1645c07a..5559ecb3c586 100644 --- a/x11-toolkits/aquamarine/Makefile +++ b/x11-toolkits/aquamarine/Makefile @@ -1,42 +1,43 @@ PORTNAME= aquamarine DISTVERSIONPREFIX= v -DISTVERSION= 0.6.0 +DISTVERSION= 0.7.0 CATEGORIES= x11-toolkits PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 6a4f096a9486.patch:-p1 # https://github.com/hyprwm/aquamarine/pull/129 +PATCHFILES+= f0238475419a.patch:-p1 # https://github.com/hyprwm/aquamarine/pull/131 +PATCHFILES+= 957e1d3c3866.patch:-p1 # https://github.com/hyprwm/aquamarine/pull/131 MAINTAINER= jbeich@FreeBSD.org COMMENT= Very light linux rendering backend library WWW= https://github.com/hyprwm/aquamarine LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ hyprwayland-scanner>=0.4.0:devel/hyprwayland-scanner \ wayland-protocols>0:graphics/wayland-protocols \ hwdata>0:misc/hwdata LIB_DEPENDS= libhyprutils.so:devel/hyprutils \ libudev.so:devel/libudev-devd \ libdrm.so:graphics/libdrm \ libwayland-client.so:graphics/wayland \ libdisplay-info.so:sysutils/libdisplay-info \ libseat.so:sysutils/seatd \ libinput.so:x11/libinput RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri USES= cmake:testing compiler:c++11-lib gl pathfix pkgconfig xorg USE_GITHUB= yes USE_GL= egl gbm glesv2 USE_XORG= pixman GH_ACCOUNT= hyprwm PLIST_SUB= VERSION=${DISTVERSION:C/-.*//} # XXX Drop after FreeBSD 13.4 EOL around 2026-01-31 # https://cgit.freebsd.org/src/commit/?id=af93fea71038 .if !exists(/usr/include/sys/timerfd.h) LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim .endif .include diff --git a/x11-toolkits/aquamarine/distinfo b/x11-toolkits/aquamarine/distinfo index 02d1ec6ee5a7..4632a3702709 100644 --- a/x11-toolkits/aquamarine/distinfo +++ b/x11-toolkits/aquamarine/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1736102453 -SHA256 (hyprwm-aquamarine-v0.6.0_GH0.tar.gz) = eb5e17ae9a9b8e08037b0e8325e4939dbe0cf886883829fd71bffb862d3fcc48 -SIZE (hyprwm-aquamarine-v0.6.0_GH0.tar.gz) = 78703 -SHA256 (6a4f096a9486.patch) = be5feada857e18cbe530e25b9dfe91549e6a3f38a7db034df5197c174c9ce743 -SIZE (6a4f096a9486.patch) = 1048 +TIMESTAMP = 1736535133 +SHA256 (hyprwm-aquamarine-v0.7.0_GH0.tar.gz) = 73d115c7bbf20bb6b6a25012a95a1a85f435de26a227a9c32e220889d36f7550 +SIZE (hyprwm-aquamarine-v0.7.0_GH0.tar.gz) = 79857 +SHA256 (f0238475419a.patch) = 7fe3c2eaf97ec682a3bc8974ace6a99f0f92887991b0d14622c03b79786d6a7a +SIZE (f0238475419a.patch) = 704 +SHA256 (957e1d3c3866.patch) = 2adabb01f436fa2b89f3a9259c99f1731c2ec2f00e4741ae4190a8191bfd4d4d +SIZE (957e1d3c3866.patch) = 980 diff --git a/x11-toolkits/aquamarine/pkg-plist b/x11-toolkits/aquamarine/pkg-plist index fe6732184ed6..3c11c801b959 100644 --- a/x11-toolkits/aquamarine/pkg-plist +++ b/x11-toolkits/aquamarine/pkg-plist @@ -1,20 +1,20 @@ include/aquamarine/allocator/Allocator.hpp include/aquamarine/allocator/DRMDumb.hpp include/aquamarine/allocator/GBM.hpp include/aquamarine/allocator/Swapchain.hpp include/aquamarine/backend/Backend.hpp include/aquamarine/backend/DRM.hpp include/aquamarine/backend/Headless.hpp include/aquamarine/backend/Misc.hpp include/aquamarine/backend/Session.hpp include/aquamarine/backend/Wayland.hpp include/aquamarine/backend/drm/Atomic.hpp include/aquamarine/backend/drm/Legacy.hpp include/aquamarine/buffer/Buffer.hpp include/aquamarine/input/Input.hpp include/aquamarine/misc/Attachment.hpp include/aquamarine/output/Output.hpp lib/libaquamarine.so -lib/libaquamarine.so.5 +lib/libaquamarine.so.6 lib/libaquamarine.so.%%VERSION%% libdata/pkgconfig/aquamarine.pc diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 458fc6cdd3ec..5ad2304f342b 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,101 +1,101 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v DISTVERSION= 0.46.2 -PORTREVISION= 2 +PORTREVISION= 3 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= evdev-proto>0:devel/evdev-proto \ hyprwayland-scanner>=0.3.10:devel/hyprwayland-scanner \ wayland-protocols>=1.35:graphics/wayland-protocols LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ libhyprutils.so:devel/hyprutils \ libre2.so:devel/re2 \ libtomlplusplus.so:devel/tomlplusplus \ libhyprgraphics.so:graphics/hyprgraphics \ libdrm.so:graphics/libdrm \ libwayland-server.so:graphics/wayland \ libuuid.so:misc/e2fsprogs-libuuid \ libaquamarine.so:x11-toolkits/aquamarine \ libhyprcursor.so:x11/hyprcursor \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++11-lib gl gnome pkgconfig xorg USE_GITHUB= yes USE_GL= egl gbm opengl USE_GNOME= cairo pango USE_XORG= pixman xcursor GH_ACCOUNT= hyprwm GH_PROJECT= Hyprland GH_TUPLE= hyprwm:hyprland-protocols:v0.4.0:hyprland_protocols/subprojects/hyprland-protocols \ canihavesomecoffee:udis86:1.7.2-186-g5336633:udis86/subprojects/udis86 CMAKE_OFF= CMAKE_CXX_SCAN_FOR_MODULES # avoid devel/llvm* CMAKE_ON= NO_SYSTEMD LDFLAGS+= -Wl,--as-needed # GL, pango deps # Generated by "make update-hash" for commit_pins in hyprpm.toml GH_HASH= 0bd541f2fd902dbfa04c3ea2ccf679395e316887 # XXX Drop after FreeBSD 13.4 EOL around 2026-01-31 # https://cgit.freebsd.org/src/commit/?id=af93fea71038 .if !exists(/usr/include/sys/timerfd.h) LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim .endif OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 X11_USE= XORG=xcb X11_LIB_DEPENDS= libxcb-errors.so:x11/xcb-util-errors \ libxcb-icccm.so:x11/xcb-util-wm X11_CMAKE_BOOL_OFF= NO_XWAYLAND post-patch: # Extract (snapshot) version from the port instead of CMakeLists.txt @${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}/' \ -e '/^COMMITS/s/=.*/="?"/' \ ${WRKSRC}/scripts/generateVersion.sh # Respect consolekit2 as XDG_RUNTIME_DIR fallback @${REINPLACE_CMD} 's,/run/user,/var&,' \ ${WRKSRC}/hyprctl/main.cpp \ ${WRKSRC}/src/Compositor.cpp # Respect PREFIX for wallpapers @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/src/render/OpenGL.cpp # XXX Replace linprocfs(4) with sysctl(3) @${REINPLACE_CMD} -e 's,/proc,${LINUXBASE}&,g' \ ${WRKSRC}/src/desktop/Window.cpp \ ${WRKSRC}/src/plugins/HookSystem.cpp 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 .include # XXX Work around !target(makesum) makesum: update-hash