diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-09-25 17:54:23 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-09-25 17:54:23 +0200 |
| commit | 608a3ef0b71359fb19ecfaaa3c8163dc58058010 (patch) | |
| tree | 029dfa69db345d7dd3bbb7500c7810eb29f4f6fd | |
| parent | 2864ef44e391283ccedd0865778725d06cf94397 (diff) | |
| download | nixpkgs-608a3ef0b71359fb19ecfaaa3c8163dc58058010.tar nixpkgs-608a3ef0b71359fb19ecfaaa3c8163dc58058010.tar.gz nixpkgs-608a3ef0b71359fb19ecfaaa3c8163dc58058010.tar.bz2 nixpkgs-608a3ef0b71359fb19ecfaaa3c8163dc58058010.tar.lz nixpkgs-608a3ef0b71359fb19ecfaaa3c8163dc58058010.tar.xz nixpkgs-608a3ef0b71359fb19ecfaaa3c8163dc58058010.tar.zst nixpkgs-608a3ef0b71359fb19ecfaaa3c8163dc58058010.zip | |
gscan2pdf: 2.12.6 -> 2.12.8
Adds a patch that fixes ffmpeg 5.1 compatibility
| -rw-r--r-- | pkgs/applications/graphics/gscan2pdf/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch | 15 |
2 files changed, 21 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 214688b56f8..fc686ad1f21 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,13 +10,17 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.12.6"; + version = "2.12.8"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz"; - sha256 = "sha256-9ntpUEM3buT3EhneXz9G8bibvzOnEK6Xt0jJcTvLKT0="; + hash = "sha256-dmN2fMBDZqgvdHQryQgjmBHeH/h2dihRH8LkflFYzTk="; }; + patches = [ + ./ffmpeg5-compat.patch + ]; + nativeBuildInputs = [ wrapGAppsHook ]; buildInputs = diff --git a/pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch b/pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch new file mode 100644 index 00000000000..ff522735fe3 --- /dev/null +++ b/pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch @@ -0,0 +1,15 @@ +--- a/t/351_unpaper.t ++++ b/t/351_unpaper.t +@@ -88,8 +88,10 @@ + + # if we use unlike, we no longer + # know how many tests there will be +- if ( $msg !~ +-/(deprecated|Encoder did not produce proper pts, making some up)/ ++ if ( $msg !~ /( deprecated | ++ \Qdoes not contain an image sequence pattern\E | ++ \QEncoder did not produce proper pts, making some up\E | ++ \Quse the -update option\E )/x + ) + { + fail 'no warnings'; |