From 7c17c4e5aafbdd82dda8e50fd7bdd97ae05f1a00 Mon Sep 17 00:00:00 2001
From: "coadde [Márcio Alexandre Silva Delgado]" <coadde@parabola.nu>
Date: Wed, 29 Mar 2017 19:13:12 -0300
Subject: mesa and lib32-mesa: fix provides, conflicts and replaces

---
 libre/mesa/PKGBUILD | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

(limited to 'libre')

diff --git a/libre/mesa/PKGBUILD b/libre/mesa/PKGBUILD
index 6c5c1a157..7b3c5d0fb 100644
--- a/libre/mesa/PKGBUILD
+++ b/libre/mesa/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('opencl-mesa' 'libva-mesa-driver' 'mesa-vdpau' 'mesa'
          'mesa-libgl' 'mesa-libcl-icd' 'vulkan-radeon')
 [[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]] && pkgname+=('vulkan-intel')
 pkgver=17.0.2
-pkgrel=2.parabola2
+pkgrel=2.parabola3
 arch=('i686' 'x86_64' 'armv7h')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm'
@@ -140,6 +140,8 @@ package_opencl-mesa() {
   depends=('expat' 'libdrm' 'libelf' 'libclc' 'clang' 'lm_sensors')
   optdepends=('opencl-headers: headers necessary for OpenCL development')
   provides=('opencl-driver')
+  conflicts=('opencl-nvidia' 'opencl-nvidia-340xx' 'opencl-nvidia-304xx' 'opencl-catalyst')
+  replaces=('opencl-nvidia' 'opencl-nvidia-340xx' 'opencl-nvidia-304xx' 'opencl-catalyst')
 
   install -m755 -d ${pkgdir}/etc
   cp -rv ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/
@@ -213,13 +215,23 @@ package_mesa() {
               'mesa-vdpau: for accelerated video playback'
               'libva-mesa-driver: for accelerated video playback')
   if [[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]]; then
-    provides=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'opengl-driver')
-    conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
-    replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
+    provides=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri'
+              'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'opengl-driver')
+    conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri'
+               'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri'
+               'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils')
+    replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri'
+              'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri'
+              'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils')
   elif [[ "${CARCH}" = 'armv7h' ]]; then
-    provides=('ati-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'opengl-driver')
-    conflicts=('ati-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
-    replaces=('ati-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
+    provides=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri'
+              'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri' 'opengl-driver')
+    conflicts=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri'
+               'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri'
+               'nvidia-utils' 'catalyst-utils')
+    replaces=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri'
+              'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri'
+              'nvidia-utils' 'catalyst-utils')
   fi
 
   install -m755 -d ${pkgdir}/etc
@@ -250,7 +262,8 @@ package_mesa-libgl() {
   pkgdesc="Mesa 3-D graphics library"
   depends=('libdrm' 'libxdamage' 'libxshmfence' 'libxxf86vm' 'wayland')
   provides=('libgl' 'libegl' 'libgles' 'libglvnd')
-  conflicts=('libglvnd')
+  conflicts=('libglvnd' 'nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl' 'nvidia-cg-toolkit' 'catalyst-libgl')
+  replaces=('libglvnd' 'nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl' 'nvidia-cg-toolkit' 'catalyst-libgl')
 
   install -m755 -d "${pkgdir}/usr/lib/"
   cp -rv ${srcdir}/fakeinstall/usr/lib/libGL.so*        ${pkgdir}/usr/lib/
@@ -267,7 +280,7 @@ package_mesa-libcl-icd() {
   optdepends=('opencl-driver: packaged opencl driver')
   provides=('opencl-icd-loader' 'ocl-icd' 'libcl')
   conflicts=('ocl-icd' 'libcl')
-  replaces=('ocl-icd')
+  replaces=('ocl-icd' 'libcl')
 
   install -m755 -d ${pkgdir}/usr/lib
   cp -rv ${srcdir}/openclinstall/usr/lib/libOpenCL* ${pkgdir}/usr/lib/
-- 
cgit v1.2.3