public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: gui-wm/hyprland/
Date: Sat,  4 Nov 2023 19:48:07 +0000 (UTC)	[thread overview]
Message-ID: <1699127240.2651d43c2142e0b5c629a274b14455e2122c75fe.sam@gentoo> (raw)

commit:     2651d43c2142e0b5c629a274b14455e2122c75fe
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Fri Nov  3 12:10:04 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 19:47:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2651d43c

gui-wm/hyprland: include wlr headers

* pkgconfig files already expects this location so no further
  modification is required.

Bug: https://bugs.gentoo.org/916760
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gui-wm/hyprland/hyprland-0.31.0-r1.ebuild | 132 ++++++++++++++++++++++++++++++
 1 file changed, 132 insertions(+)

diff --git a/gui-wm/hyprland/hyprland-0.31.0-r1.ebuild b/gui-wm/hyprland/hyprland-0.31.0-r1.ebuild
new file mode 100644
index 000000000000..d418c6225339
--- /dev/null
+++ b/gui-wm/hyprland/hyprland-0.31.0-r1.ebuild
@@ -0,0 +1,132 @@
+# 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
+	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
+}


             reply	other threads:[~2023-11-04 19:48 UTC|newest]

Thread overview: 87+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-04 19:48 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-20 21:30 [gentoo-commits] repo/gentoo:master commit in: gui-wm/hyprland/ Yixun Lan
2024-11-19  0:12 Yixun Lan
2024-11-17 10:15 Yixun Lan
2024-11-17 10:15 Yixun Lan
2024-10-17 11:40 Yixun Lan
2024-10-17 11:40 Yixun Lan
2024-09-26 12:49 Yixun Lan
2024-09-11  2:34 Yixun Lan
2024-09-11  2:34 Yixun Lan
2024-09-10 15:46 Jakov Smolić
2024-08-11  2:44 Yixun Lan
2024-08-11  2:44 Yixun Lan
2024-08-11  2:44 Yixun Lan
2024-08-11  2:44 Yixun Lan
2024-08-09  3:18 Yixun Lan
2024-08-09  3:18 Yixun Lan
2024-08-09  3:18 Yixun Lan
2024-08-09  3:18 Yixun Lan
2024-08-09  3:18 Yixun Lan
2024-07-27 17:16 Arthur Zamarin
2024-07-25  0:06 Yixun Lan
2024-07-01 22:40 Yixun Lan
2024-07-01 22:40 Yixun Lan
2024-06-30 15:05 James Le Cuirot
2024-06-25  8:18 Yixun Lan
2024-05-28 14:08 Yixun Lan
2024-05-23 16:10 Matt Turner
2024-05-15  8:04 Yixun Lan
2024-05-15  8:04 Yixun Lan
2024-05-13 18:00 Arthur Zamarin
2024-05-06  2:21 Yixun Lan
2024-04-27 11:09 Yixun Lan
2024-04-16 22:09 Yixun Lan
2024-04-16 22:09 Yixun Lan
2024-04-16 22:09 Yixun Lan
2024-04-15 23:51 Yixun Lan
2024-04-15 23:51 Yixun Lan
2024-04-13  5:45 Joonas Niilola
2024-04-08 12:56 Yixun Lan
2024-04-02 11:44 Yixun Lan
2024-03-17  9:10 Yixun Lan
2024-03-16 23:51 Yixun Lan
2024-03-16 23:51 Yixun Lan
2024-03-02  1:23 Yixun Lan
2024-03-01  1:08 Yixun Lan
2024-03-01  1:08 Yixun Lan
2024-02-23  0:50 Yixun Lan
2024-02-23  0:50 Yixun Lan
2024-02-23  0:50 Yixun Lan
2024-02-18  8:57 Yixun Lan
2024-02-18  8:57 Yixun Lan
2024-02-18  0:15 Sam James
2024-01-05 19:42 Jakov Smolić
2024-01-05 10:36 Sam James
2024-01-03 13:45 Yixun Lan
2024-01-03 13:45 Yixun Lan
2024-01-03 13:45 Yixun Lan
2023-12-20 15:19 Sam James
2023-12-13 12:27 Yixun Lan
2023-12-12  8:14 Yixun Lan
2023-12-12  8:14 Yixun Lan
2023-11-26  7:49 Yixun Lan
2023-11-26  7:49 Yixun Lan
2023-11-12 23:56 Yixun Lan
2023-11-12 23:29 Yixun Lan
2023-11-12 23:29 Yixun Lan
2023-11-12  6:39 Sam James
2023-11-12  0:02 Yixun Lan
2023-11-11 11:23 Yixun Lan
2023-11-11 10:28 Yixun Lan
2023-11-11 10:28 Yixun Lan
2023-11-04 19:48 Sam James
2023-10-27  3:20 Sam James
2023-10-01  7:47 Sam James
2023-10-01  7:47 Sam James
2023-09-18  9:50 Sam James
2023-09-18  9:50 Sam James
2023-07-27  3:10 Sam James
2023-07-23  1:52 Sam James
2023-07-19 15:10 Sam James
2023-07-19 15:10 Sam James
2023-06-11  8:22 Joonas Niilola
2023-06-05  8:05 Sam James
2023-06-05  5:32 Sam James
2023-06-05  5:15 Sam James
2023-05-29 14:21 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1699127240.2651d43c2142e0b5c629a274b14455e2122c75fe.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox