Date: Mon, 2 Sep 2024 14:47:59 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5fed0aee8298 - main - x11-wm/hyprland: switch to USES=cmake Message-ID: <202409021447.482Elx8E010739@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=5fed0aee8298ea4a878a6447b44986a01afa1d57 commit 5fed0aee8298ea4a878a6447b44986a01afa1d57 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-09-02 13:01:18 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-09-02 14:44:32 +0000 x11-wm/hyprland: switch to USES=cmake --- x11-wm/hyprland/Makefile | 21 +++++++++------------ x11-wm/hyprland/distinfo | 4 ++++ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 5bde57fe05b9..9940f1f679d3 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,11 +1,13 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v DISTVERSION= 0.42.0 -PORTREVISION= 1 +PORTREVISION= 2 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 +PATCHFILES+= ff3f41c9a5d1.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/7626 +PATCHFILES+= 89fa6a6a66e6.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/7626 MAINTAINER= jbeich@FreeBSD.org COMMENT= Dynamic tiling Wayland compositor that doesn't sacrifice on its looks #' @@ -16,10 +18,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ hyprwayland-scanner>=0.3.10:devel/hyprwayland-scanner \ + tomlplusplus>0:devel/tomlplusplus \ 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 \ @@ -28,7 +30,7 @@ LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon -USES= cmake:indirect compiler:c++11-lib gl gnome meson pkgconfig xorg +USES= cmake compiler:c++11-lib gl gnome pkgconfig xorg USE_GITHUB= yes USE_GL= egl gbm opengl USE_GNOME= cairo pango @@ -37,7 +39,8 @@ 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 +CMAKE_ON= NO_SYSTEMD +LDFLAGS+= -Wl,--as-needed # GL, pango deps # Generated by "make update-hash" for commit_pins in hyprpm.toml GH_HASH= 9a09eac79b85c846e3a865a9078a3f8ff65a9259 @@ -59,10 +62,10 @@ 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 +X11_CMAKE_BOOL_OFF= NO_XWAYLAND post-patch: -# Extract (snapshot) version from the port instead of meson.build +# Extract (snapshot) version from the port instead of CMakeLists.txt @${REINPLACE_CMD} -i .nogit \ -e '/^HASH/s/=.*/=${GH_HASH}/' \ -e '/^BRANCH/s/=.*/=main/' \ @@ -85,12 +88,6 @@ post-patch: ${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} diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo index e1063e370761..ba0c441a4c48 100644 --- a/x11-wm/hyprland/distinfo +++ b/x11-wm/hyprland/distinfo @@ -7,3 +7,7 @@ SHA256 (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 69aff959179ff SIZE (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 116938 SHA256 (4fdc0d55e4b4.patch) = 1f3e4cf9c33a37683127feca287318a5532eff95fdaa1a5b87aad8aaca1aa220 SIZE (4fdc0d55e4b4.patch) = 970 +SHA256 (ff3f41c9a5d1.patch) = 942e5271c07c853ced50584179ffc89ee7a1e0269fed0c661e371be34b5dac58 +SIZE (ff3f41c9a5d1.patch) = 727 +SHA256 (89fa6a6a66e6.patch) = 2e3bc9a15a4de383976c41d3a0c80e3c44dc181adedf1ec843a867eb26c0a027 +SIZE (89fa6a6a66e6.patch) = 1103
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409021447.482Elx8E010739>