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

[Felix Yan]

    Date: Sunday, March 9, 2014 @ 05:24:27
  Author: fyan
Revision: 106839

upgpkg: lib32-mesa 10.1.0-2

- move libEGL, libGLES* to lib32-mesa-libgl as the main mesa package

Modified:
  lib32-mesa/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-09 02:41:25 UTC (rev 106838)
+++ PKGBUILD	2014-03-09 04:24:27 UTC (rev 106839)
@@ -5,7 +5,7 @@
 pkgbase=lib32-mesa
 pkgname=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa' 'lib32-mesa-libgl')
 pkgver=10.1.0
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 makedepends=('python2' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-elfutils' 'lib32-llvm' 'lib32-systemd')
@@ -103,9 +103,14 @@
   replaces=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl')
 
   mv -v ${srcdir}/fakeinstall/* ${pkgdir}
+  # rename libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
   mv ${pkgdir}/usr/lib32/libGL.so.1.2.0 ${pkgdir}/usr/lib32/mesa-libGL.so.1.2.0
-  ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib32/mesa-libGL.so.1
-  rm ${pkgdir}/usr/lib32/libGL.so{,.1}
+  mv ${pkgdir}/usr/lib32/libEGL.so.1.0.0    ${pkgdir}/usr/lib32/mesa-libEGL.so.1.0.0
+  mv ${pkgdir}/usr/lib32/libGLESv1_CM.so.1.1.0  ${pkgdir}/usr/lib32/mesa-libGLESv1_CM.so.1.1.0
+  mv ${pkgdir}/usr/lib32/libGLESv2.so.2.0.0   ${pkgdir}/usr/lib32/mesa-libGLESv2.so.2.0.0
+  
+  rm ${pkgdir}/usr/lib32/lib{GL,EGL,GLESv1_CM,GLESv2}.so*
+  
   rm -r ${pkgdir}/etc
   rm -r ${pkgdir}/usr/include
   
@@ -121,9 +126,18 @@
 
   install -m755 -d ${pkgdir}/usr/lib32
 
-  ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so
-  ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1
-  ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1.2.0
+  ln -s mesa-libGL.so.1.2.0         ${pkgdir}/usr/lib32/libGL.so
+  ln -s mesa-libGL.so.1.2.0         ${pkgdir}/usr/lib32/libGL.so.1
+  ln -s mesa-libGL.so.1.2.0         ${pkgdir}/usr/lib32/libGL.so.1.2.0
+  ln -s mesa-libEGL.so.1.0.0        ${pkgdir}/usr/lib32/libEGL.so
+  ln -s mesa-libEGL.so.1.0.0        ${pkgdir}/usr/lib32/libEGL.so.1
+  ln -s mesa-libEGL.so.1.0.0        ${pkgdir}/usr/lib32/libEGL.so.1.0.0
+  ln -s mesa-libGLESv1_CM.so.1.1.0  ${pkgdir}/usr/lib32/libGLESv1_CM.so
+  ln -s mesa-libGLESv1_CM.so.1.1.0  ${pkgdir}/usr/lib32/libGLESv1_CM.so.1
+  ln -s mesa-libGLESv1_CM.so.1.1.0  ${pkgdir}/usr/lib32/libGLESv1_CM.so.1.1.0
+  ln -s mesa-libGLESv2.so.2.0.0     ${pkgdir}/usr/lib32/libGLESv2.so
+  ln -s mesa-libGLESv2.so.2.0.0     ${pkgdir}/usr/lib32/libGLESv2.so.2
+  ln -s mesa-libGLESv2.so.2.0.0     ${pkgdir}/usr/lib32/libGLESv2.so.2.0.0
 
   install -m755 -d "${pkgdir}/usr/share/licenses"
   ln -s libglapi "${pkgdir}/usr/share/licenses/lib32-libglapi"