Commit Graph

188 Commits

Author SHA1 Message Date
Eelco Dolstra
7ff232e958 mesa: Don't depend on Wayland
NixOS currently does not have any Wayland support, so it's kinda
pointless ATM to make everything depend on it.
2014-11-06 11:02:02 +01:00
Vladimír Čunát
4fa5fffe56 mesa: bugfix update
I'm still having some problems with 10.3.1 compilation.
2014-10-19 19:31:58 +02:00
Vladimír Čunát
e90e423a26 mesa: maintenance update 2014-09-13 21:06:49 +02:00
Vladimír Čunát
381dcb1d98 various packages fixed 2014-08-30 23:30:31 +02:00
Vladimír Čunát
ead8f2ba0a mesa: bugfix update 2014-08-21 15:13:20 +02:00
Vladimír Čunát
aa0da0e1a8 mesa: bugfix update
Squashed this one as well, as mesa bugfixes tend to be very reliable.
2014-08-04 20:33:39 +02:00
Vladimír Čunát
14953d7bc9 mesa: maintenance update 10.2.3 -> .4 2014-07-20 08:40:25 +02:00
Vladimír Čunát
9a00938334 mesa: bugfix update 2014-07-09 20:47:47 +02:00
Vladimír Čunát
e80ec957f0 mesa: feature update 10.1.5 -> 10.2.2 2014-06-26 18:33:20 +02:00
Vladimír Čunát
e4dc3f8ae3 mesa: fix libGL searching for libudev
Close #2784, #2731.

I don't have a clue if using our libudev is always correct on non-nixos,
or if using /run/current-system/sw/lib/libudev would be better...
2014-06-11 07:46:15 +02:00
Vladimír Čunát
9c7dc50159 mesa: maintenance update 10.1.4 -> .5 2014-06-11 06:46:25 +02:00
Vladimír Čunát
872860e6de Merge #1187 into p/stdenv
Tested building firefox, kdelibs, evince on x86_64-linux.
2014-05-29 22:16:07 +02:00
Vladimír Čunát
d55184a8f1 mesa: maintenance update 10.1.3 -> .4 2014-05-22 21:28:38 +02:00
Vladimír Čunát
0c142b2a18 mesa: small bugfix update 10.1.2 -> .3
Mainly fixes performance regression for vmware.
2014-05-15 21:02:28 +02:00
Ricardo M. Correia
92cc5b8c0c mesa-noglu: Add support for grsecurity 2014-05-15 13:25:48 +02:00
Vladimír Čunát
6335d5bd3f mesa: bugfix update 10.1.1 -> .2
Contains many driver fixes.
2014-05-06 18:43:01 +02:00
Vladimír Čunát
85c6634eb5 mesa: major update 10.0.4 -> 10.1.1 2014-04-19 13:18:41 +02:00
Vladimír Čunát
8340454544 mesa: have all output on /run/opengl-driver{,-32}
Fixes #2242 in a different way (cleaner, I hope).
2014-04-14 21:38:23 +02:00
Vladimír Čunát
685d5a02a2 mesa: disable tests again
Still affected by https://bugs.freedesktop.org/show_bug.cgi?id=67672
2014-04-03 09:13:54 +02:00
Vladimír Čunát
7b6225c3a4 mesa: try enabling tests again
I know this doesn't really belong into this branch, but rebuilding time
is expensive (and I forgot in x-updates).

