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 629F21581D3 for ; Wed, 15 May 2024 08:04:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B02EE2A1D; Wed, 15 May 2024 08:04:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 5E88CE2A1D for ; Wed, 15 May 2024 08:04:21 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8C90733FE60 for ; Wed, 15 May 2024 08:04:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9CE721ACD for ; Wed, 15 May 2024 08:04:18 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1715760225.0fe69c4c758d917bc5f042d99c33867c95d5bebc.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-wm/hyprland/, gui-wm/hyprland/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-wm/hyprland/Manifest gui-wm/hyprland/files/wlroots-hyprland-apply-0.40.0.patch gui-wm/hyprland/hyprland-0.40.0.ebuild X-VCS-Directories: gui-wm/hyprland/files/ gui-wm/hyprland/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: 0fe69c4c758d917bc5f042d99c33867c95d5bebc X-VCS-Branch: master Date: Wed, 15 May 2024 08:04:18 +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: 05edb2ec-1df4-415d-9164-796216ab383e X-Archives-Hash: 117495b5398c7ef4a74c141e80424f23 commit: 0fe69c4c758d917bc5f042d99c33867c95d5bebc Author: Julien Roy jroy ca> AuthorDate: Mon May 13 18:47:24 2024 +0000 Commit: Yixun Lan gentoo org> CommitDate: Wed May 15 08:03:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fe69c4c gui-wm/hyprland: add 0.40.0 Closes: https://bugs.gentoo.org/931680 Bug: https://bugs.gentoo.org/930945 Signed-off-by: Julien Roy jroy.ca> Signed-off-by: Yixun Lan gentoo.org> gui-wm/hyprland/Manifest | 1 + .../files/wlroots-hyprland-apply-0.40.0.patch | 23 ++++ gui-wm/hyprland/hyprland-0.40.0.ebuild | 147 +++++++++++++++++++++ 3 files changed, 171 insertions(+) diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest index 87f489ff055d..492ef0804cd8 100644 --- a/gui-wm/hyprland/Manifest +++ b/gui-wm/hyprland/Manifest @@ -1,3 +1,4 @@ DIST hyprland-0.37.1.gh.tar.gz 54651435 BLAKE2B 92bd78168909510ffb21b46f7d66e139e7b86f7655c7a8126eaf90b6ef6d7d5affaf0bc55ca1647a2f80b6d767afc00e1efe5f2241b2bc88d20357acee611b92 SHA512 f09316e210805b833a27524894222edc7a048b77f9f5d9cc8faa5b4e37040485ad3b9638f60a346da8d4d4aff24bbd6382b7fde64d07528990e9a521b2f46454 DIST hyprland-0.38.1.gh.tar.gz 54701702 BLAKE2B 56f16d938099856be9aea0a089154e58a1d2226f42fc2a81a560e3f3883caed6eb76faa674340a3a4a1632df5a8c1a28d084c64c6749c3452c23ca192bef967b SHA512 addd4cea3f83e17907180288021718a66973c247b261e306accb7b32bbbbd2f0b3f4fcf4c22189614f561c361bfb99ea0645f4698e7af9491379d424d1d1142b DIST hyprland-0.39.1.gh.tar.gz 54681029 BLAKE2B 5a78c5e7cef3369fd72abc05941f88f0391fb87e79afaa13c128acd9f8d2aa79d6af4d0dc82a90c09689993fe914ac48bc5ba4a32173eed31ecc20204f5a4edc SHA512 da8ee577aa823c9fb7b45bfd07503656561c1cd4cac42a9bf8f582f653c93b20824b3bce7bbcbd47b7f7f8e83fb1b630d6d5c983fe345c971322369f193c2c8f +DIST hyprland-0.40.0.gh.tar.gz 54734246 BLAKE2B 54d5b1bb062003e38156c67bfc0b796d0e4d855f35b0122fa191037caa47e5be2a25acfe588835c49ac747fc7430124480e4a7716782fd23d028289bee236e7f SHA512 948e7237fa811f104ee11764d7947d2fd8291e79cf6db00d3f3905204f5bb2df1e51e26b2600f086f5b22d910ef50c2941343dd05e7a5d2f4b6053b150800f21 diff --git a/gui-wm/hyprland/files/wlroots-hyprland-apply-0.40.0.patch b/gui-wm/hyprland/files/wlroots-hyprland-apply-0.40.0.patch new file mode 100644 index 000000000000..65148b64137f --- /dev/null +++ b/gui-wm/hyprland/files/wlroots-hyprland-apply-0.40.0.patch @@ -0,0 +1,23 @@ +diff --git a/patches/apply.sh b/patches/apply.sh +index d5492b1b..87d84848 100755 +--- a/subprojects/wlroots-hyprland/patches/apply.sh ++++ b/subprojects/wlroots-hyprland/patches/apply.sh +@@ -4,15 +4,15 @@ + PATCHES=$(find patches/ -type f -name '*.patch') + + apply () { +- git apply $PATCH ++ patch -p1 -r /dev/null -N -s < $PATCH >/dev/null 2>&1 && echo NEW: \'$PATCH\' + } + + check_applied () { +- git apply --check --reverse -q $PATCH ++ patch -p1 -r /dev/null --dry-run -R -s < $PATCH >/dev/null 2>&1 && echo OK: \'$PATCH\' + } + + fail () { +- echo =======\> \'$PATCH\' was not applied && exit 1 ++ echo FAILED: \'$PATCH\' NOT APPLICABLE && exit 1 + } + + if [ -n "$PATCHES" ]; diff --git a/gui-wm/hyprland/hyprland-0.40.0.ebuild b/gui-wm/hyprland/hyprland-0.40.0.ebuild new file mode 100644 index 000000000000..0893dbca86c0 --- /dev/null +++ b/gui-wm/hyprland/hyprland-0.40.0.ebuild @@ -0,0 +1,147 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson toolchain-funcs + +DESCRIPTION="A dynamic tiling Wayland compositor that doesn't sacrifice on its looks" +HOMEPAGE="https://github.com/hyprwm/Hyprland" + +if [[ "${PV}" = *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git" +else + SRC_URI="https://github.com/hyprwm/${PN^}/releases/download/v${PV}/source-v${PV}.tar.gz -> ${P}.gh.tar.gz" + S="${WORKDIR}/${PN}-source" + + KEYWORDS="~amd64" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="X legacy-renderer systemd" + +# hyprpm (hyprland plugin manager) requires the dependencies at runtime +# so that it can clone, compile and install plugins. +HYPRPM_RDEPEND=" + app-alternatives/ninja + dev-build/cmake + dev-build/meson + dev-libs/libliftoff + 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[egl(+)] ) + >=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-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 + media-libs/libglvnd + x11-libs/cairo + x11-libs/libdrm + x11-libs/libxkbcommon + x11-libs/pango + x11-libs/pixman + X? ( + x11-libs/libxcb:0= + ) +" +DEPEND=" + ${RDEPEND} + ${WLROOTS_DEPEND} + >=dev-libs/hyprland-protocols-0.2 + >=dev-libs/hyprlang-0.3.2 + >=dev-libs/wayland-protocols-1.34 +" +BDEPEND=" + ${WLROOTS_BDEPEND} + || ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* ) + app-misc/jq + dev-build/cmake + ~dev-util/hyprwayland-scanner-0.3.4 + virtual/pkgconfig +" + +PATCHES=( + # apply.sh script is broken in the targetted commit of 0.40.0 + # they fixed it since; the fix being this patch + "${FILESDIR}"/wlroots-hyprland-apply-0.40.0.patch +) + +pkg_setup() { + [[ ${MERGE_TYPE} == binary ]] && return + + if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then + eerror "Hyprland requires >=sys-devel/gcc-13 to build" + eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc" + die "GCC version is too old to compile Hyprland!" + elif tc-is-clang && ver_test $(clang-version) -lt 16 ; then + eerror "Hyprland requires >=sys-devel/clang-16 to build" + eerror "Please upgrade Clang: emerge -v1 sys-devel/clang" + die "Clang version is too old to compile Hyprland!" + fi +} + +src_configure() { + local emesonargs=( + $(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 + + # Wlroots headers are required by hyprland-plugins and the pkgconfig file expects + # them to be in /usr/include/hyprland/wlroots, despite this they aren't installed there. + # Ideally you could override includedir per subproject and the install tags would + # be granular enough to only install headers. But its not requiring this. + mkdir "${ED}"/usr/include/hyprland/wlroots || die + mv "${ED}"/usr/include/wlr "${ED}"/usr/include/hyprland/wlroots || die + # devel tag includes wlroots .pc and .a files still + rm -rf "${ED}"/usr/$(get_libdir)/ || die +}