summaryrefslogtreecommitdiffstats
path: root/abs/core
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core')
-rwxr-xr-xabs/core/LinHES-config/PKGBUILD4
-rwxr-xr-xabs/core/LinHES-config/xconfig.sh20
2 files changed, 12 insertions, 12 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 2032b7d..c31677e 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.4.3
-pkgrel=5
+pkgrel=6
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'
@@ -152,7 +152,7 @@ md5sums=('fe70208a7c11f7e2115655ad0004ddaf'
'27e4fcacca9b9662dd782fbdc92fceea'
'2a7f3b34e522acfd08283b86c8926aba'
'b596d2e3779a434435bc0f0277b1ba3e'
- 'f0fb2ec7bcfa827686f590db8890d87a'
+ '4239a837227ff97a24c5335de47ce029'
'f0376c98a7986897406d393186c0365e'
'157e73d0f90d7b306aba8f5921aeedd3'
'1f58c0393a131f4a8f9a84b3fe08a7e4'
diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh
index be01857..5514b00 100755
--- a/abs/core/LinHES-config/xconfig.sh
+++ b/abs/core/LinHES-config/xconfig.sh
@@ -77,7 +77,7 @@ function presetupX {
function nvidia_prepare {
[[ -f "$NVIDIA_MSI_MODPROBE" ]] && rm -f "$NVIDIA_MSI_MODPROBE"
- for i in libva-intel-driver mesa-libgl nvidia nvidia-utils nvidia-libgl opencl-nvidia nvidia-settings libglvnd nvidia-304xx nvidia-304xx-utils nvidia-304xx-libgl opencl-nvidia-304xx nvidia-340xx nvidia-340xx-utils nvidia-340xx-libgl opencl-nvidia-340xx
+ for i in libva-intel-driver mesa-libgl nvidia nvidia-utils nvidia-libgl opencl-nvidia nvidia-settings libxnvctrl libglvnd nvidia-304xx nvidia-304xx-utils nvidia-304xx-libgl opencl-nvidia-304xx nvidia-340xx nvidia-340xx-utils nvidia-340xx-libgl opencl-nvidia-340xx
do
pacman --noconfirm -Rdd $i >> $LOGFILE 2>&1
done
@@ -108,7 +108,7 @@ function nvidia_driver_install {
if [[ $? = 0 || $VGAFORCED -eq 1 && $VGACARDTYPE == "nvidia" ]]
then
echo "$CARDNAME" | tee -a $LOGFILE
- LIST="nvidia nvidia-libgl nvidia-utils opencl-nvidia nvidia-settings"
+ LIST="nvidia nvidia-utils opencl-nvidia nvidia-settings libglvnd"
for i in `echo ${LIST}`
do
pkg_check $i
@@ -130,7 +130,7 @@ function nvidia_driver_install {
if [[ $? = 0 || $VGAFORCED -eq 1 && $VGACARDTYPE == "nvidia-340xx" ]]
then
echo "$CARDNAME" | tee -a $LOGFILE
- LIST="nvidia-340xx nvidia-340xx-libgl nvidia-340xx-utils opencl-nvidia-340xx"
+ LIST="nvidia-340xx nvidia-340xx-utils opencl-nvidia-340xx libglvnd"
for i in `echo ${LIST}`
do
pkg_check $i
@@ -153,7 +153,7 @@ function nvidia_driver_install {
if [[ $? = 0 || $VGAFORCED -eq 1 && $VGACARDTYPE == "nvidia-304xx" ]]
then
echo "$CARDNAME" | tee -a $LOGFILE
- LIST="nvidia-304xx nvidia-304xx-libgl nvidia-304xx-utils opencl-nvidia-304xx"
+ LIST="nvidia-304xx nvidia-304xx-utils opencl-nvidia-304xx libglvnd"
for i in `echo ${LIST}`
do
pkg_check $i
@@ -174,7 +174,7 @@ function nvidia_driver_install {
then
#this is a failsafe, can't find the right driver, then use the latest'
echo " Couldn't find the card id in any list" | tee -a $LOGFILE
- LIST="nvidia nvidia-libgl nvidia-utils opencl-nvidia nvidia-settings"
+ LIST="nvidia nvidia-utils opencl-nvidia nvidia-settings libglvnd"
for i in `echo ${LIST}`
do
pkg_check $i
@@ -204,7 +204,7 @@ function nvidia_driver_install {
}
function vmware_driver_install {
- LIST="xf86-input-vmmouse xf86-video-vmware xf86-video-vesa svga-dri mesa-libgl"
+ LIST="xf86-input-vmmouse xf86-video-vmware xf86-video-vesa svga-dri libglvnd"
for i in `echo ${LIST}`
do
pkg_check $i
@@ -220,20 +220,20 @@ function vmware_driver_install {
function vesa_driver_install {
pkg_check xf86-video-vesa
- pkg_check mesa-libgl
+ pkg_check libglvnd
echo "Installing Vesa driver" | tee -a $LOGFILE
#this is used to remove nvidia
nvidia_prepare
- pacman -S --noconfirm xf86-video-vesa mesa-libgl >> $LOGFILE 2>&1
+ pacman -S --noconfirm xf86-video-vesa libglvnd >> $LOGFILE 2>&1
}
function intel_driver_install {
pkg_check xf86-video-intel
- pkg_check mesa-libgl
+ pkg_check libglvnd
echo "Installing Intel driver" | tee -a $LOGFILE
#this is used to remove nvidia
nvidia_prepare
- pacman -S --noconfirm xf86-video-intel libva-intel-driver mesa-libgl >> $LOGFILE 2>&1
+ pacman -S --noconfirm xf86-video-intel libva-intel-driver libglvnd >> $LOGFILE 2>&1
echo "/usr/lib/libIntelXvMC.so.1" > "$XVMC_CONFIG"
}