Date: Tuesday, November 19, 2013 @ 19:26:48 Author: thomas Revision: 101206
upgpkg: lib32-mesa 9.2.3-2: change mesa-libgl and *-dri to make replacing mesa-libgl easier This is the same as commit svn-packages/mesa@199795 Modified: lib32-mesa/trunk/PKGBUILD ----------+ PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-19 15:27:48 UTC (rev 101205) +++ PKGBUILD 2013-11-19 18:26:48 UTC (rev 101206) @@ -5,7 +5,7 @@ pkgbase=lib32-mesa pkgname=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa' 'lib32-mesa-libgl') pkgver=9.2.3 -pkgrel=1 +pkgrel=2 arch=('x86_64') makedepends=('python2' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-elfutils' 'lib32-llvm' 'lib32-systemd') @@ -55,7 +55,7 @@ package_lib32-ati-dri() { pkgdesc="Mesa drivers for AMD/ATI Radeon (32-bit)" - depends=("lib32-mesa-libgl=${pkgver}" 'lib32-libtxc_dxtn' 'ati-dri') + depends=('lib32-mesa-libgl' "lib32-mesa=${pkgver}" 'lib32-libtxc_dxtn' 'ati-dri') install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{r200,r300,r600,radeon,radeonsi}_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri/ @@ -69,7 +69,7 @@ package_lib32-intel-dri() { pkgdesc="Mesa DRI drivers for Intel (32-bit)" - depends=("lib32-mesa-libgl=${pkgver}" 'lib32-libtxc_dxtn' 'intel-dri') + depends=('lib32-mesa-libgl' "lib32-mesa=${pkgver}" 'lib32-libtxc_dxtn' 'intel-dri') install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri/ @@ -80,7 +80,7 @@ package_lib32-nouveau-dri() { pkgdesc="Mesa drivers for Nouveau (32-bit)" - depends=("lib32-mesa-libgl=${pkgver}" 'lib32-libtxc_dxtn' 'nouveau-dri') + depends=('lib32-mesa-libgl' "lib32-mesa=${pkgver}" 'lib32-libtxc_dxtn' 'nouveau-dri') install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/nouveau_{dri,vieux_dri}.so ${pkgdir}/usr/lib32/xorg/modules/dri/ @@ -102,6 +102,7 @@ mv -v ${srcdir}/fakeinstall/* ${pkgdir} 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} rm -r ${pkgdir}/etc rm -r ${pkgdir}/usr/include