Add some changes from the official repository package

Changes picked up from the nvidia-utils package from the
official repositories:
  - add libnvidia-wfb.so (present in nvidia-utils package)
  - renamed and updated the contents of the xorg.conf.d file
  - use a sysusers file instead of configuring through .install
  - removed the nologo configuration (user should handle this)
  - apply changes to vulkan icd file in prepare()

7 files changed, 41 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a07d091af94f..8c875e919722 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = nvidia-utils-beta
 	pkgver = 410.57
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.nvidia.com/
 	arch = x86_64
 	license = custom:NVIDIA
 	options = !strip
 	source = http://us.download.nvidia.com/XFree86/Linux-x86_64/410.57/NVIDIA-Linux-x86_64-410.57-no-compat32.run
-	source = 10-nvidia-drm-outputclass.conf
-	source = 20-nvidia.conf
+	source = nvidia-drm-outputclass.conf
+	source = nvidia-utils-beta.sysusers
 	sha256sums = 1ad40d83ec712843c1b5593949abefc9093399fb26a418ae9a571fbd1d9b228e
-	sha256sums = 3a5f66620501d8dd85085a35c2f9e85a2e0d56a1b565b2df1e9fabc40e643363
-	sha256sums = 444c6cfceac08a52d0873a1f5146fea2eeb44e7952ca1cc08629786b691e92b4
+	sha256sums = 089d6dc247c9091b320c418b0d91ae6adda65e170934d178cdd4e9bd0785b182
+	sha256sums = d8d1caa5d72c71c6430c2a0d9ce1a674787e9272ccce28b9d5898ca24e60a167
 
 pkgname = nvidia-utils-beta
 	pkgdesc = NVIDIA driver utilities and libraries (beta version)
@@ -29,7 +29,6 @@ pkgname = nvidia-utils-beta
 	conflicts = nvidia-utils
 	conflicts = nvidia-settings
 	conflicts = libglvnd
-	backup = etc/X11/xorg.conf.d/20-nvidia.conf
 
 pkgname = nvidia-egl-wayland-beta
 	pkgdesc = NVIDIA EGL Wayland library (libnvidia-egl-wayland.so.1.1.0) for 'nvidia-utils-beta'
diff --git a/10-nvidia-drm-outputclass.conf b/10-nvidia-drm-outputclass.conf
deleted file mode 100644
index 6a01fba8cfc3..000000000000
--- a/10-nvidia-drm-outputclass.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Section "OutputClass"
-    Identifier "nvidia"
-    MatchDriver "nvidia-drm"
-    Driver "nvidia"
-    ModulePath "/usr/lib/nvidia/xorg"
-EndSection
diff --git a/20-nvidia.conf b/20-nvidia.conf
deleted file mode 100644
index 8b8e26863c90..000000000000
--- a/20-nvidia.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-Section "Device"
-        Identifier      "Default Nvidia Device"
-        Option          "NoLogo" "True"
-EndSection
diff --git a/PKGBUILD b/PKGBUILD
index 2210a7e02991..6944ee237db3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,18 +6,18 @@
 
 pkgname=('nvidia-utils-beta' 'nvidia-egl-wayland-beta' 'nvidia-libgl-beta' 'opencl-nvidia-beta')
 pkgver=410.57
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url="http://www.nvidia.com/"
 license=('custom:NVIDIA')
 options=('!strip')
 _pkg="NVIDIA-Linux-x86_64-$pkgver-no-compat32"
-source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/$pkgver/$_pkg.run"
-        '10-nvidia-drm-outputclass.conf'
-        '20-nvidia.conf')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
+        'nvidia-drm-outputclass.conf'
+        'nvidia-utils-beta.sysusers')
 sha256sums=('1ad40d83ec712843c1b5593949abefc9093399fb26a418ae9a571fbd1d9b228e'
-            '3a5f66620501d8dd85085a35c2f9e85a2e0d56a1b565b2df1e9fabc40e643363'
-            '444c6cfceac08a52d0873a1f5146fea2eeb44e7952ca1cc08629786b691e92b4')
+            '089d6dc247c9091b320c418b0d91ae6adda65e170934d178cdd4e9bd0785b182'
+            'd8d1caa5d72c71c6430c2a0d9ce1a674787e9272ccce28b9d5898ca24e60a167')
 
 _eglver='1.1.0'
 
