Skip to content

Conversation

@sandboxcoder
Copy link

@sandboxcoder sandboxcoder commented Sep 24, 2025

Description

Bump obs-browser plugin for mac and cherry-pick changes from upstream to fix mac github workflow due to recent github runner update for macos-14 image.

Motivation and Context

Resolve issue with CEF on SLD. See related pull request here.

How Has This Been Tested?

Made an SLD build with this OSN artifact to verify browser sources work well on Desktop.app

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the streamlabs branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

sandboxcoder and others added 3 commits September 24, 2025 12:08
Feature was removed in Ccache 4.12, which is provided by Homebrew by
default since 2025-10-19.
Feature was removed in Ccache 4.12, which is provided by Homebrew by
default since 2025-10-19.
@sandboxcoder sandboxcoder changed the title bump obs-browser (fix cef main loop blocking call) fix cef main loop blocking call & github workflow ccache issue Sep 24, 2025
@sandboxcoder sandboxcoder marked this pull request as ready for review September 24, 2025 19:59
@sandboxcoder sandboxcoder marked this pull request as draft September 24, 2025 20:01
@sandboxcoder
Copy link
Author

Waiting on related PR to be merged. then update the PR to point to top of streamlabs branch.

@sandboxcoder sandboxcoder marked this pull request as ready for review September 24, 2025 20:08
@sandboxcoder sandboxcoder merged commit 8ae233b into streamlabs Sep 24, 2025
30 checks passed
stevensoftware52 added a commit that referenced this pull request Oct 14, 2025
commit 35087df
Author: Richard <[email protected]>
Date:   Thu Oct 9 10:22:09 2025 -0500

    rename macos_avcapture (replace dashes with underscore) (#679)

    * remove dash character so this can be looked up easily from JS code
    in frontend

commit c01bded
Author: Richard <[email protected]>
Date:   Wed Oct 8 14:16:01 2025 -0500

    add comment to mac-screen-capture plugin and bump obs-browser (#678)

    * add note indicating why we renamed this plugin

    * makes future merges easier and reduces risk of accidental naming conflict.

    * bump obs-browser (added comment that explained float literal value)

commit 5b2f353
Author: Aleksandr Voitenko <[email protected]>
Date:   Wed Oct 8 17:43:31 2025 +0100

    Twitch dual streaming (#670)

    * Backported changes from OBS 31 to enable Twitch dual streaming mode

    * Restored back lost code from the commit 'Ffmpeg mux freez'

    * Updated AMD library

    * CMake format

    * Fix MacOS build

    * Fixing linking issues on Window by removing the older tools install step

    * Fix buid. Updated ftl-sdk submodule

    * Set option ENABLE_UI to OFF everywhere

    * CMake format

    * Updated deps files

    * Broadcast Performance Metrics (BPM)

    * Fix HEVC packet priority issues

    * Allow interleaver to recover from temporary stalls

    * CMake format

    * MacOS build fix

    * Revert "Updated deps files"

    This reverts commit 5122468.

    * Attempt to fix dependencies checker

    * Making step 'Chech for changes in dependencies' on Windows optional

    * Fixing MacOS build

    * Removed setup_ccache from MacOS X build

    * Fixing MacOS build

commit 938395a
Author: Richard <[email protected]>
Date:   Fri Oct 3 15:51:50 2025 -0500

    update slobs to build on macOS Tahoe dev env (#676)

    * cmake: Disable CCache for local builds and enable by default for CI

    * cmake: Disable discovery of Homebrew libraries for dependencies

    macOS builds should only use dependencies built via the obs-deps
    build scripts. Default variants of the same dependencies are not
    compatible with our app packaging requirements and thus will create
    issues when creating the app bundle.

    This is specifically an issue when MbedTLS is installed via Homebrew
    which ships a CMake package config by default and is picked up
    by our code ever since we switched to prefer CMake packages.

    * upgrade Qt6 to resolve missing AGL framework on macos Tahoe

    * Apple remove AGL framework on macos tahoe which breaks the older Qt6
    Link: https://bugreports.qt.io/browse/QTBUG-137687

    ---------

    Co-authored-by: PatTheMav <[email protected]>

commit 1758f33
Author: Richard <[email protected]>
Date:   Thu Sep 25 10:04:57 2025 -0500

    bump obs-browser (qt browser loop shutdown) (#675)

commit 8ae233b
Author: Richard <[email protected]>
Date:   Wed Sep 24 16:52:58 2025 -0500

    fix cef main loop blocking call & github workflow ccache issue (#674)

    * bump obs-browser (fix cef main loop blocking call)

    * 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.

    * 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.

    ---------

    Co-authored-by: PatTheMav <[email protected]>

commit a9d81e1
Author: Richard <[email protected]>
Date:   Tue Sep 16 10:37:10 2025 -0500

    upgrade obs-browser (#672)

commit a14a0c9
Author: Vladimir <[email protected]>
Date:   Mon Sep 15 10:31:51 2025 -0700

    api to communicate with browser source (#647)
@sandboxcoder sandboxcoder deleted the rno/cef-main-timer branch October 29, 2025 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants