Date: Wednesday, March 12, 2014 @ 16:29:34 Author: lcarlier Revision: 207582
upgpkg: mesa 10.1.0-3 Move mesa gl libs in mesa subdir Modified: mesa/trunk/PKGBUILD ----------+ PKGBUILD | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-03-12 13:10:24 UTC (rev 207581) +++ PKGBUILD 2014-03-12 15:29:34 UTC (rev 207582) @@ -5,7 +5,7 @@ pkgbase=mesa pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl') pkgver=10.1.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd') @@ -121,14 +121,12 @@ replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') mv -v ${srcdir}/fakeinstall/* ${pkgdir} - # 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 + install -m755 -d ${pkgdir}/usr/lib/mesa + # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ? + mv -v ${pkgdir}/usr/lib/libGL.so* ${pkgdir}/usr/lib/mesa/ + mv -v ${pkgdir}/usr/lib/libEGL.so* ${pkgdir}/usr/lib/mesa/ + mv -v ${pkgdir}/usr/lib/libGLES*.so* ${pkgdir}/usr/lib/mesa/ - 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/" } @@ -143,19 +141,22 @@ 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-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 + ln -s /usr/lib/mesa/libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0 + ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1 + ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so + ln -s /usr/lib/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1.1.0 + ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1 + ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so + + ln -s /usr/lib/mesa/libGLESv1-CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1-CM.so.1.1.0 + ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1-CM.so.1 + ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1-CM.so + + ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2.0.0 + ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2 + ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so + install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/" }