[arch-commits] Commit in nvidia-utils/trunk (PKGBUILD nvidia-drm-outputclass.conf)

Laurent Carlier lcarlier at archlinux.org
Sun Feb 12 17:35:14 UTC 2017


    Date: Sunday, February 12, 2017 @ 17:35:14
  Author: lcarlier
Revision: 288756

upgpkg: nvidia-utils 375.26-3

remove glx symlink support

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

-----------------------------+
 PKGBUILD                    |   21 +++++++++++----------
 nvidia-drm-outputclass.conf |    6 ++++++
 2 files changed, 17 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-12 16:40:19 UTC (rev 288755)
+++ PKGBUILD	2017-02-12 17:35:14 UTC (rev 288756)
@@ -6,15 +6,17 @@
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
 pkgver=375.26
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
 options=('!strip')
+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_i686=('3bc859a95469a45f3c627018248d83e178d160385c3d17d9f890b0d142ecd1220fb21c442e4fe7755b831227a9c820736f447b162acd9699819c6e8145d6d841')
-sha512sums_x86_64=('f52f6597daa1eaf4cbd934d785da6028ef23ecef98e14746143e3738504f8d65b73788abbcf9fd812317fc2c53cdf1c4d4839de57fafdea1930a08c6b21f1992')
+md5sums=('4f5562ee8f3171769e4638b35396c55d')
+md5sums_i686=('b0706e88ad173f6b9c7bd2e5a838c163')
+md5sums_x86_64=('5595fb385e41638c5118784114b03d9a')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -60,10 +62,7 @@
     provides=('libgl' 'libegl' 'libgles')
     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.1" "${pkgdir}/usr/lib/libGL.so.1"
     ln -s "libGL.so.1" "${pkgdir}/usr/lib/libGL.so"
@@ -95,8 +94,10 @@
     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
+    
     install -D -m755 "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libGLX_nvidia.so.${pkgver}"
     ln -s "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libGLX_indirect.so.0"
 
@@ -184,7 +185,7 @@
     ln -s nvidia "${pkgdir}/usr/share/doc/nvidia-utils"
 
     # distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -D -m644 nvidia-drm-outputclass.conf "${pkgdir}/usr/share/X11/xorg.conf.d/nvidia-drm-outputclass.conf"
+    install -D -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/nvidia-drm-outputclass.conf"
 
     create_links
 }

Added: nvidia-drm-outputclass.conf
===================================================================
--- nvidia-drm-outputclass.conf	                        (rev 0)
+++ nvidia-drm-outputclass.conf	2017-02-12 17:35:14 UTC (rev 288756)
@@ -0,0 +1,6 @@
+Section "OutputClass"
+    Identifier "nvidia"
+    MatchDriver "nvidia-drm"
+    Driver "nvidia"
+    ModulePath "/usr/lib/nvidia/xorg"
+EndSection



More information about the arch-commits mailing list