summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Schütz <dev@schuetz-co.de>2021-04-27 12:00:17 +0200
committerRobert Schütz <dev@schuetz-co.de>2021-04-27 21:14:24 +0200
commitc287776d9ee3909b0d102b02b8d6203ea0d794e7 (patch)
treea8b0f46c6fa0e5acd0bf18343d700603df7d293b
parente20f991a115bdb7f93946e3f9aefcb92877f833c (diff)
downloadnixpkgs-c287776d9ee3909b0d102b02b8d6203ea0d794e7.tar
nixpkgs-c287776d9ee3909b0d102b02b8d6203ea0d794e7.tar.gz
nixpkgs-c287776d9ee3909b0d102b02b8d6203ea0d794e7.tar.bz2
nixpkgs-c287776d9ee3909b0d102b02b8d6203ea0d794e7.tar.lz
nixpkgs-c287776d9ee3909b0d102b02b8d6203ea0d794e7.tar.xz
nixpkgs-c287776d9ee3909b0d102b02b8d6203ea0d794e7.tar.zst
nixpkgs-c287776d9ee3909b0d102b02b8d6203ea0d794e7.zip
ffms: 2.23 -> 2.40
https://github.com/FFMS/ffms2/releases/tag/2.40

@tadeokondrak agreed to being a maintainer:
https://github.com/NixOS/nixpkgs/pull/120846#issuecomment-827849034
-rw-r--r--pkgs/development/libraries/ffms/default.nix32
1 files changed, 25 insertions, 7 deletions
diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
index 7fa96cff7f8..283942df63f 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -1,20 +1,38 @@
-{ lib, stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkg-config }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, ffmpeg
+, zlib
+}:
 
 stdenv.mkDerivation rec {
   pname = "ffms";
-  version = "2.23";
+  version = "2.40";
 
   src = fetchFromGitHub {
     owner = "FFMS";
     repo = "ffms2";
     rev = version;
-    sha256 = "0dkz5b3gxq5p4xz0qqg6l2sigszrlsinz3skyf0ln4wf3zrvf8m5";
+    sha256 = "sha256-3bPxt911T0bGpAIS2RxBjo+VV84xW06eKcCj3ZAcmvw=";
   };
 
   NIX_CFLAGS_COMPILE = "-fPIC";
 
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ zlib ffmpeg_3 ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  preAutoreconf = ''
+    mkdir src/config
+  '';
+
+  buildInputs = [
+    ffmpeg
+    zlib
+  ];
 
   # ffms includes a built-in vapoursynth plugin, see:
   # https://github.com/FFMS/ffms2#avisynth-and-vapoursynth-plugin
@@ -25,9 +43,9 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/FFMS/ffms2/";
-    description = "Libav/ffmpeg based source library for easy frame accurate access";
+    description = "FFmpeg based source library for easy frame accurate access";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ tadeokondrak ];
     platforms = platforms.unix;
   };
 }