From c80552b41838a5668458ebb1eb9b0f44ea6fe879 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 18 Jun 2011 23:03:19 +0000 Subject: Sat Jun 18 23:03:19 UTC 2011 --- multilib/lib32-mesa/PKGBUILD | 59 +++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 20 deletions(-) (limited to 'multilib/lib32-mesa/PKGBUILD') diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD index 489fd3703..b787a2a8b 100644 --- a/multilib/lib32-mesa/PKGBUILD +++ b/multilib/lib32-mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44674 2011-04-10 20:53:16Z lcarlier $ +# $Id: PKGBUILD 49474 2011-06-17 12:06:33Z lcarlier $ # Contributor: Jan de Groot # Contributor: Andreas Radke @@ -10,24 +10,24 @@ pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dr _git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.0.git20110215 + pkgver=7.10.99.git20110616 else - pkgver=7.10.2 + pkgver=7.10.3 fi -pkgrel=2 +pkgrel=1 arch=(x86_64) -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' -'lib32-gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev') +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') # 'lib32-llvm' 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 mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe + source=('ftp://ftp.archlinux.org/other/mesa/mesa-fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe.tar.bz2') + md5sums=('f9cf11f9fd8f5d2092536fc48fad922f') else - source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" nouveau-fix-header.patch) - md5sums=('f5de82852f1243f42cc004039e10b771' '67c87b77cc2236b52a3b47dad3fbb5d4') + source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.zip" nouveau-fix-header.patch) + md5sums=('614d063ecd170940d9ae7b355d365d59' '67c87b77cc2236b52a3b47dad3fbb5d4') fi build() { @@ -37,31 +37,43 @@ build() { if [ "${_git}" = "true" ]; then cd ${srcdir}/mesa-* + # for our llvm-config for 32 bit :( + export PATH="/usr/lib32/llvm:$PATH" + # fix linking with llvmpipe driver + sed -i -e 's:LD=g++:LD=g++ -m32:' src/gallium/drivers/llvmpipe/Makefile autoreconf -vfi else 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 \ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --enable-gallium-radeon \ + --enable-gallium-r300 \ --enable-gallium-r600 \ --enable-gallium-nouveau \ + --enable-gallium-llvm \ + --enable-gallium-egl \ --enable-gallium-swrast \ --enable-glx-tls \ --with-driver=dri \ --enable-xcb \ - --with-state-trackers=dri,glx \ + --with-state-trackers=dri,glx,egl \ --disable-glut \ --enable-gles1 \ --enable-gles2 \ --enable-egl \ - --disable-gallium-egl \ + --enable-texture-float \ + --enable-shared-dricore \ --enable-32-bit \ --libdir=/usr/lib32 + # --enable-gallium-svga \ + # --enable-shared-dricore - link DRI modules with shared core DRI routines[default=disabled] http://bugs.gentoo.org/show_bug.cgi?id=357177 + # --enable-shared-glapi EXPERIMENTAL. Enable shared glapi for OpenGL[default=no] else ./configure --prefix=/usr \ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ @@ -86,7 +98,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 @@ -99,6 +111,10 @@ package_lib32-libgl() { install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions" bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/" + if [ "${_git}" = "true" ]; then + bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/" + bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/" + fi if [ "${_git}" = "true" ]; then make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install @@ -139,15 +155,18 @@ package_lib32-libegl() { if [ "${_git}" = "true" ]; then cd ${srcdir}/mesa-* + make -C src/gallium/targets/egl DESTDIR="${pkgdir}" install else cd "${srcdir}/Mesa-${pkgver}" 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 +174,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 @@ -180,7 +199,7 @@ package_lib32-mesa() { package_lib32-ati-dri() { depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)" + pkgdesc="Mesa DRI radeon/r200 + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)" conflicts=('xf86-video-ati<6.9.0-6') if [ "${_git}" = "true" ]; then -- cgit v1.2.3-54-g00ecf