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

libqtav: 1.12.0 -> git-2020-09-10 #98796

Merged
merged 2 commits into from Sep 26, 2020
Merged

libqtav: 1.12.0 -> git-2020-09-10 #98796

merged 2 commits into from Sep 26, 2020

Conversation

callahad
Copy link
Member

Motivation for this change

This un-breaks libqtav by upgrading it to the current upstream HEAD.
Previously, Qtav was broken by the Qt 5.12 -> 5.14 migration (#84232).
See commit 819bb63

This patch also re-adds libqtav to digikam's list of dependencies,
restoring support for video playback.
This effectively reverts commit 5194e7c

As digikam is currently the only derivation that references libqtav,
upgrading to an pre-release revision poses minimal risk.

Lastly, this un-pins ffmpeg_3; libqtav works fine with current ffmpeg.

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.

@callahad callahad mentioned this pull request Sep 25, 2020
Merged
10 tasks
@jonringer
Copy link
Contributor

@GrahamcOfBorg eval

@ofborg ofborg bot requested a review from jraygauthier September 26, 2020 00:43
@AndersonTorres
Copy link
Member

Can you split the PR in two commits, one for each file?

@callahad
libqtav: 1.12.0 -> git-2020-09-10
9cb5285 
This un-breaks libqtav by upgrading it to the current upstream HEAD.
Previously, Qtav was broken by the Qt 5.12 -> 5.14 migration (NixOS#84232).
See commit 819bb63

This also un-pins ffmpeg_3; libqtav works fine with current ffmpeg.

Digikam is the only derivation in nixpkgs that has referenced libqtav, thus
upgrading to a pre-release revision poses minimal risk.
@callahad
digikam: unbreak media playback
c4c101e 
This patch re-adds libqtav to digikam's list of dependencies, restoring
support for video playback in the application.
This effectively reverts commit 5194e7c
@callahad
Copy link
Member Author

@AndersonTorres Done 🙂

@ttuegel ttuegel merged commit d0636ea into NixOS:master Sep 26, 2020
@ttuegel
Copy link
Member

ttuegel commented Sep 26, 2020

Thanks!

@callahad callahad deleted the qtav branch September 26, 2020 12:50
@jraygauthier
Copy link
Member

Good job 👍

viric pushed a commit to viric/nixpkgs that referenced this pull request Jan 6, 2021
@ttuegel @viric
Merge pull request NixOS#98796 from callahad/qtav
fe0470a 
libqtav: 1.12.0 -> git-2020-09-10
(cherry picked from commit d0636ea)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ttuegel ttuegel ttuegel approved these changes

@jraygauthier jraygauthier Awaiting requested review from jraygauthier

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@callahad @jonringer @AndersonTorres @ttuegel @jraygauthier