diff --git a/devel/hyprutils/Makefile b/devel/hyprutils/Makefile index 44c42ba0021b..3e270afa687c 100644 --- a/devel/hyprutils/Makefile +++ b/devel/hyprutils/Makefile @@ -1,25 +1,30 @@ PORTNAME= hyprutils DISTVERSIONPREFIX= v -DISTVERSION= 0.1.5 +DISTVERSION= 0.2.0 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Hyprland utilities library used across the ecosystem WWW= https://github.com/hyprwm/hyprutils LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c++11-lib cmake:testing pkgconfig xorg USE_GITHUB= yes USE_LDCONFIG= yes 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 +post-patch: +# Respect PREFIX for system-wide config + @${REINPLACE_CMD} 's,/etc,${PREFIX}&,' \ + ${WRKSRC}/src/path/Path.cpp + .include diff --git a/devel/hyprutils/distinfo b/devel/hyprutils/distinfo index 0195be77819e..13635aa336d5 100644 --- a/devel/hyprutils/distinfo +++ b/devel/hyprutils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1719316102 -SHA256 (hyprwm-hyprutils-v0.1.5_GH0.tar.gz) = 60cce1b4160a4e5383fa0ff665c6bf49b54cfb387dc8a52229abfc367000b0be -SIZE (hyprwm-hyprutils-v0.1.5_GH0.tar.gz) = 17974 +TIMESTAMP = 1721071737 +SHA256 (hyprwm-hyprutils-v0.2.0_GH0.tar.gz) = 958d0b9ba1157ae0099c9d879fd5247eceda3af0bfd7d6fdacb69926e1d3eeb3 +SIZE (hyprwm-hyprutils-v0.2.0_GH0.tar.gz) = 19268 diff --git a/devel/hyprutils/pkg-plist b/devel/hyprutils/pkg-plist index e847bfbb368e..3b99a12e3498 100644 --- a/devel/hyprutils/pkg-plist +++ b/devel/hyprutils/pkg-plist @@ -1,14 +1,15 @@ include/hyprutils/math/Box.hpp include/hyprutils/math/Misc.hpp include/hyprutils/math/Region.hpp include/hyprutils/math/Vector2D.hpp include/hyprutils/memory/SharedPtr.hpp include/hyprutils/memory/WeakPtr.hpp +include/hyprutils/path/Path.hpp include/hyprutils/signal/Listener.hpp include/hyprutils/signal/Signal.hpp include/hyprutils/string/String.hpp include/hyprutils/string/VarList.hpp lib/libhyprutils.so -lib/libhyprutils.so.0 +lib/libhyprutils.so.1 lib/libhyprutils.so.%%VERSION%% libdata/pkgconfig/hyprutils.pc diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index d8c935f320b3..7998197655b5 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,110 +1,111 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v DISTVERSION= 0.41.2 +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= 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 \ libwlroots-${PORTNAME}.so:x11-toolkits/wlroots-${PORTNAME} \ 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 opengl USE_GNOME= cairo pango USE_XORG= pixman 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= 918d8340afd652b011b937d29d5eea0be08467f5 # 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 diff --git a/x11/hyprlock/Makefile b/x11/hyprlock/Makefile index 0030a047a9d8..81a793d1dfaa 100644 --- a/x11/hyprlock/Makefile +++ b/x11/hyprlock/Makefile @@ -1,45 +1,46 @@ PORTNAME= hyprlock DISTVERSIONPREFIX= v DISTVERSION= 0.4.0 +PORTREVISION= 1 CATEGORIES= x11 wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 7fb3c0350076.patch:-p1 # https://github.com/hyprwm/hyprlock/pull/404 MAINTAINER= jbeich@FreeBSD.org COMMENT= Hyprland's GPU-accelerated screen locking utility #' WWW= https://github.com/hyprwm/hyprlock LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ libhyprutils.so:devel/hyprutils \ libdrm.so:graphics/libdrm \ libwayland-client.so:graphics/wayland \ libwebp.so:graphics/webp \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= unix-selfauth-helper>0:security/unix-selfauth-helper USES= cmake compiler:c++11-lib gl gnome jpeg pkgconfig USE_GITHUB= yes USE_GL= egl gbm USE_GNOME= cairo pango GH_ACCOUNT= hyprwm LDFLAGS+= -Wl,--as-needed # pango deps PLIST_FILES= bin/${PORTNAME} \ etc/pam.d/${PORTNAME} # 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.3 EOL around 2025-07-01 .if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__chrono/time_zone.h) LIB_DEPENDS+= libdate-tz.so:devel/date USES+= localbase:ldflags .endif .include