diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 12:18:02 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 12:18:02 -0300 |
| commit | bf1c001b59869cf10e5921b4f38d1f69db2db76c (patch) | |
| tree | a472ad2701076586f54fbd0859fe2e5c8311184b /extra/mesa/PKGBUILD | |
| parent | aebba8cfcb8c0ef8befa351c73fbd228e07475e2 (diff) | |
| parent | 1512c792951d7fbd2c9c336f9bf35654bbb85cc6 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/cdemu-daemon/60-vhba.rules
community-testing/cdemu-daemon/PKGBUILD
community-testing/cdemu-daemon/cdemud.install
community/guake/PKGBUILD
core/openssl/PKGBUILD
extra/mesa/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/folks/PKGBUILD
gnome-unstable/gjs/PKGBUILD
gnome-unstable/gnome-online-accounts/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-openssl/PKGBUILD
testing/dhcpcd/PKGBUILD
Diffstat (limited to 'extra/mesa/PKGBUILD')
| -rw-r--r-- | extra/mesa/PKGBUILD | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index b0baea6c1..7dbd1da55 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153288 2012-03-12 20:52:15Z andyrtr $ +# $Id: PKGBUILD 154038 2012-03-21 20:31:55Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> @@ -14,9 +14,9 @@ if [ "${_git}" = "true" ]; then pkgver=7.10.99.git20110709 #pkgver=7.11 else - pkgver=8.0.1 + pkgver=8.0.2 fi -pkgrel=2 +pkgrel=1 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' 'python2' 'libxml2' 'imake' 'udev' 'dri2proto>=2.6') @@ -37,7 +37,8 @@ fi source+=(mesa-loongson.patch) md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' '24eeebf66971809d8f40775a379b36c9' - '598c24dccfcdcc99c07d883f7c09f36a') + '598c24dccfcdcc99c07d883f7c09f36a' + 'a368104e5700707048dc3e8691a9a7a1') build() { cd ${srcdir}/?esa-* @@ -88,7 +89,7 @@ fi package_libgl() { depends=('libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs') pkgdesc="Mesa 3-D graphics library and DRI software rasterizer" - replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') +# replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') [[ "$CARCH" != "mips64el" ]] && depends+=('libdrm>=2.4.31') cd ${srcdir}/?esa-* |