Author: viric
Date: Sat Jan 21 00:34:30 2012
New Revision: 31749
URL: https://nixos.org/websvn/nix/?rev=31749&sc=1
Log:
Adding a patch for mesa, for it to build on the loongson2f.
Added:
nixpkgs/trunk/pkgs/development/libraries/mesa/mips_wmb.patch
Modified:
nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix Sat Jan 21
00:26:50 2012 (r31748)
+++ nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix Sat Jan 21
00:34:30 2012 (r31749)
@@ -17,7 +17,8 @@
sha256 = "0msk1fh4yw4yi7z37v75vhpa23z49lkwgin6drczbihbqsl6lx2p";
};
- patches = [ ./swrast-settexbuffer.patch ];
+ patches = [ ./swrast-settexbuffer.patch ] ++ stdenv.lib.optional
+ (stdenv.system == "mips64-linux") ./mips_wmb.patch;
prePatch = "patchShebangs .";
Added: nixpkgs/trunk/pkgs/development/libraries/mesa/mips_wmb.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/mesa/mips_wmb.patch Sat Jan
21 00:34:30 2012 (r31749)
@@ -0,0 +1,16 @@
+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
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
