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

[Andreas Radke]

    Date: Sunday, February 24, 2013 @ 13:46:56
  Author: andyrtr
Revision: 178490

upgpkg: mesa 9.1-2

make mesa-libgl provide a versioned libgl; don't conflict with other libgl providers - some can be installed along each other

Modified:
  mesa/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-24 12:44:10 UTC (rev 178489)
+++ PKGBUILD	2013-02-24 12:46:56 UTC (rev 178490)
@@ -5,7 +5,7 @@
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
 pkgver=9.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
              'libvdpau' 'wayland' 'llvm-amdgpu-snapshot')
@@ -124,8 +124,6 @@
   # rename libgl.so to not conflict with blobs - may break gl.pc ?
   mv ${pkgdir}/usr/lib/libGL.so.1.2.0 	${pkgdir}/usr/lib/mesa-libGL.so.1.2.0
   rm ${pkgdir}/usr/lib/libGL.so{,.1}
-#  ln -s mesa-libGL.so.1.2.0         ${pkgdir}/usr/lib/mesa-libGL.so
-#  ln -s mesa-libGL.so.1.2.0         ${pkgdir}/usr/lib/mesa-libGL.so.1
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
@@ -134,16 +132,14 @@
 package_mesa-libgl() {
   pkgdesc="Mesa 3-D graphics library"
   depends=("mesa=${pkgver}")
-  provides=('libgl')
+  provides=("libgl=${pkgver}")
   replaces=('libgl')
  
   # See FS#26284
   install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
   ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
 
-#  ln -s mesa-libGL.so           ${pkgdir}/usr/lib/libGL.so
   ln -s mesa-libGL.so.1.2.0      ${pkgdir}/usr/lib/libGL.so
-#  ln -s mesa-libGL.so.1         ${pkgdir}/usr/lib/libGL.so.1
   ln -s mesa-libGL.so.1.2.0      ${pkgdir}/usr/lib/libGL.so.1
   ln -s mesa-libGL.so.1.2.0      ${pkgdir}/usr/lib/libGL.so.1.2.0