Fixes nvidia/nouveau/intel installation (due package name changes ups…

…tream)

cnchi/features.py

@@ -170,7 +170,6 @@ def fill_listbox(self):
         self.listbox_rows = {}
 
         # Only add graphic-driver feature if an AMD or Nvidia is detected
-        # FIXME: Conflict between lib32-nvidia-libgl and lib32-mesa-libgl
         if "graphic_drivers" in self.features:
             allow = False
             if self.detect.amd():

cnchi/hardware/modules/bumblebee.py_

@@ -75,15 +75,13 @@ class Bumblebee(Hardware):
         """ Get all required packages """
         pkgs = ["bumblebee", "mesa", "xf86-video-intel", "nvidia", "nvidia-settings", "bbswitch"]
         if os.uname()[-1] == "x86_64":
-            pkgs.extend(["lib32-nvidia-utils", "lib32-virtualgl", "lib32-mesa-libgl"])
+            pkgs.extend(["lib32-nvidia-utils", "lib32-virtualgl"])
         return pkgs
 
     @staticmethod
     def get_conflicts():
         """ Get conflicting packages """
-        pkgs = ["mesa-libgl", "xf86-video-nouveau"]
-        #if os.uname()[-1] == "x86_64":
-        #    pkgs.append("lib32-mesa-libgl")
+        pkgs = ["xf86-video-nouveau"]
         return pkgs
 
     @staticmethod

cnchi/hardware/modules/i915.py

@@ -52,7 +52,7 @@ def get_packages():
         """ Get all required packages """
         pkgs = ["xf86-video-intel", "libva-intel-driver", "libtxc_dxtn"]
         if os.uname()[-1] == "x86_64":
-            pkgs.extend(["lib32-mesa", "lib32-mesa-libgl"])
+            pkgs.extend(["lib32-mesa"])
         return pkgs
 
     @staticmethod

cnchi/hardware/modules/nouveau.py

@@ -56,7 +56,7 @@ def get_packages():
         """ Get all required packages """
         pkgs = ["xf86-video-nouveau"]
         if os.uname()[-1] == "x86_64":
-            pkgs.extend(["lib32-mesa", "lib32-mesa-libgl"])
+            pkgs.extend(["lib32-mesa"])
         return pkgs
 
     @staticmethod

cnchi/hardware/modules/nvidia.py

@@ -101,17 +101,15 @@ def __init__(self):
     @staticmethod
     def get_packages():
         """ Get all required packages """
-        pkgs = ["nvidia", "nvidia-utils", "nvidia-libgl", "libvdpau"]
+        pkgs = ["nvidia", "nvidia-utils", "libvdpau"]
         if os.uname()[-1] == "x86_64":
-            pkgs.extend(["lib32-nvidia-libgl", "lib32-libvdpau"])
+            pkgs.extend(["lib32-libvdpau"])
         return pkgs
 
     @staticmethod
     def get_conflicts():
         """ Get conflicting packages """
-        pkgs = ["mesa-libgl", "xf86-video-nouveau"]
-        if os.uname()[-1] == "x86_64":
-            pkgs.append("lib32-mesa-libgl")
+        pkgs = ["xf86-video-nouveau"]
         return pkgs
 
     @staticmethod

cnchi/hardware/modules/nvidia_304xx.py

@@ -143,9 +143,7 @@ def get_packages():
     @staticmethod
     def get_conflicts():
         """ Get conflicting packages """
-        pkgs = ["mesa-libgl", "xf86-video-nouveau"]
-        #if os.uname()[-1] == "x86_64":
-        #    pkgs.append("lib32-mesa-libgl")
+        pkgs = ["xf86-video-nouveau"]
         return pkgs
 
     @staticmethod

cnchi/hardware/modules/nvidia_340xx.py

@@ -142,8 +142,6 @@ def get_packages():
     def get_conflicts():
         """ Get conflicting packages """
         pkgs = ["xf86-video-nouveau"]
-        #if os.uname()[-1] == "x86_64":
-        #    pkgs.append("lib32-mesa-libgl")
         return pkgs
 
     @staticmethod

cnchi/hardware/modules/radeon.py

@@ -55,7 +55,7 @@ def get_packages():
         """ Get all required packages """
         pkgs = ["xf86-video-ati", "libva-vdpau-driver", "libtxc_dxtn"]
         if os.uname()[-1] == "x86_64":
-            pkgs.extend(["lib32-mesa", "lib32-mesa-libgl"])
+            pkgs.extend(["lib32-mesa"])
         return pkgs
 
     @staticmethod

cnchi/info.py

@@ -29,7 +29,7 @@
 
 """ Set some Cnchi global constants """
 
-CNCHI_VERSION = "0.14.253"
+CNCHI_VERSION = "0.14.254"
 CNCHI_WEBSITE = "http://www.antergos.com"
 CNCHI_RELEASE_STAGE = "production"
 

update.info

@@ -1,2 +1,2 @@
-{"version":"0.14.253","files":[
+{"version":"0.14.254","files":[
 ]}