diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index beb7b6f642..27f9f98d71 100644
--- 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
index d2ac22eac2..bf6cfd8a2c 100644
--- 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
index 74c9911426..df68fda632 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 efde8532a4..5af37c4b81 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 d2378ea0bb..4df85ca2d7 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/dav1d.wrap b/subprojects/dav1d.wrap
index 2dc6bfc6df..9b8ebf872b 100644
--- 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
new file mode 100644
index 0000000000..646c03e1ea
--- /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(
diff --git a/subprojects/packagefiles/dav1d/0001.patch b/subprojects/packagefiles/dav1d/0001.patch
deleted file mode 100644
index 324e07335f..0000000000
--- a/subprojects/packagefiles/dav1d/0001.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/include/dav1d/dav1d.h b/include/dav1d/dav1d.h
-index e8f0705..ff48ea0 100644
---- a/include/dav1d/dav1d.h
-+++ b/include/dav1d/dav1d.h
-@@ -34,7 +34,7 @@
- #include "common.h"
- #include "picture.h"
- #include "data.h"
--#include "version.h"
-+#include "dav1d_version.h"
- 
- #ifdef __cplusplus
- extern "C" {
-diff --git a/include/dav1d/meson.build b/include/dav1d/meson.build
-index 68faaf9..09b0239 100644
---- a/include/dav1d/meson.build
-+++ b/include/dav1d/meson.build
-@@ -28,7 +28,7 @@ version_h_data.set('DAV1D_API_VERSION_MAJOR', dav1d_api_version_major)
- version_h_data.set('DAV1D_API_VERSION_MINOR', dav1d_api_version_minor)
- version_h_data.set('DAV1D_API_VERSION_PATCH', dav1d_api_version_revision)
- version_h_target = configure_file(input: 'version.h.in',
--                                  output: 'version.h',
-+                                  output: 'dav1d_version.h',
-                                   configuration: version_h_data)
- 
- dav1d_api_headers = [
-diff --git a/src/meson.build b/src/meson.build
-index 3a34e76..53ef660 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -335,7 +335,7 @@ libdav1d = library('dav1d',
- )
- 
- dav1d_dep = declare_dependency(link_with: libdav1d,
--    include_directories : include_directories('../include/dav1d')
-+    include_directories : include_directories('../include/', '../include/dav1d/')
- )
- 
- #