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

[andyrtr at archlinux.org]

    Date: Sunday, December 2, 2012 @ 06:34:08
  Author: andyrtr
Revision: 172446

upgpkg: nvidia-304xx-utils 304.64-2

split pkg into utils and opencl pkg, fix conflicts and provides FS#32869; stop shipping static libXvMCNVIDIA.a

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

----------+
 PKGBUILD |   49 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-02 11:27:31 UTC (rev 172445)
+++ PKGBUILD	2012-12-02 11:34:08 UTC (rev 172446)
@@ -1,17 +1,12 @@
 # $Id$
-# Maintainer: Thomas Baechler <thomas at archlinux.org>
-# Contributor: James Rayner <iphitus at gmail.com>
-pkgname=nvidia-304xx-utils
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=nvidia-304xx-utils
+pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
 pkgver=304.64
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-pkgdesc="NVIDIA drivers utilities and libraries, 304xx legacy branch"
-depends=('xorg-server' 'libxvmc')
-optdepends=('gtk2: nvidia-settings' 'pangox-compat: nvidia-settings' 'pkg-config: nvidia-xconfig'
-           'opencl-nvidia: OpenCL support')
-conflicts=('libgl' 'nvidia-utils')
-provides=('libgl')
 license=('custom')
 options=('!strip')
 
@@ -41,9 +36,34 @@
     sh "${_pkg}.run" --extract-only
 }
 
-package() {
+package_opencl-nvidia-304xx() {
+    pkgdesc="OpenCL implemention for NVIDIA, 304xx legacy branch"
+    depends=('libcl' 'zlib')
+    optdepends=('opencl-headers: headers necessary for OpenCL development')
+    provides=('opencl-nvidia')
+    conflicts=('opencl-nvidia')
+ 
     cd "${srcdir}/${_pkg}"
 
+    # OpenCL
+    install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd"
+    install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-compiler.so.${pkgver}"
+    install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" 
+
+    create_links
+}
+
+package_nvidia-304xx-utils() {
+    pkgdesc="NVIDIA drivers utilities and libraries, 304xx legacy branch"
+    depends=('xorg-server' 'libxvmc')
+    optdepends=('gtk2: nvidia-settings'
+                'pangox-compat: nvidia-settings'
+                'pkg-config: nvidia-xconfig'
+                'opencl-nvidia-304xx: OpenCL support')
+    conflicts=('libgl' 'nvidia-utils')
+    provides=('libgl' 'nvidia-utils')
+    cd "${srcdir}/${_pkg}"
+
     # X driver
     install -D -m755 nvidia_drv.so "${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so"
     # GLX extension module for X
@@ -54,7 +74,7 @@
     # OpenGL core library
     install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}"
     # XvMC
-    install -D -m644 libXvMCNVIDIA.a "${pkgdir}/usr/lib/libXvMCNVIDIA.a"
+#    install -D -m644 libXvMCNVIDIA.a "${pkgdir}/usr/lib/libXvMCNVIDIA.a"
     install -D -m755 "libXvMCNVIDIA.so.${pkgver}" "${pkgdir}/usr/lib/libXvMCNVIDIA.so.${pkgver}"
     # VDPAU
     install -D -m755 "libvdpau_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.${pkgver}"
@@ -81,13 +101,8 @@
     # nvidia-smi
     install -D -m755 nvidia-smi "${pkgdir}/usr/bin/nvidia-smi"
     install -D -m644 nvidia-smi.1.gz "${pkgdir}/usr/share/man/man1/nvidia-smi.1.gz"
-    # OpenCL
-    install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd"
-    install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-compiler.so.${pkgver}"
-    install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" 
 
 
-
     install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nvidia/LICENSE"
     ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-utils"
     install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia/README"