From 2363cc101e923e5cf7696f95a3dc3d49a2e3db33 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sun, 26 Jan 2025 16:01:03 +0800
Subject: [PATCH 1/2] avidemux: fix build against x265 4.1

---
 pkgs/applications/video/avidemux/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 4c1dfaa7a8fa..2e7275372514 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -64,6 +64,13 @@ stdenv.mkDerivation rec {
   patches = [
     ./dynamic_install_dir.patch
     ./bootstrap_logging.patch
+    # x265 API change in 4.1 breaks build
+    # See discussion in https://avidemux.org/smif/index.php/topic,19995.msg97494.html#msg97494
+    (fetchpatch {
+      name = "fix_build_with_x265_4_1.patch";
+      url = "https://github.com/mean00/avidemux2/commit/c16d32a67cdb012db093472ad3776713939a30d1.patch";
+      hash = "sha256-5QqocvYaY/phyvSX2lhTzeAi+z9Wgqs+ITR0cXReps4=";
+    })
   ];
 
   postPatch = ''

From 4b19f0fa2ea2a7fd62d6aae3827d0ac480343feb Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sun, 26 Jan 2025 16:06:46 +0800
Subject: [PATCH 2/2] avidemux: move to pkgs/by-name

---
 .../av}/avidemux/bootstrap_logging.patch       |  0
 .../av}/avidemux/dynamic_install_dir.patch     |  0
 .../av/avidemux/package.nix}                   | 18 +++++++++---------
 pkgs/top-level/all-packages.nix                |  2 --
 4 files changed, 9 insertions(+), 11 deletions(-)
 rename pkgs/{applications/video => by-name/av}/avidemux/bootstrap_logging.patch (100%)
 rename pkgs/{applications/video => by-name/av}/avidemux/dynamic_install_dir.patch (100%)
 rename pkgs/{applications/video/avidemux/default.nix => by-name/av/avidemux/package.nix} (95%)

diff --git a/pkgs/applications/video/avidemux/bootstrap_logging.patch b/pkgs/by-name/av/avidemux/bootstrap_logging.patch
similarity index 100%
rename from pkgs/applications/video/avidemux/bootstrap_logging.patch
rename to pkgs/by-name/av/avidemux/bootstrap_logging.patch
diff --git a/pkgs/applications/video/avidemux/dynamic_install_dir.patch b/pkgs/by-name/av/avidemux/dynamic_install_dir.patch
similarity index 100%
rename from pkgs/applications/video/avidemux/dynamic_install_dir.patch
rename to pkgs/by-name/av/avidemux/dynamic_install_dir.patch
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/by-name/av/avidemux/package.nix
similarity index 95%
rename from pkgs/applications/video/avidemux/default.nix
rename to pkgs/by-name/av/avidemux/package.nix
index 2e7275372514..c08cfd2f49a0 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/by-name/av/avidemux/package.nix
@@ -18,9 +18,6 @@
   makeWrapper,
   libXext,
   libGLU,
-  qttools,
-  qtbase,
-  wrapQtAppsHook,
   alsa-lib,
   withX265 ? true,
   x265,
@@ -43,12 +40,12 @@
   withVPX ? true,
   libvpx,
   withQT ? true,
+  libsForQt5,
   withCLI ? true,
   default ? "qt5",
   withPlugins ? true,
 }:
 
-assert withQT -> qttools != null && qtbase != null;
 assert default != "qt5" -> default == "cli";
 assert !withQT -> default != "qt5";
 
@@ -90,7 +87,7 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
     makeWrapper
-  ] ++ lib.optional withQT wrapQtAppsHook;
+  ] ++ lib.optional withQT libsForQt5.wrapQtAppsHook;
   buildInputs =
     [
       zlib
@@ -115,10 +112,13 @@ stdenv.mkDerivation rec {
     ++ lib.optional withPulse libpulseaudio
     ++ lib.optional withFAAD faad2
     ++ lib.optional withOpus libopus
-    ++ lib.optionals withQT [
-      qttools
-      qtbase
-    ]
+    ++ lib.optionals withQT (
+      with libsForQt5;
+      [
+        qttools
+        qtbase
+      ]
+    )
     ++ lib.optional withVPX libvpx;
 
   dontWrapQtApps = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 257671f33092..f4256f6998bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12972,8 +12972,6 @@ with pkgs;
 
   ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { };
 
-  avidemux = libsForQt5.callPackage ../applications/video/avidemux { };
-
   awesome = callPackage ../applications/window-managers/awesome {
     cairo = cairo.override { xcbSupport = true; };
     inherit (texFunctions) fontsConf;