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

[Andreas Radke]

    Date: Saturday, February 23, 2013 @ 09:28:50
  Author: andyrtr
Revision: 178456

upgpkg: mesa 9.1-1

upstream update 9.1; drop some unneeded links when renaming libGL

Modified:
  mesa/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-23 08:07:00 UTC (rev 178455)
+++ PKGBUILD	2013-02-23 08:28:50 UTC (rev 178456)
@@ -5,23 +5,23 @@
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
 pkgver=9.1
-pkgrel=0.2
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
              'libvdpau' 'wayland' 'llvm-amdgpu-snapshot')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 options=('!libtool')
-source=(#ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-	    ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # for RC testing
+source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
+	    #ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # for RC testing
         LICENSE)
-md5sums=('b6d3520e21f2cbe97284a155662b350d'
+md5sums=('d3891e02215422e120271d976ff1947e'
          '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
     cd ${srcdir}/?esa-*
 
-    autoreconf -vfi
+    autoreconf -vfi # our automake is far too new for their build system :)
 
     ./configure --prefix=/usr \
     --sysconfdir=/etc \
@@ -124,8 +124,8 @@
   # 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
+#  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/"
@@ -142,9 +142,11 @@
   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         ${pkgdir}/usr/lib/libGL.so.1
-  ln -s mesa-libGL.so.1.2.0	    ${pkgdir}/usr/lib/libGL.so.1.2.0
+#  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
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"