From 073df46c321745edba3a2fdf6e4bb04c77c3114a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 25 Dec 2019 11:28:06 +0100
Subject: [PATCH] nvidia: the conflicts in -libs are unnecessary.

libglvnd should replace the affected pkgs instead.
---
 srcpkgs/nvidia/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 0a580ed2c19..93bde387c97 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=440.44
-revision=1
+revision=2
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -244,7 +244,6 @@ nvidia-gtklibs_package() {
 }
 nvidia-libs_package() {
 	short_desc="${_desc} - common libraries"
-	conflicts="libGL>10_1<19.2.5_2 libEGL>10_1<19.2.5_2 libGLES>10_1<19.2.5_2"
 	# manually set 32bit depends for libglvnd
 	depends="libglvnd"
 	lib32depends="glibc-32bit>=0 libX11-32bit>=0 libXext-32bit>=0 libglvnd-32bit>=0"