diff --git a/x11-toolkits/aquamarine/Makefile b/x11-toolkits/aquamarine/Makefile index df076e83bd9a..588e60b5c7c5 100644 --- a/x11-toolkits/aquamarine/Makefile +++ b/x11-toolkits/aquamarine/Makefile @@ -1,44 +1,44 @@ PORTNAME= aquamarine DISTVERSIONPREFIX= v -DISTVERSION= 0.3.3 +DISTVERSION= 0.4.0 CATEGORIES= x11-toolkits 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 14.0 EOL around 2024-10-01 .if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) CXXFLAGS+= -fexperimental-library .endif # 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 f4bb69c3b4c7..2f3215a0bacf 100644 --- a/x11-toolkits/aquamarine/distinfo +++ b/x11-toolkits/aquamarine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1724091711 -SHA256 (hyprwm-aquamarine-v0.3.3_GH0.tar.gz) = 8785d2d0d23ece3dda39c6a51d36b321611578a8339fcfe9f110e17b309d8047 -SIZE (hyprwm-aquamarine-v0.3.3_GH0.tar.gz) = 73874 +TIMESTAMP = 1725268610 +SHA256 (hyprwm-aquamarine-v0.4.0_GH0.tar.gz) = c6575250568755309ebdb1fceee03ae32d0d57c144c6c8298e94f3c63bc9654a +SIZE (hyprwm-aquamarine-v0.4.0_GH0.tar.gz) = 74156 diff --git a/x11-toolkits/aquamarine/pkg-plist b/x11-toolkits/aquamarine/pkg-plist index 7129d2cb9efd..40515848462f 100644 --- a/x11-toolkits/aquamarine/pkg-plist +++ b/x11-toolkits/aquamarine/pkg-plist @@ -1,19 +1,19 @@ include/aquamarine/allocator/Allocator.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.2 +lib/libaquamarine.so.3 lib/libaquamarine.so.%%VERSION%% libdata/pkgconfig/aquamarine.pc diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index f0c81f9c4241..13f207c03dcf 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,113 +1,114 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v DISTVERSION= 0.42.0 +PORTREVISION= 1 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 4fdc0d55e4b4.patch:-p1 # https://github.com/hyprwm/Hyprland/issues/6842 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 \ libtomlplusplus.so:devel/tomlplusplus \ 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:indirect compiler:c++11-lib gl gnome meson 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.2-5-ge06482e: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= 9a09eac79b85c846e3a865a9078a3f8ff65a9259 # XXX Drop after FreeBSD 14.0 EOL around 2024-10-01 .if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) CXXFLAGS+= -fexperimental-library .endif # 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_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}/' \ -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 .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 .include # XXX Work around !target(makesum) makesum: update-hash