diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 29d89293e500..a4a9bcbeb9bf 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,111 +1,94 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v -DISTVERSION= 0.28.0 -PORTREVISION= 1 +DISTVERSION= 0.29.0 CATEGORIES= x11-wm wayland -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 7a2027d1fd5d.patch:-p1 # https://github.com/hyprwm/Hyprland/issues/2828 -PATCHFILES+= 7d98181ade0a.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/2884 -PATCHFILES+= 2e6693fbb650.patch:-p1 - 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 \ wlroots>=0.16.0.668<0.17.0:x11-toolkits/wlroots LIB_DEPENDS= libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ 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:hyprland_protocols/subprojects/hyprland-protocols \ canihavesomecoffee:udis86:1.7.2-186-g5336633:udis86/subprojects/udis86 MESON_ARGS= -Dsystemd=disabled OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland -post-extract: -.if defined(PATCHFILES) && ${PATCHFILES:M7d98181ade0a*} -# Pretend to be a regular file for vendor patch to apply as is - @${RMDIR} ${WRKSRC}/subprojects/wlroots - @${ECHO_CMD} "Subproject commit e8d545a9770a2473db32e0a0bfa757b05d2af4f3" \ - >${WRKSRC}/subprojects/wlroots -.endif - post-patch: # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} -i .nogit -e "/GIT_BRANCH/s/run_command.*/'main'/" \ -e "/GIT_COMMIT_HASH/s/run_command.*/'${DISTVERSIONFULL}'/" \ -e "/GIT_COMMIT_MESSAGE/d" \ -e "/GIT_DIRTY/s/run_command.*/'portbld'/" \ -e "/version.*jq/s/run_command.*/'${DISTVERSIONFULL}',/" \ ${WRKSRC}/meson.build # Respect PREFIX for wallpapers @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/src/render/OpenGL.cpp -# Respect LOCALBASE for xdg-desktop-portal-hyprland installation - @${REINPLACE_CMD} 's,/usr/share,${LOCALBASE}/share,g' \ - ${WRKSRC}/src/Compositor.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} # XXX Drop after FreeBSD 13.2 EOL around 2024-05-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 PATH:= ${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm* CC= clang${LLVM_VERSION} CXX= clang++${LLVM_VERSION} CPP= clang-cpp${LLVM_VERSION} 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 #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 diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo index e08c6d4a1f51..f371b9e93311 100644 --- a/x11-wm/hyprland/distinfo +++ b/x11-wm/hyprland/distinfo @@ -1,15 +1,9 @@ -TIMESTAMP = 1691078410 -SHA256 (hyprwm-Hyprland-v0.28.0_GH0.tar.gz) = 5b90863c99aff4e48e3187b7aa454a327c4c01813621173a475a3151bbbf9c3e -SIZE (hyprwm-Hyprland-v0.28.0_GH0.tar.gz) = 7320810 +TIMESTAMP = 1693256615 +SHA256 (hyprwm-Hyprland-v0.29.0_GH0.tar.gz) = 759c6cc8ffc0869f61dd5d03b5d550ef5695c1b17fa99af9fb776c90f6b932fc +SIZE (hyprwm-Hyprland-v0.29.0_GH0.tar.gz) = 7325165 SHA256 (hyprwm-hyprland-protocols-v0.2_GH0.tar.gz) = 106cb189d0fbe4ec0ee11a12a17238172f4c4cd1b2b26db904df144e5c7a05f0 SIZE (hyprwm-hyprland-protocols-v0.2_GH0.tar.gz) = 6342 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 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271 SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803 -SHA256 (7a2027d1fd5d.patch) = dcf2e5b2233077c3b35dd1191ea672104e0f7632a6310a8c4661933444d13819 -SIZE (7a2027d1fd5d.patch) = 1916 -SHA256 (7d98181ade0a.patch) = d94c45c2abeb4d3b96c058e31d2c2090cdaf934a6f289846e9c4050c54b25c23 -SIZE (7d98181ade0a.patch) = 1195 -SHA256 (2e6693fbb650.patch) = faae4c515b3d9b45a9838a0585c71ce51a7cc97ecbe73522ad888b5976504c49 -SIZE (2e6693fbb650.patch) = 776 diff --git a/x11-wm/hyprland/pkg-plist b/x11-wm/hyprland/pkg-plist index 2322c106d771..a01b728922fe 100644 --- a/x11-wm/hyprland/pkg-plist +++ b/x11-wm/hyprland/pkg-plist @@ -1,16 +1,17 @@ bin/Hyprland bin/hyprctl man/man1/Hyprland.1.gz man/man1/hyprctl.1.gz %%DATADIR%%/hyprland.conf %%DATADIR%%/wall_2K.png %%DATADIR%%/wall_4K.png %%DATADIR%%/wall_8K.png %%DATADIR%%/wall_anime2_2K.png %%DATADIR%%/wall_anime2_4K.png %%DATADIR%%/wall_anime2_8K.png %%DATADIR%%/wall_anime_2K.png %%DATADIR%%/wall_anime_4K.png %%DATADIR%%/wall_anime_8K.png share/pkgconfig/hyprland.pc share/wayland-sessions/hyprland.desktop +share/xdg-desktop-portal/hyprland-portals.conf