@@ -45,6 +45,8 @@ prepare() {
   sh $_pkg.run -x
   cd $_pkg
   bsdtar -xf nvidia-persistenced-init.tar.bz2
+  
+  sed -i 's/__NV_VK_ICD__/libGLX_nvidia.so.0/' nvidia_icd.json.template
 }
 
 package_opencl-nvidia-beta() {
@@ -120,9 +122,9 @@ package_nvidia-utils-beta() {
               "egl-wayland-git: for alternative, more advanced Wayland library (libnvidia-egl-wayland.so.${_eglver})")
   provides=("nvidia-utils=$pkgver" "nvidia-settings=$pkgver" 'libglvnd' 'vulkan-driver')
   conflicts=('nvidia-utils' 'nvidia-settings' 'libglvnd')
-  backup=('etc/X11/xorg.conf.d/20-nvidia.conf')
-  install=$pkgname.install
-  cd $_pkg
+  install="${pkgname}.install"
+  
+  cd "$_pkg"
 
   # X driver
   install -Dm755 nvidia_drv.so "$pkgdir"/usr/lib/xorg/modules/drivers/nvidia_drv.so
@@ -131,7 +133,10 @@ package_nvidia-utils-beta() {
   install -D -m755 "libglxserver_nvidia.so.${pkgver}" -t "${pkgdir}/usr/lib/nvidia/xorg"
   ln -s "libglxserver_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglxserver_nvidia.so.1"  # X doesn't find glx otherwise
   ln -s "libglxserver_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglxserver_nvidia.so"    # X doesn't find glx otherwise
-
+  
+  # X wrapped software rendering
+  install -D -m755 "libnvidia-wfb.so.${pkgver}" -t "${pkgdir}/usr/lib"
+  
   # libGL & OpenGL
   install -Dm755 libGL.so.1.7.0 "$pkgdir"/usr/lib/nvidia/libGL.so.1.7.0
   install -Dm755 libGLdispatch.so.0 "$pkgdir"/usr/lib/libGLdispatch.so.0
@@ -191,7 +196,6 @@ package_nvidia-utils-beta() {
 
   # Vulkan icd
   install -Dm644 nvidia_icd.json.template "$pkgdir"/usr/share/vulkan/icd.d/nvidia_icd.json
-  sed -i 's/__NV_VK_ICD__/libGLX_nvidia.so.0/' "$pkgdir"/usr/share/vulkan/icd.d/nvidia_icd.json
   
   # Vulkan real-time ray tracing extensions (VK_NV_raytracing)
   install -D -m755 "libnvidia-rtcore.so.${pkgver}" -t "${pkgdir}/usr/lib"
@@ -204,9 +208,6 @@ package_nvidia-utils-beta() {
   # OptiX ray tracing engine
   install -D -m755 "libnvoptix.so.${pkgver}" -t "${pkgdir}/usr/lib"
   
-  # Not required (https://bugs.archlinux.org/task/38604):
-  # - libnvidia-wfb.so.$pkgver (provided by xorg-server: https://www.archlinux.org/packages/extra/x86_64/xorg-server/)
-
   # create missing soname links
   _create_links
 
@@ -267,9 +268,9 @@ package_nvidia-utils-beta() {
   install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/nvidia/LICENSE
   ln -s nvidia/ "$pkgdir"/usr/share/licenses/nvidia-utils
 
-  # Disable logo splash
-  install -Dm644 "$srcdir"/20-nvidia.conf "$pkgdir"/etc/X11/xorg.conf.d/20-nvidia.conf
-
   # Distro-specific files must be installed in /usr/share/X11/xorg.conf.d
-  install -Dm644 "$srcdir"/10-nvidia-drm-outputclass.conf "$pkgdir"/usr/share/X11/xorg.conf.d/10-nvidia-drm-outputclass.conf
+  install -D -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/10-nvidia-drm-outputclass.conf"
+  
+  # sysusers
+  install -D -m644 "${srcdir}/nvidia-utils-beta.sysusers" -t "${pkgdir}/usr/lib/sysusers.d"
 }
diff --git a/nvidia-drm-outputclass.conf b/nvidia-drm-outputclass.conf
new file mode 100644
index 000000000000..dd2936cb5ebf
--- /dev/null
+++ b/nvidia-drm-outputclass.conf
@@ -0,0 +1,15 @@
+Section "OutputClass"
+    Identifier "intel"
+    MatchDriver "i915"
+    Driver "modesetting"
+EndSection
+
+Section "OutputClass"
+    Identifier "nvidia"
+    MatchDriver "nvidia-drm"
+    Driver "nvidia"
+    Option "AllowEmptyInitialConfiguration"
+    Option "PrimaryGPU" "yes"
+    ModulePath "/usr/lib/nvidia/xorg"
+    ModulePath "/usr/lib/xorg/modules"
+EndSection
diff --git a/nvidia-utils-beta.install b/nvidia-utils-beta.install
index 5c4c1cfa36dd..5e16bf93e536 100644
--- a/nvidia-utils-beta.install
+++ b/nvidia-utils-beta.install
@@ -1,10 +1,7 @@
 post_upgrade() {
-  echo ":: If CUDA is unavailable, run 'nvidia-modprobe'."
+  printf '%s\n' "If you run into trouble with CUDA not being available, run 'nvidia-modprobe' first."
 }
 
 post_install() {
-  getent group nvidia-persistenced &>/dev/null || groupadd -g 143 nvidia-persistenced
-  getent passwd nvidia-persistenced &>/dev/null || useradd -c 'NVIDIA Persistence Daemon' -u 143 -g nvidia-persistenced -d '/' -s /sbin/nologin nvidia-persistenced
-
   post_upgrade
 }
diff --git a/nvidia-utils-beta.sysusers b/nvidia-utils-beta.sysusers
new file mode 100644
index 000000000000..71c0608911c2
--- /dev/null
+++ b/nvidia-utils-beta.sysusers
@@ -0,0 +1 @@
+u nvidia-persistenced 143 'NVIDIA Persistence Daemon'