Commit graph

26 commits

Author SHA1 Message Date
Shea Levy c514ee974a Merge remote-tracking branch 'upstream/master' into x-updates
mountall conflict was trivial

Conflicts:
	pkgs/os-specific/linux/mountall/default.nix
2012-07-14 14:24:27 -04:00
Peter Simons 281494cd51 libdrm: enable support for experimental radeon API
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 16:53:52 +02:00
Eelco Dolstra c5e63c593f * Go back to a slightly older libdrm version, otherwise Mesa's Nouveau
driver fails to build (because libdrm removed some header files on
  which it depends).

svn path=/nixpkgs/branches/x-updates/; revision=34144
2012-05-16 21:56:03 +00:00
Eelco Dolstra 3fb08e0150 * Remove obsolete flag.
svn path=/nixpkgs/branches/x-updates/; revision=34141
2012-05-16 20:48:30 +00:00
Eelco Dolstra 340afa4008 * libdrm updated to 2.4.34. Drop the Cairo dependency because it's
only used for tests (which we don't run anyway), and it will cause a
  cyclic dependency problem if we enable OpenGL support in Cairo.

svn path=/nixpkgs/branches/x-updates/; revision=34132
2012-05-15 22:12:27 +00:00
Yury G. Kudryashov ee0822153a Upgrade libdrm and mesa to the latest versions
svn path=/nixpkgs/trunk/; revision=31598
2012-01-16 17:48:33 +00:00
Peter Simons 4e5092d0c6 Revert "libdrm: updated to version 2.4.29"
This reverts commit ebe85f30fa075507313fc9dfa6ceb96501c6e332.

svn path=/nixpkgs/trunk/; revision=31537
2012-01-14 12:13:53 +00:00
Peter Simons 736b039b3f libdrm: updated to version 2.4.29
svn path=/nixpkgs/trunk/; revision=31534
2012-01-14 12:09:15 +00:00
Shea Levy e309c50e7e Get libdrm to compile on darwin
The added patch uses mach_absolute_time() to get a nanosecond-resolution monotonic clock on darwin systems (See http://developer.apple.com/library/mac/#qa/qa1398/_index.html for an understanding of the added code). In addition, the patch changes one use of clock_gettime to gettimeofday since only resolution of a second is needed at that point. This code compiles on darwin, but the resulting library is not yet tested.

svn path=/nixpkgs/trunk/; revision=28879
2011-08-29 18:55:37 +00:00
Eelco Dolstra c3e68778ae * libdrm updated to 2.4.24.
svn path=/nixpkgs/branches/x-updates/; revision=26185
2011-03-07 11:22:40 +00:00
Eelco Dolstra e9c3b7b55a * libdrm 2.4.23.
svn path=/nixpkgs/branches/x-updates/; revision=25814
2011-02-08 14:15:53 +00:00
Eelco Dolstra 40c9c60211 * libdrm updated to 2.4.22.
svn path=/nixpkgs/trunk/; revision=24256
2010-10-12 22:12:54 +00:00
Eelco Dolstra 65d9c03c9a * libdrm updated to 2.4.21.
svn path=/nixpkgs/branches/x-updates/; revision=22642
2010-07-18 21:54:57 +00:00
Eelco Dolstra 3687bc9e39 * libdrm updated to 2.4.18 ("motivated by a fix for a bug in the intel
support which was causing dramatic failures with at least version
  2.10 of the xf86-video-intel driver").

svn path=/nixpkgs/trunk/; revision=20073
2010-02-17 09:56:04 +00:00
Lluís Batlle i Rossell 9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Eelco Dolstra f189022d13 * Updated mesa to 7.6.1.
* Removed mesa-headers as it's not used anymore.

svn path=/nixpkgs/trunk/; revision=19389
2010-01-13 12:43:17 +00:00
Lluís Batlle i Rossell ca5d91aa60 Made more libraries cross compile. fontconfig, libxcb, bzip2, libdrm, zlib...
I was trying to cross compile SDL. Many dependencies work, but I ended seeing
libX11 not ready for cross compilation. Other xorg libraries cross-compile
well. libX11 may need a small patch. The problem is the usual "configure test
cannot be run in cross compilation", so the configure script halts.

I made the pkgconfig expression always return buildDrv, as I think it rarely
will be needed as buildInput. So to avoid rewriting all its mentions to use
it as buildNativeInput, I prefered this small change.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18500
2009-11-21 10:44:22 +00:00
Eelco Dolstra 28d718aceb * X.org 7.5.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18034
2009-10-29 17:56:10 +00:00
Eelco Dolstra 71f6b12135 * libdrm updated to 2.4.15.
* libpthread_stubs updated to 0.3.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18029
2009-10-29 14:52:10 +00:00
Lluís Batlle i Rossell 2eb865a98f Fixing libdrm build
svn path=/nixpkgs/branches/stdenv-updates/; revision=15198
2009-04-20 18:43:08 +00:00
Eelco Dolstra d2d05dc868 * libdrm 2.4.9.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15196
2009-04-20 18:09:15 +00:00
Eelco Dolstra 9fa8276ae5 * X.org 7.4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13006
2008-10-08 17:02:48 +00:00
Eelco Dolstra 3e19819c28 * X11R7.2 and associated updates.
svn path=/nixpkgs/trunk/; revision=8049
2007-02-26 16:32:27 +00:00
Eelco Dolstra 3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Eelco Dolstra 0bb8593bbb * libdrm updated to 2.0.
svn path=/nixpkgs/trunk/; revision=4569
2006-01-17 12:42:57 +00:00
Eelco Dolstra 018da5fbc2 * Added libdrm, required by the X Server.
svn path=/nixpkgs/trunk/; revision=4184
2005-11-01 20:27:57 +00:00