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.

Sign up for GitHub

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

Jump to bottom

libva: make libva-full the default #35115

Closed
wants to merge 31 commits into from
Closed

libva: make libva-full the default #35115

wants to merge 31 commits into from

Conversation

oxij
Copy link
Member

@oxij oxij commented Feb 18, 2018

Motivation for this change

Side-effect of me making kodi play torrent streams (will PR when this gets merged and staging gets merged into master).

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.

They way it was recursively defined with overrides before was also very
confusing.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
  • Tested compilation of most 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/)
  • Fits CONTRIBUTING.md.

@oxij oxij force-pushed the pkgs/libva-full-by-default branch 2 times, most recently from 7e45b8e to 7c0bd6c Compare March 6, 2018 14:19
@oxij
Copy link
Member Author

oxij commented Mar 6, 2018

ping @vcunat because its related to libGL

@oxij oxij force-pushed the pkgs/libva-full-by-default branch from 7c0bd6c to 290789d Compare March 13, 2018 23:11
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: libva

Partial log (click to expand)

these paths will be fetched (5.28 MiB download, 20.36 MiB unpacked):
  /nix/store/b0ig9w3qqi4jm61pv13szrdam17b2prb-libva-2.1.0-dev
  /nix/store/b9wzy0qbkja3mmm6iqx0fdpvs4ghmavz-libva-2.1.0
  /nix/store/nabyf16xkk5aag6ijn8k242lm3gyxx2p-libdrm-2.4.90
  /nix/store/p59wbsv95bqapd9mpilcrdpcfv4bxldg-glibc-2.26-131
copying path '/nix/store/p59wbsv95bqapd9mpilcrdpcfv4bxldg-glibc-2.26-131' from 'https://cache.nixos.org'...
copying path '/nix/store/nabyf16xkk5aag6ijn8k242lm3gyxx2p-libdrm-2.4.90' from 'https://cache.nixos.org'...
copying path '/nix/store/b9wzy0qbkja3mmm6iqx0fdpvs4ghmavz-libva-2.1.0' from 'https://cache.nixos.org'...
copying path '/nix/store/b0ig9w3qqi4jm61pv13szrdam17b2prb-libva-2.1.0-dev' from 'https://cache.nixos.org'...
/nix/store/b0ig9w3qqi4jm61pv13szrdam17b2prb-libva-2.1.0-dev

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: libva

Partial log (click to expand)

  /nix/store/dl8wxdwa49ss60fhdvpgjzs7h9nyshx2-libva-2.1.0
  /nix/store/dry822m1h3n0wxpxwrl4hrh857mvm33c-libva-2.1.0-dev
  /nix/store/k94rhaa7r7fsmii17qvsn5llzmhqpkwk-libpciaccess-0.14
  /nix/store/v7c35fsdilaw9awdiphy00vd9zsb9sr2-libdrm-2.4.90
copying path '/nix/store/84h2zni7h805k0i1ys2bba3dsp1cqnhh-glibc-2.26-131' from 'https://cache.nixos.org'...
copying path '/nix/store/k94rhaa7r7fsmii17qvsn5llzmhqpkwk-libpciaccess-0.14' from 'https://cache.nixos.org'...
copying path '/nix/store/v7c35fsdilaw9awdiphy00vd9zsb9sr2-libdrm-2.4.90' from 'https://cache.nixos.org'...
copying path '/nix/store/dl8wxdwa49ss60fhdvpgjzs7h9nyshx2-libva-2.1.0' from 'https://cache.nixos.org'...
copying path '/nix/store/dry822m1h3n0wxpxwrl4hrh857mvm33c-libva-2.1.0-dev' from 'https://cache.nixos.org'...
/nix/store/dry822m1h3n0wxpxwrl4hrh857mvm33c-libva-2.1.0-dev

@oxij
Copy link
Member Author

oxij commented Mar 15, 2018

@vcunat @garbas ping! Just look at the master, more and more things get libva = libva-full every week.

@garbas
Copy link
Member

garbas commented Mar 15, 2018

i'm +0 on this. i would let @vcunat decide.

@oxij oxij mentioned this pull request Mar 20, 2018
Closed
8 tasks
abbradar
abbradar approved these changes Mar 20, 2018
View reviewed changes
Copy link
Member

@abbradar abbradar left a comment

Choose a reason for hiding this comment

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

I can merge this with my libglvnd changes as related in the staging batch. Note to myself: check for new packages using libva before merging.

@oxij oxij force-pushed the pkgs/libva-full-by-default branch 2 times, most recently from d859e79 to 7ef85a8 Compare March 20, 2018 22:35
@oxij
Copy link
Member Author

oxij commented Mar 20, 2018 via email

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: libva

Partial log (click to expand)

