Date: Saturday, March 8, 2014 @ 14:34:29 Author: lcarlier Revision: 207383
upgpkg: mesa 10.1.0-2 Rename gles/egl with mesa prefixes, add symlinks in mesa-libgl (FS#39219) Modified: mesa/trunk/PKGBUILD ----------+ PKGBUILD | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-03-08 12:43:47 UTC (rev 207382) +++ PKGBUILD 2014-03-08 13:34:29 UTC (rev 207383) @@ -5,7 +5,7 @@ pkgbase=mesa pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl') pkgver=10.1.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd') @@ -121,11 +121,14 @@ replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') 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} + # rename libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ? + mv ${pkgdir}/usr/lib/libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1.2.0 + mv ${pkgdir}/usr/lib/libEGL.so.1.0.0 ${pkgdir}/usr/lib/mesa-libEGL.so.1.0.0 + mv ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/mesa-libGLESv1_CM.so.1.1.0 + mv ${pkgdir}/usr/lib/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/mesa-libGLESv2.so.2.0.0 + rm ${pkgdir}/usr/lib/lib{GL,EGL,GLESv1_CM,GLESv2}.so* + install -m755 -d "${pkgdir}/usr/share/licenses/mesa" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" } @@ -140,9 +143,18 @@ 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.1.2.0 ${pkgdir}/usr/lib/libGL.so - 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 + ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so + 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 + ln -s mesa-libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so + ln -s mesa-libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1 + ln -s mesa-libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1.0.0 + ln -s mesa-libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so + ln -s mesa-libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1 + ln -s mesa-libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0 + ln -s mesa-libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so + ln -s mesa-libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2 + ln -s mesa-libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2.0.0 install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"