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

Laurent Carlier lcarlier at archlinux.org
Sun Feb 12 14:29:20 UTC 2017


    Date: Sunday, February 12, 2017 @ 14:29:20
  Author: lcarlier
Revision: 288748

upgpkg: nvidia-304xx-utils 304.134-2

remove glx symlink support

Modified:
  nvidia-304xx-utils/trunk/PKGBUILD

----------+
 PKGBUILD |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-12 14:20:39 UTC (rev 288747)
+++ PKGBUILD	2017-02-12 14:29:20 UTC (rev 288748)
@@ -5,16 +5,18 @@
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
 pkgver=304.134
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
 makedepends=('zlib')
 options=('!strip')
-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_i686=('9abd7e9272382bd0e6939c3a367cc1a6')
-md5sums_x86_64=('2ecfa6bd145f673264f7977e0366e259')
+source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" nvidia-drm-outputclass.conf)
+source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" nvidia-drm-outputclass.conf)
+md5sums_i686=('9abd7e9272382bd0e6939c3a367cc1a6'
+              '44bdaa2fdaec5cdcf72961e9aa71f971')
+md5sums_x86_64=('2ecfa6bd145f673264f7977e0366e259'
+                '44bdaa2fdaec5cdcf72961e9aa71f971')
 
 if [ "$CARCH" = "i686" ]; then
   _arch='x86'
@@ -65,10 +67,7 @@
 
   cd ${_pkg}
 
-  mkdir -p "${pkgdir}/usr/lib/xorg/modules/extensions"
-  ln -s "../../../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 nvidia/libGL.so.${pkgver} "${pkgdir}/usr/lib/libGL.so.${pkgver}"
   ln -s libGL.so.${pkgver} "${pkgdir}/usr/lib/libGL.so.1"
@@ -106,8 +105,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}"
@@ -160,7 +160,7 @@
 
   # distro specific files must be installed in /usr/share/X11/xorg.conf.d
   install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d"
-  install -m644 nvidia-drm-outputclass.conf "${pkgdir}/usr/share/X11/xorg.conf.d/"
+  install -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/"
 
   create_links
 }



More information about the arch-commits mailing list