From e330d4e211c71d5cc29558e5a12fbfc92ebc2554 Mon Sep 17 00:00:00 2001 From: Roy Shilkrot Date: Sun, 13 Aug 2023 18:00:23 +0300 Subject: [PATCH] dont fail on patch --- .gitignore | 1 + cmake/common/buildspec_common.cmake | 5 ++--- patch_libobs.diff | 20 ++++++++++++++++++++ src/whisper-processing.cpp | 1 + 4 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 patch_libobs.diff diff --git a/.gitignore b/.gitignore index 40a8b2d..a064dbf 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ !LICENSE !README.md !/vendor +!patch_libobs.diff # Exclude lock files *.lock.json diff --git a/cmake/common/buildspec_common.cmake b/cmake/common/buildspec_common.cmake index 2e9c575..d0f43c7 100644 --- a/cmake/common/buildspec_common.cmake +++ b/cmake/common/buildspec_common.cmake @@ -76,9 +76,8 @@ function(_setup_obs_studio) message(STATUS "Patch libobs") execute_process( COMMAND patch --forward "libobs/CMakeLists.txt" "${CMAKE_CURRENT_SOURCE_DIR}/patch_libobs.diff" - RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY - WORKING_DIRECTORY "${dependencies_dir}/${_obs_destination}" - ) + RESULT_VARIABLE _process_result + WORKING_DIRECTORY "${dependencies_dir}/${_obs_destination}") message(STATUS "Patch - done") message(STATUS "Configure ${label} (${arch})") diff --git a/patch_libobs.diff b/patch_libobs.diff new file mode 100644 index 0000000..2746d2c --- /dev/null +++ b/patch_libobs.diff @@ -0,0 +1,20 @@ +diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt +index d2e2671..5a9242a 100644 +--- a/libobs/CMakeLists.txt ++++ b/libobs/CMakeLists.txt +@@ -263,6 +263,7 @@ set(public_headers + graphics/vec3.h + graphics/vec4.h + media-io/audio-io.h ++ media-io/audio-resampler.h + media-io/frame-rate.h + media-io/media-io-defs.h + media-io/video-io.h +@@ -287,6 +288,7 @@ set(public_headers + util/base.h + util/bmem.h + util/c99defs.h ++ util/circlebuf.h + util/darray.h + util/profiler.h + util/sse-intrin.h diff --git a/src/whisper-processing.cpp b/src/whisper-processing.cpp index 35e8d3e..9219934 100644 --- a/src/whisper-processing.cpp +++ b/src/whisper-processing.cpp @@ -263,6 +263,7 @@ void process_audio_from_buffer(struct transcription_filter_data *gf) if (gf->log_words) { obs_log(LOG_INFO, "skipping inference"); } + gf->setTextCallback(""); } // end of timer