diff options
Diffstat (limited to 'extra/mesa/PKGBUILD')
| -rw-r--r-- | extra/mesa/PKGBUILD | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 4fd8cbc0b..6990f754e 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186351 2013-05-25 08:49:44Z andyrtr $ +# $Id: PKGBUILD 188839 2013-06-22 10:51:37Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl') pkgver=9.1.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'llvm-amdgpu-snapshot' 'systemd') @@ -13,18 +13,21 @@ url="http://mesa3d.sourceforge.net" license=('custom') options=('!libtool') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 - #ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # for RC testing - LICENSE) + LICENSE + CVE-2013-1993.patch) md5sums=('952ccd03547ed72333b64e1746cf8ada' - '5c65a0fe315dd347e09b1f2826a1df5a') + '5c65a0fe315dd347e09b1f2826a1df5a' + 'dc8dad7c9bc6a92bd9c33b27b9da825e') -build() { +prepare() { cd ${srcdir}/?esa-* - # pick 2 commits from master to - # fix a nouveau crash: http://cgit.freedesktop.org/mesa/mesa/commit/?id=17f1cb1d99e66227d1e05925ef937643f5c1089a - # and intel kwin slowness http://cgit.freedesktop.org/mesa/mesa/commit/?id=e062a4187d8ea518a39c913ae7562cf1d8ac3205 - #patch -Np1 -i ${srcdir}/git-fixes.patch + # fix CVE-2013-1993 merged upstream + patch -Np1 -i ${srcdir}/CVE-2013-1993.patch +} + +build() { + cd ${srcdir}/?esa-* autoreconf -vfi # our automake is far too new for their build system :) @@ -60,7 +63,7 @@ build() { package_ati-dri() { pkgdesc="Mesa drivers for AMD/ATI Radeon" - depends=("mesa-libgl=${pkgver}" 'llvm-amdgpu-lib-snapshot') + depends=("mesa-libgl=${pkgver}") conflicts=('xf86-video-ati<6.9.0-6') install -m755 -d ${pkgdir}/usr/lib/vdpau/ @@ -89,7 +92,7 @@ package_intel-dri() { package_nouveau-dri() { pkgdesc="Mesa drivers for Nouveau" - depends=("mesa-libgl=${pkgver}" 'llvm-amdgpu-lib-snapshot') + depends=("mesa-libgl=${pkgver}") install -m755 -d ${pkgdir}/usr/lib/vdpau/ mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/ @@ -106,7 +109,7 @@ package_nouveau-dri() { package_svga-dri() { pkgdesc="Gallium3D VMware guest GL driver" - depends=('gcc-libs' 'libdrm' 'expat' 'libffi' 'llvm-amdgpu-lib-snapshot') + depends=('libdrm' 'expat' 'llvm-amdgpu-lib-snapshot') install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ |