Commit d8dddd1b authored by abveritas's avatar abveritas

nvidia legacy rebuilds, modules error, conflicts errors

parent 44cbdf56
......@@ -10,14 +10,14 @@ _kver="$(cat /lib/modules/${_extramodules}/version)"
pkgname=nvidia-173xx
pkgver=173.14.31
pkgrel=6
pkgrel=7
arch=('i686' 'x86_64')
[ "$CARCH" = "i686" ] && ARCH=x86
[ "$CARCH" = "x86_64" ] && ARCH=x86_64
url="http://www.nvidia.com/"
depends=('linux>=3.2' 'linux<3.3' 'nvidia-173xx-utils')
makedepends=('linux-headers')
conflicts=('nvidia-96xx' 'nvidia' 'nvidia-173xx')
conflicts=('nvidia-96xx' 'nvidia')
license=('custom')
install=nvidia.install
source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run")
......
# $Id: PKGBUILD 69361 2010-02-20 11:24:49Z tpowa $
# Maintainer: Thomas Baechler <thomas@archlinux.org>
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=nvidia-96xx-utils
pkgver=96.43.20
pkgrel=1
pkgrel=2
pkgdesc="NVIDIA drivers utilities and libraries, 96xx branch."
arch=('i686' 'x86_64')
[ "$CARCH" = "i686" ] && ARCH=x86
......@@ -30,38 +33,38 @@ build() {
mkdir -p $pkgdir/usr/share/licenses/nvidia-96xx/
install lib/{libGLcore,libGL,libnvidia-cfg,tls/libnvidia-tls}.so.${pkgver} \
$pkgdir/usr/lib/ || return 1
install -m644 share/man/man1/* $pkgdir/usr/share/man/man1/ || return 1
rm $pkgdir/usr/share/man/man1/nvidia-installer.1.gz || return 1
install X11R6/lib/libXv* $pkgdir/usr/lib/ || return 1
install -m644 share/applications/nvidia-settings.desktop $pkgdir/usr/share/applications/ || return 1
$pkgdir/usr/lib/
install -m644 share/man/man1/* $pkgdir/usr/share/man/man1/
rm $pkgdir/usr/share/man/man1/nvidia-installer.1.gz
install X11R6/lib/libXv* $pkgdir/usr/lib/
install -m644 share/applications/nvidia-settings.desktop $pkgdir/usr/share/applications/
# fix nvidia .desktop file
sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i $pkgdir/usr/share/applications/nvidia-settings.desktop
install -m644 share/pixmaps/nvidia-settings.png $pkgdir/usr/share/pixmaps/ || return 1
install X11R6/lib/modules/drivers/nvidia_drv.so $pkgdir/usr/lib/xorg/modules/drivers || return 1
install X11R6/lib/modules/extensions/libglx.so.$pkgver $pkgdir/usr/lib/xorg/modules/extensions || return 1
install -m755 bin/nvidia-{settings,xconfig,bug-report.sh} $pkgdir/usr/bin/ || return 1
install -m644 share/pixmaps/nvidia-settings.png $pkgdir/usr/share/pixmaps/
install X11R6/lib/modules/drivers/nvidia_drv.so $pkgdir/usr/lib/xorg/modules/drivers
install X11R6/lib/modules/extensions/libglx.so.$pkgver $pkgdir/usr/lib/xorg/modules/extensions
install -m755 bin/nvidia-{settings,xconfig,bug-report.sh} $pkgdir/usr/bin/
cd $pkgdir/usr/lib/
ln -s libGL.so.$pkgver libGL.so || return 1
ln -s libGL.so.$pkgver libGL.so.1 || return 1
ln -s libGLcore.so.$pkgver libGLcore.so.1 || return 1
ln -s libnvidia-cfg.so.$pkgver libnvidia-cfg.so.1 || return 1
ln -s libnvidia-tls.so.$pkgver libnvidia-tls.so.1 || return 1
ln -s libXvMCNVIDIA.so.$pkgver libXvMCNVIDIA_dynamic.so.1 || return 1
ln -s libGL.so.$pkgver libGL.so
ln -s libGL.so.$pkgver libGL.so.1
ln -s libGLcore.so.$pkgver libGLcore.so.1
ln -s libnvidia-cfg.so.$pkgver libnvidia-cfg.so.1
ln -s libnvidia-tls.so.$pkgver libnvidia-tls.so.1
ln -s libXvMCNVIDIA.so.$pkgver libXvMCNVIDIA_dynamic.so.1
cd $pkgdir/usr/lib/xorg/modules/extensions
ln -s libglx.so.$pkgver libglx.so || return 1
ln -s libglx.so.$pkgver libglx.so
install -m644 $srcdir/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/LICENSE $pkgdir/usr/share/licenses/nvidia-96xx/ || return 1
ln -s nvidia-96xx $startdir/pkg/usr/share/licenses/nvidia-96xx-utils || return 1
install -m644 $srcdir/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/LICENSE $pkgdir/usr/share/licenses/nvidia-96xx/
ln -s nvidia-96xx $startdir/pkg/usr/share/licenses/nvidia-96xx-utils
install -D -m644 $srcdir/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/usr/share/doc/README.txt $pkgdir/usr/share/doc/nvidia-96xx/README || return 1
install -D -m644 $srcdir/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/usr/share/doc/README.txt $pkgdir/usr/share/doc/nvidia-96xx/README
find $pkgdir/usr -type d -exec chmod 755 {} \;
# Blacklist nouveau since 2.6.33
mkdir -p $pkgdir/etc/modprobe.d/ || return 1
echo "blacklist nouveau" >> $pkgdir/etc/modprobe.d/nouveau_blacklist.conf || return 1
#mkdir -p $pkgdir/etc/modprobe.d/ || return 1
#echo "blacklist nouveau" >> $pkgdir/etc/modprobe.d/nouveau_blacklist.conf || return 1
}
......@@ -10,7 +10,7 @@ _kver="$(cat /lib/modules/${_extramodules}/version)"
pkgname=nvidia-96xx
pkgver=96.43.20
pkgrel=6
pkgrel=7
pkgdesc="NVIDIA drivers for kernel26, 96xx branch."
arch=('i686' 'x86_64')
[ "$CARCH" = "i686" ] && ARCH=x86
......@@ -18,7 +18,7 @@ arch=('i686' 'x86_64')
url="http://www.nvidia.com/"
depends=('linux>=3.2' 'linux<3.3' 'nvidia-96xx-utils')
makedepends=('linux-headers')
conflicts=('nvidia-96xx' 'nvidia' 'nvidia-173xx')
conflicts=('nvidia' 'nvidia-173xx')
license=('custom')
install=nvidia.install
source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run")
......@@ -29,7 +29,7 @@ build() {
sh "NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run" --extract-only
cd "NVIDIA-Linux-$ARCH-${pkgver}-pkg0/usr/src/nv/"
ln -s Makefile.kbuild Makefile
make SYSSRC=/lib/modules/${_kver}/build module || return 1
make SYSSRC=/lib/modules/${_kver}/build module
}
package() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment