diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-09-18 17:06:27 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-09-18 17:06:27 +0100 |
commit | 4be6deadf3e814bc37585cde9dc08faad2561453 (patch) | |
tree | 1e3079a08beb9cfc316ed858851592e9437d5f38 /gui-wm/hyprland | |
parent | 1426dfeb15e4d49cb4238c6cf37455a6130cd83f (diff) |
gentoo auto-resync : 18:09:2023 - 17:06:27
Diffstat (limited to 'gui-wm/hyprland')
-rw-r--r-- | gui-wm/hyprland/Manifest | 4 | ||||
-rw-r--r-- | gui-wm/hyprland/hyprland-0.29.1.ebuild (renamed from gui-wm/hyprland/hyprland-0.27.2-r1.ebuild) | 80 |
2 files changed, 50 insertions, 34 deletions
diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest index 6a3eb84f2c07..af5f2f0f190e 100644 --- a/gui-wm/hyprland/Manifest +++ b/gui-wm/hyprland/Manifest @@ -1,6 +1,6 @@ AUX hyprland-0.28.0-no-wlroots-automagic-r1.patch 880 BLAKE2B eecb42897483a41040442e2dc8a14a3ca22276a8625a15f2b43a180db5f2cdd509e186dc30271d2c2c679844082ccbb6af4d73b7a2b08eb890f1e87dcfc0f323 SHA512 5f629a3e755bf513e17f6b814001677e9c6ea0ec249030ca652dd3661180fa7ed3b85340b62c5ee7f08df29c0d0678d185c3949d1df1bbc950128028163e7a88 -DIST hyprland-0.27.2.gh.tar.gz 4992717 BLAKE2B 6725ee593edb4f7d127eb95ed567bc7344edc066a9ce818ba99bd15eb718ce1d8de86a63da5684521ccbe3ba918a3f385c3a3e662314704e60e855101d391d05 SHA512 92e8ca21eba52ff423654cd345d37125656c32e1262e4e76d8841ee4ba698788d46d70a5876fc9aca42440efa5dd4122f46c84365da53810284a666f5d13ce7e DIST hyprland-0.28.0.gh.tar.gz 14060441 BLAKE2B 25059b74b67df222867e84f5f1d44219302e7e454ec68110b70d6e915e95913bfdc8c6112bc8725e9be61f10a44603a96ba70980a9835d4b7757363825b93326 SHA512 c0802f2b061d5c9265c7767fae6ddaf00c1bbf6dc620f75593ba1538f94105a9ebe1517b7be444a1e70b81fd3a4205afd8154ba9ad02b3d610b00a9440ee6a63 -EBUILD hyprland-0.27.2-r1.ebuild 2485 BLAKE2B ac074f5264a3a038d22b36ea17d8afd5d42d70bf8a10c49fa4dd7a5ce94bc7fa609166cf508d23f1071c27250306b4caf0928e59fe503730fb8ae295490b0433 SHA512 3288207b62c8c2659391830863a11aeadfdb86a7714761e329f7ef9bda1996ef7c843c5959afacee55b70130d6be725537f23c5f93f55b78b8012391925198a8 +DIST hyprland-0.29.1.gh.tar.gz 14056843 BLAKE2B 9e9f1b15d354cf5e391b1add5dc5ce8cf2e4b206853465028a6170e613c7c5435e9a6e3318cd1006d3c2874d885128b95495bba08444fade0185b2a69d9ab950 SHA512 abbfd244b7473ec521a639b0d424e2873193ab9ef0d24e6272e15b79da9ade8ee56ea4cffdc328713f99600c1d320384839d32eb223034945659b015125e98b1 EBUILD hyprland-0.28.0-r1.ebuild 2800 BLAKE2B 12bea435a4863101d32bdbde0bd588a0c295b6ef7b92d5511dcccc37a42ef264945f37db43861f9b53de813703eae128f0d50d7ac48aa30d4183770a32db7382 SHA512 e382b0819c2d4484d421ce69c682305b2176b1c2125dce57b6431335018b8521006c86b6d89ae9d16294cad8942222dcb5788596418f21ee6aa941ca4899f201 +EBUILD hyprland-0.29.1.ebuild 2576 BLAKE2B eabbf6255c19a2a200efc8c2ef77d55e1c995448af3c859a0c734f03704a1a1ff2ebacdba124e6187bc39ec283d6c86e282ccea75d3d3a600734a418d7efd30c SHA512 fa64b70fb0914beaffdc16bd50ab40c7c96f4e2f8c30b8b2cf3ed258343df8e053c844a7e4df7d6ab1801d39ad2b5e836cf421b2d8e40d90cecfced5b6592b59 MISC metadata.xml 716 BLAKE2B fc5248c809b9b5bf1002e3d82ff80f595b8e613d09e5541f1a0151c3ea2c117376d25fa5a40c85d254533708d9eff5339bd329b42118e87ca49e22e55c0c5d7b SHA512 31252ced2546f3686f17259aabfe9273af14f7efaf3fa0bfb446c65c6d9478be3a23c531e0ac463f27fe1d50842f6f126f32e47a8a03a345306297e182952e98 diff --git a/gui-wm/hyprland/hyprland-0.27.2-r1.ebuild b/gui-wm/hyprland/hyprland-0.29.1.ebuild index 16078510e4d7..116dc4c643f0 100644 --- a/gui-wm/hyprland/hyprland-0.27.2-r1.ebuild +++ b/gui-wm/hyprland/hyprland-0.29.1.ebuild @@ -16,45 +16,65 @@ LICENSE="BSD" SLOT="0" IUSE="X legacy-renderer systemd video_cards_nvidia" -RDEPEND=" - app-misc/jq - dev-libs/glib:2 - dev-libs/libinput:= +# 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_RDEPEND=" + >=dev-libs/libinput-1.14.0:= dev-libs/libliftoff - dev-libs/wayland - dev-libs/wayland-protocols - dev-util/glslang - dev-util/vulkan-headers - gui-libs/gtk-layer-shell + >=dev-libs/wayland-1.22 media-libs/libdisplay-info - media-libs/libglvnd[X?] - media-libs/mesa[gles2,wayland,X?] - media-libs/vulkan-loader + media-libs/libglvnd + media-libs/mesa[egl(+),gles2] + sys-apps/hwdata:= sys-auth/seatd:= - x11-base/xcb-proto + >=x11-libs/libdrm-2.4.114 + x11-libs/libxkbcommon + >=x11-libs/pixman-0.42.0 + virtual/libudev:= + X? ( + x11-base/xwayland + x11-libs/libxcb:0= + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) +" +WLROOTS_DEPEND=" + >=dev-libs/wayland-protocols-1.32 +" +WLROOTS_BDEPEND=" + dev-util/glslang + dev-util/wayland-scanner +" + +RDEPEND=" + ${WLROOTS_RDEPEND} + dev-libs/glib:2 + dev-libs/libinput + dev-libs/wayland + media-libs/libglvnd x11-libs/cairo x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman - x11-misc/xkeyboard-config - virtual/libudev:= X? ( - gui-libs/wlroots[x11-backend] - x11-base/xwayland - x11-libs/libxcb:= - x11-libs/xcb-util-image - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm + x11-libs/libxcb:0= ) " -DEPEND="${RDEPEND}" -BDEPEND=" +DEPEND=" + ${RDEPEND} + ${WLROOTS_DEPEND} dev-libs/hyprland-protocols - >=dev-libs/wayland-1.22.0 + >=dev-libs/wayland-protocols-1.25 +" +BDEPEND=" + ${WLROOTS_BDEPEND} + app-misc/jq + dev-util/cmake dev-util/wayland-scanner dev-vcs/git - >=gui-libs/wlroots-0.16.0[X?] + virtual/pkgconfig " pkg_setup() { @@ -75,10 +95,12 @@ pkg_setup() { src_prepare() { if use video_cards_nvidia; then cd "${S}/subprojects/wlroots" || die - eapply "${S}/nix/wlroots-nvidia.patch" + eapply "${S}/nix/patches/wlroots-nvidia.patch" cd "${S}" || die fi + eapply "${FILESDIR}/hyprland-0.28.0-no-wlroots-automagic-r1.patch" + default } @@ -94,10 +116,4 @@ src_configure() { src_install() { meson_src_install --skip-subprojects wlroots - - # FIXME: undo this in next release if meson is fixed (https://github.com/hyprwm/Hyprland/pull/2820) - # https://github.com/hyprwm/Hyprland/commit/70dae78c1b5b17288a3e343b87ca6d10244ee937 - # upstream added new backgrounds but didnt add them to be installed by meson. - insinto /usr/share/hyprland - doins assets/wall_anime_{2,4,8}K.png } |