shrinking /nix/store/3rqdf4qbh5fhr7kpyy7j7xan55g5my52-libva-full-2.1.0/lib/libva-wayland.so.2.100.0
shrinking /nix/store/3rqdf4qbh5fhr7kpyy7j7xan55g5my52-libva-full-2.1.0/lib/libva-glx.so.2.100.0
shrinking /nix/store/3rqdf4qbh5fhr7kpyy7j7xan55g5my52-libva-full-2.1.0/lib/libva-x11.so.2.100.0
shrinking /nix/store/3rqdf4qbh5fhr7kpyy7j7xan55g5my52-libva-full-2.1.0/lib/libva-drm.so.2.100.0
shrinking /nix/store/3rqdf4qbh5fhr7kpyy7j7xan55g5my52-libva-full-2.1.0/lib/libva.so.2.100.0
strip is /nix/store/ijmisi52n5wbwybg5ldysa6af01zy5dl-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/3rqdf4qbh5fhr7kpyy7j7xan55g5my52-libva-full-2.1.0/lib
patching script interpreter paths in /nix/store/3rqdf4qbh5fhr7kpyy7j7xan55g5my52-libva-full-2.1.0
checking for references to /build in /nix/store/3rqdf4qbh5fhr7kpyy7j7xan55g5my52-libva-full-2.1.0...
/nix/store/q9n0bhawc5z8prh5h9bgrpvq6jc28b98-libva-full-2.1.0-dev

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: libva

Partial log (click to expand)

cannot build derivation '/nix/store/lrdf86c7vrdypjxmsda8ih2chx6qmxic-libXxf86vm-1.1.4.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/wh90qqrx80pr0n3y3n6a7j2q0269fgql-libvdpau-1.1.1.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/k3vrawbmaakcdcla8gq2jr7iacg20vrb-libXt-1.1.5.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/8hn6p7irm9pgn8mjswsklxlddzx41gl9-libXvMC-1.0.10.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/kdnf1sjyx27klnjgxz4lh3amxz3qr2ix-libarchive-3.3.2.drv': 12 dependencies couldn't be built
cannot build derivation '/nix/store/mzx994bv038h7pns60js15i1ifg4vczb-cmake-3.10.2.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/rpnz45in5lkdjp5r2glvllx9b0b203ip-llvm-5.0.1.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/rxvw8saysxb7i8ql0azmfj2w98zyfjdb-mesa-noglu-17.3.6.drv': 33 dependencies couldn't be built
cannot build derivation '/nix/store/ryy3l65z0xmb50zxx6vxk3xdsf817rid-libva-full-2.1.0.drv': 12 dependencies couldn't be built
error: build of '/nix/store/ryy3l65z0xmb50zxx6vxk3xdsf817rid-libva-full-2.1.0.drv' failed

@oxij oxij force-pushed the pkgs/libva-full-by-default branch from 7ef85a8 to ccf15a3 Compare March 26, 2018 00:09
@oxij oxij requested a review from ttuegel as a code owner March 26, 2018 00:09
oxij and others added 20 commits March 26, 2018 01:11
@oxij
qemu: fix options
fb3782c
@abbradar @oxij
glxinfo: fix build
c5fa31f
@abbradar @oxij
xorg: update autogeneration script
23a0be9 
* Fix shebang so that it's usable on NixOS;
* Enable warnings (they were enabled with Perl flag before);
* Switch from mesa to libGL.
@abbradar @oxij
nixos: xserver: cleanup LD_LIBRARY_PATH
9f3a21a 
X libraries in LD_LIBRARY_PATH seem to not be needed anymore.
I've tracked this addition as far as I could
(02cef04) and they seem to be added for unfree
NVIDIA and ATI drivers but at least for NVIDIA they are not needed anymore. We
can add them with patchelf instead if it turns out to be the case with ATI.
@abbradar @oxij
xorg.xorgserver: don't use XORG_DRI_DRIVER_PATH
1b96af4 
Our patch which adds this envvar has been removed.
@abbradar @oxij
nixos: qemu-vm: quote arguments in qemu runner
a058e30
@abbradar @oxij
gtk3: fix build
731f961
@abbradar @oxij
qt5.qtwebengine: fix build
373fdad
@abbradar @oxij
fbida: fix build
b1df037
@abbradar @oxij
cogl: fix build
b88581c
@abbradar @oxij
intel-gpu-tools: enable parallel building
8104a6a
@abbradar @oxij
nixos: opengl: don't override mesa non-drivers in runtime
cc9d875
@abbradar @oxij
primusLib: fix path to libglapi
73c1667
@abbradar @oxij
steam: add libGL to the environment
db17970 
Also remove duplicate libGLU.
@abbradar @oxij
bumblebee: remove X libraries from LD_LIBRARY_PATH
6fc3469 
They seem to no longer be needed.
@oxij
spice-gtk: fix build
16936fd
@oxij
webkitgtk218x: fix build
2d545bf
@oxij
kodi: fix build
a870d67
@oxij
nvidia_x11.settings: fix build
8bf9416
@oxij
libva: make libva-full the default
ea7ef75 
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.
@oxij oxij force-pushed the pkgs/libva-full-by-default branch from ccf15a3 to ea7ef75 Compare March 26, 2018 01:15
@oxij
Copy link
Member Author

oxij commented Mar 26, 2018 via email

@abbradar
Copy link
Member

Merged into staging, thanks!

@abbradar abbradar closed this Mar 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abbradar abbradar abbradar approved these changes

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

Assignees
No one assigned
Labels
6.topic: nixos 6.topic: qt/kde 6.topic: steam 8.has: clean-up 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@oxij @GrahamcOfBorg @garbas @abbradar