Skip to content

OBS Merge 32.1.1 #1722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aleksandr-voitenko wants to merge 2 commits into
base: staging
Choose a base branch
from
Open

OBS Merge 32.1.1 #1722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f28f434
Allow extra libobs dependency prefixes
aleksandr-voitenko Jun 2, 2026
df6c23d
OBS 32.1.1test1
aleksandr-voitenko Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
SLGenerator: Visual Studio 17 2022
SLDistributeDirectory: distribute
SLFullDistributePath: "streamlabs-build.app/distribute" # The .app extension is required to run macOS tests correctly.
LibOBSVersion: 31.1.2sl20
LibOBSVersion: 32.1.1test1
PACKAGE_NAME: osn

jobs:
Expand Down
8 changes: 7 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ cmake --build . --target install --config RelWithDebInfo

This will will download any required dependencies, build the module, and then place it in an archive compatible with npm or yarn that you may specify in a given package.json.

If you are testing a local libobs development package that was built before it bundled its public development dependencies, pass those dependency package prefixes with `OSN_LIBOBS_DEPENDENCY_PREFIX_PATH`. For example:

```
cmake .. -G"Visual Studio 17 2022" -A x64 -DCMAKE_PREFIX_PATH=%CD%/libobs-src/cmake/ -DOSN_LIBOBS_DEPENDENCY_PREFIX_PATH=D:/path/to/obs/.deps/obs-deps-2025-08-23sl2-x64
```

### Mac
Building on Mac requires Xcode.

Expand Down Expand Up @@ -168,4 +174,4 @@ If you wish to debug a specific test change the wildcard character to the name o
}
]
}
```
```
12 changes: 12 additions & 0 deletions obs-studio-server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,12 +209,24 @@ set(
CACHE STRING "Location of libobs archive to base on"
)

set(
OSN_LIBOBS_DEPENDENCY_PREFIX_PATH
""
CACHE STRING "Additional CMake prefixes required by the libobs package"
)

download_project(
PROJ libobs
URL ${OSN_LIBOBS_URL}
UPDATE_DISCONNECTED 1
)

list(APPEND CMAKE_PREFIX_PATH "${libobs_SOURCE_DIR}" "${libobs_SOURCE_DIR}/cmake")
if(OSN_LIBOBS_DEPENDENCY_PREFIX_PATH)
list(APPEND CMAKE_PREFIX_PATH ${OSN_LIBOBS_DEPENDENCY_PREFIX_PATH})
endif()
list(REMOVE_DUPLICATES CMAKE_PREFIX_PATH)

if (WIN32)
include("${libobs_SOURCE_DIR}/cmake/LibObsConfig.cmake")
elseif(APPLE)
Expand Down
Loading