about summary refs log tree commit diff
path: root/pkgs/applications/video/handbrake/default.nix
diff options
context:
space:
mode:
authorThiago Kenji Okada <thiagokokada@gmail.com>2023-06-03 20:34:53 +0100
committerThiago Kenji Okada <thiagokokada@gmail.com>2023-06-03 20:34:53 +0100
commitabf8128af390574c11a13101d402c8ba8731175d (patch)
tree557e7400627ee7db31fbc845861a9d0b294f59ba /pkgs/applications/video/handbrake/default.nix
parent8d0598da60f5e81748da095cc5eefc31d6e59ec3 (diff)
handbrake: fix build
There were 2 issues in the current handbrake derivation:
- Since version 1.6.0 upstream is using ffmpeg 5.1.2 instead of 5.1.1
- One of the ffmpeg patches from upstream are not applying anymore at
  least since 5.1.1

This commit fixes those 2 issues and allow handbrake to build again.
Diffstat (limited to 'pkgs/applications/video/handbrake/default.nix')
-rw-r--r--pkgs/applications/video/handbrake/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index bd15099b26bac..483d165f947bc 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -97,12 +97,12 @@ let
   # Handbrake maintains a set of ffmpeg patches. In particular, these
   # patches are required for subtitle timing to work correctly. See:
   # https://github.com/HandBrake/HandBrake/issues/4029
-  ffmpeg-version = "5.1.1";
+  ffmpeg-version = "5.1.2";
   ffmpeg-hb = ffmpeg_5-full.overrideAttrs (old: {
     version = ffmpeg-version;
     src = fetchurl {
       url = "https://www.ffmpeg.org/releases/ffmpeg-${ffmpeg-version}.tar.bz2";
-      hash = "sha256-zQ4W+QNCEmbVzN3t97g7nldUrvS596fwbOnkyALwVFs=";
+      hash = "sha256-OaC8yNmFSfFsVwYkZ4JGpqxzbAZs69tAn5UC6RWyLys=";
     };
     patches = old.patches or [ ] ++ [
       "${src}/contrib/ffmpeg/A01-qsv-libavfilter-qsvvpp-change-the-output-frame-s-width-a.patch"
@@ -133,7 +133,8 @@ let
       "${src}/contrib/ffmpeg/A26-Update-the-min-version-to-1.4.23.0-for-AMF-SDK.patch"
       "${src}/contrib/ffmpeg/A27-avcodec-amfenc-Fixes-the-color-information-in-the-ou.patch"
       "${src}/contrib/ffmpeg/A28-avcodec-amfenc-HDR-metadata.patch"
-      "${src}/contrib/ffmpeg/A30-svt-av1-backports.patch"
+      # This patch is not applying since ffmpeg 5.1.1, probably it was backported by upstream
+      # "${src}/contrib/ffmpeg/A30-svt-av1-backports.patch"
     ];
   });