Merge branches 'bugfixes', 'workarounds' and 'bestsource' into feature

arch1t3cht · Oct 23, 2024 · 74ed5a6 · 74ed5a6
4 parents e8ebb10 + 2969ba4 + 546abe9 + b1fadaf
commit 74ed5a6
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 45 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -116,7 +116,7 @@ jobs:
       - name: Setup Meson
         run: |
           python -m pip install --upgrade pip setuptools
-          pip install meson==1.4.2
+          pip install meson
 
       - name: Setup MSVC
         if: matrix.config.os == 'windows-latest' && matrix.config.msvc == true

diff --git a/.gitignore b/.gitignore
@@ -46,4 +46,4 @@ subprojects/dirent-*
 subprojects/hunspell-*
 subprojects/uchardet-*
 subprojects/vapoursynth
-subprojects/xxhash
+subprojects/xxHash-*
diff --git a/src/audio_provider_bestsource.cpp b/src/audio_provider_bestsource.cpp
@@ -40,7 +40,7 @@ namespace {
 class BSAudioProvider final : public agi::AudioProvider {
 	std::map<std::string, std::string> bsopts;
 	std::unique_ptr<BestAudioSource> bs;
-	AudioProperties properties;
+	BSAudioProperties properties;
 
 	void FillBuffer(void *Buf, int64_t Start, int64_t Count) const override;
 public:

diff --git a/src/video_provider_bestsource.cpp b/src/video_provider_bestsource.cpp
@@ -55,7 +55,7 @@ class BSVideoProvider final : public VideoProvider {
 	bool apply_rff;
 
 	std::unique_ptr<BestVideoSource> bs;
-	VideoProperties properties;
+	BSVideoProperties properties;
 
 	std::vector<int> Keyframes;
 	agi::vfr::Framerate Timecodes;

diff --git a/subprojects/bestsource.wrap b/subprojects/bestsource.wrap
@@ -1,7 +1,8 @@
 [wrap-git]
 url = https://github.com/vapoursynth/bestsource
-revision = R4
+revision = R8
 clone-recursive = true
+diff_files = bestsource/0001.patch
 
 [provide]
 bestsource = bestsource_dep
diff --git a/subprojects/dav1d.wrap b/subprojects/dav1d.wrap
@@ -2,7 +2,6 @@
 directory = dav1d
 url = https://github.com/videolan/dav1d.git
 revision = head
-diff_files = dav1d/0001.patch
 
 [provide]
 dav1d = dav1d_dep
diff --git a/subprojects/packagefiles/bestsource/0001.patch b/subprojects/packagefiles/bestsource/0001.patch
@@ -0,0 +1,15 @@
+diff --git a/meson.build b/meson.build
+index 6017b15..de1fbc5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2,10 +2,6 @@ project('BestSource', 'cpp',
+     default_options: ['buildtype=release', 'b_ndebug=if-release', 'cpp_std=c++17'],
+     license: 'MIT',
+     meson_version: '>=0.53.0',
+-    version: '.'.join([
+-        run_command('grep', 'BEST_SOURCE_VERSION_MAJOR', 'src/version.h', check: true).stdout().strip().split()[2],
+-        run_command('grep', 'BEST_SOURCE_VERSION_MINOR', 'src/version.h', check: true).stdout().strip().split()[2],
+-    ])
+ )
+
+ api_sources = files(
diff --git a/subprojects/packagefiles/dav1d/0001.patch b/subprojects/packagefiles/dav1d/0001.patch