diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-01-12 19:19:50 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-01-12 19:19:50 (GMT) |
| commit | 6c619a60fd89b5e75a93cff06977c552ddf1e621 (patch) | |
| tree | 630ca50ea1c128c4be85ce920ecf034c561bf7fe /abs/core-testing/LinHES-config | |
| parent | 0b2b9b97e95f8f8bfda1d1fe09136d121cd0750d (diff) | |
| parent | 634dff8fdd0a9c866c92f0020f282c23d1a438d8 (diff) | |
| download | linhes_pkgbuild-6c619a60fd89b5e75a93cff06977c552ddf1e621.zip linhes_pkgbuild-6c619a60fd89b5e75a93cff06977c552ddf1e621.tar.gz linhes_pkgbuild-6c619a60fd89b5e75a93cff06977c552ddf1e621.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD.git
Conflicts:
abs/core-testing/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core-testing/LinHES-config')
7 files changed, 11 insertions, 10 deletions
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 1d845b0..166f047 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 ;; |