[arch-commits] Commit in nvidia-utils/trunk (20-nvidia.conf PKGBUILD)
Ionut Biru
ibiru at archlinux.org
Sun Jul 17 14:50:39 UTC 2011
Date: Sunday, July 17, 2011 @ 10:50:38
Author: ibiru
Revision: 131920
update to 275.19, split out libcl and opencl-nvidia to comply with opencl specification.
Modified:
nvidia-utils/trunk/PKGBUILD
Deleted:
nvidia-utils/trunk/20-nvidia.conf
----------------+
20-nvidia.conf | 5 -
PKGBUILD | 154 +++++++++++++++++++++++++++++--------------------------
2 files changed, 82 insertions(+), 77 deletions(-)
Deleted: 20-nvidia.conf
===================================================================
--- 20-nvidia.conf 2011-07-17 14:18:07 UTC (rev 131919)
+++ 20-nvidia.conf 2011-07-17 14:50:38 UTC (rev 131920)
@@ -1,5 +0,0 @@
-Section "Device"
- Identifier "Default nvidia Device"
- Driver "nvidia"
- Option "NoLogo" "True"
-EndSection
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-07-17 14:18:07 UTC (rev 131919)
+++ PKGBUILD 2011-07-17 14:50:38 UTC (rev 131920)
@@ -1,98 +1,108 @@
# $Id$
# Maintainer: Thomas Baechler <thomas at archlinux.org>
# Contributor: James Rayner <iphitus at gmail.com>
-
-pkgname=nvidia-utils
-pkgver=275.09.07
+pkgbase=nvidia-utils
+pkgname=('nvidia-utils' 'opencl-nvidia')
+pkgver=275.19
pkgrel=1
-pkgdesc="NVIDIA drivers utilities and libraries."
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"
-depends=('xorg-server' 'libxvmc')
-optdepends=('gtk2: nvidia-settings' 'pkg-config: nvidia-xconfig')
-conflicts=('libgl')
-provides=('libgl' 'libcl')
license=('custom')
install=nvidia.install
options=('!strip')
if [ "$CARCH" = "i686" ]; then
- _arch='x86'
- _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
- source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
- md5sums=('d779057af3a2f96a05ddda201606618b')
+ _arch='x86'
+ _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
+ source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+ md5sums=('9e74b1913ff5eb6786600d47b64ba57d')
elif [ "$CARCH" = "x86_64" ]; then
- _arch='x86_64'
- _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
- source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
- md5sums=('f75df248f7bf32199ed88db2f080cbfa')
+ _arch='x86_64'
+ _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
+ source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+ md5sums=('45a6074db3efe961d025afa7a89fa036')
fi
+create_links() {
+ # create soname links
+ for _lib in $(find $pkgdir -name '*.so*'); do
+ _soname="$(dirname ${_lib})/$(readelf -d "$_lib" | sed -nr 's/.*Library soname: \[(.*)\].*/\1/p')"
+ if [ ! -e "${_soname}" ]; then
+ ln -s "$(basename ${_lib})" "${_soname}"
+ ln -s "$(basename ${_soname})" "${_soname/.[0-9]*/}"
+ fi
+ done
+}
+
build() {
- cd $srcdir
- sh ${_pkg}.run --extract-only
+ cd $srcdir
+ sh ${_pkg}.run --extract-only
}
-package() {
- cd $srcdir/${_pkg}
+package_opencl-nvidia() {
+ pkgdesc="OpenCL implemention for NVIDIA"
+ depends=('libcl')
+ optdepends=('opencl-headers: headers necessary for OpenCL development')
+ 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
- install -D -m755 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 # X doesn't find glx otherwise
- # OpenGL library
- install -D -m755 libGL.so.$pkgver $pkgdir/usr/lib/libGL.so.$pkgver
- # 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 -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
- # CUDA
- install -D -m755 libcuda.so.$pkgver $pkgdir/usr/lib/libcuda.so.$pkgver
- install -D -m755 libnvcuvid.so.$pkgver $pkgdir/usr/lib/libnvcuvid.so.$pkgver
- # nvidia-tls library
- install -D -m755 tls/libnvidia-tls.so.$pkgver $pkgdir/usr/lib/libnvidia-tls.so.$pkgver
- # OpenCL
- install -D -m755 libnvidia-compiler.so.$pkgver $pkgdir/usr/lib/libnvidia-compiler.so.$pkgver
- install -D -m755 libOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1.0.0
- install -D -m644 nvidia.icd $pkgdir/etc/OpenCL/vendors/nvidia.icd
+ # 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
+ # CUDA
+ install -D -m755 libcuda.so.$pkgver $pkgdir/usr/lib/libcuda.so.$pkgver
+ install -D -m755 libnvcuvid.so.$pkgver $pkgdir/usr/lib/libnvcuvid.so.$pkgver
+ create_links
+}
- install -D -m755 libnvidia-cfg.so.$pkgver $pkgdir/usr/lib/libnvidia-cfg.so.$pkgver
+package_nvidia-utils() {
+ pkgdesc="NVIDIA drivers utilities and libraries."
+ depends=('xorg-server' 'libxvmc' 'libcl' 'opencl-nvidia')
+ optdepends=('gtk2: nvidia-settings' 'pkg-config: nvidia-xconfig')
+ conflicts=('libgl')
+ provides=('libgl')
+ cd $srcdir/${_pkg}
- install -D -m755 libnvidia-ml.so.$pkgver $pkgdir/usr/lib/libnvidia-ml.so.$pkgver
+ # X driver
+ 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/xorg/modules/extensions/libglx.so.$pkgver
+ ln -s libglx.so.$pkgver $pkgdir/usr/lib/xorg/modules/extensions/libglx.so # X doesn't find glx otherwise
+ # OpenGL library
+ install -D -m755 libGL.so.$pkgver $pkgdir/usr/lib/libGL.so.$pkgver
+ # 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 -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
+ # nvidia-tls library
+ install -D -m755 tls/libnvidia-tls.so.$pkgver $pkgdir/usr/lib/libnvidia-tls.so.$pkgver
+ install -D -m755 libnvidia-cfg.so.$pkgver $pkgdir/usr/lib/libnvidia-cfg.so.$pkgver
- # create soname links
- for _lib in $(find $pkgdir -name '*.so*'); do
- _soname="$(dirname ${_lib})/$(readelf -d "$_lib" | sed -nr 's/.*Library soname: \[(.*)\].*/\1/p')"
- if [ ! -e "${_soname}" ]; then
- ln -s "$(basename ${_lib})" "${_soname}"
- ln -s "$(basename ${_soname})" "${_soname/.[0-9]*/}"
- fi
- done
+ install -D -m755 libnvidia-ml.so.$pkgver $pkgdir/usr/lib/libnvidia-ml.so.$pkgver
+ # nvidia-xconfig
+ install -D -m755 nvidia-xconfig $pkgdir/usr/bin/nvidia-xconfig
+ install -D -m644 nvidia-xconfig.1.gz $pkgdir/usr/share/man/man1/nvidia-xconfig.1.gz
+ # nvidia-settings
+ install -D -m755 nvidia-settings $pkgdir/usr/bin/nvidia-settings
+ install -D -m644 nvidia-settings.1.gz $pkgdir/usr/share/man/man1/nvidia-settings.1.gz
+ install -D -m644 nvidia-settings.desktop $pkgdir/usr/share/applications/nvidia-settings.desktop
+ install -D -m644 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 -D -m755 nvidia-bug-report.sh $pkgdir/usr/bin/nvidia-bug-report.sh
+ # 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
- # nvidia-xconfig
- install -D -m755 nvidia-xconfig $pkgdir/usr/bin/nvidia-xconfig
- install -D -m644 nvidia-xconfig.1.gz $pkgdir/usr/share/man/man1/nvidia-xconfig.1.gz
- # nvidia-settings
- install -D -m755 nvidia-settings $pkgdir/usr/bin/nvidia-settings
- install -D -m644 nvidia-settings.1.gz $pkgdir/usr/share/man/man1/nvidia-settings.1.gz
- install -D -m644 nvidia-settings.desktop $pkgdir/usr/share/applications/nvidia-settings.desktop
- install -D -m644 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 -D -m755 nvidia-bug-report.sh $pkgdir/usr/bin/nvidia-bug-report.sh
- # 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
+ 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
+ install -D -m644 NVIDIA_Changelog $pkgdir/usr/share/doc/nvidia/NVIDIA_Changelog
+ ln -s nvidia $pkgdir/usr/share/doc/nvidia-utils
- 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
- install -D -m644 NVIDIA_Changelog $pkgdir/usr/share/doc/nvidia/NVIDIA_Changelog
- ln -s nvidia $pkgdir/usr/share/doc/nvidia-utils
+ create_links
}
More information about the arch-commits
mailing list