From c49b604172f97f5dd098cecc3d08be2515d4f1ff Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Tue, 16 Jul 2024 16:22:33 +0200 Subject: [PATCH 1/2] vapoursynth: Improve lsmas plugin version detection Some lsmas versions (like HomeOfAviSynthPlusEvolution's, the currently actively maintained one) support the "cachedir" argument but do not have a "Version" function. Hence, it's better to just check for the argument directly. --- automation/vapoursynth/aegisub_vs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/automation/vapoursynth/aegisub_vs.py b/automation/vapoursynth/aegisub_vs.py index 7de104ddc..ef610b403 100644 --- a/automation/vapoursynth/aegisub_vs.py +++ b/automation/vapoursynth/aegisub_vs.py @@ -195,7 +195,8 @@ def wrap_lwlibavsource(filename: str, cachedir: str | None = None, **kwargs: Any ensure_plugin("lsmas", "libvslsmashsource", "To use Aegisub's LWLibavSource wrapper, the `lsmas` plugin for VapourSynth must be installed") - if b"-Dcachedir" not in core.lsmas.Version()["config"]: # type: ignore + import inspect + if "cachedir" not in inspect.getfullargspec(vs.core.lsmas.LWLibavSource).args: raise vs.Error("To use Aegisub's LWLibavSource wrapper, the `lsmas` plugin must support the `cachedir` option for LWLibavSource.") clip = core.lsmas.LWLibavSource(source=filename, cachefile=cachefile, **kwargs) From 1e20306d489cf6b8975c9707dddc5312ce096b29 Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Tue, 16 Jul 2024 16:24:08 +0200 Subject: [PATCH 2/2] ci: Pin meson version to 1.4.2 for now The harfbuzz subproject doesn't build with 1.5 due to a meson regression. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index deb7d40e2..1d5cc037b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,7 +87,7 @@ jobs: - name: Setup Meson run: | python -m pip install --upgrade pip setuptools - pip install meson + pip install meson==1.4.2 - name: Setup MSVC if: matrix.config.os == 'windows-latest' && matrix.config.msvc == true