From 506ab259e8910000e65b7d2bc6f00ee984da404e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 23 Oct 2014 17:16:48 +0000
Subject: LinHES-config: xconfig.sh: make mesa-libgl install on non nvidia

---
 abs/core/LinHES-config/PKGBUILD   |  4 ++--
 abs/core/LinHES-config/xconfig.sh | 30 ++++++++++++++++++++++--------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 8591b81..d26a94f 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=8.2
-pkgrel=15
+pkgrel=16
 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'
@@ -144,7 +144,7 @@ md5sums=('af15ebdfbbc3442626a807569a0db2a4'
          'b8becf69d4309b938ceba3178c799270'
          '2a7f3b34e522acfd08283b86c8926aba'
          'b596d2e3779a434435bc0f0277b1ba3e'
-         '5f308b40c57f588a118a5c1d8655e833'
+         '9b3d200e101d2ba814de00318a41db8f'
          '157e73d0f90d7b306aba8f5921aeedd3'
          'f8f803cb5738ce0021cd37c1ab514c45'
          '879c692ebfd86cdd60d93278f1df8041'
diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh
index 2c8c86d..52dc952 100755
--- a/abs/core/LinHES-config/xconfig.sh
+++ b/abs/core/LinHES-config/xconfig.sh
@@ -21,6 +21,7 @@ home_check
 
 
 function Xvalues {
+    echo $VGACARDTYPE
     if [ "x$VGACARDTYPE" = "x" ]
     then
         CMDLINE=$(cat /proc/cmdline)
@@ -59,7 +60,7 @@ function presetupX {
 }
 
 function nvidia_prepare {
-    for i in mesa-libgl nvidia nvidia-utils nvidia-173xx nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils
+    for i in mesa-libgl nvidia nvidia-utils nvidia-libgl nvidia-173xx nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils
     do
         pacman --noconfirm -Rdd $i >> $LOGFILE 2>&1
     done
@@ -86,10 +87,17 @@ function nvidia_driver_install {
     echo "Installing Nvidia driver"
     cp "$TEMPLATES/xorg/xorg.nvidia"  $BASE/etc/X11/xorg.conf.d/20-automv.conf
     #install latest drivers
-    pkg_check nvidia-utils
-    echo "Installing current nvidia drivers"
+    LIST="nvidia nvidia-libgl nvidia-utils"
+    for i in `echo ${LIST}`
+    do
+        pkg_check $i
+    done
+    #this is used to remove nvidia
     nvidia_prepare
-    pacman --noconfirm  -S nvidia nvidia-utils >> $LOGFILE 2>&1
+    for i in `echo ${LIST}`
+    do
+        pacman -S --noconfirm $i >> $LOGFILE 2>&1
+    done
     installed=1
     echo "/usr/lib/libXvMCNVIDIA_dynamic.so.1" > "$XVMC_CONFIG"
 }
@@ -97,31 +105,37 @@ function nvidia_driver_install {
 function vmware_driver_install {
     echo "Installing VMware driver"
     echo "Installing VMware driver" >> $LOGFILE 2>&1
-    LIST="xf86-input-vmmouse  xf86-video-vmware xf86-video-vesa svga-dri"
+    LIST="xf86-input-vmmouse xf86-video-vmware xf86-video-vesa svga-dri mesa-libgl"
     for i in `echo ${LIST}`
     do
         pkg_check $i
     done
+    #this is used to remove nvidia
+    nvidia_prepare
     for i in `echo ${LIST}`
     do
         pacman -S --noconfirm $i >> $LOGFILE 2>&1
     done
-
 }
 
 function vesa_driver_install {
     echo "Installing Vesa driver"
     echo "Installing Vesa driver" >> $LOGFILE 2>&1
-    pacman -S --noconfirm xf86-video-vesa  >> $LOGFILE 2>&1
+    pkg_check xf86-video-vesa
+    pkg_check mesa-libgl
+    #this is used to remove nvidia
+    nvidia_prepare
+    pacman -S --noconfirm xf86-video-vesa mesa-libgl  >> $LOGFILE 2>&1
 }
 
 function intel_driver_install {
     echo "Installing Intel driver"
     echo "Installing Intel driver" >> $LOGFILE 2>&1
     pkg_check xf86-video-intel
+    pkg_check mesa-libgl
     #this is used to remove nvidia
     nvidia_prepare
-    pacman -S --noconfirm xf86-video-intel >> $LOGFILE 2>&1
+    pacman -S --noconfirm xf86-video-intel mesa-libgl >> $LOGFILE 2>&1
     echo "/usr/lib/libIntelXvMC.so.1" > "$XVMC_CONFIG"
 }
 
-- 
cgit v0.12

