From 4e3ecd54b54bab0f5746f1d0e0f4dfe0e3040fd8 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Mon, 19 Sep 2022 14:07:49 +0200 Subject: [PATCH] vapoursynthPlugins.vsTAAmbk: fix with R60 --- ...-Use-format-IDs-from-VapourSynth-R55.patch | 35 ------------------- plugins/vsTAAmbk/default.nix | 8 +++-- 2 files changed, 6 insertions(+), 37 deletions(-) delete mode 100644 plugins/vsTAAmbk/0002-Use-format-IDs-from-VapourSynth-R55.patch diff --git a/plugins/vsTAAmbk/0002-Use-format-IDs-from-VapourSynth-R55.patch b/plugins/vsTAAmbk/0002-Use-format-IDs-from-VapourSynth-R55.patch deleted file mode 100644 index f09b046..0000000 --- a/plugins/vsTAAmbk/0002-Use-format-IDs-from-VapourSynth-R55.patch +++ /dev/null @@ -1,35 +0,0 @@ -From cfc284a25d94ddf4459bac612d208f9065ccebcf Mon Sep 17 00:00:00 2001 -From: Simon Bruder -Date: Fri, 15 Oct 2021 19:32:44 +0200 -Subject: [PATCH 2/2] Use format IDs from VapourSynth R55 - ---- - test/vsTAAmbkTestCase.py | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/test/vsTAAmbkTestCase.py b/test/vsTAAmbkTestCase.py -index 7a70a00..d2acdd6 100644 ---- a/test/vsTAAmbkTestCase.py -+++ b/test/vsTAAmbkTestCase.py -@@ -88,12 +88,12 @@ class GeneralTestCase(unittest.TestCase): - yuv420p16 = core.std.BlankClip(width=1920, height=1080, format=vs.YUV420P16, fpsnum=24000, fpsden=1001) - yuv444p16 = core.std.BlankClip(width=1920, height=1080, format=vs.YUV444P16, fpsnum=24000, fpsden=1001) - format_id = { -- '1000010': 'GRAY8', -- '1000011': 'GRAY16', -- '3000010': 'YUV420P8', -- '3000012': 'YUV444P8', -- '3000022': 'YUV420P16', -- '3000024': 'YUV444P16', -+ '268959744': 'GRAY8', -+ '269484032': 'GRAY16', -+ '805830913': 'YUV420P8', -+ '805830656': 'YUV444P8', -+ '806355201': 'YUV420P16', -+ '806354944': 'YUV444P16', - } - - def test_default_value(self): --- -2.31.1 - diff --git a/plugins/vsTAAmbk/default.nix b/plugins/vsTAAmbk/default.nix index ecf593b..211622e 100644 --- a/plugins/vsTAAmbk/default.nix +++ b/plugins/vsTAAmbk/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, vapoursynthPlugins, python, vapoursynth }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, vapoursynthPlugins, python, vapoursynth }: buildPythonPackage rec { pname = "vsTAAmbk"; @@ -12,8 +12,12 @@ buildPythonPackage rec { }; patches = [ + (fetchpatch { + name = "Remove-unnecessary-format-registration.patch"; + url = "https://github.com/HomeOfVapourSynthEvolution/vsTAAmbk/commit/c707f5a8178b80e3ddc4556b69dd36c0d1928166.patch"; + sha256 = "sha256-zLSr5POLWvAsHqTFbQOsLQnPpPRl/KjiN/tCr+zIMVg="; + }) ./0001-Skip-OpenCL-test.patch - ./0002-Use-format-IDs-from-VapourSynth-R55.patch ]; propagatedBuildInputs = with vapoursynthPlugins; [