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

mesa: add support for wayland to default version.

Browse Source 
Remove duplicated versions now that mesa and libdrm are updated.
This commit is contained in:
Carles Pagès
2013-02-18 20:32:47 +01:00
parent d32a973fc9
commit d09f2424ed
5 changed files with 8 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/mesa/9.0.x.nix
-50
View File
@@ -1,50 +0,0 @@
{ stdenv, fetchurl, autoconf, automake, autoreconfHook, libtool
, flex, bison, pkgconfig, libdrm2_4_40, file, expat, makedepend, llvm
, libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext
, libXt, udev, enableTextureFloats ? false
, python, libxml2Python, wayland }:
if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
throw "unsupported platform for Mesa"
else
let version = "9.0.2"; in
stdenv.mkDerivation {
name = "mesa-${version}";
src = fetchurl {
url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
md5 = "dc45d1192203e418163e0017640e1cfc";
};
patches =
stdenv.lib.optional (stdenv.system == "mips64el-linux") ./mips_wmb.patch;
prePatch = "patchShebangs .";
configureFlags =
" --enable-gles1 --enable-gles2 --disable-gallium-egl"
+ " --with-egl-platforms=x11,wayland,drm --enable-gbm --enable-shared-glapi"
+ " --with-gallium-drivers=i915,nouveau,r600,svga,swrast"
# Texture floats are patented, see docs/patents.txt
+ stdenv.lib.optionalString enableTextureFloats " --enable-texture-float";
buildInputs = [ autoconf automake autoreconfHook libtool
expat libdrm2_4_40 libXxf86vm libXfixes libXdamage glproto dri2proto llvm
libxml2Python libX11 libXext libxcb libXt udev wayland ];
buildNativeInputs = [ pkgconfig python makedepend file flex bison ];
enableParallelBuilding = true;
passthru = { inherit libdrm2_4_40; };
meta = {
description = "An open source implementation of OpenGL";
homepage = http://www.mesa3d.org/;
license = "bsd";
platforms = stdenv.lib.platforms.mesaPlatforms;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}
pkgs/development/libraries/mesa/default.nix
+6 -4
View File
@@ -1,7 +1,8 @@
{ stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend
, libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext
, libXt, udev, enableTextureFloats ? false, enableR600LlvmCompiler ? false
, python, libxml2Python, autoconf, automake, libtool, llvm, writeText }:
, python, libxml2Python, autoconf, automake, libtool, llvm, writeText
, wayland }:
if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
throw "unsupported platform for Mesa"
@@ -24,14 +25,15 @@ stdenv.mkDerivation {
configureFlags =
""
+ " --enable-gles1 --enable-gles2 --enable-gallium-egl"
+ " --with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast"
+ " --enable-gles1 --enable-gles2 --disable-gallium-egl"
+ " --with-egl-platforms=x11,wayland,drm --enable-gbm --enable-shared-glapi"
+ " --with-gallium-drivers=nouveau,r300,r600,svga,swrast"
+ stdenv.lib.optionalString enableR600LlvmCompiler " --enable-r600-llvm-compiler"
# Texture floats are patented, see docs/patents.txt
+ stdenv.lib.optionalString enableTextureFloats " --enable-texture-float";
buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto dri2proto
libxml2Python libX11 libXext libxcb libXt udev llvm ];
libxml2Python libX11 libXext libxcb libXt udev llvm wayland ];
buildNativeInputs = [ pkgconfig python makedepend file flex bison automake autoconf libtool ];