Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 99f235b3457e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d0636ea72ed6
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 26, 2020

  1. libqtav: 1.12.0 -> git-2020-09-10 

    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 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
    callahad committed Sep 26, 2020
    Copy the full SHA
    9cb5285 View commit details
    Browse the repository at this point in the history

  2. digikam: unbreak media playback 

    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
    callahad committed Sep 26, 2020
    Copy the full SHA
    c4c101e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #98796 from callahad/qtav 

    libqtav: 1.12.0 -> git-2020-09-10
    @ttuegel
    ttuegel committed Sep 26, 2020
    Copy the full SHA
    d0636ea View commit details
    Browse the repository at this point in the history