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 73C5E15814D for ; Fri, 27 Oct 2023 03:20:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BAA482BC0B2; Fri, 27 Oct 2023 03:20:44 +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 A43802BC0B2 for ; Fri, 27 Oct 2023 03:20:44 +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 F15DB335D2B for ; Fri, 27 Oct 2023 03:20:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54EF512D1 for ; Fri, 27 Oct 2023 03:20:41 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1698376678.6fbec12f57b34dae8c49ca8d01fd7c899877a6d3.sam@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/hyprland-0.31.0-fix-log-headers.patch gui-wm/hyprland/hyprland-0.31.0.ebuild X-VCS-Directories: gui-wm/hyprland/ gui-wm/hyprland/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6fbec12f57b34dae8c49ca8d01fd7c899877a6d3 X-VCS-Branch: master Date: Fri, 27 Oct 2023 03:20:41 +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: 82a3fa12-3588-40b6-b423-2d8e9d222fd5 X-Archives-Hash: d23da02d720722f97cb83d245758e18d commit: 6fbec12f57b34dae8c49ca8d01fd7c899877a6d3 Author: Julien Roy jroy ca> AuthorDate: Thu Oct 19 16:10:21 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Oct 27 03:17:58 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fbec12f gui-wm/hyprland: add 0.31.0 Signed-off-by: Julien Roy jroy.ca> Signed-off-by: Sam James gentoo.org> gui-wm/hyprland/Manifest | 1 + .../files/hyprland-0.31.0-fix-log-headers.patch | 33 ++++++ gui-wm/hyprland/hyprland-0.31.0.ebuild | 122 +++++++++++++++++++++ 3 files changed, 156 insertions(+) diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest index 4c4e9e1253aa..d24c531125e4 100644 --- a/gui-wm/hyprland/Manifest +++ b/gui-wm/hyprland/Manifest @@ -1,2 +1,3 @@ DIST hyprland-0.29.1.gh.tar.gz 14056843 BLAKE2B 9e9f1b15d354cf5e391b1add5dc5ce8cf2e4b206853465028a6170e613c7c5435e9a6e3318cd1006d3c2874d885128b95495bba08444fade0185b2a69d9ab950 SHA512 abbfd244b7473ec521a639b0d424e2873193ab9ef0d24e6272e15b79da9ade8ee56ea4cffdc328713f99600c1d320384839d32eb223034945659b015125e98b1 DIST hyprland-0.30.0.gh.tar.gz 14064946 BLAKE2B 188328ed08ca8a9db97ae94b77159f9ebe5361a050a177ec586f376b168dab4c9dcd6b6d71d3314e9470f46b57f0610a92cdfe73ff1704b9f55f21399895e69f SHA512 f8053c19460e7768aa00944d1fc624d85ff9e042d0750a74d28e08147fe50e45262bdb1c259642bb7241746a8fb967344841e58fa598213f8c333f15246f9c94 +DIST hyprland-0.31.0.gh.tar.gz 14068621 BLAKE2B 272ba0c92ee6f8db623bb7b79a64ec1a3f2d2e0e1a8825ab7cc43e30dc64d77396ae014469a308c10deea0f9607680ff3a9328b747c82acccd5156e9d9c07cde SHA512 27798eba3bc430fe3689ecfb6ae38a59f48c39183c8cbd4fea8dca0a92a25941e6ee8b51d70f18498a3b0ef6c2575658299ee36ed6a6a93c7b54548ab64f07ca diff --git a/gui-wm/hyprland/files/hyprland-0.31.0-fix-log-headers.patch b/gui-wm/hyprland/files/hyprland-0.31.0-fix-log-headers.patch new file mode 100644 index 000000000000..7abd8164c9b4 --- /dev/null +++ b/gui-wm/hyprland/files/hyprland-0.31.0-fix-log-headers.patch @@ -0,0 +1,33 @@ +From 5dd0637e90efa17e391b67934998936194701d08 Mon Sep 17 00:00:00 2001 +From: memchr +Date: Mon, 16 Oct 2023 16:22:01 +0000 +Subject: [PATCH] fix(build): do not include wlr headers directly, use + includes.hpp instead. + +--- + src/debug/Log.hpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/debug/Log.hpp b/src/debug/Log.hpp +index 125ed7f45d..085465c911 100644 +--- a/src/debug/Log.hpp ++++ b/src/debug/Log.hpp +@@ -1,10 +1,10 @@ + #pragma once + #include +-#include + #include + #include + #include + #include ++#include "../includes.hpp" + #include "../helpers/MiscFunctions.hpp" + + #define LOGMESSAGESIZE 1024 +@@ -79,4 +79,4 @@ namespace Debug { + } + + void wlrLog(wlr_log_importance level, const char* fmt, va_list args); +-}; +\ No newline at end of file ++}; diff --git a/gui-wm/hyprland/hyprland-0.31.0.ebuild b/gui-wm/hyprland/hyprland-0.31.0.ebuild new file mode 100644 index 000000000000..55520c4c2de9 --- /dev/null +++ b/gui-wm/hyprland/hyprland-0.31.0.ebuild @@ -0,0 +1,122 @@ +# Copyright 2023 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" + +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" +LICENSE="BSD" +SLOT="0" +IUSE="X legacy-renderer systemd video_cards_nvidia" + +# 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-1.22 + media-libs/libdisplay-info + media-libs/libglvnd + media-libs/mesa[egl(+),gles2] + sys-apps/hwdata:= + sys-auth/seatd:= + >=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 + X? ( + x11-libs/libxcb:0= + ) +" +DEPEND=" + ${RDEPEND} + ${WLROOTS_DEPEND} + dev-libs/hyprland-protocols + >=dev-libs/wayland-protocols-1.25 +" +BDEPEND=" + ${WLROOTS_BDEPEND} + || ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* ) + app-misc/jq + dev-util/cmake + dev-util/wayland-scanner + dev-vcs/git + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/hyprland-0.30.0-no-wlroots-automagic-r1.patch" + "${FILESDIR}/hyprland-0.31.0-fix-log-headers.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_prepare() { + if use video_cards_nvidia; then + cd "${S}/subprojects/wlroots" || die + eapply "${S}/nix/patches/wlroots-nvidia.patch" + cd "${S}" || die + fi + + default +} + +src_configure() { + local emesonargs=( + $(meson_feature legacy-renderer legacy_renderer) + $(meson_feature X xwayland) + $(meson_feature systemd) + ) + + meson_src_configure +} + +src_install() { + meson_src_install --skip-subprojects wlroots +}