diff options
| author | Britney Fransen <brfransen@gmail.com> | 2011-08-07 05:44:00 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2011-08-07 05:44:00 (GMT) |
| commit | 2747bb3963f6a0e237e540301311f430f1876346 (patch) | |
| tree | a31cb47f0e4e13370f4e52f28fdc564746047f26 /abs/core/LinHES-config | |
| parent | f6cb11445db39ac6c33047426893107a54520bb9 (diff) | |
| parent | f75cfa40ac713fbc58294c72d98aa77511e01524 (diff) | |
| download | linhes_pkgbuild-2747bb3963f6a0e237e540301311f430f1876346.zip linhes_pkgbuild-2747bb3963f6a0e237e540301311f430f1876346.tar.gz linhes_pkgbuild-2747bb3963f6a0e237e540301311f430f1876346.tar.bz2 | |
Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/LinHES-config')
| -rw-r--r-- | abs/core/LinHES-config/PKGBUILD | 4 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/xconfig.sh | 54 |
2 files changed, 42 insertions, 16 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 3821d1b..4a4748d 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.2 -pkgrel=27 +pkgrel=28 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -110,7 +110,7 @@ md5sums=('c737f8538aea20fcb5f3903957e80837' 'c20f73d4da5d7e15e1f3eb85c7dcb49a' '8ac1cfd2eca0f641737da0d0aca416a7' '9ae8d79f620c6d19973c55c32a921874' - '95526b4d3dec6c9341088fb6511d831a' + '266d48cc336c70e8967c5bb9f5e1787d' 'ecf9e5df20683a769c4a8a8f2d65de85' 'e459ed069317bccb20351f037a9df3d2' '83be9a3bc72179909773479c74d13b38' diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh index fff7f44..d684c21 100755 --- a/abs/core/LinHES-config/xconfig.sh +++ b/abs/core/LinHES-config/xconfig.sh @@ -4,7 +4,15 @@ #SET DISPLAYRES to force Xres, ENV takes precendent over cmdline #displayres=cmdline #NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel unichrome-dri xf86-video-unichrome xf86-video-mga xf86-video-savage xf86-video-trident" -NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel xf86-video-mga xf86-video-savage xf86-video-trident unichrome-dri xf86-video-openchrome" +#NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel xf86-video-mga xf86-video-savage xf86-video-trident unichrome-dri xf86-video-openchrome " +#NVPKGS="unichrome-dri" +for i in ati intel mga savage sis unichrome +do + #templist="$i-dri xf86-video-$i" + templist=`echo $i-dri xf86-video-$i` + NVPKGS=`echo $NVPKGS $templist` + +done BASE="" . /etc/profile NVIDIA_96XX="$TEMPLATES/xorg/96xx_supported.txt" @@ -187,28 +195,37 @@ function setupAdvancedX { esac } +function nvidia_prepare { + pacman --noconfirm -Rdd libgl > /dev/null 2>&1 + for i in `echo ${NVPKGS}` + do + echo $i + pacman --noconfirm -Rc $i + # echo pacman -R $NVPKGS + #pacman -R $NVPKGS + done + + +} + function nvidia_driver_install { cp "$TEMPLATES/xorg/xorg.conf.nvidia" $BASE/etc/X11/xorg.conf.d/20-automv.conf - if [ ${Xres} = Auto ] - then - nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --mode-list="nvidia-auto-select" - else - nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --mode-list=${Xres} - fi + if [ "$TESTMODE" != "test" ] then - + grep -qi "$CARDID" "$NVIDIA_SUPPORTED" if [ $? = 0 ] then #install latest drivers echo "installing current nvidia drivers" - pacman --noconfirm -Rd libgl > /dev/null 2>&1 - pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 + # pacman --noconfirm -Rd libgl > /dev/null 2>&1 + # pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 + nvidia_prepare pacman --noconfirm -S nvidia nvidia-utils > /dev/null 2>&1 fi @@ -219,8 +236,9 @@ function nvidia_driver_install { then #install 96xx drivers echo "installing nvidia 96xx drivers" - pacman --noconfirm -Rd libgl > /dev/null 2>&1 - pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 +# # pacman --noconfirm -Rd libgl > /dev/null 2>&1 +# # pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 + nvidia_prepare pacman --noconfirm -S nvidia-96xx nvidia-96xx-utils > /dev/null 2>&1 fi @@ -229,11 +247,19 @@ function nvidia_driver_install { then #install latest drivers echo "installing 173 nvidia drivers" - pacman --noconfirm -Rd libgl > /dev/null 2>&1 - pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 +# pacman --noconfirm -Rd libgl > /dev/null 2>&1 +# pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 + nvidia_prepare pacman --noconfirm -S nvidia-173xx nvidia-173xx-utils > /dev/null 2>&1 fi fi + if [ ${Xres} = Auto ] + then + nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --mode-list="nvidia-auto-select" + else + nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --mode-list=${Xres} + fi + echo "/usr/lib/libXvMCNVIDIA_dynamic.so.1" > "$XVMC_CONFIG" rm $BASE/etc/X11/xorg.conf.d/20-nvidia.conf } |