diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-17 00:11:55 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-17 00:11:55 -0300 |
commit | b3d851540186419305a4b89ba8e5320f4e7fa56d (patch) | |
tree | 4d8a05d5b84a06b60b56343950ab1a7f88e831ea /multilib-testing/lib32-mesa/PKGBUILD | |
parent | fdd03e5ecce11853fa939682ed87e938605d36be (diff) | |
parent | 7d13548d48c1e98b9c12201685fd6fef5e9388db (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/autocutsel/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-mesa/PKGBUILD
Diffstat (limited to 'multilib-testing/lib32-mesa/PKGBUILD')
-rw-r--r-- | multilib-testing/lib32-mesa/PKGBUILD | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD index 3bd351707..5bc9b7c23 100644 --- a/multilib-testing/lib32-mesa/PKGBUILD +++ b/multilib-testing/lib32-mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44674 2011-04-10 20:53:16Z lcarlier $ +# $Id: PKGBUILD 45021 2011-04-14 09:13:42Z lcarlier $ # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -6,25 +6,25 @@ pkgbase=lib32-mesa pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri' 'lib32-nouveau-dri') -#_git=true -_git=false +_git=true +#_git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.0.git20110215 + pkgver=7.10.99.git20110412 else pkgver=7.10.2 fi -pkgrel=2 -arch=(x86_64 'mips64el') -makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.23' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' +pkgrel=1 +arch=(x86_64) +makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.25' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev') url="http://mesa3d.sourceforge.net" license=('custom') if [ "${_git}" = "true" ]; then - # mesa git shot from 7.10 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=cc1636b6db85604510f97f8a37d7fd0ecf453866 - source=('ftp://ftp.archlinux.org/other/mesa/mesa-cc1636b6db85604510f97f8a37d7fd0ecf453866.tar.bz2') - md5sums=('f0d9daab4aaaacfd3b756dcb23b268af') + # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f05751aa2af1a8ec83c2d110385aab1b7e735238 + source=('ftp://ftp.archlinux.org/other/mesa/mesa-f05751aa2af1a8ec83c2d110385aab1b7e735238.tar.bz2') + md5sums=('56d8862d1155f7e8054f9aa7f93ebebc') else source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" nouveau-fix-header.patch) md5sums=('f5de82852f1243f42cc004039e10b771' '67c87b77cc2236b52a3b47dad3fbb5d4') @@ -42,7 +42,9 @@ build() { cd "${srcdir}/Mesa-${pkgver}" fi - patch -Np1 -i "${srcdir}/nouveau-fix-header.patch" + if [ "${_git}" != "true" ]; then + patch -Np1 -i "${srcdir}/nouveau-fix-header.patch" + fi if [ "${_git}" = "true" ]; then ./autogen.sh --prefix=/usr \ @@ -86,7 +88,7 @@ build() { } package_lib32-libgl() { - depends=('lib32-libdrm>=2.4.23' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-gcc-libs>=4.5' 'libgl') + depends=('lib32-libdrm>=2.4.25' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-gcc-libs>=4.5' 'libgl') pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)" if [ "${_git}" = "true" ]; then @@ -144,10 +146,12 @@ package_lib32-libegl() { fi install -m755 -d "${pkgdir}/usr/lib32" - install -m755 -d "${pkgdir}/usr/lib32/egl" install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/" - bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/" + if [ "${_git}" != "true" ]; then + install -m755 -d "${pkgdir}/usr/lib32/egl" + bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/" + fi bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/" install -m755 -d "${pkgdir}/usr/share/licenses/libegl" @@ -155,7 +159,7 @@ package_lib32-libegl() { } package_lib32-mesa() { - depends=('lib32-libgl' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' 'mesa') + depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-libdrm>=2.4.25' 'lib32-gcc-libs>=4.5' 'mesa') pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)" if [ "${_git}" = "true" ]; then |