Commit graph

118 commits

Author SHA1 Message Date
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