[arch-commits] Commit in nvidia-304xx-utils/trunk (2 files)

Laurent Carlier lcarlier at archlinux.org
Mon Feb 27 17:52:25 UTC 2017


    Date: Monday, February 27, 2017 @ 17:52:25
  Author: lcarlier
Revision: 289638

upgpkg: nvidia-304xx-utils 304.135-6

Use a better default configuration file especially for optimus systems, adapt to libglvnd mesa

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD
  nvidia-304xx-utils/trunk/nvidia-drm-outputclass.conf

-----------------------------+
 PKGBUILD                    |   10 +++++-----
 nvidia-drm-outputclass.conf |    8 ++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-27 17:45:22 UTC (rev 289637)
+++ PKGBUILD	2017-02-27 17:52:25 UTC (rev 289638)
@@ -5,7 +5,7 @@
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
 pkgver=304.135
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
@@ -14,7 +14,7 @@
 source=(nvidia-drm-outputclass.conf)
 source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
 source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-md5sums=('4f5562ee8f3171769e4638b35396c55d')
+md5sums=('a433deeb5f9cc661e537f42bde2f1df7')
 md5sums_i686=('0e2082ae8490b135eb306befe6db56e1')
 md5sums_x86_64=('8ee9bd0b020508bca9953181811422fa')
 
@@ -129,15 +129,15 @@
   ln -s nvidia-304xx "${pkgdir}/usr/share/doc/nvidia-304xx-utils"
 
   # We have to provide symlinks to mesa, as nvidia 304xx doesn't ship them
-  ln -s /usr/lib/mesa/libEGL.so.1.0.0 "${pkgdir}/usr/lib/nvidia/libEGL.so.1.0.0"
+  ln -s /usr/lib/libEGL.so.1.0.0 "${pkgdir}/usr/lib/nvidia/libEGL.so.1.0.0"
   ln -s libEGL.so.1.0.0      "${pkgdir}/usr/lib/nvidia/libEGL.so.1"
   ln -s libEGL.so.1.0.0      "${pkgdir}/usr/lib/nvidia/libEGL.so"
 
-  ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.1.1.0"
+  ln -s /usr/lib/libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.1.1.0"
   ln -s libGLESv1_CM.so.1.1.0      "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.1"
   ln -s libGLESv1_CM.so.1.1.0      "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so"
 
-  ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/nvidia/libGLESv2.so.2.0.0"
+  ln -s /usr/lib/libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/nvidia/libGLESv2.so.2.0.0"
   ln -s libGLESv2.so.2.0.0      "${pkgdir}/usr/lib/nvidia/libGLESv2.so.2"
   ln -s libGLESv2.so.2.0.0      "${pkgdir}/usr/lib/nvidia/libGLESv2.so"
 

Modified: nvidia-drm-outputclass.conf
===================================================================
--- nvidia-drm-outputclass.conf	2017-02-27 17:45:22 UTC (rev 289637)
+++ nvidia-drm-outputclass.conf	2017-02-27 17:52:25 UTC (rev 289638)
@@ -1,6 +1,14 @@
 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"
 EndSection



More information about the arch-commits mailing list