From 9cb5285c0aee6adad68343f0babbe6fa53ce5aa7 Mon Sep 17 00:00:00 2001
From: Dan Callahan <dan.callahan@gmail.com>
Date: Sat, 26 Sep 2020 08:36:14 +0100
Subject: [PATCH 1/2] 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 819bb63d5c1ff038f7cd39bb0fa7a4f9564ce000

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.
---
 pkgs/development/libraries/libqtav/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix
index 43489e8e850..fc577d7e508 100644
--- a/pkgs/development/libraries/libqtav/default.nix
+++ b/pkgs/development/libraries/libqtav/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, lib, fetchFromGitHub, extra-cmake-modules
 , qtbase, qtmultimedia, qtquick1, qttools
 , libGL, libX11
-, libass, openal, ffmpeg_3, libuchardet
+, libass, openal, ffmpeg, libuchardet
 , alsaLib, libpulseaudio, libva
 }:
 
@@ -9,19 +9,19 @@ with lib;
 
 mkDerivation rec {
   pname = "libqtav";
-  version = "1.12.0";
+  version = "git-2020-09-10";
 
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [
     qtbase qtmultimedia qtquick1
     libGL libX11
-    libass openal ffmpeg_3 libuchardet
+    libass openal ffmpeg libuchardet
     alsaLib libpulseaudio libva
   ];
 
   src = fetchFromGitHub {
-    sha256 = "03ii9l38l3fsr27g42fx4151ipzkip2kr4akdr8x28sx5r9rr5m2";
-    rev = "v${version}";
+    sha256 = "0qwrk40dihkbwmm7krz6qaqyn9v3qdjnd2k9b4s3a67x4403pib3";
+    rev = "2a470d2a8d2fe22fae969bee5d594909a07b350a";
     repo = "QtAV";
     owner = "wang-bin";
     fetchSubmodules = true;
@@ -46,6 +46,5 @@ mkDerivation rec {
     homepage = "http://www.qtav.org/";
     maintainers = [ maintainers.jraygauthier ];
     platforms = platforms.linux;
-    broken = !(lib.versionOlder qtbase.version "5.13");
   };
 }

From c4c101e41410689ffbbb04dbd36c0e6ea7e18c16 Mon Sep 17 00:00:00 2001
From: Dan Callahan <dan.callahan@gmail.com>
Date: Sat, 26 Sep 2020 08:38:59 +0100
Subject: [PATCH 2/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 5194e7c0cbb4601df1a57531bf5955c35bbf4314
---
 pkgs/applications/graphics/digikam/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 2c0dbd5f3f0..cdd428a29c7 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -32,6 +32,7 @@
 , libkipi
 , libksane
 , liblqr1
+, libqtav
 , libusb1
 , marble
 , libGL
@@ -72,6 +73,7 @@ mkDerivation rec {
     libkipi
     libksane
     liblqr1
+    libqtav
     libusb1
     libGL
     libGLU