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

[Thomas Bächler]

    Date: Saturday, November 16, 2013 @ 16:01:21
  Author: thomas
Revision: 199795

upgpkg: mesa 9.2.3-2: change mesa-libgl and *-dri to make replacing mesa-libgl easier

Modified:
  mesa/trunk/PKGBUILD

----------+
 PKGBUILD |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-16 14:39:23 UTC (rev 199794)
+++ PKGBUILD	2013-11-16 15:01:21 UTC (rev 199795)
@@ -5,7 +5,7 @@
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
 pkgver=9.2.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
              'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
@@ -53,7 +53,7 @@
 
 package_ati-dri() {
   pkgdesc="Mesa drivers for AMD/ATI Radeon"
-  depends=("mesa-libgl=${pkgver}")
+  depends=('mesa-libgl' "mesa=${pkgver}")
   optdepends=('libtxc_dxtn: S3 Texture Compressed support')
   conflicts=('xf86-video-ati<6.9.0-6')
 
@@ -73,7 +73,7 @@
 package_intel-dri() {
   pkgdesc="Mesa drivers for Intel"
   optdepends=('libtxc_dxtn: S3 Texture Compressed support')
-  depends=("mesa-libgl=${pkgver}")
+  depends=('mesa-libgl' "mesa=${pkgver}")
 
   install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
   mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/
@@ -85,7 +85,7 @@
 package_nouveau-dri() {
   pkgdesc="Mesa drivers for Nouveau"
   optdepends=('libtxc_dxtn: S3 Texture Compressed support')
-  depends=("mesa-libgl=${pkgver}")
+  depends=('mesa-libgl' "mesa=${pkgver}")
 
   install -m755 -d ${pkgdir}/usr/lib/vdpau/
   mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/
@@ -128,6 +128,7 @@
   mv -v ${srcdir}/fakeinstall/* ${pkgdir}
   # 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
+  ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1
   rm ${pkgdir}/usr/lib/libGL.so{,.1}
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa"