commit: 71c5a4429b7419f69a3cfa88f7b5b51413faa21c Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Wed Apr 16 13:32:52 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Apr 22 00:37:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c5a442
dev-util/nsight-compute: 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-compute-2025.1.1.2.ebuild | 50 ++++++++++++---------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/dev-util/nsight-compute/nsight-compute-2025.1.1.2.ebuild b/dev-util/nsight-compute/nsight-compute-2025.1.1.2.ebuild index 7efa373cda03..40b25470751a 100644 --- a/dev-util/nsight-compute/nsight-compute-2025.1.1.2.ebuild +++ b/dev-util/nsight-compute/nsight-compute-2025.1.1.2.ebuild @@ -3,13 +3,14 @@ EAPI=8 -inherit desktop unpacker +inherit desktop edo unpacker DESCRIPTION="performance analysis tool designed to visualize an application’s algorithms" HOMEPAGE="https://developer.nvidia.com/nsight-systems"; -MY_PV=$(ver_cut 1-3) -MY_PV=${MY_PV//./_} +MY_PV="$(ver_rs 1-3 '_' "$(ver_cut 1-3)")" +MY_PN="${PN//nsight-}" +MY_PN_SHORT="cu" PV_BUILD="35528883" SRC_URI=" @@ -19,9 +20,10 @@ SRC_URI=" arm64? ( https://developer.nvidia.com/downloads/assets/tools/secure/${PN}/${MY_PV}/${PN}-armserver-${PV}-${PV_BUILD}.run ) - mirror+https://developer.download.nvidia.com/images/nvidia-nsight-compute-icon-gbp-shaded-128.png - -> nvidia-nsight-compute-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" LICENSE="NVIDIA-r2" @@ -67,6 +69,7 @@ RDEPEND=" x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm " + BDEPEND=" dev-util/patchelf " @@ -80,18 +83,18 @@ src_prepare() { pushd host/linux-desktop-* >/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\"" \ -e "s/AGORA_USE_MESA_FALLBACK=true/AGORA_USE_MESA_FALLBACK=false/" \ - -i "$(basename "${rpath_bin}" .bin)" \ + -i "$(basename "${rpath}" .bin)" \ || die done @@ -115,28 +118,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-compute-icon-gbp-shaded-128.20231126.png" \ - "${ED}${dir}/host/${arch_dir}/ncu-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 Compute ${PV} - GenericName=NVIDIA Nsight Compute - Icon=${EPREFIX}${dir}/host/${arch_dir}/ncu-ui.png - Exec=env WAYLAND_DISPLAY= ${EPREFIX}${dir}/host/${arch_dir}/ncu-ui - TryExec=${EPREFIX}${dir}/host/${arch_dir}/ncu-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;
