diff options
author | Balló György | 2017-02-20 08:28:31 +0100 |
---|---|---|
committer | Balló György | 2017-02-20 08:28:31 +0100 |
commit | 31d54e12288163e613ba252355cd86973014e304 (patch) | |
tree | 834d1466add72ba69ae51a2590b61fb7ad4a3d62 | |
parent | b08fca992d849235dcaf34bf2b7877423c165529 (diff) | |
download | aur-31d54e12288163e613ba252355cd86973014e304.tar.gz |
upgpkg: nvidia-96xx-utils 96.43.23-7
Use ld.so.conf to avoid conflict with mesa
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 134 |
2 files changed, 80 insertions, 66 deletions
@@ -1,7 +1,7 @@ pkgbase = nvidia-96xx-utils pkgdesc = NVIDIA drivers utilities and libraries, 96xx branch. pkgver = 96.43.23 - pkgrel = 6 + pkgrel = 7 url = http://www.nvidia.com/ arch = i686 arch = x86_64 @@ -11,11 +11,13 @@ pkgbase = nvidia-96xx-utils optdepends = gtk2: nvidia-settings optdepends = pangox-compat: nvidia-settings optdepends = pkgconfig: nvidia-xconfig - provides = libgl - conflicts = libgl + provides = nvidia-utils=96.43.23 + conflicts = nvidia-utils options = !strip - source = http://download.nvidia.com/XFree86/Linux-/96.43.23/NVIDIA-Linux--96.43.23-pkg0.run - md5sums = ca0bc6ae3b37cb259f3a906b4dc4670b + source_i686 = http://download.nvidia.com/XFree86/Linux-x86/96.43.23/NVIDIA-Linux-x86-96.43.23-pkg0.run + md5sums_i686 = ca0bc6ae3b37cb259f3a906b4dc4670b + source_x86_64 = http://download.nvidia.com/XFree86/Linux-x86_64/96.43.23/NVIDIA-Linux-x86_64-96.43.23-pkg0.run + md5sums_x86_64 = a043fe8dd639bd00b1792eea7a195677 pkgname = nvidia-96xx-utils @@ -1,78 +1,90 @@ # $Id$ # Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Thomas Baechler <thomas@archlinux.org> +# Contributor: Thomas Bächler <thomas@archlinux.org> pkgname=nvidia-96xx-utils pkgver=96.43.23 -pkgrel=6 +pkgrel=7 pkgdesc="NVIDIA drivers utilities and libraries, 96xx branch." arch=('i686' 'x86_64') -[ "$CARCH" = "i686" ] && ARCH=x86 -[ "$CARCH" = "x86_64" ] && ARCH=x86_64 +[ "$CARCH" = "i686" ] && _arch=x86 +[ "$CARCH" = "x86_64" ] && _arch=x86_64 +_pkg="NVIDIA-Linux-$_arch-$pkgver-pkg0" url="http://www.nvidia.com/" depends=('xorg-server<1.12.99' 'mesa') -optdepends=('gtk2: nvidia-settings' 'pangox-compat: nvidia-settings' 'pkgconfig: nvidia-xconfig') -conflicts=('libgl') -provides=('libgl') +optdepends=('gtk2: nvidia-settings' + 'pangox-compat: nvidia-settings' + 'pkgconfig: nvidia-xconfig') +conflicts=('nvidia-utils') +provides=("nvidia-utils=$pkgver") license=('custom') options=(!strip) -source=("http://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run") -md5sums=('ca0bc6ae3b37cb259f3a906b4dc4670b') -[ "$CARCH" = "x86_64" ] && md5sums=('a043fe8dd639bd00b1792eea7a195677') +source_i686=("http://download.nvidia.com/XFree86/Linux-x86/$pkgver/NVIDIA-Linux-x86-$pkgver-pkg0.run") +source_x86_64=("http://download.nvidia.com/XFree86/Linux-x86_64/$pkgver/NVIDIA-Linux-x86_64-$pkgver-pkg0.run") +md5sums_i686=('ca0bc6ae3b37cb259f3a906b4dc4670b') +md5sums_x86_64=('a043fe8dd639bd00b1792eea7a195677') prepare() { - cd $srcdir - sh NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run --extract-only + sh $_pkg.run --extract-only } package() { - cd $srcdir/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/usr/ - - mkdir -p $pkgdir/usr/{lib,bin,share/applications,share/pixmaps,share/man/man1} - mkdir -p $pkgdir/usr/lib/xorg/modules/{extensions,drivers} - mkdir -p $pkgdir/usr/share/licenses/nvidia-96xx/ - - install lib/{libGLcore,libGL,libnvidia-cfg,tls/libnvidia-tls}.so.${pkgver} \ - $pkgdir/usr/lib/ - install -m644 share/man/man1/* $pkgdir/usr/share/man/man1/ - rm $pkgdir/usr/share/man/man1/nvidia-installer.1.gz - install X11R6/lib/libXv* $pkgdir/usr/lib/ - install -m644 share/applications/nvidia-settings.desktop $pkgdir/usr/share/applications/ - # fix nvidia .desktop file - sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i $pkgdir/usr/share/applications/nvidia-settings.desktop - install -m644 share/pixmaps/nvidia-settings.png $pkgdir/usr/share/pixmaps/ - install X11R6/lib/modules/drivers/nvidia_drv.so $pkgdir/usr/lib/xorg/modules/drivers - install X11R6/lib/modules/extensions/libglx.so.$pkgver $pkgdir/usr/lib/xorg/modules/extensions - install -m755 bin/nvidia-{settings,xconfig,bug-report.sh} $pkgdir/usr/bin/ - cd $pkgdir/usr/lib/ - ln -s libGL.so.$pkgver libGL.so - ln -s libGL.so.$pkgver libGL.so.1 - ln -s libGLcore.so.$pkgver libGLcore.so.1 - ln -s libnvidia-cfg.so.$pkgver libnvidia-cfg.so.1 - ln -s libnvidia-tls.so.$pkgver libnvidia-tls.so.1 - ln -s libXvMCNVIDIA.so.$pkgver libXvMCNVIDIA_dynamic.so.1 - - cd $pkgdir/usr/lib/xorg/modules/extensions - ln -s libglx.so.$pkgver libglx.so - - # We have to provide symlinks to mesa, as nvidia 96xx doesn't ship them - ln -s mesa/libEGL.so.1.0.0 "${pkgdir}/usr/lib/libEGL.so.1.0.0" - ln -s libEGL.so.1.0.0 "${pkgdir}/usr/lib/libEGL.so.1" - ln -s libEGL.so.1.0.0 "${pkgdir}/usr/lib/libEGL.so" - - ln -s mesa/libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0" - ln -s libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/libGLESv1_CM.so.1" - ln -s libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/libGLESv1_CM.so" - - ln -s mesa/libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so.2.0.0" - ln -s libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so.2" - ln -s libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so" - - install -m644 $srcdir/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/LICENSE $pkgdir/usr/share/licenses/nvidia-96xx/ - ln -s nvidia-96xx $pkgdir/usr/share/licenses/nvidia-96xx-utils - - install -D -m644 $srcdir/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/usr/share/doc/README.txt $pkgdir/usr/share/doc/nvidia-96xx/README - - find $pkgdir/usr -type d -exec chmod 755 {} \; -} + cd $_pkg + + # X driver + install -D -m755 usr/X11R6/lib/modules/drivers/nvidia_drv.so "$pkgdir/usr/lib/xorg/modules/drivers/nvidia_drv.so" + + # GLX extension module for X + install -Dm755 usr/X11R6/lib/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" + + # OpenGL libraries + install -Dm755 usr/lib/libGL.so.$pkgver "$pkgdir/usr/lib/nvidia/libGL.so.$pkgver" + ln -s libGL.so.$pkgver "$pkgdir/usr/lib/nvidia/libGL.so.1" + ln -s libGL.so.$pkgver "$pkgdir/usr/lib/nvidia/libGL.so" + + # OpenGL core library + install -Dm755 usr/lib/libGLcore.so.$pkgver "$pkgdir/usr/lib/nvidia/libGLcore.so.$pkgver" + ln -s libGLcore.so.$pkgver "$pkgdir/usr/lib/nvidia/libGLcore.so.1" + ln -s libGLcore.so.$pkgver "$pkgdir/usr/lib/nvidia/libGLcore.so" + + # XvMC + install -Dm755 usr/X11R6/lib/libXvMCNVIDIA.so.$pkgver "$pkgdir/usr/lib/nvidia/libXvMCNVIDIA.so.$pkgver" + ln -s libXvMCNVIDIA.so.$pkgver "$pkgdir/usr/lib/nvidia/libXvMCNVIDIA_dynamic.so.1" + ln -s libXvMCNVIDIA.so.$pkgver "$pkgdir/usr/lib/nvidia/libXvMCNVIDIA_dynamic.so" + + # nvidia-tls library + install -Dm755 usr/lib/tls/libnvidia-tls.so.$pkgver "$pkgdir/usr/lib/nvidia/libnvidia-tls.so.$pkgver" + ln -s libnvidia-tls.so.$pkgver "$pkgdir/usr/lib/nvidia/libnvidia-tls.so.1" + ln -s libnvidia-tls.so.$pkgver "$pkgdir/usr/lib/nvidia/libnvidia-tls.so" + # nvidia-cfg library + install -Dm755 usr/lib/libnvidia-cfg.so.$pkgver "$pkgdir/usr/lib/nvidia/libnvidia-cfg.so.$pkgver" + ln -s libnvidia-cfg.so.$pkgver "$pkgdir/usr/lib/nvidia/libnvidia-cfg.so.1" + ln -s libnvidia-cfg.so.$pkgver "$pkgdir/usr/lib/nvidia/libnvidia-cfg.so" + + # nvidia-xconfig + install -Dm755 usr/bin/nvidia-xconfig "$pkgdir/usr/bin/nvidia-xconfig" + install -Dm644 usr/share/man/man1/nvidia-xconfig.1.gz "$pkgdir/usr/share/man/man1/nvidia-xconfig.1.gz" + + # nvidia-settings + install -Dm755 usr/bin/nvidia-settings "$pkgdir/usr/bin/nvidia-settings" + install -Dm644 usr/share/man/man1/nvidia-settings.1.gz "$pkgdir/usr/share/man/man1/nvidia-settings.1.gz" + install -Dm644 usr/share/applications/nvidia-settings.desktop "$pkgdir/usr/share/applications/nvidia-settings.desktop" + install -Dm644 usr/share/pixmaps/nvidia-settings.png "$pkgdir/usr/share/pixmaps/nvidia-settings.png" + sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i "$pkgdir/usr/share/applications/nvidia-settings.desktop" + + # nvidia-bug-report + install -Dm755 usr/bin/nvidia-bug-report.sh "$pkgdir/usr/bin/nvidia-bug-report.sh" + + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/nvidia-96xx/LICENSE" + ln -s nvidia-96xx "$pkgdir/usr/share/licenses/nvidia-96xx-utils" + + install -D -m644 usr/share/doc/README.txt "$pkgdir/usr/share/doc/nvidia-96xx/README" + install -D -m644 usr/share/doc/NVIDIA_Changelog "$pkgdir/usr/share/doc/nvidia-96xx/NVIDIA_Changelog" + ln -s nvidia-96xx "$pkgdir/usr/share/doc/nvidia-96xx-utils" + + install -dm 755 "$pkgdir"/etc/ld.so.conf.d + echo -e '/usr/lib/nvidia/' > "$pkgdir"/etc/ld.so.conf.d/00-nvidia.conf +} |