15.9-8: added lib32-mesa-noglvnd dependencies

2 files changed, 6 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fda48094cbfe..a27dd2dbbdf5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lib32-catalyst-utils
 	pkgver = 15.9
-	pkgrel = 7
+	pkgrel = 8
 	url = http://www.amd.com
 	arch = x86_64
 	license = custom
@@ -30,7 +30,7 @@ pkgname = lib32-catalyst-libgl
 	pkgdesc = AMD/ATI drivers. Catalyst drivers libraries symlinks (32-bit)
 	install = lib32-catalyst-libgl.install
 	depends = lib32-catalyst-utils
-	depends = lib32-mesa
+	depends = lib32-mesa-noglvnd
 	provides = lib32-libgl
 	provides = lib32-mesa-libgl
 	provides = lib32-mesa-libgl-git
@@ -41,6 +41,7 @@ pkgname = lib32-catalyst-libgl
 	conflicts = lib32-mesa-libgl-git
 	conflicts = lib32-libgles
 	conflicts = lib32-libegl
+	conflicts = lib32-libglvnd
 
 pkgname = lib32-opencl-catalyst
 	pkgdesc = AMD/ATI drivers. OpenCL implemention for AMD Catalyst (32-bit)
diff --git a/PKGBUILD b/PKGBUILD
index 354a48c8204f..fad510e4a574 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ pkgbase=lib32-$_pkgbasename
 pkgname=('lib32-catalyst-utils' 'lib32-catalyst-libgl' 'lib32-opencl-catalyst')
 
 pkgver=15.9
-pkgrel=7
+pkgrel=8
 _amdver=15.201.1151
 url="http://www.amd.com"
 arch=(x86_64)
@@ -31,8 +31,8 @@ build() {
 
 package_lib32-catalyst-libgl() {
       pkgdesc="AMD/ATI drivers. Catalyst drivers libraries symlinks (32-bit)"
-      depends=('lib32-catalyst-utils' 'lib32-mesa')
-      conflicts=('lib32-libgl' 'lib32-mesa-libgl' 'lib32-mesa-libgl-git' 'lib32-libgles' 'lib32-libegl')
+      depends=('lib32-catalyst-utils' 'lib32-mesa-noglvnd')
+      conflicts=('lib32-libgl' 'lib32-mesa-libgl' 'lib32-mesa-libgl-git' 'lib32-libgles' 'lib32-libegl' 'lib32-libglvnd')
       provides=('lib32-libgl' 'lib32-mesa-libgl' 'lib32-mesa-libgl-git' 'lib32-libgles' 'lib32-libegl')
       install=lib32-catalyst-libgl.install