Merge pull request #34 from arch1t3cht/fix_ci

Fix CI
vapoursynth · Apr 1, 2024 · aab4628 · aab4628
2 parents b248a0b + 045d9c6
commit aab4628
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
@@ -7,6 +7,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - uses: codespell-project/actions-codespell@v2
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -11,18 +11,18 @@ jobs:
       CXX: g++-13
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.11'
 
     - name: Install Ubuntu packages
       run: |
         sudo apt update
-        sudo apt -y install libjansson-dev nasm ninja-build
+        sudo apt -y install libxxhash-dev nasm ninja-build
 
     - name: Install Python packages
       run: |

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -7,11 +7,11 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.11'
 
@@ -21,7 +21,7 @@ jobs:
         export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
         # Skip brew update for now, see https://github.com/actions/setup-python/issues/577
         # brew update
-        brew install ffmpeg jansson llvm meson vapoursynth
+        brew install ffmpeg xxhash llvm meson vapoursynth
 
     - name: Set environment variables for Clang/LLVM
       run: |

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -11,7 +11,7 @@ jobs:
         shell: msys2 {0}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -26,7 +26,7 @@ jobs:
           git
           libtool
           mingw-w64-ucrt-x86_64-dav1d
-          mingw-w64-ucrt-x86_64-jansson
+          mingw-w64-ucrt-x86_64-xxhash
           mingw-w64-ucrt-x86_64-meson
           mingw-w64-ucrt-x86_64-nasm
           mingw-w64-ucrt-x86_64-toolchain
@@ -57,7 +57,7 @@ jobs:
         ninja -C build
         strip build/libbestsource.dll
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: libbestsource
         path: build/libbestsource.dll
diff --git a/src/avisynth.cpp b/src/avisynth.cpp
@@ -166,10 +166,10 @@ class AvisynthVideoSource : public IClip {
 
             // FIXME, does anyone use this?
             // Set AR variables
-            Env->SetVar(Env->Sprintf("%s%s", this->VarPrefix, "BSSAR_NUM"), VP.SAR.Num);
-            Env->SetVar(Env->Sprintf("%s%s", this->VarPrefix, "BSSAR_DEN"), VP.SAR.Den);
+            Env->SetVar(Env->Sprintf("%s%s", this->VarPrefix.c_str(), "BSSAR_NUM"), VP.SAR.Num);
+            Env->SetVar(Env->Sprintf("%s%s", this->VarPrefix.c_str(), "BSSAR_DEN"), VP.SAR.Den);
             if (VP.SAR.Num > 0 && VP.SAR.Den > 0)
-                Env->SetVar(Env->Sprintf("%s%s", this->VarPrefix, "BSSAR"), VP.SAR.Num / static_cast<double>(VP.SAR.Den));
+                Env->SetVar(Env->Sprintf("%s%s", this->VarPrefix.c_str(), "BSSAR"), VP.SAR.Num / static_cast<double>(VP.SAR.Den));
 
             /*
             FIXME, is this even relevant?