diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-15 10:55:52 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-15 10:55:52 +0100 |
| commit | 1f8bbc40bc42f162b7b62e0dca5176ba3d0b39a4 (patch) | |
| tree | b19a7be5f8a23cdf854c9694f968a531244204d2 /extra/mesa/PKGBUILD | |
| parent | 2e3ca4b49391dc8484dd6064828ee42cbe66ed03 (diff) | |
| parent | eebfa6ebe1522831767019e496b0c094b2e15a5c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/audex/PKGBUILD
community/gimp-ufraw/PKGBUILD
community/ogmrip/PKGBUILD
community/oss/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/soundkonverter/PKGBUILD
core/iptables/PKGBUILD
core/libffi/PKGBUILD
extra/clamav/PKGBUILD
extra/ecasound/PKGBUILD
extra/mariadb/PKGBUILD
extra/mesa/PKGBUILD
Diffstat (limited to 'extra/mesa/PKGBUILD')
| -rw-r--r-- | extra/mesa/PKGBUILD | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index ea074d552..ff38eff10 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178616 2013-02-25 20:44:59Z andyrtr $ +# $Id: PKGBUILD 180010 2013-03-14 16:21:55Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('mesa' 'mesa-libgl') pkgver=9.1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' 'wayland') @@ -18,8 +18,10 @@ 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 + git-fixes.patch LICENSE) md5sums=('d3891e02215422e120271d976ff1947e' + 'c3e45fe7287bbf8f620c209a872330dc' '5c65a0fe315dd347e09b1f2826a1df5a') build() { @@ -31,7 +33,10 @@ build() { extraconf="" fi -# patch -Np1 -i ${srcdir}/git_fixes.diff + # 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 autoreconf -vfi # our automake is far too new for their build system :) |