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: dev-util/nsight-graphics/
Date: Tue, 22 Apr 2025 00:41:16 +0000 (UTC)	[thread overview]
Message-ID: <1745282267.c96cdae14c0682a3f94c55e6b968fa0ce40b8d8b.sam@gentoo> (raw)

commit:     c96cdae14c0682a3f94c55e6b968fa0ce40b8d8b
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Wed Apr 16 13:33:02 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 00:37:47 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c96cdae1

dev-util/nsight-graphics: use edo, ebuild cleanup

Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../nsight-graphics-2025.2.0.ebuild                | 48 ++++++++++++----------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/dev-util/nsight-graphics/nsight-graphics-2025.2.0.ebuild b/dev-util/nsight-graphics/nsight-graphics-2025.2.0.ebuild
index 36bad1006898..b120943f6c73 100644
--- a/dev-util/nsight-graphics/nsight-graphics-2025.2.0.ebuild
+++ b/dev-util/nsight-graphics/nsight-graphics-2025.2.0.ebuild
@@ -3,18 +3,21 @@
 
 EAPI=8
 
-inherit desktop unpacker
+inherit desktop edo unpacker
 
 DESCRIPTION="standalone developer tool with ray-tracing support"
 HOMEPAGE="https://developer.nvidia.com/nsight-graphics"
 
 MY_PV="$(ver_rs 1-3 '_')"
+MY_PN="${PN//nsight-}"
+MY_PN_SHORT="gfx"
+
 PV_BUILD="25073"
 
 SRC_URI="
 	https://developer.nvidia.com/downloads/assets/tools/secure/${PN}/${MY_PV}/linux/NVIDIA_Nsight_Graphics_${PV}.${PV_BUILD}.run
-	mirror+https://developer.download.nvidia.com/images/nvidia-nsight-graphics-icon-gbp-shaded-128.png
-		-> nvidia-nsight-graphics-icon-gbp-shaded-128.20231126.png
+	mirror+https://developer.download.nvidia.com/images/nvidia-nsight-${MY_PN}-icon-gbp-shaded-128.png
+		-> nvidia-nsight-${MY_PN}-icon-gbp-shaded-128.20231126.png
 "
 
 S="${WORKDIR}/pkg"
@@ -60,16 +63,18 @@ src_prepare() {
 
 	pushd host/linux-desktop-nomad-* >/dev/null || die
 
-	readarray -t rpath_bins < <(find . -maxdepth 1 -name '*.bin')
-	for rpath_bin in "${rpath_bins[@]}"; do
-		ebegin "fixing rpath for ${rpath_bin}"
-		patchelf --set-rpath '$ORIGIN' "${rpath_bin}" || die
-		eend $?
+	local rpaths rpath
+	readarray -t rpaths < <(find . -maxdepth 1 -name '*.bin')
+	for rpath in "${rpaths[@]}"; do
+		edob -m "fixing rpath for ${rpath}" \
+			patchelf --set-rpath '$ORIGIN' "${rpath}"
 
+		# OpenGLVersionChecker stumbles on "OpenGL ES profile version string" so disable the check
 		sed \
 			-e "s/NV_AGORA_PATH/NV_AGORA_PATH_/g" \
 			-e "4i export QT_PLUGIN_PATH=\"\${NV_AGORA_PATH_}/Plugins\"" \
-			-i "$(basename "${rpath_bin}" .bin)" \
+			-e "s/AGORA_USE_MESA_FALLBACK=true/AGORA_USE_MESA_FALLBACK=false/" \
+			-i "$(basename "${rpath}" .bin)" \
 			|| die
 	done
 
@@ -93,28 +98,29 @@ src_install() {
 	dodir "${dir}"
 	mv ./* "${ED}${dir}" || die
 
-	local arch_dir="$(find "${ED}${dir}/host" -mindepth 1 -maxdepth 1 -name 'linux-*' -exec basename {} \;)"
-	if [[ -z "${arch_dir}" ]]; then
+	local arch_dirs
+	readarray -t arch_dirs < <(find "${ED}${dir}/host" -mindepth 1 -maxdepth 1 -name 'linux-*' -exec basename {} \;)
+	if [[ -z "${arch_dirs[*]}" ]]; then
 		die "failed to find arch dir"
 	fi
-	if [[ "$(echo "${arch_dir}" | wc -l )" -gt 1 ]]; then
-		echo ${arch_dir}
-		die "found $(echo "${arch_dir}" | wc -l )"
+	if [[ "$(echo "${#arch_dirs[@]}" | wc -l )" -gt 1 ]]; then
+		eerror "${arch_dirs[*]}"
+		die "found ${#arch_dirs[*]} arch dirs"
 	fi
 
 	cp \
-		"${DISTDIR}/nvidia-nsight-graphics-icon-gbp-shaded-128.20231126.png" \
-		"${ED}${dir}/host/${arch_dir}/ngfx-ui.png" \
+		"${DISTDIR}/nvidia-nsight-${MY_PN}-icon-gbp-shaded-128.20231126.png" \
+		"${ED}${dir}/host/${arch_dirs[0]}/n${MY_PN_SHORT}-ui.png" \
 			|| die
 
 	newmenu - "${P}.desktop" <<-EOF || die
 		[Desktop Entry]
 		Type=Application
-		Name=NVIDIA Nsight Graphics ${PV}
-		GenericName=NVIDIA Nsight Graphics
-		Icon=${EPREFIX}${dir}/host/${arch_dir}/ngfx-ui.png
-		Exec=env WAYLAND_DISPLAY= ${EPREFIX}${dir}/host/${arch_dir}/ngfx-ui
-		TryExec=${EPREFIX}${dir}/host/${arch_dir}/ngfx-ui
+		Name=NVIDIA Nsight ${MY_PN^} ${PV}
+		GenericName=NVIDIA Nsight ${MY_PN^}
+		Icon=${EPREFIX}${dir}/host/${arch_dirs[0]}/n${MY_PN_SHORT}-ui.png
+		Exec=env WAYLAND_DISPLAY= ${EPREFIX}${dir}/host/${arch_dirs[0]}/n${MY_PN_SHORT}-ui
+		TryExec=${EPREFIX}${dir}/host/${arch_dirs[0]}/n${MY_PN_SHORT}-ui
 		Keywords=cuda;gpu;nvidia;nsight;
 		X-AppInstall-Keywords=cuda;gpu;nvidia;nsight;
 		X-GNOME-Keywords=cuda;gpu;nvidia;nsight;


                 reply	other threads:[~2025-04-22  0:41 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=1745282267.c96cdae14c0682a3f94c55e6b968fa0ce40b8d8b.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