From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 79C35159C9B for ; Fri, 26 Jul 2024 20:37:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84E432BC029; Fri, 26 Jul 2024 20:37:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68E112BC029 for ; Fri, 26 Jul 2024 20:37:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3DC2E335CB4 for ; Fri, 26 Jul 2024 20:37:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CF59E1E2E for ; Fri, 26 Jul 2024 20:37:24 +0000 (UTC) From: "John M. Harris, Jr." To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "John M. Harris, Jr." Message-ID: <1722026163.112313ee06dd1a292744440cdc9413206a1bff09.johnmh@gentoo> Subject: [gentoo-commits] repo/user/johnmh:master commit in: gui-wm/hyprland/ X-VCS-Repository: repo/user/johnmh X-VCS-Files: gui-wm/hyprland/hyprland-9999.ebuild X-VCS-Directories: gui-wm/hyprland/ X-VCS-Committer: johnmh X-VCS-Committer-Name: John M. Harris, Jr. X-VCS-Revision: 112313ee06dd1a292744440cdc9413206a1bff09 X-VCS-Branch: master Date: Fri, 26 Jul 2024 20:37:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 28a4a4aa-5f95-491f-8528-6062c12520a9 X-Archives-Hash: acb60e2cc73d6af1079b8779f5293ef9 commit: 112313ee06dd1a292744440cdc9413206a1bff09 Author: John M. Harris Jr. johnmh me> AuthorDate: Mon Jul 22 19:05:09 2024 +0000 Commit: John M. Harris, Jr. johnmh me> CommitDate: Fri Jul 26 20:36:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/user/johnmh.git/commit/?id=112313ee gui-wm/hyprland: Update dependencies Signed-off-by: John M. Harris Jr. johnmh.me> gui-wm/hyprland/hyprland-9999.ebuild | 56 ++++-------------------------------- 1 file changed, 6 insertions(+), 50 deletions(-) diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild index c513e77..8202372 100644 --- a/gui-wm/hyprland/hyprland-9999.ebuild +++ b/gui-wm/hyprland/hyprland-9999.ebuild @@ -32,48 +32,14 @@ HYPRPM_RDEPEND=" dev-vcs/git virtual/pkgconfig " -# bundled wlroots has the following dependency string according to included headers. -# wlroots[drm,gles2-renderer,libinput,x11-backend?,X?] -# enable x11-backend with X and vice versa -WLROOTS_DEPEND=" - >=dev-libs/wayland-1.22 - media-libs/libglvnd - || ( - >=media-libs/mesa-24.1.0_rc1[opengl] - =x11-libs/libdrm-2.4.114 - x11-libs/libxkbcommon - >=x11-libs/pixman-0.42.0 - media-libs/libdisplay-info:= - sys-apps/hwdata - >=dev-libs/libinput-1.14.0:= - sys-auth/seatd:= - virtual/libudev:= - X? ( - x11-libs/libxcb:= - x11-libs/xcb-util-errors - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - x11-base/xwayland - ) -" -WLROOTS_RDEPEND=" - ${WLROOTS_DEPEND} -" -WLROOTS_BDEPEND=" - >=dev-libs/wayland-protocols-1.32 - dev-util/hyprwayland-scanner - virtual/pkgconfig -" RDEPEND=" ${HYPRPM_RDEPEND} - ${WLROOTS_RDEPEND} dev-cpp/tomlplusplus dev-libs/glib:2 dev-libs/libinput >=dev-libs/wayland-1.20.0 - >=gui-libs/hyprcursor-0.1.7 + gui-libs/aquamarine + >=gui-libs/hyprcursor-0.1.9 media-libs/libglvnd x11-libs/cairo x11-libs/libdrm @@ -87,16 +53,17 @@ RDEPEND=" DEPEND=" ${RDEPEND} ${WLROOTS_DEPEND} - >=dev-libs/hyprland-protocols-0.2 + >=dev-libs/hyprland-protocols-0.3 >=dev-libs/hyprlang-0.3.2 - >=dev-libs/wayland-protocols-1.34 + >=dev-libs/wayland-protocols-1.36 + >=gui-libs/hyprutils-0.2.0 " BDEPEND=" ${WLROOTS_BDEPEND} || ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* ) app-misc/jq dev-build/cmake - dev-util/hyprwayland-scanner + >=dev-util/hyprwayland-scanner-0.3.8 virtual/pkgconfig " @@ -119,20 +86,9 @@ src_configure() { $(meson_feature legacy-renderer legacy_renderer) $(meson_feature systemd) $(meson_feature X xwayland) - $(meson_feature X wlroots:xwayland) -Dwlroots:backends=drm,libinput$(usev X ',x11') -Dwlroots:xcb-errors=disabled ) meson_src_configure } - -src_install() { - # First install everything except wlroots to avoid conflicts. - meson_src_install --skip-subprojects wlroots - # Then install development files (mainly wlroots) for bug #916760. - meson_src_install --tags devel - - # devel tag includes wlroots .pc and .a files still - rm -rf "${ED}"/usr/$(get_libdir)/ || die -}