public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Rui Huang" <vowstar@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-process/nvtop/
Date: Tue,  6 Sep 2022 02:50:26 +0000 (UTC)	[thread overview]
Message-ID: <1662432611.1d2eb258bd5c407caf298cd80cb8eeaa50f924b9.vowstar@gentoo> (raw)

commit:     1d2eb258bd5c407caf298cd80cb8eeaa50f924b9
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Tue Sep  6 02:50:11 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Tue Sep  6 02:50:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1d2eb258

sys-process/nvtop: fix 9999 ebuild

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 sys-process/nvtop/nvtop-9999.ebuild | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/sys-process/nvtop/nvtop-9999.ebuild b/sys-process/nvtop/nvtop-9999.ebuild
index 128d6f80e..a4383e95d 100644
--- a/sys-process/nvtop/nvtop-9999.ebuild
+++ b/sys-process/nvtop/nvtop-9999.ebuild
@@ -5,25 +5,34 @@ EAPI=8
 
 inherit cmake
 
+NVIDIA_PV="455.38"
+
 DESCRIPTION="NVIDIA GPUs htop like monitoring tool"
 HOMEPAGE="https://github.com/Syllo/nvtop"
 
 if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Syllo/${PN}.git"
 	inherit git-r3
+	SRC_URI="
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${NVIDIA_PV}.tar.bz2
+	"
 else
-	SRC_URI="https://github.com/Syllo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://github.com/Syllo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${NVIDIA_PV}.tar.bz2
+	"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
 
-IUSE="unicode"
+IUSE="unicode video_cards_amdgpu video_cards_nvidia"
 
 RDEPEND="
+	video_cards_amdgpu? ( x11-libs/libdrm[video_cards_amdgpu] )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers )
 	sys-libs/ncurses:0=
-	x11-drivers/nvidia-drivers
 "
 
 DEPEND="${RDEPEND}"
@@ -32,16 +41,15 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.0-add-nvml.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DNVML_INCLUDE_DIRS="${S}/include"
 		-DCURSES_NEED_WIDE=$(usex unicode)
+		-DNVIDIA_SUPPORT=$(usex video_cards_nvidia)
+		-DAMDGPU_SUPPORT=$(usex video_cards_amdgpu)
 	)
 
+	cp "${WORKDIR}/nvidia-settings-${NVIDIA_PV}/src/nvml.h" "${S}/include/nvml.h" || die
+
 	cmake_src_configure
 }


             reply	other threads:[~2022-09-06  2:50 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-06  2:50 Rui Huang [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-14  3:34 [gentoo-commits] repo/proj/guru:dev commit in: sys-process/nvtop/ Rui Huang
2024-12-13  9:59 Rui Huang
2024-12-13  7:59 Rui Huang
2024-12-13  7:59 Rui Huang
2024-11-30 12:29 Filip Kobierski
2024-02-09 17:16 Haelwenn Monnier
2024-01-12  5:47 YiFei Zhu
2023-03-31  4:40 Rui Huang
2023-03-31  4:38 Rui Huang
2022-10-25  2:47 Carlos Eduardo
2022-09-06  3:25 Rui Huang
2022-09-06  2:50 Rui Huang
2022-09-06  2:50 Rui Huang
2022-07-08  4:53 Rui Huang
2022-07-08  4:53 Rui Huang
2022-04-25  8:26 Rui Huang
2022-04-24  4:08 Rui Huang
2022-02-07 15:51 Rui Huang
2021-11-08 13:08 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-11-08 13:08 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-08-03  8:55 Andrew Ammerlaan
2021-07-28  2:36 Rui Huang
2021-07-28  2:34 Rui Huang
2021-05-31  3:01 Rui Huang
2021-05-31  3:01 Rui Huang
2021-01-01  9:55 Rui Huang
2020-12-04 19:21 Rui Huang
2020-12-04 19:21 Rui Huang
2020-06-14 11:03 Rui Huang
2020-06-13 17:09 Rui Huang
2020-06-13 15:36 Rui Huang
2020-06-13 15:36 Rui Huang
2020-06-13 15:28 Rui Huang

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=1662432611.1d2eb258bd5c407caf298cd80cb8eeaa50f924b9.vowstar@gentoo \
    --to=vowstar@gmail.com \
    --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