Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: libdrm, mesa: convert to meson, bump to HEAD #57562

Closed
wants to merge 1 commit into from

Conversation

colemickens
Copy link
Member

Motivation for this change

This is a WIP to get early feedback -- libdrm and mesa have switched to meson and required it when I tried to start building the upcoming release.

This is an attempt to build the same configuration options, but with meson.

There were only a few flags that were either not obvious, or didn't have an equivalent.

There are some non-trivial differences in the post-build script, though, that I think might need some scrutiny.

cc: @vcunat

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@@ -59,29 +60,25 @@ let
driDrivers =
(if dri_ == null
then optionals (elem "drm" eglPlatforms) defaultDriDrivers
else dri_) ++ lib.optional stdenv.isLinux "swrast";
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure where/when to build gallium vs dri swrast... Also, do we not want llvmpipe/softpipe in here anywhere?

# https://bugs.freedesktop.org/show_bug.cgi?id=35268
(enableFeature (!stdenv.hostPlatform.isMusl) "glx-tls")
# (optional (!stdenv.hostPlatform.isMusl) "glx-tls") #?
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure if this is still relevant, and/or what to do about it.

fi

mkdir -p $dev/lib
cp -a $out/lib/pkgconfig $dev/lib/pkgconfig
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what all is going on here and/or is necessary. I sort of hacked at this to get it to build.

@jtojnar
Copy link
Contributor

jtojnar commented Mar 15, 2019

See also #56199

@colemickens colemickens mentioned this pull request Mar 15, 2019
10 tasks
@colemickens
Copy link
Member Author

Abandoning this due to #56199 and sending as a new PR for staging up with mesa, possibly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants