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

libsForQt5.qtwebengine: use ffmpeg instead of ffmpeg_3 #120646

Merged
merged 2 commits into from May 6, 2021
Merged

libsForQt5.qtwebengine: use ffmpeg instead of ffmpeg_3 #120646

merged 2 commits into from May 6, 2021

Conversation

dotlambda
Copy link
Member

@dotlambda dotlambda commented Apr 25, 2021 •
edited

Motivation for this change

#94003 and #120372

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

I did not test this cause I don't have an aarch64 machine that's powerful enough.

cc @NixOS/qt-kde

@dotlambda dotlambda requested a review from ttuegel as a code owner April 25, 2021 21:12
dotlambda
dotlambda commented Apr 25, 2021
View reviewed changes
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -159,7 +159,7 @@ qtModule {

libevent
] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
ffmpeg_3
ffmpeg
Copy link
Member Author

Choose a reason for hiding this comment

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

Does anyone know why this is only used on ARM?
Do we use a bundled Ffmpeg on other platforms? If so, we shouldn't.

Copy link
Contributor

Choose a reason for hiding this comment

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

Looking at qmakeFlags above:

  qmakeFlags = if stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64
    then [ "--" "-system-ffmpeg" ] ++ optional enableProprietaryCodecs "-proprietary-codecs"
    else optional enableProprietaryCodecs "-- -proprietary-codecs";

Maybe we shouldn't? Looks like it was changed in e01c613, but only done for aarch64 to avoid a rebuild.

It's interesting that OfBorg claims this causes 0 rebuilds...

Copy link
Member Author

@dotlambda dotlambda May 1, 2021 •
edited

Choose a reason for hiding this comment

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

Maybe we shouldn't? Looks like it was changed in e01c613, but only done for aarch64 to avoid a rebuild.

Yes, let's use system ffmpeg on all platforms.

It's interesting that OfBorg claims this causes 0 rebuilds...

That's because ofborg only checks on x86_64.

Copy link
Member

@samueldr samueldr May 1, 2021 •
edited

Choose a reason for hiding this comment

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

Nope, ofborg checks aarch64-linux too. The ^.^ check includes the list of changed paths.

The reported count, though, might be x86_64 only.

Copy link
Member Author

Choose a reason for hiding this comment

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

The reported count, though, might be x86_64 only.

That's what I meant.

@ofborg ofborg bot requested a review from matthewbauer April 25, 2021 21:21
@ghost ghost mentioned this pull request Apr 26, 2021
Closed
@dotlambda
Copy link
Member Author

Can someone explain why we're using propagatedBuildInputs?

@roberth roberth removed their request for review May 2, 2021 20:37
@dotlambda
Copy link
Member Author

I can play everything on https://tekeye.uk/html/html5-video-test-page in qutebrowser on x86_64-linux. Any objections to merging this?

@lukegb lukegb merged commit b418e17 into NixOS:master May 6, 2021
@dotlambda dotlambda deleted the qtwebengine-ffmpeg branch May 6, 2021 12:05
@dotlambda
Copy link
Member Author

Can someone explain why we're using propagatedBuildInputs?

This still bugs me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samueldr samueldr samueldr left review comments

@lukegb lukegb lukegb left review comments

@vcunat vcunat Awaiting requested review from vcunat

@rnhmjoj rnhmjoj Awaiting requested review from rnhmjoj

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

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees
No one assigned
Labels
6.topic: qt/kde 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dotlambda @samueldr @lukegb