From 50a0c349623755e799954a79fc7afb2079ec35ce Mon Sep 17 00:00:00 2001 From: Richard Osborne Date: Wed, 24 Sep 2025 12:08:40 -0500 Subject: [PATCH 1/4] bump obs-browser (fix cef main loop blocking call) --- plugins/obs-browser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/obs-browser b/plugins/obs-browser index c404f3895a6863..aea2b28f09a659 160000 --- a/plugins/obs-browser +++ b/plugins/obs-browser @@ -1 +1 @@ -Subproject commit c404f3895a68636c72dcbdfb7a69e316d11d7d3e +Subproject commit aea2b28f09a659f3956a68697d455297f862c2b4 From def9962537338585d656daf8b2a4fcd2232f9437 Mon Sep 17 00:00:00 2001 From: PatTheMav Date: Fri, 19 Sep 2025 02:28:30 +0200 Subject: [PATCH 2/4] cmake: Remove Ccache option to enforce second preprocessor call Feature was removed in Ccache 4.12, which is provided by Homebrew by default since 2025-10-19. --- cmake/macos/resources/ccache-launcher-c.in | 1 - cmake/macos/resources/ccache-launcher-cxx.in | 1 - 2 files changed, 2 deletions(-) diff --git a/cmake/macos/resources/ccache-launcher-c.in b/cmake/macos/resources/ccache-launcher-c.in index aef91a4053ef0c..173e27553422cf 100644 --- a/cmake/macos/resources/ccache-launcher-c.in +++ b/cmake/macos/resources/ccache-launcher-c.in @@ -4,7 +4,6 @@ if [[ "$1" == "${CMAKE_C_COMPILER}" ]] ; then shift fi -export CCACHE_CPP2=true export CCACHE_DEPEND=true export CCACHE_DIRECT=true export CCACHE_FILECLONE=true diff --git a/cmake/macos/resources/ccache-launcher-cxx.in b/cmake/macos/resources/ccache-launcher-cxx.in index 76c81ee0296df5..61502521464a9b 100644 --- a/cmake/macos/resources/ccache-launcher-cxx.in +++ b/cmake/macos/resources/ccache-launcher-cxx.in @@ -4,7 +4,6 @@ if [[ "$1" == "${CMAKE_CXX_COMPILER}" ]] ; then shift fi -export CCACHE_CPP2=true export CCACHE_DEPEND=true export CCACHE_DIRECT=true export CCACHE_FILECLONE=true From 8dbbd930c3bfb586e02d0dc5bcd821132117b67f Mon Sep 17 00:00:00 2001 From: PatTheMav Date: Fri, 19 Sep 2025 02:29:26 +0200 Subject: [PATCH 3/4] ci: Limit use of Ccache option to enforce second preprocessor call Feature was removed in Ccache 4.12, which is provided by Homebrew by default since 2025-10-19. --- .github/scripts/utils.zsh/setup_ccache | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/scripts/utils.zsh/setup_ccache b/.github/scripts/utils.zsh/setup_ccache index 34f220ad9cdbbe..bf758ce657428b 100644 --- a/.github/scripts/utils.zsh/setup_ccache +++ b/.github/scripts/utils.zsh/setup_ccache @@ -1,9 +1,13 @@ -autoload -Uz log_debug log_warning +autoload -Uz is-at-least log_debug log_warning if (( ${+commands[ccache]} )) { log_debug "Found ccache at ${commands[ccache]}" - ccache --set-config=run_second_cpp=true + local ccache_version=$(ccache --version | head -1 | cut -d ' ' -f 3) + if ! is-at-least 4.12 ${ccache_version}; then + ccache --set-config=run_second_cpp=true + fi + ccache --set-config=direct_mode=true ccache --set-config=inode_cache=true ccache --set-config=compiler_check=content From 04b6db9cd4655a1196e2a4f6af7802e54a9f6dc7 Mon Sep 17 00:00:00 2001 From: Richard Osborne Date: Wed, 24 Sep 2025 15:07:42 -0500 Subject: [PATCH 4/4] bump obs-browser plugin --- plugins/obs-browser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/obs-browser b/plugins/obs-browser index aea2b28f09a659..19a0a167cbdf8f 160000 --- a/plugins/obs-browser +++ b/plugins/obs-browser @@ -1 +1 @@ -Subproject commit aea2b28f09a659f3956a68697d455297f862c2b4 +Subproject commit 19a0a167cbdf8f4533923856db91da7dc7c7becf