mesa: updated to version 7.11.2

svn path=/nixpkgs/trunk/; revision=31533
This commit is contained in:
Peter Simons 2012-01-14 12:09:09 +00:00
parent 9ddd085129
commit 0819c85d91

View File

@ -1,37 +1,37 @@
{ stdenv, fetchurl, flex, bison, pkgconfig, x11, xlibs, libdrm, file, expat { stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend
, libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext
, libXt, udev
, python, libxml2Python, lipo ? null }: , python, libxml2Python, lipo ? null }:
if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
throw "unsupported platform for Mesa" throw "unsupported platform for Mesa"
else else
let version = "7.10.3"; in let version = "7.11.2"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mesa-${version}"; name = "mesa-${version}";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
sha256 = "1h451vgsfsp0h0wig66spqgxmjalsy28gvd9viynfwmq7741yw0y"; sha256 = "0msk1fh4yw4yi7z37v75vhpa23z49lkwgin6drczbihbqsl6lx2p";
}; };
patches = [ ./swrast-settexbuffer.patch ]; patches = [ ./swrast-settexbuffer.patch ];
postPatch = '' prePatch = "patchShebangs .";
find . -name "*.py" -exec sed -i -e "s|#! */usr/bin/env python|#! ${python}/bin/python|" {} +
'';
# r300
configureFlags = configureFlags =
" --with-driver=dri --enable-gl-osmesa --enable-gles1" " --with-driver=dri --enable-gl-osmesa --enable-gles1"
+ " --enable-gallium --enable-gallium-r600 --enable-gles2" + " --with-gallium-drivers=i915,i965,nouveau,r600,svga,swrast"
+ " --enable-gallium-swrast --enable-gallium-egl --disable-glx-tls" + " --enable-gles2 --enable-gallium-egl --disable-glx-tls"
+ " --enable-xcb --enable-egl --disable-glut"; + " --enable-xcb --enable-egl --disable-glut";
buildInputs = buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto dri2proto
[ pkgconfig expat x11 libdrm xlibs.makedepend xlibs.glproto libxml2Python libX11 libXext libxcb lipo libXt udev ];
xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
lipo file python libxml2Python flex bison buildNativeInputs = [ pkgconfig python makedepend file flex bison ];
];
enableParallelBuilding = true; enableParallelBuilding = true;