From 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Fri, 27 Dec 2013 23:55:53 +0000 Subject: Fri Dec 27 23:54:04 UTC 2013 --- extra/mesa/PKGBUILD | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'extra/mesa/PKGBUILD') diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 96a771563..d83c26897 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198319 2013-10-30 14:08:41Z allan $ +# $Id: PKGBUILD 201668 2013-12-17 21:04:31Z lcarlier $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke pkgbase=mesa pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl') -pkgver=9.2.2 +pkgver=10.0.1 pkgrel=1 arch=('i686' 'x86_64') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' @@ -13,7 +13,7 @@ url="http://mesa3d.sourceforge.net" license=('custom') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 LICENSE) -md5sums=('20887f8020db7d1736a01ae9cd5d8c38' +md5sums=('0a72ca5b36046a658bf6038326ff32ed' '5c65a0fe315dd347e09b1f2826a1df5a') build() { @@ -53,12 +53,12 @@ build() { package_ati-dri() { pkgdesc="Mesa drivers for AMD/ATI Radeon" - depends=("mesa-libgl=${pkgver}") + depends=('mesa-libgl' "mesa=${pkgver}") optdepends=('libtxc_dxtn: S3 Texture Compressed support') conflicts=('xf86-video-ati<6.9.0-6') install -m755 -d ${pkgdir}/usr/lib/vdpau/ - mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_{r300,r600,radeonsi}.* ${pkgdir}/usr/lib/vdpau/ + mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_{r600,radeonsi}.* ${pkgdir}/usr/lib/vdpau/ install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{r200,r300,r600,radeon,radeonsi}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ @@ -73,7 +73,7 @@ package_ati-dri() { package_intel-dri() { pkgdesc="Mesa drivers for Intel" optdepends=('libtxc_dxtn: S3 Texture Compressed support') - depends=("mesa-libgl=${pkgver}") + depends=('mesa-libgl' "mesa=${pkgver}") install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ @@ -85,7 +85,7 @@ package_intel-dri() { package_nouveau-dri() { pkgdesc="Mesa drivers for Nouveau" optdepends=('libtxc_dxtn: S3 Texture Compressed support') - depends=("mesa-libgl=${pkgver}") + depends=('mesa-libgl' "mesa=${pkgver}") install -m755 -d ${pkgdir}/usr/lib/vdpau/ mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/ @@ -96,9 +96,6 @@ package_nouveau-dri() { install -m755 -d ${pkgdir}/usr/lib/gallium-pipe mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib/gallium-pipe/ - # vdpau drivers are still buggy with nouveau, so remove them (FS#36754) - rm -rf ${pkgdir}/usr/lib/vdpau/ - install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/" } @@ -128,6 +125,7 @@ package_mesa() { 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} install -m755 -d "${pkgdir}/usr/share/licenses/mesa" -- cgit v1.2.3-54-g00ecf