diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 6e020ec322bd..ee2d6d1e8e18 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,111 +1,116 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v -DISTVERSION= 0.48.1 -PORTREVISION= 2 +DISTVERSION= 0.49.0 CATEGORIES= x11-wm wayland +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= fcb6f936ea8b.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/10344 +PATCHFILES+= e44aae0c2064.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/10345 + 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 \ glaze>0:devel/glaze \ hyprwayland-scanner>=0.3.10:devel/hyprwayland-scanner \ - wayland-protocols>=1.41:graphics/wayland-protocols + wayland-protocols>=1.43:graphics/wayland-protocols LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ libhyprutils.so:devel/hyprutils \ libinotify.so:devel/libinotify \ 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.6.2:hyprland_protocols/subprojects/hyprland-protocols \ +GH_TUPLE= hyprwm:hyprland-protocols:v0.6.4: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= 29e2e59fdbab8ed2cc23a20e3c6043d5decb5cdc +GH_HASH= 9958d297641b5c84dcff93f9039d80a5ad37ab00 # 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= QT6 X11 OPTIONS_DEFAULT=QT6 X11 QT6_RUN_DEPENDS= hyprland-dialog:x11/hyprland-qtutils 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: +# XXX Cleanup install after scripts/generateShaderIncludes.sh + ${RMDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}/src/render/shaders/glsl # 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 COMPILER_TYPE is defined after USES was already parsed .if "${CHOSEN_COMPILER_TYPE}-${_OSRELEASE:C/.*-//}" == "clang-CURRENT" llvm_ARGS= build .include "${USESDIR}/llvm.mk" .endif # XXX Work around !target(makesum) makesum: update-hash diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo index 72a5c857bff9..ad2d064e6c3a 100644 --- a/x11-wm/hyprland/distinfo +++ b/x11-wm/hyprland/distinfo @@ -1,7 +1,11 @@ -TIMESTAMP = 1743178567 -SHA256 (hyprwm-Hyprland-v0.48.1_GH0.tar.gz) = 7c78b5d3249b35318bc49877347c41e855714a6794169bc90755264c0162278e -SIZE (hyprwm-Hyprland-v0.48.1_GH0.tar.gz) = 48325182 -SHA256 (hyprwm-hyprland-protocols-v0.6.2_GH0.tar.gz) = bba082af141599d4342e7b8505401a6e3a32be819d9eb23ce6c90f7407e62c1f -SIZE (hyprwm-hyprland-protocols-v0.6.2_GH0.tar.gz) = 9887 +TIMESTAMP = 1746735318 +SHA256 (hyprwm-Hyprland-v0.49.0_GH0.tar.gz) = bea9d5c7b59fe5461e8caf27c298638b8ae78ad14d7b92fadf6e0373e84c5b68 +SIZE (hyprwm-Hyprland-v0.49.0_GH0.tar.gz) = 48349545 +SHA256 (hyprwm-hyprland-protocols-v0.6.4_GH0.tar.gz) = 0d4f99abc21b04fc126dd754e306bb84cd334131d542ff2e0c172190c6570384 +SIZE (hyprwm-hyprland-protocols-v0.6.4_GH0.tar.gz) = 10447 SHA256 (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 69aff959179ff6247b375b92e797221dbd8e078eabbf1366280b0532617e7fb8 SIZE (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 116938 +SHA256 (fcb6f936ea8b.patch) = c5e90b93efd4c2980bcab9f9237bee6b9c3effaee1a40f45133c5f615b669d30 +SIZE (fcb6f936ea8b.patch) = 972 +SHA256 (e44aae0c2064.patch) = e9c0cd1b5d92275d0e415c506f76d19905c113a379e85581b694bf6511cffa93 +SIZE (e44aae0c2064.patch) = 1312