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

Update mesa to 9.0.2 and libdrm to 2.4.40.

Browse Source
This commit is contained in:
Carles Pagès 2013-01-26 12:32:17 +01:00
parent 29150b43a3
commit 5cb61fd967
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libdrm/2.4.39.nix → pkgs/development/libraries/libdrm/2.4.40.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.39"; 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 = "0gbk598li3nlyjvyqilg931i4yy7skp1rs7d2v54nl40i4w1fsrq"; sha256 = "07xazz6flzc2khvks2cxls36sbsx0ns3x2cj499dw3za0134xha8";
}; };
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];

10
pkgs/development/libraries/mesa/9.0.x.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoconf, automake, autoreconfHook, libtool { stdenv, fetchurl, autoconf, automake, autoreconfHook, libtool
, flex, bison, pkgconfig, libdrm2_4_39, file, expat, makedepend, llvm , flex, bison, pkgconfig, libdrm2_4_40, file, expat, makedepend, llvm
, 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, wayland }: , python, libxml2Python, wayland }:
@ -8,14 +8,14 @@ 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 = "9.0.1"; in let version = "9.0.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";
md5 = "97d6554c05ea7449398afe3a0ede7018"; md5 = "dc45d1192203e418163e0017640e1cfc";
}; };
patches = patches =
@ -31,14 +31,14 @@ stdenv.mkDerivation {
+ stdenv.lib.optionalString enableTextureFloats " --enable-texture-float"; + stdenv.lib.optionalString enableTextureFloats " --enable-texture-float";
buildInputs = [ autoconf automake autoreconfHook libtool buildInputs = [ autoconf automake autoreconfHook libtool
expat libdrm2_4_39 libXxf86vm libXfixes libXdamage glproto dri2proto llvm expat libdrm2_4_40 libXxf86vm libXfixes libXdamage glproto dri2proto llvm
libxml2Python libX11 libXext libxcb libXt udev wayland ]; libxml2Python libX11 libXext libxcb libXt udev wayland ];
buildNativeInputs = [ pkgconfig python makedepend file flex bison ]; buildNativeInputs = [ pkgconfig python makedepend file flex bison ];
enableParallelBuilding = true; enableParallelBuilding = true;
passthru = { inherit libdrm2_4_39; }; passthru = { inherit libdrm2_4_40; };
meta = { meta = {
description = "An open source implementation of OpenGL"; description = "An open source implementation of OpenGL";

2
pkgs/top-level/all-packages.nix
View File

@ -4178,7 +4178,7 @@ let
inherit (xorg) libpthreadstubs; inherit (xorg) libpthreadstubs;
}; };
libdrm2_4_39 = callPackage ../development/libraries/libdrm/2.4.39.nix { libdrm2_4_40 = callPackage ../development/libraries/libdrm/2.4.40.nix {
inherit fetchurl stdenv pkgconfig; inherit fetchurl stdenv pkgconfig;
inherit (xorg) libpthreadstubs; inherit (xorg) libpthreadstubs;
}; };