Commit Graph

325 Commits

Author SHA1 Message Date
John Ericson
ba52ae5048 treewide: isArm -> isAarch32
Following legacy packing conventions, `isArm` was defined just for
32-bit ARM instruction set. This is confusing to non packagers though,
because Aarch64 is an ARM instruction set.

The official ARM overview for ARMv8[1] is surprisingly not confusing,
given the overall state of affairs for ARM naming conventions, and
offers us a solution. It divides the nomenclature into three levels:

```
ISA:             ARMv8   {-A, -R, -M}
                 /    \
Mode:     Aarch32     Aarch64
             |         /   \
Encoding:   A64      A32   T32
```

At the top is the overall v8 instruction set archicture. Second are the
two modes, defined by bitwidth but differing in other semantics too, and
buttom are the encodings, (hopefully?) isomorphic if they encode the
same mode.

The 32 bit encodings are mostly backwards compatible with previous
non-Thumb and Thumb encodings, and if so we can pun the mode names to
instead mean "sets of compatable or isomorphic encodings", and then
voilà we have nice names for 32-bit and 64-bit arm instruction sets
which do not use the word ARM so as to not confused either laymen or
experienced ARM packages.

[1]: https://developer.arm.com/products/architecture/a-profile
2018-04-25 15:28:55 -04:00
Will Dietz
f07f0c6009 Merge remote-tracking branch 'origin/master' into staging 2018-04-24 19:58:44 -05:00
Will Dietz
64c2e058e6 mesa, libglvnd, xorg: disable tls w/musl 2018-04-24 17:16:22 -05:00
David McFarland
ee1778de78 mesa_drivers: fix drirc install path
This will install drirc to the location where mesa expects to find it.

You can test with:

    LIBGL_DEBUG=1 glxgears

An error message will be printed if drirc can't be found.
2018-04-21 11:42:06 -03:00
Will Dietz
bf44cf71b7 mesa: 17.3.7 -> 17.3.8
https://www.mesa3d.org/relnotes/17.3.8.html

Remove upstreamed portion of musl patch,
always add remaining fix (missing include).
2018-04-05 11:41:49 -05:00
Will Dietz
231cdaf159 mesa: 17.3.6 -> 17.3.7 2018-04-03 08:11:26 -05:00
Jan Malakhovski
c7cf808ff8 libva: make libva-full the default
It seems that all uses of `libva` it in nixpkgs except `mesa` and itself actually
either will gain from using `libva-full` instead of `libva-minimal` by default
or simply won't care.
2018-03-26 14:02:06 +03:00
Nikolay Amiantov
6bf1421f13 treewide: refactor to use libglvnd
* Implement libGL as a symlink package which uses libraries from libglvnd and
  headers from Mesa (since ones from libglvnd are outdated).
