From 6bb93f9ab2c0b16f8700f8f52b952458e2c4ba19 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 27 Feb 2025 20:56:17 +0100
Subject: [PATCH] auto-editor: 24w29a -> 26.2.0

---
 pkgs/by-name/au/auto-editor/package.nix       | 11 +++-----
 .../au/auto-editor/set-exe-paths.patch        | 25 +++----------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/au/auto-editor/package.nix b/pkgs/by-name/au/auto-editor/package.nix
index a517327148c81..d09d8245f12c0 100644
--- a/pkgs/by-name/au/auto-editor/package.nix
+++ b/pkgs/by-name/au/auto-editor/package.nix
@@ -3,25 +3,23 @@
   python3Packages,
   fetchFromGitHub,
   replaceVars,
-  ffmpeg,
   yt-dlp,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "auto-editor";
-  version = "24w29a";
+  version = "26.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "WyattBlue";
     repo = "auto-editor";
     tag = version;
-    hash = "sha256-2/6IqwMlaWobOlDr/h2WV2OqkxqVmUI65XsyBphTbpA=";
+    hash = "sha256-BYpt/EelCChhphfuTcqI/VIVis6dnt0J4FcNhWeiiyY=";
   };
 
   patches = [
     (replaceVars ./set-exe-paths.patch {
-      ffmpeg = lib.getExe ffmpeg;
       yt_dlp = lib.getExe yt-dlp;
     })
   ];
@@ -29,12 +27,9 @@ python3Packages.buildPythonApplication rec {
   postPatch = ''
     # pyav is a fork of av, but has since mostly been un-forked
     substituteInPlace pyproject.toml \
-        --replace-fail '"pyav==12.2.*"' '"av"'
+        --replace-fail '"pyav==14.*"' '"av"'
   '';
 
-  # our patch file also removes the dependency on ae-ffmpeg
-  pythonRemoveDeps = [ "ae-ffmpeg" ];
-
   build-system = with python3Packages; [
     setuptools
   ];
diff --git a/pkgs/by-name/au/auto-editor/set-exe-paths.patch b/pkgs/by-name/au/auto-editor/set-exe-paths.patch
index 8eaa7bc58bf6f..97266aab9ef26 100644
--- a/pkgs/by-name/au/auto-editor/set-exe-paths.patch
+++ b/pkgs/by-name/au/auto-editor/set-exe-paths.patch
@@ -1,29 +1,10 @@
-diff --git a/auto_editor/ffwrapper.py b/auto_editor/ffwrapper.py
-index b6df2d4..8409032 100644
---- a/auto_editor/ffwrapper.py
-+++ b/auto_editor/ffwrapper.py
-@@ -30,13 +30,7 @@ class FFmpeg:
-                 return ff_location
-             if my_ffmpeg:
-                 return "ffmpeg"
--
--            try:
--                import ae_ffmpeg
--
--                return ae_ffmpeg.get_path()
--            except ImportError:
--                return "ffmpeg"
-+            return "@ffmpeg@"
- 
-         self.debug = debug
-         self.show_cmd = show_cmd
 diff --git a/auto_editor/utils/types.py b/auto_editor/utils/types.py
-index ccd6581..a66e5e3 100644
+index 931cc33..b0aecbc 100644
 --- a/auto_editor/utils/types.py
 +++ b/auto_editor/utils/types.py
-@@ -218,7 +218,7 @@ def resolution(val: str | None) -> tuple[int, int] | None:
+@@ -191,7 +191,7 @@ def resolution(val: str | None) -> tuple[int, int] | None:
  
- @dataclass
+ @dataclass(slots=True)
  class Args:
 -    yt_dlp_location: str = "yt-dlp"
 +    yt_dlp_location: str = "@yt_dlp@"