Commit graph

423 commits

Author SHA1 Message Date
ash lea 1b3ba289b2 mesa: fix datadir location 2021-07-24 15:11:58 +02:00
github-actions[bot] 6d11e6d03e
Merge master into staging-next 2021-07-17 00:01:37 +00:00
TredwellGit 79a4590495 steamPackages.steam-fhsenv: fix Proton
LLVM must match version required by Mesa.

Fixes https://github.com/NixOS/nixpkgs/issues/127068
2021-07-16 15:13:31 -07:00
Michael Weiss b5a7a474d1
mesa: 21.1.4 -> 21.1.5 2021-07-15 11:41:34 +02:00
Michael Weiss f7997354b7
wayland-scanner: use for nativeBuildInputs
This makes things more explicit (and less confusing) but only touches
the packages that I maintain.
2021-07-03 17:56:23 +02:00
Michael Weiss e23145b62a
mesa: 21.1.3 -> 21.1.4 2021-07-01 13:13:43 +02:00
Michael Weiss ecbe6c123f
mesa: 21.1.2 -> 21.1.3
I've also updated the URL for the RISC-V patch in case the content of
the old URL will change (not sure if that's possible after a merge
request is merged but now that the patch is upstream it seems like a
good idea regardless; and the content has actually already changed so
the old hash wasn't correct anymore).
2021-06-18 22:58:15 +02:00
Zhaofeng Li f885e987ef mesa: Add patch for RISC-V driver selection 2021-06-12 23:17:13 -07:00
Zhaofeng Li 1f007dd009 Use lib.meta.availableOn for optional Valgrind dependency 2021-06-12 23:17:13 -07:00
Jonathan Ringer 012a33b0de mesa: fix darwin build 2021-06-06 22:31:19 -07:00
Michael Weiss 70029711d4
mesa: 21.1.1 -> 21.1.2 2021-06-02 23:09:36 +02:00
Michael Weiss e56bed6bdb
mesa: 21.0.3 -> 21.1.1
Note: This update likely causes some issues when running an application
that has a direct dependency on Mesa (e.g. Sway and XWayland) and was
compiled against a different Nixpkgs revision. See 7106fca0fe for more
details regarding that issue.
2021-05-24 18:43:28 +02:00
Michael Weiss 7106fca0fe
mesa: 21.0.1 -> 21.0.3
Note: The update to Mesa 21.0.2 was reverted (25ae1fd29f) because it
caused major issues with Sway (segfault on startup [0]).
This is still the case and might affect all packages that directly
depend on "mesa" (for libgbm or libglapi) but it only causes issues when
the package depends on a "mesa" version that differs from "mesa.drivers"
used for "/run/opengl-driver/". I've noticed this while testing Mesa
updates with the NixOS option "hardware.opengl.package" (as usual)
instead of rebuilding my whole system (which would work). Unfortunately
this can/will likely also cause issues when mixing different channels,
using Flakes/Overlays, etc.

The cause of this should be similar to [1] ("mesa" updates now cause the
same issues that "glibc" updates already do, maybe triggered by certain
Mesa changes) and some additional discussions is in [2],[3].

Note: Don't backport this to NixOS 21.05, at least not without careful
consideration.

[0]: https://github.com/NixOS/nixpkgs/pull/118753#issuecomment-818950977
[1]: https://github.com/NixOS/nixpkgs/issues/95808
[2]: https://github.com/NixOS/nixpkgs/pull/120325
[3]: https://github.com/NixOS/nixpkgs/pull/119558
2021-05-20 18:59:09 +02:00
Michael Weiss ba7ede846b
mesa: Cleanup enableRadv (not used anymore) 2021-05-20 18:59:09 +02:00
Alyssa Ross 31c5b4fe9b mesa: don't manually enableParallelBuilding
This is automatic for Meson builds.
2021-05-12 11:57:35 +00:00
John Ericson 96f700fc24 mesa: Fix build
Needed more LLVM outputs
2021-04-30 22:08:26 +00:00
Las e22d1d37cc mesa: Don't fail to build when d3d isn't built 2021-04-28 21:10:58 +00:00
Michael Weiss 25ae1fd29f
Revert "mesa: 21.0.1 -> 21.0.2"
This reverts commit e3bc983d8f.

It caused segmentation faults for at least Sway and XWayland with the
iris driver, see [0]. The cause and impact of this regression is still
unknown but let's revert it until we know more.

[0]: https://github.com/NixOS/nixpkgs/pull/118753#issuecomment-818950977
2021-04-13 20:36:45 +02:00
Gabriel Ebner acbfd3f7c0 mesa: add driversdev output and test that dev doesn't depend on drivers
OpenGL applications should not depend on the Mesa drivers, since these
are supposed to be loaded at runtime from /run/opengl-driver using the
glvnd library.  Furthermore, the drivers output has a large closure
since it depends on LLVM.

The only dependency from dev to drivers came from the xatracker
pkg-config file.  This commit moves this file into a new
output called driversdev.
2021-04-09 09:26:12 +02:00
Gabriel Ebner 4bff6d04e4 libGL: use headers from glvnd
The glvnd library contains a copy of the OpenGL headers.  By compiling
against the glvnd headers we completely avoid a dependency on Mesa (and
LLVM).  This reduces rebuild time.  It also prevents accidents, such as
where some packages kept a reference to the mesa.drivers output and thus
had all Mesa drivers in their runtime closure.
2021-04-09 09:24:24 +02:00
Michael Weiss e3bc983d8f
mesa: 21.0.1 -> 21.0.2 2021-04-07 20:34:37 +02:00
Michael Weiss 8cd7e290e4
mesa: 20.3.5 -> 21.0.1 (#109319) 2021-03-25 15:34:08 +01:00
Michael Weiss f6e726a3db
mesa: 20.3.4 -> 20.3.5 (#117513) 2021-03-25 14:54:04 +01:00
Ivan Babrou 5363f1714b mesa: fix missing timespec_get on aarch64-darwin
This doesn't affect any other target.

See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1020
2021-02-20 10:03:52 -08:00
Michael Weiss d51b3b7413
mesa: 20.3.3 -> 20.3.4 (#111202) 2021-01-30 01:00:41 +01:00
zowoq 153ad8bc1e Merge staging-next into staging 2021-01-22 16:56:40 +10:00
Ben Siraphob 66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
Jan Tojnar fc7bd322df
Merge branch 'staging-next' into staging 2021-01-19 13:50:04 +01:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Michael Weiss 79851ec593
mesa: 20.3.2 -> 20.3.3 (#109310)
The "util: Disable memstream for Apple builds" patch got backported:
6a006c3567
2021-01-14 12:12:21 +01:00
Michael Weiss 16cf68dc7a
mesa: 20.3.1 -> 20.3.2 (#108152)
This also applies the macOS patch unconditionally to avoid breakages in
the future.
2021-01-01 20:08:54 +01:00
Ryan Burns 7115040e19 mesa: fix build on darwin
Latest mesa requires macOS SDK 10.13 - this applies an upstream
patch for compatibility with 10.13

Applied on darwin only to avoid linux rebuilds in staging-next - left a
note that this can be done unconditionally as it has no effect on
non-darwin platforms, if this would be considered more robust.
2020-12-31 09:11:38 +01:00
Michael Weiss af9f917ce1
mesa: 20.3.0 -> 20.3.1 2020-12-17 12:01:08 +01:00
Michael Weiss 3106113c9e
mesa: Drop all old patches
There's no need to keep the expressions for old patches around.
Also: Apply the musl patch unconditionally to ensure that it doesn't
break after future updates.
2020-12-17 12:01:03 +01:00
Michael Weiss a9385a730b
mesa: 20.2.4 -> 20.3.0 2020-12-17 11:51:02 +01:00
Vladimír Čunát 37dfd61f02
mesa: fix musl-specific patching
When updating to 20.2, this was apparently forgotten.
2020-12-13 11:36:18 +01:00
Vladimír Čunát e955c4315f
Merge #106804: mesa: find prefixed nm when cross compiling 2020-12-13 11:06:17 +01:00
Atemu 01698009ac mesa: find prefixed nm when cross compiling 2020-12-13 08:08:02 +01:00
Michael Weiss 8c19846912
mesa: 20.2.3 -> 20.2.4 (#105959) 2020-12-05 13:26:32 +01:00
Michael Weiss f2ff3a7867
mesa: 20.2.2 -> 20.2.3 (#104789) 2020-11-25 12:23:02 +01:00
Michael Weiss 971aef5e08
mesa: 20.2.1 -> 20.2.2 (#103174) 2020-11-09 10:59:34 +01:00
Vladimír Čunát 336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Vladimír Čunát c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Vladimír Čunát 17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Andreas Rammhold 250fb4611f
Merge pull request #100456 from maralorn/boolToString
treewide: De-inline uses of lib.boolToString
2020-10-25 00:45:11 +02:00
Michael Weiss b13615663c
mesa: 20.1.9 -> 20.2.1 (#99091)
Announcements:
- https://docs.mesa3d.org/relnotes/20.2.0.html
- https://docs.mesa3d.org/relnotes/20.2.1.html

I've rebased the patches accordingly and avoided:
meson.build:320: WARNING: Platform `surfaceless` is now always selected; setting this option will be an error in Mesa 20.3
meson.build:324: WARNING: Platform `drm` is now automatically selected; setting this option will be an error in Mesa 20.3
This will also fix the list in the configuration summary:
EGL/Vulkan/VL platforms:   x11 surfaceless wayland drm surfaceless drm
2020-10-15 16:08:01 +02:00
Malte Brandy cebf9198f3
treewide: De-inline uses of lib.boolToString
This commit should not change eval results
2020-10-14 01:46:17 +02:00
Michael Weiss e991a1ea1f
mesa: 20.1.8 -> 20.1.9 (#99291) 2020-10-01 17:58:27 +02:00
Michael Weiss 6343fb95c6
mesa: 20.1.7 -> 20.1.8 (#98154) 2020-09-17 14:24:33 +02:00
Michael Weiss 5f29a2b2ee mesa: 20.1.6 -> 20.1.7 2020-09-04 20:00:58 +02:00