15.9-8: added mesa-noglvnd dependencies

2 files changed, 6 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dea04e93fda2..221e21c1afe8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = catalyst-utils
 	pkgver = 15.9
-	pkgrel = 7
+	pkgrel = 8
 	url = http://www.amd.com
 	arch = i686
 	arch = x86_64
@@ -65,7 +65,7 @@ pkgname = catalyst-libgl
 	pkgdesc = AMD/ATI drivers. Catalyst drivers libraries symlinks + experimental powerXpress support.
 	install = catalyst-libgl.install
 	depends = catalyst-utils
-	depends = mesa
+	depends = mesa-noglvnd
 	provides = libgl
 	provides = mesa-libgl
 	provides = mesa-libgl-git
@@ -76,6 +76,7 @@ pkgname = catalyst-libgl
 	conflicts = mesa-libgl-git
 	conflicts = libgles
 	conflicts = libegl
+	conflicts = libglvnd
 
 pkgname = opencl-catalyst
 	pkgdesc = AMD/ATI drivers. OpenCL implemention for AMD Catalyst
diff --git a/PKGBUILD b/PKGBUILD
index f05503430e0c..54b960340cce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ pkgbase=catalyst-utils
 pkgname=('catalyst-utils' 'catalyst-libgl' 'opencl-catalyst')
 
 pkgver=15.9
-pkgrel=7
+pkgrel=8
 _amdver=15.201.1151
 arch=('i686' 'x86_64')
 url="http://www.amd.com"
@@ -56,8 +56,8 @@ build() {
 
 package_catalyst-libgl() {
       pkgdesc="AMD/ATI drivers. Catalyst drivers libraries symlinks + experimental powerXpress support."
-      depends=('catalyst-utils' 'mesa')
-      conflicts=('libgl' 'mesa-libgl' 'mesa-libgl-git' 'libgles' 'libegl')
+      depends=('catalyst-utils' 'mesa-noglvnd')
+      conflicts=('libgl' 'mesa-libgl' 'mesa-libgl-git' 'libgles' 'libegl' 'libglvnd')
       provides=('libgl' 'mesa-libgl' 'mesa-libgl-git' 'libgles' 'libegl')
       install=catalyst-libgl.install