diff --git a/cnchi/features.py b/cnchi/features.py index 879efcce7..59d33534f 100644 --- a/cnchi/features.py +++ b/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(): diff --git a/cnchi/hardware/modules/bumblebee.py_ b/cnchi/hardware/modules/bumblebee.py_ index feda58884..c523dacf9 100644 --- a/cnchi/hardware/modules/bumblebee.py_ +++ b/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 diff --git a/cnchi/hardware/modules/i915.py b/cnchi/hardware/modules/i915.py index d9fede78c..22be51923 100644 --- a/cnchi/hardware/modules/i915.py +++ b/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 diff --git a/cnchi/hardware/modules/nouveau.py b/cnchi/hardware/modules/nouveau.py index 8ab81d722..9788947ce 100644 --- a/cnchi/hardware/modules/nouveau.py +++ b/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 diff --git a/cnchi/hardware/modules/nvidia.py b/cnchi/hardware/modules/nvidia.py index 9b09c71a7..18f693151 100644 --- a/cnchi/hardware/modules/nvidia.py +++ b/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 diff --git a/cnchi/hardware/modules/nvidia_304xx.py b/cnchi/hardware/modules/nvidia_304xx.py index a24bb2267..484bab6a4 100644 --- a/cnchi/hardware/modules/nvidia_304xx.py +++ b/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 diff --git a/cnchi/hardware/modules/nvidia_340xx.py b/cnchi/hardware/modules/nvidia_340xx.py index 3965f7bf2..caeda6c79 100644 --- a/cnchi/hardware/modules/nvidia_340xx.py +++ b/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 diff --git a/cnchi/hardware/modules/radeon.py b/cnchi/hardware/modules/radeon.py index 3fba4a0f8..c26f0f26b 100644 --- a/cnchi/hardware/modules/radeon.py +++ b/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 diff --git a/cnchi/info.py b/cnchi/info.py index 29790f32e..5645a33ac 100755 --- a/cnchi/info.py +++ b/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" diff --git a/update.info b/update.info index 2b9daced5..f38b1fb99 100644 --- a/update.info +++ b/update.info @@ -1,2 +1,2 @@ -{"version":"0.14.253","files":[ +{"version":"0.14.254","files":[ ]}