From 66113e7871aede225d661473925cea4cce9e6d23 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 May 2024 00:01:30 +0100 Subject: gentoo auto-resync : 16:05:2024 - 00:01:30 --- gui-wm/Manifest.gz | Bin 1211 -> 1210 bytes gui-wm/hyprland/Manifest | 7 +- .../files/wlroots-hyprland-apply-0.40.0.patch | 23 ++++ gui-wm/hyprland/hyprland-0.38.1.ebuild | 139 ------------------- gui-wm/hyprland/hyprland-0.40.0.ebuild | 147 +++++++++++++++++++++ gui-wm/hyprland/hyprland-9999.ebuild | 10 +- 6 files changed, 180 insertions(+), 146 deletions(-) create mode 100644 gui-wm/hyprland/files/wlroots-hyprland-apply-0.40.0.patch delete mode 100644 gui-wm/hyprland/hyprland-0.38.1.ebuild create mode 100644 gui-wm/hyprland/hyprland-0.40.0.ebuild (limited to 'gui-wm') diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz index d873d7eb2e69..ea0b9aea46a2 100644 Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest index d83466e4e997..7d3f59c19826 100644 --- a/gui-wm/hyprland/Manifest +++ b/gui-wm/hyprland/Manifest @@ -1,9 +1,10 @@ AUX bash-completion-fix-0.39.1.patch 1428 BLAKE2B 5fac61964fc255357e73f7d3cc7120818336849a049b83a7b728b5775995ce4b90b3496620962a596ca74f45a7933950568300e193e2e8d13f130bbdf06c756d SHA512 4101bb40509eec8a1649315d8fdb54d683347a576564f80b5a9e2d958fe75cc7e5ff3b669ed24cf8d897929e1eba4ab3c92b7287cc6ac9a90f2b7c01c93ab1f6 +AUX wlroots-hyprland-apply-0.40.0.patch 669 BLAKE2B be2bd47edc1eb640dd8a8e0be24cb9f9dea5c9a722dffde5d0fb6a11b2deb6a52f14b964a2043b9cbd08e32b769fee8597e9965ca76095c4c5453d356bdea673 SHA512 ba34e30f2f88afbb2758eee9479a523bcfa70596663faa825116a95a6b646bdb6333fa1a400d60b93ac65499c19809e8b181983b8dce3bcaa3b1aab00274c11e 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 EBUILD hyprland-0.37.1.ebuild 3715 BLAKE2B 9ad1db0bcb9e2c63fa3a23abe14c26c4a3fae60a46985731fbea497a9fa86165f1f7c942ad744cd84a5f8a7d2b711f93493ad04faf23317c89bee3adb631c499 SHA512 3de2a9ed87567edf2707e2997ebc2cef0ac3f914aed184ae4121515298f1c566075fcb3e4b1ca2dc19b333676dcc259dfea110b5deb177629ed6d46396938e35 -EBUILD hyprland-0.38.1.ebuild 3735 BLAKE2B 867a6609496a33ebb6863c7d0405136e83eea51b5967527a71027b61259a3887395f8c623bf81372db92845d0497e40ac987eec06c47ee57156f4145d5f09939 SHA512 8bd315cb5cecec8c3aab4c2d9c768cb4c18e07b286b1828072f5897ab567861b28a128f6adfd94606653610e551fc845c710c58bd5525a5ddb9cacd48985fd85 EBUILD hyprland-0.39.1-r2.ebuild 3906 BLAKE2B 8341946d0afe3c75c6bc30cb72f275e0792dbd3576195da30649070cabcbdae95ec9827328253e3931edbee6e98b66dfacd82282825e5f1c70e49fc8bd8480a5 SHA512 2ed56e04300995827428c5dd50dc71221d3346dad0c205e3d45f6ae0f6df0bf133e9a63e7a3c02069c51734f7936bb22093b5874d70c3ac259d437ddda13eb2f -EBUILD hyprland-9999.ebuild 3743 BLAKE2B edd4811dd90e6e7bcc687fad14d3347f9c8f1b331495dc16bbc2be9923d030a64ad4cebb3c1e6a854d4ae71bfb8cb0e9a0b33ff65db59ad239d6970cdb0b7503 SHA512 00e9734317157f11133d409f4911a61d70cb52227e40b57044b6576b8b5a4a6da124bd156baab1981dc955a24a367ffd7f544a9ff06e56f44d1f47080e2bf196 +EBUILD hyprland-0.40.0.ebuild 3995 BLAKE2B becf3268ebc3d5e12ddd9d62c00e4faec409f4d92b588028339d2fceed53a86fa9a719f57f1256c69b527c3a15f16d9f2170c9d5cb108e62c8fcb8d1d133d2f7 SHA512 8175d2dc1d08edd01c8b9b0545fb2f583ada10adb39bd0e021b3ca8b31b162f97f56d1bf1479e21786f36f43d5af032bfa1e31eb219f88456053c640d1416f06 +EBUILD hyprland-9999.ebuild 3812 BLAKE2B c74f955cbb1d0a5e24e42dcc924c34ccee4f7adc5b0a7a4192a94313ccd76585e6e724f98d17d88e3267521e8c90baf3b7af9985b752cc82d3dbfdbeb10e5544 SHA512 2fbe82d774bbaaa77742fd07b268a067c6548ec09bcc78b777ba8ed374856d1f308c51d4d67d6abe8b68f8a2aa173036401cb5c46d449270cea0b1b2b6ac8d99 MISC metadata.xml 716 BLAKE2B fc5248c809b9b5bf1002e3d82ff80f595b8e613d09e5541f1a0151c3ea2c117376d25fa5a40c85d254533708d9eff5339bd329b42118e87ca49e22e55c0c5d7b SHA512 31252ced2546f3686f17259aabfe9273af14f7efaf3fa0bfb446c65c6d9478be3a23c531e0ac463f27fe1d50842f6f126f32e47a8a03a345306297e182952e98 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.38.1.ebuild b/gui-wm/hyprland/hyprland-0.38.1.ebuild deleted file mode 100644 index a2006ea15983..000000000000 --- a/gui-wm/hyprland/hyprland-0.38.1.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# 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 ~riscv" -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-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[egl(+),gles2] - >=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/wayland-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 - 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.32 -" -BDEPEND=" - ${WLROOTS_BDEPEND} - || ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* ) - app-misc/jq - dev-build/cmake - dev-util/wayland-scanner - virtual/pkgconfig -" - -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 -} 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 +} diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild index 65a0a8843541..932052e219d2 100644 --- a/gui-wm/hyprland/hyprland-9999.ebuild +++ b/gui-wm/hyprland/hyprland-9999.ebuild @@ -15,7 +15,7 @@ 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 ~riscv" + KEYWORDS="~amd64" fi LICENSE="BSD" @@ -28,6 +28,7 @@ HYPRPM_RDEPEND=" app-alternatives/ninja dev-build/cmake dev-build/meson + dev-libs/libliftoff dev-vcs/git virtual/pkgconfig " @@ -37,7 +38,8 @@ HYPRPM_RDEPEND=" WLROOTS_DEPEND=" >=dev-libs/wayland-1.22 media-libs/libglvnd - media-libs/mesa[egl(+),gles2] + || ( =media-libs/mesa-24.1[egl(+)] ) >=x11-libs/libdrm-2.4.114 x11-libs/libxkbcommon >=x11-libs/pixman-0.42.0 @@ -68,7 +70,7 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libinput >=dev-libs/wayland-1.20.0 - gui-libs/hyprcursor + >=gui-libs/hyprcursor-0.1.7 media-libs/libglvnd x11-libs/cairo x11-libs/libdrm @@ -84,7 +86,7 @@ DEPEND=" ${WLROOTS_DEPEND} >=dev-libs/hyprland-protocols-0.2 >=dev-libs/hyprlang-0.3.2 - >=dev-libs/wayland-protocols-1.32 + >=dev-libs/wayland-protocols-1.34 " BDEPEND=" ${WLROOTS_BDEPEND} -- cgit v1.2.3