diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-16 17:48:33 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-16 17:48:33 +0000 |
commit | ee0822153a33dc87269b4e41661d7b3b9e199800 (patch) | |
tree | aedf66891aa01f879677efe37dea094e72bc149e /pkgs/development/libraries/libdrm | |
parent | 81b4eef864edabd9ea3f470ced3d090703dd7e5e (diff) |
Upgrade libdrm and mesa to the latest versions
svn path=/nixpkgs/trunk/; revision=31598
Diffstat (limited to 'pkgs/development/libraries/libdrm')
-rw-r--r-- | pkgs/development/libraries/libdrm/default.nix | 29 | ||||
-rw-r--r-- | pkgs/development/libraries/libdrm/libdrm-apple.patch | 2 |
2 files changed, 17 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index d37b7dd0b7fb3..7c0127bf71008 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,28 +1,31 @@ -{stdenv, fetchurl, pkgconfig, libpthreadstubs}: +{stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, cairo, udev}: -stdenv.mkDerivation (rec { - name = "libdrm-2.4.24"; +stdenv.mkDerivation rec { + name = "libdrm-2.4.29"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "19dnzy7g6jqfjz38dp187b97vb4a8h4k748x56gsyn24ys0j60f7"; + sha256 = "0bj5ihmnzpbbgdrvp5f8bgsk0k19haixr893449pjd4k7v4jshz2"; }; - buildInputs = [ pkgconfig libpthreadstubs ]; + buildNativeInputs = [ pkgconfig ]; + buildInputs = [ libpthreadstubs libpciaccess cairo udev ]; - patches = [ ./libdrm-apple.patch ]; + patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch; - preConfigure = '' - # General case: non intel. - if test -n "$crossConfig"; then - configureFlags="$configureFlags --disable-intel"; - fi - '' + stdenv.lib.optionalString stdenv.isDarwin + preConfigure = stdenv.lib.optionalString stdenv.isDarwin "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; + configureFlags = [ "--enable-nouveau-experimental-api" "--enable-udev" ] + ++ stdenv.lib.optional stdenv.isDarwin "-C"; + + crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ]; + meta = { homepage = http://dri.freedesktop.org/libdrm/; description = "Library for accessing the kernel's Direct Rendering Manager"; license = "bsd"; + maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.linux; }; -} // (stdenv.lib.optionalAttrs stdenv.isDarwin { configureFlags = [ "-C" ]; })) +} diff --git a/pkgs/development/libraries/libdrm/libdrm-apple.patch b/pkgs/development/libraries/libdrm/libdrm-apple.patch index e9fd63c5faec0..17b447789c2f0 100644 --- a/pkgs/development/libraries/libdrm/libdrm-apple.patch +++ b/pkgs/development/libraries/libdrm/libdrm-apple.patch @@ -2,9 +2,9 @@ diff -Naur libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c libdrm-2.4.26/intel/intel --- libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c 2011-04-01 10:30:51.000000000 -0400 +++ libdrm-2.4.26/intel/intel_bufmgr_gem.c 2011-08-29 02:17:20.000000000 -0400 @@ -51,6 +51,7 @@ - #include <sys/mman.h> #include <sys/stat.h> #include <sys/types.h> + #include <stdbool.h> +#include <sys/time.h> #include "errno.h" |