[arch-commits] Commit in mesa/trunk (PKGBUILD)

[Laurent Carlier]

    Date: Wednesday, July 27, 2016 @ 16:50:18
  Author: lcarlier
Revision: 272512

upgpkg: mesa 12.0.1-3

mesa should not conflict with libegl and libgles (FS#49542)

Modified:
  mesa/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-27 16:28:24 UTC (rev 272511)
+++ PKGBUILD	2016-07-27 16:50:18 UTC (rev 272512)
@@ -5,7 +5,7 @@
 pkgbase=mesa
 pkgname=('opencl-mesa' 'vulkan-intel' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' 'mesa-libgl')
 pkgver=12.0.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm'
@@ -135,11 +135,11 @@
   optdepends=('opengl-man-pages: for the OpenGL API man pages'
               'mesa-vdpau: for accelerated video playback'
               'libva-mesa-driver: for accelerated video playback')
-  provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel'
+  provides=('libglapi' 'osmesa' 'libgbm' 'khrplatform-devel'
             'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
-  conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel'
+  conflicts=('libglapi' 'osmesa' 'libgbm' 'khrplatform-devel'
              'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
-  replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel'
+  replaces=('libglapi' 'osmesa' 'libgbm' 'khrplatform-devel'
             'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
 
   install -m755 -d ${pkgdir}/etc
@@ -175,8 +175,8 @@
 package_mesa-libgl() {
   pkgdesc="Mesa 3-D graphics library"
   depends=('mesa')
-  provides=('libgl')
-  replaces=('libgl')
+  provides=('libgl' 'libgles' 'libegl')
+  replaces=('libgl' 'libgles' 'libegl')
  
   # See FS#26284
   install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"