Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=5cadb2cd1487767a0b69c5adbc42206033be85db
commit 5cadb2cd1487767a0b69c5adbc42206033be85db Author: janny <[EMAIL PROTECTED]> Date: Wed Mar 5 21:18:11 2008 +0100 nvidia-fwlive-169.12-2-i686 * version bump in fwlive repo diff --git a/source/x11-extra/nvidia-fwlive/FrugalBuild b/source/x11-extra/nvidia-fwlive/FrugalBuild index a64c48e..9981781 100644 --- a/source/x11-extra/nvidia-fwlive/FrugalBuild +++ b/source/x11-extra/nvidia-fwlive/FrugalBuild @@ -2,8 +2,9 @@ # Maintainer: AlexExtreme <[EMAIL PROTECTED]> pkgname=nvidia-fwlive -pkgver=100.14.11 -pkgrel=1 +_F_archive_name=nvidia +pkgver=169.12 +pkgrel=2 pkgdesc="3D accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html"; conflicts=('libgl' 'libglx') @@ -11,23 +12,27 @@ provides=('libgl' 'libglx') groups=('x11-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.nvidia.com/object/unix.html|grep -m1 'Latest Version:'|sed 's/.*]//;s/-/_/'" -[ "$CARCH" == "x86_64" ] && jarch=x86_64 && sha1=d542b702fdf7835f5dc7ec767789b2c1ada60908 && pkgnum=2 -echo "$CARCH" | grep -q 'i.86' && jarch=x86 && sha1=1427c18afd1cae198bee5d321f0a023994619926 && pkgnum=1 -source=(http://us.download.nvidia.com/XFree86/Linux-$jarch/$pkgver/NVIDIA-Linux-$jarch-$pkgver-pkg$pkgnum.run) -sha1sums=($sha1) +if echo "$CARCH" | grep -q 'i.86'; then + _arch=x86 + sha1sums=('6ce789da785bf109fcb213db755eaf6975de2e46') + pkgnum=1 +elif [ "$CARCH" == "x86_64" ]; then + _arch=x86_64 + sha1sums=('62f9e1055ce6cd4d7806757ece0a144695ef12ff') + pkgnum=2 +fi +source=(http://us.download.nvidia.com/XFree86/Linux-$_arch/$pkgver/NVIDIA-Linux-$_arch-$pkgver-pkg$pkgnum.run) options=('nostrip' 'force') -#Finclude kernel-module -kver=2.6.22-1 -depends=("kernel-fwlive=$kver") +_F_kernelmod_scriptlet=$_F_archive_name.install +Finclude kernel-module +kver=2.6.24-3 +depends=("kernel-fwlive=$kver" 'xorg-server>=1.1.0') makedepends=("kernel-fwlive-source=$kver") -_F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` -_F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" -depends=([EMAIL PROTECTED] 'xorg-server>=1.1.0') -unset install -install=$pkgname.install +#_F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` +#_F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" build() { - nvdir=NVIDIA-Linux-$jarch-$pkgver-pkg$pkgnum + nvdir=NVIDIA-Linux-$_arch-$pkgver-pkg$pkgnum cd $Fsrcdir sh $nvdir.run --extract-only Fcd $nvdir/ @@ -83,6 +88,7 @@ build() { Ffilerel usr/src/nv/nvidia.ko $_F_kernelmod_dir/kernel/drivers/video/nvidia.ko Fdoc $nvdir/LICENSE - Fcpr $nvdir/usr/share/doc/* /usr/share/doc/$pkgname-$pkgver/ + Fcpr $nvdir/usr/share/doc/* usr/share/doc/$pkgname-$pkgver/ Fln "$pkgname-$pkgver" "/usr/share/doc/$pkgname" + Fbuild_kernelmod_scriptlet } diff --git a/source/x11-extra/nvidia-fwlive/nvidia-fwlive.install b/source/x11-extra/nvidia-fwlive/nvidia-fwlive.install deleted file mode 100644 index cae4fc4..0000000 --- a/source/x11-extra/nvidia-fwlive/nvidia-fwlive.install +++ /dev/null @@ -1,47 +0,0 @@ -post_install() { - echo "*** In order to use this package you have to accept Nvidia's license which" - echo "*** can be found at /usr/share/doc/nvidia/LICENSE." - echo "*** If you don't accept it, please remove the package!" - - sed -i 's/^.*Load "dri"/# Load "dri"/' /etc/X11/xorg.conf - sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' /etc/X11/xorg.conf - - exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` - if [ "$exist" -eq 0 ]; then - echo nvidia >> /etc/sysconfig/modules - fi - /sbin/depmod -a - /sbin/modprobe nvidia -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - if test `lsmod | grep ^nvidia | wc -l` -gt 0; then - rmmod nvidia - fi - - sed -i 's/^.*# Load "dri"/Load "dri"/' /etc/X11/xorg.conf - sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf - - exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` - if [ "$exist" -eq 1 ]; then - grep -v '^nvidia' /etc/sysconfig/modules > /etc/sysconfig/modules.tmp - mv /etc/sysconfig/modules.tmp /etc/sysconfig/modules - fi - if [ -e /usr/lib/xorg/temp/libglx.so ]; then - mv /usr/lib/xorg/temp/libglx.so /usr/lib/xorg/modules/extensions/ - fi -} - -post_remove() { - depmod -a - echo "*** Nvidia driver is removed now. To have a working Xorg Server again run : ***" - echo "*** pacman-g2 -S libgl libglx ****" -} - -op=$1 -shift -$op $* diff --git a/source/x11-extra/nvidia-fwlive/nvidia.install b/source/x11-extra/nvidia-fwlive/nvidia.install new file mode 100644 index 0000000..cae4fc4 --- /dev/null +++ b/source/x11-extra/nvidia-fwlive/nvidia.install @@ -0,0 +1,47 @@ +post_install() { + echo "*** In order to use this package you have to accept Nvidia's license which" + echo "*** can be found at /usr/share/doc/nvidia/LICENSE." + echo "*** If you don't accept it, please remove the package!" + + sed -i 's/^.*Load "dri"/# Load "dri"/' /etc/X11/xorg.conf + sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' /etc/X11/xorg.conf + + exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` + if [ "$exist" -eq 0 ]; then + echo nvidia >> /etc/sysconfig/modules + fi + /sbin/depmod -a + /sbin/modprobe nvidia +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + if test `lsmod | grep ^nvidia | wc -l` -gt 0; then + rmmod nvidia + fi + + sed -i 's/^.*# Load "dri"/Load "dri"/' /etc/X11/xorg.conf + sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf + + exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` + if [ "$exist" -eq 1 ]; then + grep -v '^nvidia' /etc/sysconfig/modules > /etc/sysconfig/modules.tmp + mv /etc/sysconfig/modules.tmp /etc/sysconfig/modules + fi + if [ -e /usr/lib/xorg/temp/libglx.so ]; then + mv /usr/lib/xorg/temp/libglx.so /usr/lib/xorg/modules/extensions/ + fi +} + +post_remove() { + depmod -a + echo "*** Nvidia driver is removed now. To have a working Xorg Server again run : ***" + echo "*** pacman-g2 -S libgl libglx ****" +} + +op=$1 +shift +$op $* _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
