From b1fadaf1ee18de1859a652f782a4f89dfbe56d3f Mon Sep 17 00:00:00 2001
From: arch1t3cht <arch1t3cht@gmail.com>
Date: Wed, 23 Oct 2024 20:33:00 +0200
Subject: [PATCH] bestsource: Bump to R8

---
 .gitignore                                     |  2 +-
 src/audio_provider_bestsource.cpp              |  2 +-
 src/video_provider_bestsource.cpp              |  2 +-
 subprojects/bestsource.wrap                    |  3 ++-
 subprojects/packagefiles/bestsource/0001.patch | 15 +++++++++++++++
 5 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 subprojects/packagefiles/bestsource/0001.patch

diff --git a/.gitignore b/.gitignore
index 744f0c708..ea66ba851 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,4 +42,4 @@ subprojects/zlib-*
 subprojects/dirent-*
 subprojects/hunspell-*
 subprojects/uchardet-*
-subprojects/xxhash
+subprojects/xxHash-*
diff --git a/src/audio_provider_bestsource.cpp b/src/audio_provider_bestsource.cpp
index 74c991142..df68fda63 100644
--- 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
index efde8532a..5af37c4b8 100644
--- 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
index d2378ea0b..4df85ca2d 100644
--- 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/packagefiles/bestsource/0001.patch b/subprojects/packagefiles/bestsource/0001.patch
new file mode 100644
index 000000000..646c03e1e
--- /dev/null
+++ 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(