build: Arch upstream changes

- Add libcudadebugger
- Properly set libnvidia-vulkan-producer.so SONAME using patchelf

2 files changed, 6 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 24f076871f50..7a33b9a2a1a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = nvidia-utils-beta-nvlax
 	pkgdesc = NVIDIA drivers utilities (beta version) with NVENC and NvFBC patched with nvlax
 	pkgver = 525.85.05
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/illnyang/nvlax/
 	install = nvidia-utils-beta.install
 	arch = x86_64
 	license = custom
 	makedepends = cmake
 	makedepends = git
+	makedepends = patchelf
 	depends = xorg-server
 	depends = libglvnd
 	depends = egl-wayland
diff --git a/PKGBUILD b/PKGBUILD
index 53a0e0ed20d8..cd678623341d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=nvidia-utils-beta
 pkgname=${_pkgname}-nvlax
 pkgver=525.85.05
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA drivers utilities (beta version) with NVENC and NvFBC patched with nvlax"
 arch=('x86_64')
 license=('custom')
@@ -11,7 +11,7 @@ url="https://github.com/illnyang/nvlax/"
 depends=(
   'xorg-server' 'libglvnd' 'egl-wayland'
 )
-makedepends=('cmake' 'git')
+makedepends=('cmake' 'git' 'patchelf')
 optdepends=(
   "nvidia-settings-beta=${pkgver}: configuration tool"
   'xorg-server-devel: nvidia-xconfig'
@@ -124,8 +124,7 @@ package() {
   install -Dm755 "libnvidia-allocator.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-allocator.so.${pkgver}"
   install -Dm755 "libnvidia-vulkan-producer.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-vulkan-producer.so.${pkgver}"
   # Sigh libnvidia-vulkan-producer.so has no SONAME set so create_links doesn't catch it. NVIDIA please fix!
-  ln -s "libnvidia-vulkan-producer.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-vulkan-producer.so.1"
-  ln -s "libnvidia-vulkan-producer.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-vulkan-producer.so"
+  patchelf --set-soname "libnvidia-vulkan-producer.so.1" "${pkgdir}/usr/lib/libnvidia-vulkan-producer.so.${pkgver}"
 
   # Patched NvFBC
   ./nvlax_fbc -i "libnvidia-fbc.so.${pkgver}" -o "libnvidia-fbc.so.${pkgver}"
@@ -148,6 +147,7 @@ package() {
   # CUDA
   install -Dm755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/libcuda.so.${pkgver}"
   install -Dm755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/libnvcuvid.so.${pkgver}"
+  install -Dm755 "libcudadebugger.so.${pkgver}" "${pkgdir}/usr/lib/libcudadebugger.so.${pkgver}"
 
   # NVVM Compiler library loaded by the CUDA driver to do JIT link-time-optimization
   install -Dm644 "libnvidia-nvvm.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-nvvm.so.${pkgver}"