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

Laurent Carlier lcarlier at archlinux.org
Sun Feb 12 16:40:12 UTC 2017


    Date: Sunday, February 12, 2017 @ 16:40:11
  Author: lcarlier
Revision: 288754

upgpkg: nvidia-340xx-utils 340.101-2

remove glx symlink support

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-12 16:11:59 UTC (rev 288753)
+++ PKGBUILD	2017-02-12 16:40:11 UTC (rev 288754)
@@ -6,7 +6,7 @@
 pkgbase=nvidia-340xx-utils
 pkgname=('nvidia-340xx-utils' 'nvidia-340xx-libgl' 'opencl-nvidia-340xx')
 pkgver=340.101
-pkgrel=1
+pkgrel=2
 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")
-sha512sums=('06c649df3b02c6ccf5491fecd06f4c979656aaba2bb366e6197e96bb0eecd8d0a46245e69628d507ddc8c5fc6d5f1cac694f036bc45ba51f82a092ebd6097bf5')
+sha512sums=('bf7e27b2f3c815f5e21ba3b17cb9f4e76360bb2c41b30face591834d82d786fee93546a469e30ebcb89f64a17a7e79e0b7ed6fd9f26438dfaa48899fce3ddf33')
 sha512sums_i686=('5866f2b4e6e22863c54d9fc08c9c88c9c911df2396d0ceaca653ded04589ea3a9e4550ed58f4b182b0a42cfe205ef643fe43ea709478e5df5360a7f74fa87f41')
 sha512sums_x86_64=('d5bea7315346e93a7cccd3d99900f4dad51dfa6e93382d4d61c314d0ab97dea063169b8d666d3a3373dea33b4322f945c3a18ed0fc3308e3f89af6f22f373abc')
 
@@ -63,10 +63,7 @@
     provides=('libgl' 'libgles' 'libegl' 'nvidia-libgl')
     cd "${_pkg}"
 
-    mkdir -p "${pkgdir}/usr/lib/xorg/modules/extensions"
-    ln -s "/usr/lib/nvidia/xorg/modules/extensions/libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.${pkgver}"
-    ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.1"
-    ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
+    mkdir -p "${pkgdir}/usr/lib/"
 
     ln -s "/usr/lib/nvidia/libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.${pkgver}"
     ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.1"
@@ -103,8 +100,9 @@
     install -D -m755 nvidia_drv.so "${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so"
 
     # GLX extension module for X
-    install -D -m755 "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so.${pkgver}"
-    ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so"	# X doesn't find glx otherwise
+    install -D -m755 "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglx.so.${pkgver}"
+    ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglx.so.1"	# X doesn't find glx otherwise
+    ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglx.so"	# X doesn't find glx otherwise
 
     # OpenGL libraries
     install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGL.so.${pkgver}"

Modified: nvidia-drm-outputclass.conf
===================================================================
--- nvidia-drm-outputclass.conf	2017-02-12 16:11:59 UTC (rev 288753)
+++ nvidia-drm-outputclass.conf	2017-02-12 16:40:11 UTC (rev 288754)
@@ -1,6 +1,6 @@
 Section "OutputClass"
-	Identifier "nvidia"
-	MatchDriver "nvidia-drm"
-	Driver "nvidia"
+    Identifier "nvidia"
+    MatchDriver "nvidia-drm"
+    Driver "nvidia"
+    ModulePath "/usr/lib/nvidia/xorg"
 EndSection
-



More information about the arch-commits mailing list