diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-02 21:25:54 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-02 21:25:54 -0300 |
commit | 8b9ddc7fec12ba69e50ece961525c90bed96df99 (patch) | |
tree | fc12914f9d27317b3d3f1df6f0009f02ebb7668a /extra/mesa/PKGBUILD | |
parent | 40134114ddb57a36863a256ffdc5b65a8edb5a67 (diff) | |
parent | d915cad658736d96368750201c34df752048751a (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/perl-berkeleydb/PKGBUILD
community/egoboo/PKGBUILD
community/kdenlive/PKGBUILD
community/postgis/PKGBUILD
core/lvm2/PKGBUILD
extra/gvfs/PKGBUILD
extra/libatasmart/PKGBUILD
extra/mesa/PKGBUILD
extra/pixman/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/system-config-printer/PKGBUILD
extra/xorg-server/PKGBUILD
kde-unstable/kdenetwork/PKGBUILD
multilib/lib32-mesa/PKGBUILD
testing/imagemagick/PKGBUILD
testing/php/PKGBUILD
testing/php/logrotate.d.php-fpm
testing/php/php-fpm.conf.in.patch
testing/php/rc.d.php-fpm
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'extra/mesa/PKGBUILD')
-rw-r--r-- | extra/mesa/PKGBUILD | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 60da603d4..dc0b3c3b0 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159247 2012-05-19 08:19:03Z andyrtr $ +# $Id: PKGBUILD 160367 2012-06-01 12:58:38Z dreisner $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> @@ -16,14 +16,15 @@ if [ "${_git}" = "true" ]; then else pkgver=8.0.3 fi -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' - 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'udev') + 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'udev>=183') [[ "$CARCH" != "mips64el" ]] && makedepends+=('llvm') url="http://mesa3d.sourceforge.net" license=('custom') -source=(LICENSE) +source=(LICENSE + mesa-8.0.3-llvm-3.1-fixes.patch) if [ "${_git}" = "true" ]; then # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') @@ -46,6 +47,8 @@ build() { fi patch -Np1 -i $srcdir/mesa-loongson.patch + patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch" + if [ "${_git}" = "true" ]; then autoreconf -vfi ./autogen.sh --prefix=/usr \ |