public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Mesa to 9.0.2

Browse Source 
Also updated libdrm to 2.4.40 (not 2.4.41 because they have broken tars for that)

Removed the Mesa patch for sis video on mips64el-linux because sis is not
supported in Mesa anyway (since version 8)
This commit is contained in:
Arseniy Alekseyev 2013-01-26 19:20:56 +00:00 committed by Peter Simons
parent ad242d38f0
commit 099ccef982
3 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libdrm/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libdrm-2.4.33"; name = "libdrm-2.4.40";
src = fetchurl { src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
sha256 = "1slgi61n4dlsfli47ql354fd1ppj7n40jd94wvnsdqx0mna9syrd"; sha256 = "07xazz6flzc2khvks2cxls36sbsx0ns3x2cj499dw3za0134xha8";
}; };
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];

23
pkgs/development/libraries/mesa/default.nix
View File

@ -1,37 +1,38 @@
{ stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend { stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend
, libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext , libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext
, libXt, udev, enableTextureFloats ? false , libXt, udev, enableTextureFloats ? false
, python, libxml2Python }: , python, libxml2Python, autoconf, automake, libtool, llvm, writeText }:
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 = "8.0.5"; in let version = "9.0.2"; in
stdenv.mkDerivation { stdenv.mkDerivation rec {
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";
md5 = "01305591073a76b65267f69f27d635a3"; sha256="0knnb8srr1xbin25js4y5kmpw7xys5gh1h8hwqamayvfdkr33gvm";
}; };
patches =
stdenv.lib.optional (stdenv.system == "mips64el-linux") ./mips_wmb.patch;
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";
preConfigure = "./autogen.sh";
configureFlags = configureFlags =
" --enable-gles1 --enable-gles2 --enable-gallium-egl" ""
+ " --with-gallium-drivers=i915,nouveau,r600,svga,swrast" + " --enable-gles1 --enable-gles2 --enable-gallium-egl"
# + " --enable-r600-llvm-compiler"
+ " --with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast"
# Texture floats are patented, see docs/patents.txt # Texture floats are patented, see docs/patents.txt
+ stdenv.lib.optionalString enableTextureFloats " --enable-texture-float"; + stdenv.lib.optionalString enableTextureFloats " --enable-texture-float";
buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto dri2proto buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto dri2proto
libxml2Python libX11 libXext libxcb libXt udev ]; libxml2Python libX11 libXext libxcb libXt udev llvm ];
buildNativeInputs = [ pkgconfig python makedepend file flex bison ]; buildNativeInputs = [ pkgconfig python makedepend file flex bison automake autoconf libtool ];
enableParallelBuilding = true; enableParallelBuilding = true;

16
pkgs/development/libraries/mesa/mips_wmb.patch
View File

@ -1,16 +0,0 @@
rixed told me (viric) it's the patch to apply for mesa.
I adapted his patch for mesa 7.5 to this 7.10
diff --git a/src/mesa/drivers/dri/sis/sis_context.h b/src/mesa/drivers/dri/sis/sis_context.h
index a82a659..d8d8d9a 100644
--- a/src/mesa/drivers/dri/sis/sis_context.h
+++ b/src/mesa/drivers/dri/sis/sis_context.h
@@ -404,6 +404,8 @@ struct sis_context
#define MMIO_WMB() __asm __volatile("" : : : "memory")
#elif defined(__ia64__)
#define MMIO_WMB() __asm __volatile("mf" : : : "memory")
+#elif defined(__mips__)
+#define MMIO_WMB() __asm __volatile("" : : : "memory")
#else
#error platform needs WMB
#endif