From 4f1bd8e4abfe973a51edece5f4c63571d4a28388 Mon Sep 17 00:00:00 2001
From: Mio <mio@mio19.uk>
Date: Fri, 14 Aug 2026 11:32:18 +1000
Subject: [PATCH] openshot-qt: fix build, 3.5.1-unstable-2026-04-22 ->
 3.5.1-unstable-2026-07-23

---
 pkgs/by-name/li/libopenshot/package.nix | 31 +++++++++++++++++++++----
 pkgs/by-name/op/openshot-qt/package.nix |  6 ++---
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/li/libopenshot/package.nix b/pkgs/by-name/li/libopenshot/package.nix
index 1eec1eaf174e..db0c8c55b496 100644
--- a/pkgs/by-name/li/libopenshot/package.nix
+++ b/pkgs/by-name/li/libopenshot/package.nix
@@ -3,15 +3,22 @@
   stdenv,
   fetchFromGitHub,
   alsa-lib,
+  catch2_3,
   cmake,
   cppzmq,
+  ctestCheckHook,
   doxygen,
-  ffmpeg,
+  # FIXME: unpin when libopenshot supports ffmpeg 9 (AVCodec.{pix_fmts,sample_fmts,...} removed)
+  ffmpeg_8,
+  glib,
   imagemagick,
   jsoncpp,
   libopenshot-audio,
   llvmPackages,
+  opencv4,
+  pipewire,
   pkg-config,
+  protobuf,
   python3,
   qt6,
   swig,
@@ -21,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libopenshot";
-  version = "0.7.0-unstable-2026-04-21";
+  version = "0.7.0-unstable-2026-07-22";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot";
-    rev = "a58565292cb84438b1c6a039c343b4c65003bd82";
-    hash = "sha256-zUzyi/VydrxDLCY7E/LBr7+btthOjal3c7md6PTXQWA=";
+    rev = "eac81cf91555438c54fbadef7fdd05bf803f26ee";
+    hash = "sha256-XeEXvKi5O/0J6rEc8rZs4+x/ImF4X0GFw/dOWn9HCCQ=";
   };
 
   patches = lib.optionals stdenv.hostPlatform.isDarwin [
@@ -39,15 +46,19 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     doxygen
     pkg-config
+    protobuf
     swig
   ];
 
   buildInputs = [
+    catch2_3
     cppzmq
-    ffmpeg
+    ffmpeg_8
     imagemagick
     jsoncpp
     libopenshot-audio
+    (opencv4.override { ffmpeg_8-headless = ffmpeg_8; })
+    protobuf
     python3
     qt6.qtbase
     qt6.qtmultimedia
@@ -56,6 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
+    glib
+    pipewire
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     llvmPackages.openmp
@@ -68,6 +81,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
+  nativeCheckInputs = [ ctestCheckHook ];
+
+  # Spherical metadata is not round-tripped when writing/reading with FFmpeg 8
+  ctestFlags = [
+    "--exclude-regex"
+    "^SphericalMetadata"
+  ];
+
   cmakeFlags = [
     (lib.cmakeBool "ENABLE_RUBY" false)
     (lib.cmakeBool "ENABLE_PYTHON" true)
diff --git a/pkgs/by-name/op/openshot-qt/package.nix b/pkgs/by-name/op/openshot-qt/package.nix
index ae7e4b63b647..1344bf74036e 100644
--- a/pkgs/by-name/op/openshot-qt/package.nix
+++ b/pkgs/by-name/op/openshot-qt/package.nix
@@ -10,12 +10,12 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "openshot-qt";
-  version = "3.5.1-unstable-2026-04-22";
+  version = "3.5.1-unstable-2026-07-23";
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "openshot-qt";
-    rev = "930ff919762570eaf35a879574da8f8da9f196be";
-    hash = "sha256-o0BPEzkEAyoZkPkiR9G8i2nANgDFI4wjD5b9hGOqB0c=";
+    rev = "9cd2b3f3ee9024c3496487a2de30a402515ed659";
+    hash = "sha256-SoEt3tuydz+JUzhvUa7Pejxd1LYNia17YvGmVlnh48I=";
   };
   format = "setuptools";