* Use libGL_driver.driverLink treewide; add FHS paths where possible.
2018-03-26 14:01:49 +03:00
Nikolay Amiantov
803e87aa1e mesa_noglu: build virgl driver
It's used for 3D acceleration inside qemu.
2018-03-26 14:01:49 +03:00
Nikolay Amiantov
03a6766a6d mesa_noglu: build with libglvnd 2018-03-26 14:01:49 +03:00
Jan Malakhovski
7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Vladimír Čunát
04c31a5de1
libGL rename: fallout after a week on master
and a few nitpicks.
2018-03-05 14:53:38 +01:00
Vladimír Čunát
6a9ab8db11
mesa: 17.3.5 -> 17.3.6 (bugfix)
It's emergency bugfix for intel.
2018-03-03 11:14:50 +01:00
Vladimír Čunát
ddb422714d
mesa: 17.3.3 -> 17.3.5 (maintenance) 2018-02-24 22:30:13 +01:00
Will Dietz
1289cdaf75 mesa: patch to fix w/musl 2018-02-13 09:44:53 -06:00
Vladimír Čunát
b91e846639
mesa: 17.2.8 -> 17.3.3
TODO: verify that S3TC works without adding libtxc*,
and clean all the related code.
2018-01-21 11:01:47 +01:00
David McFarland
af32623d04 mesa: set sysconfdir to /run/opengl-driver/etc
This allows drirc to be found.
2018-01-07 21:31:33 -04:00
Samuel Dionne-Riel
7b97c8c0c8 treewide: homepage+src updates (found by repology, #33263) 2018-01-05 20:42:46 +01:00
Vladimír Čunát
0e8283370b
mesa: 17.2.7 -> 17.2.8 (maintenance) 2017-12-29 10:01:21 +01:00
Vladimír Čunát
21ba964f0b
mesa: maintenance 17.2.6 -> 17.2.7 2017-12-16 17:51:17 +01:00
Vladimír Čunát
6a71852630
mesa: maintenance 17.2.4 -> 17.2.6 2017-11-27 13:05:52 +01:00
Orivej Desh
1f78f9fb7a mesa: replace dead https link 2017-11-13 17:50:34 +00:00
Vladimír Čunát
41267f612f
mesa: maintenance 17.2.2 -> 17.2.4 2017-10-30 22:35:54 +01:00
Vladimír Čunát
e9a1663f8c
mesa: don't build "svga" gallium driver on ARM
https://bugs.freedesktop.org/show_bug.cgi?id=102232#c1
Don't cause a rebuild on non-ARM.
2017-10-10 20:34:38 +02:00
Vladimír Čunát
0df6a8fbe3
Merge #30196: mesa: 17.1.10 -> 17.2.2 2017-10-08 18:22:49 +02:00
Gabriel Ebner
e16d95b686 mesa: 17.1.10 -> 17.2.2 2017-10-07 15:54:51 +02:00
John Ericson
f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Vladimír Čunát
332dc7c719
mesa: maintenance 17.1.9 -> 17.1.10 2017-09-25 21:50:10 +02:00
John Ericson
03d3788cdf mesa: Recategorize dependencies 2017-09-21 15:49:55 -04:00
Vladimír Čunát
9d6ac8eada
mesa: maintenance 17.1.8 -> 17.1.9 2017-09-09 07:54:46 +02:00
Vladimír Čunát
6d2d7d5f46
mesa: maintenance 17.1.7 -> 17.1.8 2017-09-03 10:53:26 +02:00
Vladimír Čunát
aa1e535b1b
mesa: maintenance 17.1.6 -> 17.1.7 2017-08-27 22:30:28 +02:00
Vladimír Čunát
f21cd84885
mesa: maintenance 17.1.5 -> 17.1.6 2017-08-13 14:45:47 +02:00
Vladimír Čunát
3d1266fcbd
mesa: maintenance 17.1.4 -> 17.1.5 2017-07-15 12:28:25 +02:00
Vladimír Čunát
c73f0caea5
mesa: maintenance 17.1.2 -> 17.1.4
The announcement seems safe, as usual.

Hydra's Darwin machines will be busy for quite some time on staging,
so let me squeeze this, as it will only be mass rebuild on *-linux.
2017-07-03 20:12:23 +02:00
Vladimír Čunát
a38b0d000c
mesa: maintenance 17.1.1 -> 17.1.2 2017-06-11 09:45:54 +02:00
Linus Heckemann
3729247acd mesa: add valgrind support 2017-06-06 10:12:40 +01:00
Vladimír Čunát
1f407a46d6
mesa: feature update 17.0.6 -> 17.1.1
Main changes: https://www.mesa3d.org/relnotes/17.1.0.html
- two options got renamed
- "ilo" driver was removed upstream
- python is no longer needed for build

I tested nouveau for a bit.
2017-05-28 10:43:53 +02:00
Vladimír Čunát
fcdb4b51f8
mesa: maintenance 17.0.5 -> 17.0.6 2017-05-14 14:36:54 +02:00
Vladimír Čunát
5725505967
mesa: maintenance 17.0.4 -> 17.0.5 2017-05-06 11:57:02 +02:00
Vladimír Čunát
69c3f280a1
mesa: maintenance 17.0.3 -> 17.0.4 2017-04-18 18:35:56 +02:00
David McFarland
f2655dd0c7 mesa: patch vulkan manifests when any driver is enabled 2017-04-10 00:17:36 +03:00
Vladimír Čunát
969849acf8
mesa: maintenance 17.0.2 -> 17.0.3 2017-04-03 11:24:50 +02:00
Tuomas Tynkkynen
adb460b30f mesa: Enable imx gallium driver on ARM
And lighten the aarch64 build by disabling drivers for hardware that
doesn't run on aarch64 processors.
2017-03-30 02:56:10 +03:00
Vladimír Čunát
39eda57d2a
mesa: maintenance 17.0.1 -> 17.0.2 2017-03-21 20:11:31 +01:00
Nikolay Amiantov
328bcdae25 mesa: enable texture floats only for drivers
To be on more safe side. This shouldn't matter theoretically as nothing in core
Mesa depends on them.
2017-03-21 21:56:42 +03:00
Nikolay Amiantov
261d7caed7 mesa: enable texture floats by default 2017-03-21 15:51:35 +03:00
Vladimír Čunát
b86b7c04a3
Merge branch 'master' into staging 2017-03-07 21:59:32 +01:00
Vladimír Čunát
17b64e8929
mesa: maintenance 17.0.0 -> 17.0.1 2017-03-07 21:48:18 +01:00
Thomas Tuegel
eccc1fa9bb
mesa: allow overriding driver compilation 2017-03-03 10:01:34 -06:00
Tuomas Tynkkynen
da1f93f445 mesa: Remove obsolete patching
The code we're patching was removed in 2015:

http://comments.gmane.org/gmane.comp.video.mesa3d.devel/102524
2017-02-16 01:29:42 +02:00
Tuomas Tynkkynen
4d54324f7c mesa: 13.0.4 -> 17.0.0
Also enable the etnaviv driver on ARM, which got added in this release
(and I've confirmed that it can run glmark2 relatively successfully).
2017-02-16 01:29:42 +02:00
Vladimír Čunát
6bea415b5e
Merge branch 'master' into staging 2017-02-09 08:42:04 +01:00
David McFarland
4ab604b6b8 mesa: add enableRadv 2017-02-08 22:15:03 -04:00
Vladimír Čunát
35dffbdf54
mesa: maintenance 13.0.3 -> 13.0.4 2017-02-05 14:29:46 +01:00
Tuomas Tynkkynen
ef089634bf mesa: Enable some ARM drivers
And disable freedreno from others since it's not useful there.
2017-01-29 02:08:04 +02:00
Vladimír Čunát
1f7b090580
mesa: maintenance 13.0.2 -> 13.0.3 2017-01-06 21:05:08 +01:00
Vladimír Čunát
2587611ed5
mesa: maintenance 13.0.1 -> 13.0.2 2016-11-28 21:44:15 +01:00
Moritz Ulrich
bc2fb9b2fe
mesa_noglu: Fix search paths for libvulkan_intel.so 2016-11-21 21:14:55 +01:00
Vladimír Čunát
c2d05207a3
mesa: drop systemd build-time dependency
After the update dropping libudev (upstream) there's no use for it.
2016-11-14 23:53:58 +01:00
rnhmjoj
a0fa2eca17
mesa: 12.0.1 -> 13.0.1 2016-11-14 15:46:33 +01:00
Benjamin Saunders
5e45a6ce8f mesa: enable intel vulkan driver 2016-10-26 19:07:26 -07:00
Frederik Rietdijk
77dacee416 mesa: use python2
since there is still code that is not compatible with Python 3.x and the
following issue occurs as well
https://bugs.freedesktop.org/show_bug.cgi?id=95338
2016-10-18 23:14:35 +02:00
Vladimír Čunát
fffc7638cd Merge branch 'master' into staging 2016-09-24 18:54:31 +02:00
Eelco Dolstra
28a659974a mesa_noglu: Replace some more hard links with symlinks
By deduplicating libXvMC*.so and {r600,radionsi}_drv_video.so, this
reduces the size of the drivers output from 63.3 MiB to 49.8 MiB.
2016-09-22 15:07:41 +02:00
Vladimír Čunát
ca0e798e50 mesa: 12.0.2 -> 12.0.3
> This is an emergency release addressing a number of regressions
> across all devices using the i965 driver.
2016-09-16 22:16:14 +02:00
Vladimír Čunát
13bf68cc6a mesa: maintenance 12.0.1 -> 12.0.2 2016-09-10 12:01:51 +02:00
Eelco Dolstra
78178d5854 systemd: Separate lib output
This moves libsystemd.so and libudev.so into systemd.lib, and gets rid
of libudev (which just contained a copy of libudev.so and the udev
headers). It thus reduces the closure size of all packages that
(indirectly) depend on libsystemd, of which there are quite a few (for
instance, PulseAudio and dbus). For example, it reduces the closure of
Blender from 430.8 to 400.8 MiB.
2016-09-05 19:17:14 +02:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Shea Levy
8b9b9fad31 Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""
Revert a revert of a merge that shouldn't have been in master but was intentionally in staging.

Next time I'll do this right after the revert instead of so far down the line...

This reverts commit 9adad8612b.
2016-08-24 07:35:30 -04:00
Shea Levy
9adad8612b Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
Was meant to go into staging, sorry

This reverts commit 57b2d1e9b0, reversing
changes made to 760b2b9048.
2016-08-15 19:05:52 -04:00
rnhmjoj
7d0f05f22c
mesa: 11.2.2 -> 12.0.1 2016-08-13 03:46:47 +02:00
Vladimír Čunát
50f909cf93 mesa: have vdpau drivers in lib/vdpau again
This was done by @abbradar 364f297bb2 but I lost that change by accident
when doing large closure-size merges 39ebb01d.
Fortunately it seems to have caused no problems, likely because
${mesa_drivers}/lib gets into $LD_LIBRARY_PATH.
2016-08-07 12:14:16 +02:00
Vladimír Čunát
73e1242172 mesa: vdpau symlinks, broken after 1a52fdc
Fixes #17559.
Using *relative* symlinks doesn't break when moving the files.
2016-08-07 11:33:20 +02:00
Vladimír Čunát
0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Eelco Dolstra
1a52fdc3c6 mesa: Use symlinks instead of hard links for the DRI/vdpau drivers
This reduces the size of the drivers output from 193 MiB to 44 MiB.

@vcunat
2016-05-22 23:05:10 +02:00
Vladimír Čunát
61f63d5ddc mesa: feature update 11.1.3 -> 11.2.2 2016-05-22 12:10:39 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Vladimír Čunát
aa711c58bf mesa: maintenance update 11.1.2 -> 11.1.3
There's also 11.2.1, but I don't have time to test ATM,
and such a change might be risky without any testing.
2016-04-20 16:39:49 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Vladimír Čunát
f4cb39c3d3 mesa: maintenance update 11.1.1 -> 11.1.2 2016-03-28 14:02:36 +02:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Vladimír Čunát
e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
Tomas Hlavaty
976895c0d0 mesa: remove broken dependency on libdrm_intel on armv7l-linux
does this work for other arm systems or should it be applied for
system.isArm?
2016-02-14 23:45:32 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Nikolay Amiantov
de26cac3cb mesa: 11.0.8 -> 11.1.1 2016-01-26 14:27:49 +03:00
Nikolay Amiantov
364f297bb2 mesa: leave vdpau libraries in lib/vdpau 2016-01-26 04:30:26 +03:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Vladimír Čunát
08dd527cc7 Merge branch 'staging'
http://hydra.nixos.org/eval/1234895
The mass errors on Hydra seem transient; I verified ghc on i686-linux.
Only darwin jobs are queued ATM. There's a libpng security update
included in this merge, so I don't want to wait too long.
2015-12-29 17:14:35 +01:00
Yann Hodique
bc6e050f21 mesa: add download url (close #11942)
vcunat refactored a bit (too long line, etc.) and reordered the URLs.
2015-12-29 14:23:41 +01:00
Vladimír Čunát
a6b34b3bfd mesa: maintenance updates 11.0.5 -> 11.0.8 2015-12-21 14:28:49 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III
0ba740d26b mesa: 11.0.4 -> 11.0.5 2015-11-11 15:45:15 -08:00
William A. Kennington III
00c9039141 mesa: 11.0.3 -> 11.0.4 2015-10-30 18:07:41 -07:00
Vladimír Čunát
f4fb1d7753 mesa: maintenance update 11.0.2 -> 11.0.3 2015-10-15 20:52:30 +02:00
Vladimír Čunát
7434b8c29f mesa: fixup with multiple outputs 2015-10-04 10:03:55 +02:00
Vladimír Čunát
b44d846990 udev: complete rework
- systemd puts all into one output now (except for man),
  because I wasn't able to fix all systemd/udev refernces
  for NixOS to work well
- libudev is now by default *copied* into another path,
  which is what most packages will use as build input :-)
- pkgs.udev = [ libudev.out libudev.dev ]; because there are too many
  references that just put `udev` into build inputs (to rewrite them all),
  also this made "${udev}/foo" fail at *evaluation* time
  so it's easier to catch and change to something more specific
2015-10-04 10:03:53 +02:00
Vladimír Čunát
f361938b21 Merge staging into closure-size
This makes gcc5 the default builder, etc.
2015-10-03 15:23:13 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
William A. Kennington III
cfba54975e mesa: 10.6.8 -> 11.0.2 2015-09-30 16:18:36 -07:00