summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--abs/core-testing/nvidia-beta/PKGBUILD41
-rw-r--r--abs/core-testing/nvidia-utils-beta/PKGBUILD43
-rw-r--r--abs/core-testing/nvidia/PKGBUILD2
3 files changed, 41 insertions, 45 deletions
diff --git a/abs/core-testing/nvidia-beta/PKGBUILD b/abs/core-testing/nvidia-beta/PKGBUILD
index 4f2171b..e822996 100644
--- a/abs/core-testing/nvidia-beta/PKGBUILD
+++ b/abs/core-testing/nvidia-beta/PKGBUILD
@@ -1,39 +1,38 @@
-# $Id: PKGBUILD 8443 2008-08-11 05:11:22Z tpowa $
-# Maintainer : Thomas Baechler <thomas@archlinux.org>
-
pkgname=nvidia-beta
-pkgver=180.06
+pkgver=180.11
_kernver='2.6.26-ARCH'
-pkgrel=3
-pkgdesc="NVIDIA drivers for kernel26."
-arch=('i686' 'x86_64')
-[ "$CARCH" = "i686" ] && ARCH=x86
-[ "$CARCH" = "x86_64" ] && ARCH=x86_64
-url="http://www.nvidia.com/"
-depends=('kernel26>=2.6.26.2-1' 'kernel26<2.6.27' 'nvidia-utils-beta')
-conflicts=('nvida' 'nvidia-96xx' 'nvidia-71xx' 'nvidia-legacy')
-license=('custom')
-install=nvidia.install
-source=(http://us.download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg1.run)
-
-[ "$CARCH" = "x86_64" ] && md5sums=('8675e4ca65033b343c8c77b2ce82e71d')
+pkgrel=2
+pkgdesc="NVIDIA beta drivers for kernel26"
+arch=('i686' 'x86_64')
+[ "$CARCH" = "i686" ] && ARCH=x86 && NV=0
+[ "$CARCH" = "x86_64" ] && ARCH=x86_64 && NV=0
+provides=('nvidia')
+url="http://www.nvidia.com/"
+depends=('kernel26' 'nvidia-utils-beta')
+conflicts=('nvidia' 'nvidia-96xx' 'nvidia-71xx' 'nvidia-legacy')
+license=('custom')
+install=nvidia.install
+source=(ftp://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg${NV}.run)
+md5sums=('759a1aa16073616e3104f461dffbeded')
+[ "$CARCH" = "x86_64" ] && md5sums=('3c7a1bb6c9e55a8df0ec4e396e9187b2')
build()
{
# Extract
+ echo ${_kernver}
cd $startdir/src/
- sh NVIDIA-Linux-$ARCH-${pkgver}-pkg1.run --extract-only
- cd NVIDIA-Linux-$ARCH-${pkgver}-pkg1
+ sh NVIDIA-Linux-$ARCH-${pkgver}-pkg${NV}.run --extract-only
+ cd NVIDIA-Linux-$ARCH-${pkgver}-pkg${NV}
# Any extra patches are applied in here...
cd usr/src/nv/
ln -s Makefile.kbuild Makefile
- make SYSSRC=/lib/modules/${_kernver}/build module || return 1
+ make SYSSRC=/lib/modules/${_kernver}/build module
# install kernel module
mkdir -p $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/video/
install -m644 nvidia.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/video/
sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install
-}
+} \ No newline at end of file
diff --git a/abs/core-testing/nvidia-utils-beta/PKGBUILD b/abs/core-testing/nvidia-utils-beta/PKGBUILD
index 956ae3b..e0dd0df 100644
--- a/abs/core-testing/nvidia-utils-beta/PKGBUILD
+++ b/abs/core-testing/nvidia-utils-beta/PKGBUILD
@@ -1,37 +1,35 @@
-# $Id: PKGBUILD 7914 2008-08-05 08:01:00Z tpowa $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Contributor: James Rayner <iphitus@gmail.com>
-
pkgname=nvidia-utils-beta
-pkgver=180.06
-pkgrel=10
-pkgdesc="NVIDIA drivers utilities and libraries."
+pkgver=180.11
+pkgrel=1
+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')
conflicts=('libgl' 'libgl-dri' 'ati-fglrx-utils' 'nvidia-legacy-utils' \
- 'nvidia-71xx-utils' 'nvidia-96xx-utils' 'nvidia-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}-pkg1.run \
- supported-cards.txt)
-
-[ "$CARCH" = "x86_64" ] && md5sums=('8675e4ca65033b343c8c77b2ce82e71d'
- 'bf8d68d66757096c3ab17653230bf2a8')
+source=(ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}.run \
+ supported-cards.txt)
+
+[ "$CARCH" = "x86_64" ] && md5sums=('3c7a1bb6c9e55a8df0ec4e396e9187b2'
+ '5b5835bdb1508a57591b812c109a2679')
+
+
options=(docs !strip)
build()
{
# override nvida install routine and do it the long way.
cd $startdir/src/
- sh NVIDIA-Linux-${ARCH}-${pkgver}-pkg1.run --extract-only
- cd NVIDIA-Linux-${ARCH}-${pkgver}-pkg1/usr/
-
+ sh NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}.run --extract-only
+ cd NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}/usr/
mkdir -p $startdir/pkg/usr/{include/cuda,include/vdpau,lib,bin,share/applications,share/pixmaps,man/man1}
+# 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/
cp -rp include/cuda/* $startdir/pkg/usr/include/cuda || return 1
@@ -45,7 +43,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
@@ -60,11 +58,10 @@ build()
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}-pkg1/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}-pkg1/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 :)
}
diff --git a/abs/core-testing/nvidia/PKGBUILD b/abs/core-testing/nvidia/PKGBUILD
index b1af8b5..0814d77 100644
--- a/abs/core-testing/nvidia/PKGBUILD
+++ b/abs/core-testing/nvidia/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=nvidia
pkgver=173.14.12
_kernver='2.6.26-ARCH'
-pkgrel=3
+pkgrel=4
pkgdesc="NVIDIA drivers for kernel26."
arch=('i686' 'x86_64')
[ "$CARCH" = "i686" ] && ARCH=x86