Tests do work locally for me, but we might hit that mentioned bug again.
2014-04-02 21:37:27 +02:00
Vladimír Čunát
97f1a251ed mesa: add symlinks from $out/lib/*.so to $drivers/lib
This is mainly in order for libGL to be present in /run/opengl-drivers{,-32}.
Now even with mesa drivers pkgs will use your current nixos libGL
instead of the one it was built against.

Thanks to @iElectric for suggesting this change.
2014-03-23 20:36:37 +01:00
Vladimír Čunát
ad8adf12a4 mesa: major update to 10.0.4, seems to work finally 2014-03-21 10:34:19 +01:00
Vladimír Čunát
fcaa782b6a mesa: revert to 9.2.* until the driver problems are fixed
I was unable to make the gallium drivers not to miss some LLVM RTTI stuff.
9.* don't build with llvm-3.4.
2014-02-02 10:00:56 +01:00
Vladimír Čunát
120be16479 llvm: propagate ncurses
Cf. discussion at https://github.com/NixOS/nixpkgs/commit/4eefe1a7
2014-01-28 12:47:51 +01:00
Vladimír Čunát
3555484493 mesa cleanup: remove patches, clean description
werror-wundef.patch came from #1082, but now no longer applied,
and it seems no longer necessary, as both qt5 and qtCreator build.
@bbenoist: was the patch useful for anything else?
2014-01-28 11:39:43 +01:00
Vladimír Čunát
4eefe1a779 mesa: fix build by adding ncurses
After stdenv merge it seems needed, and drivers remain linked against it.

Tests still don't link.
2014-01-24 11:17:22 +01:00
Vladimír Čunát
4caef493be Revert "mesa: try enabling checkPhase again"
I'm getting something like https://bugs.freedesktop.org/show_bug.cgi?id=52136

This reverts commit 5674fb556b.
2014-01-24 00:41:07 +01:00
Vladimír Čunát
5674fb556b mesa: try enabling checkPhase again 2014-01-23 23:02:46 +01:00
Vladimír Čunát
7e0b78f7b2 Merge master into x-updates
Conflicts (re-created on master, preserved):
	pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch
2014-01-23 22:52:18 +01:00
Vladimír Čunát
1cb146f3e1 Merge master into x-updates
Llvm refactorings from ae0c9b626f included.
Mesa is the only package using llvm_34 ATM.

Conflicts:
	pkgs/development/compilers/llvm/default.nix
2014-01-13 22:00:31 +01:00
Vladimír Čunát
8db8ccb408 mesa: bugfix update 10.0.1 -> .2 2014-01-11 19:15:58 +01:00
Vladimír Čunát
8f0656c2f7 mesa: update to 10.0.1, always enable R600
A few TODOs are pending, but of relatively low importance.
2013-12-30 21:38:46 +01:00
Vladimír Čunát
e8394e3f8c mesa: bugfix update 9.2.4 -> .5 2013-12-15 00:24:44 +01:00
Vladimír Čunát
458f17ae26 mesa: move vdpau drivers so they are found 2013-12-14 23:51:48 +01:00
Vladimír Čunát
db32c7ca8b mesa: add myself as a maintainer
When I authored much of the current expression,
I should better watch it, too.
2013-12-10 12:52:24 +01:00
Vladimír Čunát
796a60613e mesa: bugfix update 9.2.3 -> .4 2013-11-30 22:45:09 +01:00
Vladimír Čunát
b8aba318bd mesa: build libOSMesa into $osmesa output 2013-11-17 10:53:41 +01:00
Vladimír Čunát
9da8db195b mesa: minor update, enable vdpau drivers by default
It is in $drivers; it also depends on LLVM.
No testing done yet.
2013-11-16 21:35:26 +01:00
Vladimír Čunát
0ed07fdeaa mesa: disable checkPhase for the time being
The problem doesn't seem serious and it only occurs on some HW.
However, it would be best to fix this before merging into master.
2013-11-05 21:31:12 +01:00
Vladimír Čunát
f448cc022b changes proposed for 'release-13.10' into x-updates
Conflicts (simple, taking whole higher/later versions):
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/polkit/default.nix
2013-11-05 08:38:15 +01:00
Vladimír Čunát
923bd1ebf5 mesa: bugfix update 9.2.1 -> .2
On 9.2.* we seem to be hitting a [problem] on Hydra
(unlikely to be fixed by this update),
although the tests run fine on my machine.

[problem] https://bugs.freedesktop.org/show_bug.cgi?id=67672
2013-11-05 08:34:24 +01:00
Vladimír Čunát
9999ac6d89 mesa: add GLES 1 and 2 support by default
The libs have just a few kilobytes and no additional deps.
2013-11-05 08:19:23 +01:00
Vladimír Čunát
743f767bc3 Merge #1082: Update QtCreator to 2.8.1, add Qt 5.1.1 and QtSDK 2013-11-01 10:50:48 +01:00
Vladimír Čunát
23f495689e mesa: bugfix update 9.1.6 -> .7
Thist is just for master before the official release,
x-updates has 9.2.* already.
2013-11-01 10:32:24 +01:00
bbenoist
4edbaf9aa1 mesa: Minor fix on GL/gl.h
Apply a fix which prevented to use -DGL_GLEXT_LEGACY, -Werror and -Wundef
to be used together. This produced a build fail on any software meeting
these requirements.
2013-10-21 09:36:45 +02:00
Vladimír Čunát
4bcdeb49a1 mesa: update 9.1.6 -> 9.2.1, enable R600 LLVM stuff 2013-10-05 21:18:35 +02:00
Vladimír Čunát
2dc0f91806 mesa: fix the default DRI driver dir to /run/opegl-driver{,-32} 2013-09-11 11:38:15 +02:00
Vladimír Čunát
d239d24a89 mesa: bugfix update 9.1.4 -> 9.1.6 2013-08-02 17:13:54 +02:00
Eelco Dolstra
8eea8bbd1f mesa: Update to 9.1.4 2013-07-17 15:29:02 +02:00
Vladimír Čunát
e9f0d1013d qt4: maintenance update 4.8.4 -> 4.8.5
Also fixed search path for libGL.
Tested building against master.
2013-07-04 15:29:23 +02:00
Mathijs Kwik
1f4c079bc3 Re-propagate libdrm 2013-06-15 17:15:07 +04:00
Michael Raskin
7093dd2c70 Some fixes 2013-06-14 07:46:33 +04:00
Mathijs Kwik
c78ba70c2f mesa: propagate libraries
- fixes libreoffice -
2013-06-05 22:57:18 +02:00
Vladimír Čunát
14f36162d2 llvm: switch back to cmake build, so now clang builds 2013-06-01 23:36:38 +02:00
Vladimír Čunát
d9acff2128 mesa WIP: bugfix-only update, minor tweaks, prune features
Also disabled the workaround for #118.
2013-05-23 22:52:46 +02:00
Vladimír Čunát
16b2e1b46f mesa WIP: preferLocalBuild, hopefully work around 2013-05-17 17:54:12 +02:00
Vladimír Čunát
92da417fa4 mesa WIP: adding salt to restart hydra
Hydra seems to have a problem with multiple-output derivations.
2013-05-17 09:19:04 +02:00
Vladimír Čunát
6e1fa81568 mesa WIP: patch bad rounding (was OK on my HW, but not on hydra) 2013-05-16 20:35:04 +02:00
Vladimír Čunát
70882b980c WARNING: history from now is going to change (mesa+llvm)
Current WIP, only tested nouveau (3D works very well).
2013-05-16 17:16:02 +02:00
Vladimír Čunát
f5f56bd881 mesa(_noglu): a bugfix update 9.1.1 -> 9.1.2 2013-05-01 08:13:07 +02:00
Vladimír Čunát
eb2e46aab2 Merge branch 'master' into x-updates
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Carles Pagès
ceacc508dc mesa: append version of mesa_noglu to mesa buildEnv name. 2013-03-26 13:01:18 +01:00
Carles Pagès
68be54c8e2 mesa: create a buildEnv that joins mesa (without glu) and glu
Since mesa-9.x, upstream has separated mesa and glu. @peti suggested using
buildEnv to create a mesa environment that acts like old mesa, which is what
this commit does.
2013-03-24 12:36:33 +01:00
Vladimír Čunát
35f66fd74b mesa(_noglu): a bugfix update 2013-03-20 09:46:00 +01:00
Carles Pagès
8f77bc2024 mesa: revert to using gallium drivers.
I had copied the config flags for mesa from the building wayland page, but
after asking in the channel it turns out there is no technical reason for not
using the gallium drivers.
2013-03-10 23:04:24 +01:00
Carles Pagès
6c949148b6 Merge remote-tracking branch 'upstream/x-updates' into wayland
Conflicts:
	pkgs/development/libraries/mesa/default.nix
	pkgs/top-level/all-packages.nix
2013-03-10 18:19:49 +01:00
Vladimír Čunát
c3203cfc3b mesa: another update; 9.1 released now 2013-02-23 12:07:42 +01:00
Vladimír Čunát
d53899dfca mesa: bugfix update 2013-02-22 00:05:23 +01:00
Vladimír Čunát
ed740f4c95 mesa: add some missing buildInputs (failed in new stdenv) 2013-02-21 15:38:27 +01:00
Vladimír Čunát
0d72174dbd Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Carles Pagès
d09f2424ed mesa: add support for wayland to default version.
Remove duplicated versions now that mesa and libdrm are updated.
2013-02-18 20:32:47 +01:00
Carles Pagès
d32a973fc9 Merge remote-tracking branch 'upstream/x-updates' into wayland
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/wayland/default.nix
2013-02-18 20:15:59 +01:00
Peter Simons
86f8d4bfa2 mesa: add 'enableR600LlvmCompiler' flag to switch on r600-llvm-compiler support (defaults to off) 2013-01-28 17:39:29 +01:00
Peter Simons
ed7087a39b mesa: the build expression is not recursive 2013-01-28 17:38:42 +01:00
Arseniy Alekseyev
099ccef982 Updated Mesa to 9.0.2
Also updated libdrm to 2.4.40 (not 2.4.41 because they have broken tars for that)

Removed the Mesa patch for sis video on mips64el-linux because sis is not
supported in Mesa anyway (since version 8)
2013-01-28 17:32:08 +01:00
Peter Simons
ad242d38f0 Merge remote-tracking branch 'origin/master' into x-updates. 2013-01-28 17:26:32 +01:00
Carles Pagès
5cb61fd967 Update mesa to 9.0.2 and libdrm to 2.4.40. 2013-01-26 12:32:17 +01:00
Carles Pagès
7d591c23b3 Merge branch 'master' into wayland 2013-01-08 22:28:13 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Carles Pagès
5e5b676b4d Add mesa 9.0.x and corresponding libdrm.
I took most of the changes from falsifian's repo, but I want to keep mesa 9.0
as a separate expression. For now I added wayland as a mandatory dependency,
will have to fix that.
2012-12-02 12:07:35 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Eelco Dolstra
fe25e15009 mesa: Update to 8.0.5 2012-11-23 18:14:18 +01:00
Eelco Dolstra
bda3c649c4 mesa: Update to 8.0.4 2012-09-26 15:17:01 -04:00
Eelco Dolstra
5755aa2ce9 * Mesa updated to 8.0.2.
svn path=/nixpkgs/branches/x-updates/; revision=34143
2012-05-16 21:55:18 +00:00
Ludovic Courtès
04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'.
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
2012-04-23 15:47:31 +00:00
Peter Simons
87f1f70070 mesa: disabled unmaintained i965 gallium driver
svn path=/nixpkgs/trunk/; revision=31772
2012-01-21 18:47:37 +00:00
Lluís Batlle i Rossell
4a1c721c01 Changing every reference from mips64-linux to mips64el-linux. That's
what the new nix thinks the fuloong is.

Anyone having the old nix should use a nixpkgs previous to this change to build
the new nix. And then, with the new nix, he can use any newer nixpkgs revision.

svn path=/nixpkgs/trunk/; revision=31751
2012-01-21 00:34:51 +00:00
Lluís Batlle i Rossell
6945a75f7b Adding a patch for mesa, for it to build on the loongson2f.
svn path=/nixpkgs/trunk/; revision=31749
2012-01-21 00:34:30 +00:00
Yury G. Kudryashov
6957240078 Fix typo
svn path=/nixpkgs/trunk/; revision=31599
2012-01-16 17:50:54 +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
729162873e Revert "mesa: updated to version 7.11.2"
This reverts commit b18ddb0ac8bc232df2cfd2980bd22ee9beae7b12.

svn path=/nixpkgs/trunk/; revision=31536
2012-01-14 12:13:51 +00:00
Peter Simons
0819c85d91 mesa: updated to version 7.11.2
svn path=/nixpkgs/trunk/; revision=31533
2012-01-14 12:09:09 +00:00
Peter Simons
7c10cbb6c8 We cannot use thread-local store in mesa, because the rest of our xorg
installation has been built without support for it.

svn path=/nixpkgs/trunk/; revision=27788
2011-07-14 20:04:34 +00:00
Peter Simons
e7a9b41e9c mesa: enable full gallium, xcb, and egl support, and build all available dri back-ends
svn path=/nixpkgs/trunk/; revision=27786
2011-07-14 19:21:37 +00:00
Peter Simons
18bd4e67d7 mesa: add myself as a maintainer
svn path=/nixpkgs/trunk/; revision=27785
2011-07-14 19:21:33 +00:00
Peter Simons
ea27b1b042 mesa: depend on python+libxml2Python rather than depending on pythonFull
The latter package contains Tcl/Tk and whatnot else, so using that
expression as a built input was a bad idea. I'm sorry.

The dependency on talloc is gone, too. It wasn't used, apparently, but
it broke the build on Darwin because talloc doesn't compile there.

svn path=/nixpkgs/trunk/; revision=27784
2011-07-14 19:21:29 +00:00
Peter Simons
13db8d6999 mesa: updated to version 7.10.3
svn path=/nixpkgs/trunk/; revision=27778
2011-07-14 12:22:59 +00:00
Peter Simons
10b7a4fe96 mesa: updated to version 7.10.2
There changes are based on patch <http://sprunge.us/bOMG> from goibhniu.

svn path=/nixpkgs/trunk/; revision=27777
2011-07-14 12:22:55 +00:00
Eelco Dolstra
cf6bc1aeae * Apply a patch to prevent the X server from segfaulting if kwin is
run with swrast_dri (e.g. with the VGA driver).  (NixOS/121)

svn path=/nixpkgs/branches/x-updates/; revision=26201
2011-03-07 21:16:34 +00:00
Eelco Dolstra
3e9de5097d * Mesa updated to 7.10.1.
svn path=/nixpkgs/branches/x-updates/; revision=26186
2011-03-07 11:51:08 +00:00