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

[Laurent Carlier]

    Date: Monday, January 6, 2014 @ 14:13:21
  Author: lcarlier
Revision: 103466

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

Split OpenCL into a separated package, add some conflicts

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

----------+
 PKGBUILD |   37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-06 12:41:09 UTC (rev 103465)
+++ PKGBUILD	2014-01-06 13:13:21 UTC (rev 103466)
@@ -5,15 +5,13 @@
 # Contributor: James Rayner <iphitus at gmail.com>
 
 _pkgbasename=nvidia-304xx-utils
-pkgname=lib32-$_pkgbasename
+pkgbase=lib32-$_pkgbasename
+pkgname=('lib32-nvidia-304xx-utils' 'lib32-opencl-304xx-nvidia')
 pkgver=304.117
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA drivers utilities and libraries. (32-bit)"
 arch=('x86_64')
 url="http://www.nvidia.com/"
-depends=('lib32-libxvmc' 'lib32-zlib' 'lib32-gcc-libs' 'nvidia-304xx-utils')
-conflicts=('lib32-mesa-libgl' 'lib32-catalyst-utils' 'lib32-nvidia-utils')
-provides=('lib32-libgl')
 license=('custom')
 options=('!strip')
 
@@ -27,9 +25,33 @@
     sh ${_pkg}.run --extract-only
 }
 
-package() {
+package_lib32-opencl-304xx-nvidia() {
+    pkgdesc="OpenCL implemention for NVIDIA (32-bit)"
+    depends=('lib32-libcl' 'lib32-zlib' 'lib32-gcc-libs' 'opencl-304xx-nvidia')
+    optdepends=('opencl-headers: headers necessary for OpenCL development')
+    conflicts=('lib32-opencl-nvidia')
+
     cd "${srcdir}/${_pkg}"
 
+    # OpenCL
+    install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-compiler.so.${pkgver}"
+    ln -s "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-compiler.so.1"
+    ln -s "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-compiler.so"
+
+    install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-opencl.so.${pkgver}" 
+    ln -s "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-opencl.so.1"
+    ln -s "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-opencl.so"
+}
+
+package_lib32-nvidia-304xx-utils() {
+    pkgdesc="NVIDIA drivers utilities (32-bit)"
+    depends=('lib32-libxvmc' 'lib32-zlib' 'lib32-gcc-libs' 'nvidia-304xx-utils')
+    optdepends=('lib32-opencl-304xx-nvidia')
+    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}"
     # OpenGL core library
@@ -44,9 +66,6 @@
     install -D -m755 libnvcuvid.so.${pkgver} "${pkgdir}/usr/lib32/libnvcuvid.so.${pkgver}"
     # nvidia-tls library
     install -D -m755 tls/libnvidia-tls.so.${pkgver} "${pkgdir}/usr/lib32/libnvidia-tls.so.${pkgver}"
-    # OpenCL
-    install -D -m755 libnvidia-compiler.so.${pkgver} "${pkgdir}/usr/lib32/libnvidia-compiler.so.${pkgver}"
-    install -D -m755 libOpenCL.so.1.0.0 "${pkgdir}/usr/lib32/libOpenCL.so.1.0.0"
 
     install -D -m755 libnvidia-cfg.so.${pkgver} "${pkgdir}/usr/lib32/libnvidia-cfg.so.${pkgver}"
     install -D -m755 libnvidia-ml.so.${pkgver} "${pkgdir}/usr/lib32/libnvidia-ml.so.${pkgver}"