diff options
| author | Cecil Hugh Watson <knoppmyth@gmail.com> | 2009-01-11 18:41:04 (GMT) |
|---|---|---|
| committer | Cecil Hugh Watson <knoppmyth@gmail.com> | 2009-01-11 18:41:04 (GMT) |
| commit | bcf5ec3fa5da5bbac9a1eaba782bbcea0278d9b7 (patch) | |
| tree | 1db739b5689e79de25ff05521ff1ef620478df50 /abs/core-testing/LinHES-config | |
| parent | 22cb9c31cde8a125c3b7d159d8b50941cb5c7714 (diff) | |
| download | linhes_pkgbuild-bcf5ec3fa5da5bbac9a1eaba782bbcea0278d9b7.zip linhes_pkgbuild-bcf5ec3fa5da5bbac9a1eaba782bbcea0278d9b7.tar.gz linhes_pkgbuild-bcf5ec3fa5da5bbac9a1eaba782bbcea0278d9b7.tar.bz2 | |
Updated various packages.
Diffstat (limited to 'abs/core-testing/LinHES-config')
8 files changed, 12 insertions, 11 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index 1058a17..ef555bc 100755 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=1.0 -pkgrel=148 +pkgrel=151 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan ) diff --git a/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.ati b/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.ati index c6d9249..53c8e0b 100644 --- a/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.ati +++ b/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.ati @@ -6,7 +6,7 @@ Section "ServerLayout" EndSection Section "Files" - RgbPath "/usr/share/X11/rgb" +# RgbPath "/usr/share/X11/rgb" ModulePath "/usr/lib/xorg/modules" FontPath "/usr/share/fonts/misc" FontPath "/usr/share/fonts/75dpi" diff --git a/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.intel b/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.intel index a4d258a..f3684fb 100644 --- a/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.intel +++ b/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.intel @@ -13,7 +13,7 @@ Section "ServerFlags" EndSection Section "Files" - RgbPath "/usr/share/X11/rgb" +# RgbPath "/usr/share/X11/rgb" ModulePath "/usr/lib/xorg/modules" FontPath "/usr/share/fonts/misc:unscaled" FontPath "/usr/share/fonts/misc" diff --git a/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.nvidia b/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.nvidia index dec0f42..2cc4cb6 100755 --- a/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.nvidia +++ b/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.nvidia @@ -9,7 +9,7 @@ Section "ServerLayout" EndSection Section "Files" - RgbPath "/usr/X11R6/lib/X11/rgb" +# RgbPath "/usr/X11R6/lib/X11/rgb" EndSection Section "Module" diff --git a/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.vesa b/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.vesa index c569819..ce62457 100755 --- a/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.vesa +++ b/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.vesa @@ -9,7 +9,7 @@ Section "ServerLayout" EndSection Section "Files" - RgbPath "/usr/X11R6/lib/X11/rgb" +# RgbPath "/usr/X11R6/lib/X11/rgb" EndSection Section "Module" diff --git a/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.via b/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.via index 6dd7821..8454767 100644 --- a/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.via +++ b/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.via @@ -9,7 +9,7 @@ Section "ServerLayout" EndSection Section "Files" - RgbPath "/usr/X11R6/lib/X11/rgb" +# RgbPath "/usr/X11R6/lib/X11/rgb" EndSection Section "Module" diff --git a/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.vmware b/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.vmware index 843f2f4..a7a5113 100755 --- a/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.vmware +++ b/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.vmware @@ -9,7 +9,7 @@ Section "ServerLayout" EndSection Section "Files" - RgbPath "/usr/X11R6/lib/X11/rgb" +# RgbPath "/usr/X11R6/lib/X11/rgb" EndSection Section "Module" diff --git a/abs/core-testing/LinHES-config/xconfig.sh b/abs/core-testing/LinHES-config/xconfig.sh index ef3e836..f718a1f 100755 --- a/abs/core-testing/LinHES-config/xconfig.sh +++ b/abs/core-testing/LinHES-config/xconfig.sh @@ -1,4 +1,5 @@ #!/bin/bash +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" BASE="" . /etc/profile NVIDIA_96XX="$TEMPLATES/xorg/96xx_supported.txt" @@ -179,12 +180,12 @@ function setupX { then #install 96xx drivers echo "installing nvidia 96xx drivers" - pacman --noconfirm -R libgl-dri > /dev/null 2>&1 + pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 pacman --noconfirm -S nvidia-96xx nvidia-96xx-utils > /dev/null 2>&1 else #install latest drivers echo "installing current nvidia drivers" - pacman --noconfirm -R libgl-dri > /dev/null 2>&1 + pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 pacman --noconfirm -S nvidia nvidia-utils > /dev/null 2>&1 fi fi @@ -198,7 +199,7 @@ function setupX { if [ ! x$TESTMODE = "xtest" ] then pacman --noconfirm -R nvidia nvidia-utils > /dev/null 2>&1 - pacman --noconfirm -S libgl-dri > /dev/null 2>&1 + pacman --noconfirm -S libgl > /dev/null 2>&1 fi ;; @@ -207,7 +208,7 @@ function setupX { if [ ! x$TESTMODE = "xtest" ] then pacman --noconfirm -R nvidia-utils > /dev/null 2>&1 - pacman --noconfirm -S libgl-dri > /dev/null 2>&1 + pacman --noconfirm -S libgl > /dev/null 2>&1 fi ;; |