Some libgl packages have been removed

Antergos · Mar 6, 2017 · f29392d · f29392d
1 parent 00fc454
commit f29392d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/cnchi/hardware/modules/nvidia_304xx.py b/cnchi/hardware/modules/nvidia_304xx.py
@@ -42,13 +42,11 @@
 PRIORITY = 0
 
 # See https://wiki.archlinux.org/index.php/NVIDIA#Installing
-# nvidia, nvidia-340xx, nvidia-304xx
-# lib32-nvidia-libgl, lib32-nvidia-340xx-libgl or lib32-nvidia-304xx-libgl
 
 """
 For GeForce 6000/7000 series cards [NV4x and NV6x] from around 2004-2006, install
-    the nvidia-304xx or nvidia-304xx-lts package along with nvidia-304xx-libgl,
-    available in the official repositories.
+    the nvidia-304xx or nvidia-304xx-lts package, available in the official
+    repositories.
 """
 
 DEVICES = [
@@ -137,17 +135,17 @@ def __init__(self):
     @staticmethod
     def get_packages():
         """ Get all required packages """
-        pkgs = ["nvidia-304xx", "nvidia-304xx-utils", "nvidia-304xx-libgl", "libvdpau"]
+        pkgs = ["nvidia-304xx", "nvidia-304xx-utils", "libvdpau"]
         if os.uname()[-1] == "x86_64":
-            pkgs.extend(["lib32-nvidia-304xx-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")
+        #if os.uname()[-1] == "x86_64":
+        #    pkgs.append("lib32-mesa-libgl")
         return pkgs
 
     @staticmethod

diff --git a/cnchi/hardware/modules/nvidia_340xx.py b/cnchi/hardware/modules/nvidia_340xx.py
@@ -45,13 +45,11 @@
 PRIORITY = 1
 
 # See https://wiki.archlinux.org/index.php/NVIDIA#Installing
-# nvidia, nvidia-340xx, nvidia-304xx
-# lib32-nvidia-libgl, lib32-nvidia-340xx-libgl or lib32-nvidia-304xx-libgl
 
 """
 For GeForce 8000/9000 and 100-300 series cards [NV5x, NV8x, NV9x and NVAx] from
-    around 2006-2010, install the nvidia-340xx or nvidia-340xx-lts package along
-    with nvidia-340xx-libgl, available in the official repositories.
+    around 2006-2010, install the nvidia-340xx or nvidia-340xx-lts, available in
+    the official repositories.
 """
 
 DEVICES = [
@@ -135,17 +133,17 @@ def __init__(self):
     @staticmethod
     def get_packages():
         """ Get all required packages """
-        pkgs = ["nvidia-340xx", "nvidia-340xx-utils", "nvidia-340xx-libgl", "libvdpau"]
+        pkgs = ["nvidia-340xx", "nvidia-340xx-utils", "libvdpau"]
         if os.uname()[-1] == "x86_64":
-            pkgs.extend(["lib32-nvidia-340xx-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"]
+        #if os.uname()[-1] == "x86_64":
+        #    pkgs.append("lib32-mesa-libgl")
         return pkgs
 
     @staticmethod

diff --git a/cnchi/info.py b/cnchi/info.py
@@ -29,7 +29,7 @@
 
 """ Set some Cnchi global constants """
 
-CNCHI_VERSION = "0.14.249"
+CNCHI_VERSION = "0.14.250"
 CNCHI_WEBSITE = "http://www.antergos.com"
 CNCHI_RELEASE_STAGE = "production"
 

diff --git a/update.info b/update.info
@@ -1,2 +1,2 @@
-{"version":"0.14.249","files":[
+{"version":"0.14.250","files":[
 ]}