From 349561b48fc22064f95b67dc7219b108c44b8d6d Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 6 Mar 2009 23:45:17 -0600 Subject: add vdpau headers into nvidia utils pkg --- abs/core-testing/nvidia-utils/PKGBUILD | 57 ++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/abs/core-testing/nvidia-utils/PKGBUILD b/abs/core-testing/nvidia-utils/PKGBUILD index 5f43be3..3da2d53 100644 --- a/abs/core-testing/nvidia-utils/PKGBUILD +++ b/abs/core-testing/nvidia-utils/PKGBUILD @@ -1,43 +1,44 @@ -# $Id: PKGBUILD 24052 2009-01-12 12:52:05Z pierre $ -# Maintainer: Thomas Baechler -# Contributor: James Rayner - pkgname=nvidia-utils pkgver=180.22 -pkgrel=1 -pkgdesc="NVIDIA drivers utilities and libraries." +pkgrel=10 +pkgdesc="NVIDIA beta drivers utilities and libraries." +provides=('nvidia-utils' 'libgl') arch=('i686' 'x86_64') -[ "$CARCH" = "i686" ] && ARCH=x86 -[ "$CARCH" = "x86_64" ] && ARCH=x86_64 +[ "$CARCH" = "i686" ] && ARCH=x86 && NV=0 +[ "$CARCH" = "x86_64" ] && ARCH=x86_64 && NV=0 url="http://www.nvidia.com/" -depends=('xorg-server') +depends=('xorg-server>=1.5') conflicts=('libgl' 'libgl-dri' 'ati-fglrx-utils' 'nvidia-legacy-utils' \ - 'nvidia-71xx-utils' 'nvidia-96xx-utils') -provides=('libgl') + 'nvidia-71xx-utils' 'nvidia-96xx-utils' ) license=('custom') install=nvidia.install -source=(http://us.download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run \ - supported-cards.txt) -md5sums=('265a984e973bcf5a7c2feeba4b0927a9' - 'bf8d68d66757096c3ab17653230bf2a8') -[ "$CARCH" = "x86_64" ] && md5sums=('91a40e758b06429453d780932f51d6d9' - 'bf8d68d66757096c3ab17653230bf2a8') - -options=(docs !strip) +source=(ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}.run \ + supported-cards.txt) + +options=(docs) build() { # override nvida install routine and do it the long way. cd $startdir/src/ - sh NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run --extract-only - cd NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/usr/ + sh NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}.run --extract-only + cd NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}/usr/ mkdir -p $startdir/pkg/usr/{lib,bin,share/applications,share/pixmaps,man/man1} mkdir -p $startdir/pkg/usr/lib/xorg/modules/{extensions,drivers} mkdir -p $startdir/pkg/usr/share/licenses/nvidia/ - install lib/{libGLcore,libGL,libnvidia-cfg,libcuda,tls/libnvidia-tls}.so.${pkgver} \ - $startdir/pkg/usr/lib/ || return 1 + #install lib/{libGLcore,libGL,libnvidia-cfg,libcuda,tls/libnvidia-tls}.so.${pkgver} \ + mkdir -p $startdir/pkg/usr/include/{,GL,cuda,vdpau} + + install -m644 include/cuda/{cudaGL,cuda}.h $startdir/pkg/usr/include/cuda + install -m644 include/vdpau/{vdpau_x11,vdpau}.h $startdir/pkg/usr/include/vdpau + # Conflicts with MESA; if you want to develop opengl app, enable this line + #install -m644 include/GL/{glxext,gl,glx,glext}.h $startdir/pkg/usr/include/GL + + install lib/{libGLcore,libGL,libnvidia-cfg,libcuda,tls/libnvidia-tls,libvdpau_nvidia,libvdpau,libvdpau_trace}.so.${pkgver} \ + $startdir/pkg/usr/lib/ || return 1 + install -m644 share/man/man1/* $startdir/pkg/usr/man/man1/ || return 1 rm $startdir/pkg/usr/man/man1/nvidia-installer.1.gz || return 1 install X11R6/lib/libXv* $startdir/pkg/usr/lib/ || return 1 @@ -45,7 +46,7 @@ build() # fix nvidia .desktop file sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i $startdir/pkg/usr/share/applications/nvidia-settings.desktop install -m644 share/pixmaps/nvidia-settings.png $startdir/pkg/usr/share/pixmaps/ || return 1 - #install X11R6/lib/modules/libnvidia-wfb.so.$pkgver $startdir/pkg/usr/lib/xorg/modules || return 1 + install X11R6/lib/modules/libnvidia-wfb.so.$pkgver $startdir/pkg/usr/lib/xorg/modules || return 1 install X11R6/lib/modules/drivers/nvidia_drv.so $startdir/pkg/usr/lib/xorg/modules/drivers || return 1 install X11R6/lib/modules/extensions/libglx.so.$pkgver $startdir/pkg/usr/lib/xorg/modules/extensions || return 1 install -m755 bin/nvidia-{settings,xconfig,bug-report.sh} $startdir/pkg/usr/bin/ || return 1 @@ -57,14 +58,16 @@ build() ln -s libnvidia-tls.so.$pkgver libnvidia-tls.so.1 || return 1 ln -s libcuda.so.$pkgver libcuda.so.1 || return 1 ln -s libXvMCNVIDIA.so.$pkgver libXvMCNVIDIA_dynamic.so.1 || return 1 + ln -s libvdpau.so.$pkgver libvdpau.so.1 || return 1 + ln -s libvdpau.so.$pkgver libvdpau.so || return 1 cd $startdir/pkg/usr/lib/xorg/modules/extensions ln -s libglx.so.$pkgver libglx.so || return 1 - install -m644 $startdir/src/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/LICENSE $startdir/pkg/usr/share/licenses/nvidia/ || return 1 + install -m644 $startdir/src/NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}/LICENSE $startdir/pkg/usr/share/licenses/nvidia/ || return 1 ln -s nvidia $startdir/pkg/usr/share/licenses/nvidia-utils || return 1 - install -D -m644 $startdir/src/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/usr/share/doc/README.txt $startdir/pkg/usr/share/doc/nvidia/README || return 1 + install -D -m644 $startdir/src/NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}/usr/share/doc/README.txt $startdir/pkg/usr/share/doc/nvidia/README || return 1 install -D -m644 $startdir/src/supported-cards.txt $startdir/pkg/usr/share/doc/nvidia/supported-cards.txt || return 1 find $startdir/pkg/usr -type d -exec chmod 755 {} \; - # phew :) } + -- cgit v0.12