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

[Felix Yan]

    Date: Sunday, March 9, 2014 @ 03:10:34
  Author: fyan
Revision: 106835

upgpkg: lib32-nvidia-304xx-utils 304.119-2

- split lib32-nvidia-304xx-libgl

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

----------+
 PKGBUILD |   31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-09 00:18:48 UTC (rev 106834)
+++ PKGBUILD	2014-03-09 02:10:34 UTC (rev 106835)
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer: noone currently
+# Maintainer: Felix Yan <felixonmars at gmail.com>
 # Contributor: Jason Graham <jason at the-graham.com>
 # Contributor: Thomas Baechler <thomas at archlinux.org>
 # Contributor: James Rayner <iphitus at gmail.com>
@@ -6,9 +6,9 @@
 
 _pkgbasename=nvidia-304xx-utils
 pkgbase=lib32-$_pkgbasename
-pkgname=('lib32-nvidia-304xx-utils' 'lib32-opencl-nvidia-304xx')
+pkgname=('lib32-nvidia-304xx-utils' 'lib32-nvidia-304xx-libgl' 'lib32-opencl-nvidia-304xx')
 pkgver=304.119
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA drivers utilities and libraries. (32-bit)"
 arch=('x86_64')
 url="http://www.nvidia.com/"
@@ -45,21 +45,34 @@
     ln -s "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-opencl.so"
 }
 
+package_lib32-nvidia-304xx-libgl() {
+    pkgdesc="NVIDIA drivers libraries symlinks (32-bit)"
+    depends=('lib32-nvidia-304xx-utils')
+    conflicts=('lib32-libgl')
+    provides=('lib32-libgl')
+    cd "${srcdir}/${_pkg}"
+
+    mkdir -p "${pkgdir}/usr/lib32"
+    ln -s "/usr/lib32/nvidia/libGL.so.${pkgver}" "${pkgdir}/usr/lib32/libGL.so.${pkgver}"
+    ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib32/libGL.so.1"
+    ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib32/libGL.so"
+
+    mkdir -p "${pkgdir}/usr/share/licenses"
+    ln -s $_pkgbasename "${pkgdir}/usr/share/licenses/lib32-nvidia-libgl"
+}
+
 package_lib32-nvidia-304xx-utils() {
     pkgdesc="NVIDIA drivers utilities (32-bit)"
-    depends=('lib32-libxvmc' 'lib32-zlib' 'lib32-gcc-libs' 'lib32-libxext' 'nvidia-304xx-utils')
+    depends=('lib32-libxvmc' 'lib32-zlib' 'lib32-gcc-libs' 'lib32-libxext')
     optdepends=('lib32-opencl-nvidia-304xx')
-    provides=('lib32-libgl')
-    conflicts=('lib32-mesa-libgl' 'lib32-catalyst-utils' 'lib32-nvidia-utils' 'lib32-nvidia-libgl')
-
     cd "${srcdir}/${_pkg}"
 
     # OpenGL library
-    install -D -m755 libGL.so.${pkgver} "${pkgdir}/usr/lib32/libGL.so.${pkgver}"
+    install -D -m755 libGL.so.${pkgver} "${pkgdir}/usr/lib32/nvidia/libGL.so.${pkgver}"
     # OpenGL core library
     install -D -m755 libnvidia-glcore.so.${pkgver} "${pkgdir}/usr/lib32/libnvidia-glcore.so.${pkgver}"
     # XvMC
-    install -D -m644 libXvMCNVIDIA.a "${pkgdir}/usr/lib32/libXvMCNVIDIA.a"
+    #install -D -m644 libXvMCNVIDIA.a "${pkgdir}/usr/lib32/libXvMCNVIDIA.a"
     install -D -m755 libXvMCNVIDIA.so.${pkgver} "${pkgdir}/usr/lib32/libXvMCNVIDIA.so.${pkgver}"
     # VDPAU
     install -D -m755 libvdpau_nvidia.so.${pkgver} "${pkgdir}/usr/lib32/vdpau/libvdpau_nvidia.so.${pkgver}"