rebase to latest upstream

This commit is contained in:
Thomas Crider
2022-08-01 18:03:55 -06:00
parent 91a5e7e862
commit edbb5f6c42
6 changed files with 3012 additions and 0 deletions

14
add-plugins.patch Normal file
View File

@@ -0,0 +1,14 @@
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index d20bce142..febeff6b7 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -60,6 +60,9 @@ elseif(OS_LINUX)
add_subdirectory(vlc-video)
add_subdirectory(sndio)
add_subdirectory(obs-vst)
+ add_subdirectory(streamfx)
+ add_subdirectory(obs-vkcapture)
+ add_subdirectory(obs-source-record)
check_obs_browser()
elseif(OS_FREEBSD)