Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
54d3fa0
Revert "Merge pull request #1786 from brittneysclark/qsv_texture_base…
jp9000 Apr 26, 2020
dba5828
rtmp-services: Add Caffeine service
Xaymar Feb 26, 2020
1b1e595
libobs: Add flags to disable bandwidth test and hw encode
Xaymar Feb 26, 2020
4116645
cmake: Fix backslashes and fix bin and data not copying
prateekshadas Mar 13, 2020
7351485
cmake: Add find_package module for libcaffeine
Jul 2, 2019
882f151
caffeine: Add Caffeine output plugin
Xaymar Feb 26, 2020
e074f3d
UI: Add support for Caffeine
Xaymar Feb 26, 2020
3394b6e
COBS-63 Create build script (#70)
prateekshadas May 5, 2020
ebfa866
COBS-62 Help link in COBS should link to our help center
prateekshadas Mar 9, 2020
26452b4
caffeine: Handle audio in a secondary thread (#74)
Xaymar Jun 16, 2020
63e90c6
Caffeine: Always update video and audio pointers (#75)
turbodavidson Jun 16, 2020
3d8275d
caffeine: Don't use windows only syntax for unix pthreads (#77)
Xaymar Jun 23, 2020
dc8cb41
COBS-77 Inaccurate error message is displayed when attempting to ‘Sta…
prateekshadas Jun 25, 2020
63808e3
Updated the COBS to include Github Actions (#80)
prateekshadas Jul 27, 2020
eedd0a9
Fixed queue traversal (#84)
turbodavidson Jul 28, 2020
540b289
COBS-66 Caffeine dock is unlisted when opening COBS with a saved (#86)
prateekshadas Jul 30, 2020
3f70ac7
Updating macOS brew dependency handling on CI (+4 squashed commits)
adamroach Nov 17, 2020
d404c08
COBS-116 Caffeine account username is no longer visible in Settings->…
prateekshadas Dec 15, 2020
a51331f
Adding ./bootstrap.sh to help set up OS X build (#91)
adamroach Dec 17, 2020
49f53c4
COBS-96 Fixed Caffeine dock location not saved (#93)
prateekshadas Jan 22, 2021
1d941ed
COBS-137 Appearance of Caffeine dock does not update when changing th…
prateekshadas Feb 10, 2021
42d640b
COBS-61 (#96)
turbodavidson Feb 18, 2021
b92283b
CONTENT-72 Implemented the error messages in cobs (#95)
prateekshadas Feb 18, 2021
388eb15
COBS-163 Implement copy for error message for system overload (#97)
prateekshadas Mar 2, 2021
2ed8f0a
Fixes after rebase (#100)
prateekshadas Mar 9, 2021
2ee1721
Cobs 167 (#101)
prateekshadas Mar 11, 2021
ed478e3
COBS 172 (#102)
prateekshadas Mar 15, 2021
cc3ed2c
Fix ex bad access (#103)
prateekshadas Mar 23, 2021
79283d1
base patch for 1080p streaming
Cwoodyard Mar 26, 2021
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
16 changes: 2 additions & 14 deletions .github/workflows/clang-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,8 @@ jobs:

- name: Install clang format
run: |
# gets us newer clang
sudo bash -c "cat >> /etc/apt/sources.list" << LLVMAPT
# 3.8
deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main
deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main
LLVMAPT

wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -

sudo apt-get -qq update

sudo apt-get install -y clang-format-8

sudo apt-get install -y clang-format-10
- name: Check the Formatting
run: |
./formatcode.sh
./CI/check-format.sh
./CI/check-format.sh
29 changes: 21 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,18 @@ on:
paths-ignore:
- '**.md'
branches:
- master
tags:
- '*'
- caffeine
pull_request:
paths-ignore:
- '**.md'
branches:
- master
- caffeine

env:
MACOS_CEF_BUILD_VERSION: '4183'
LINUX_CEF_BUILD_VERSION: '3770'
CEF_VERSION: '75.1.16+g16a67c4+chromium-75.0.3770.100'
LIBCAFFEINE_VERSION: '0.6.3'

jobs:
macos64:
Expand Down Expand Up @@ -137,13 +136,19 @@ jobs:
make -j4
mkdir libcef_dll
cd ../../
- name: 'Install prerequisites: Libcaffeine'
shell: bash
run: |
curl -L -O https://github.com/caffeinetv/libcaffeine/releases/download/v${{ env.LIBCAFFEINE_VERSION }}/libcaffeine-v${{ env.LIBCAFFEINE_VERSION }}-macos.7z
brew install p7zip
7z x libcaffeine-v${{ env.LIBCAFFEINE_VERSION }}-macos.7z -o${{ github.workspace }}/cmbuild
- name: 'Configure'
shell: bash
run: |
mkdir ./build
cd ./build
LEGACY_BROWSER="$(test "${{ env.MACOS_CEF_BUILD_VERSION }}" -le 3770 && echo "ON" || echo "OFF")"
cmake -DENABLE_UNIT_TESTS=YES -DENABLE_SPARKLE_UPDATER=ON -DDISABLE_PYTHON=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ env.MIN_MACOS_VERSION }} -DQTDIR="/tmp/obsdeps" -DSWIGDIR="/tmp/obsdeps" -DDepsPath="/tmp/obsdeps" -DVLCPath="${{ github.workspace }}/cmbuild/vlc-${{ env.VLC_VERSION }}" -DENABLE_VLC=ON -DBUILD_BROWSER=ON -DBROWSER_LEGACY=$LEGACY_BROWSER -DWITH_RTMPS=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.MACOS_CEF_BUILD_VERSION }}_macosx64" ..
cmake -DENABLE_UNIT_TESTS=YES -DENABLE_SPARKLE_UPDATER=ON -DDISABLE_PYTHON=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ env.MIN_MACOS_VERSION }} -DQTDIR="/tmp/obsdeps" -DSWIGDIR="/tmp/obsdeps" -DDepsPath="/tmp/obsdeps" -DVLCPath="${{ github.workspace }}/cmbuild/vlc-${{ env.VLC_VERSION }}" -DENABLE_VLC=ON -DBUILD_BROWSER=ON -DBROWSER_LEGACY=$LEGACY_BROWSER -DWITH_RTMPS=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.MACOS_CEF_BUILD_VERSION }}_macosx64" -DLIBCAFFEINE_DIR="${{ github.workspace }}/cmbuild/libcaffeine-v${{ env.LIBCAFFEINE_VERSION }}-macos" ..
- name: 'Build'
shell: bash
working-directory: ${{ github.workspace }}/build
Expand Down Expand Up @@ -346,7 +351,7 @@ jobs:
path: ./release/*.dmg
ubuntu64:
name: 'Linux/Ubuntu 64-bit'
runs-on: [ubuntu-latest]
runs-on: [ubuntu-18.04]
steps:
- name: 'Checkout'
uses: actions/[email protected]
Expand Down Expand Up @@ -556,12 +561,16 @@ jobs:
run: |
curl -kL https://cdn-fastly.obsproject.com/downloads/cef_binary_${{ env.CEF_VERSION }}_windows64_minimal.zip -f --retry 5 -o cef.zip
7z x cef.zip -o"${{ github.workspace }}/cmbuild"
- name: 'Installing prerequisites: Libcaffeine'
run: |
curl -kLO https://github.com/caffeinetv/libcaffeine/releases/download/v${{ env.LIBCAFFEINE_VERSION }}/libcaffeine-v${{ env.LIBCAFFEINE_VERSION }}-windows.7z
7z x libcaffeine-v${{ env.LIBCAFFEINE_VERSION }}-windows.7z -o"${{ github.workspace }}/cmbuild"
- name: 'Configure'
run: |
mkdir ./build
mkdir ./build64
cd ./build64
cmake -G"${{ env.CMAKE_GENERATOR }}" -A"x64" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DBUILD_BROWSER=true -DCOMPILE_D3D12_HOOK=true -DVLCPath="${{ github.workspace }}/cmbuild/vlc" -DDepsPath="${{ github.workspace }}/cmbuild/deps/win64" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2019_64" -DENABLE_VLC=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows64_minimal" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE -DVIRTUALCAM_GUID=${{ env.VIRTUALCAM-GUID }} ..
cmake -G"${{ env.CMAKE_GENERATOR }}" -A"x64" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DBUILD_BROWSER=true -DCOMPILE_D3D12_HOOK=true -DVLCPath="${{ github.workspace }}/cmbuild/vlc" -DDepsPath="${{ github.workspace }}/cmbuild/deps/win64" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2019_64" -DENABLE_VLC=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows64_minimal" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE -DVIRTUALCAM_GUID=${{ env.VIRTUALCAM-GUID }} -DLIBCAFFEINE_DIR="${{ github.workspace }}/cmbuild/libcaffeine-v${{ env.LIBCAFFEINE_VERSION }}-windows" ..
- name: 'Build'
run: msbuild /m /p:Configuration=RelWithDebInfo .\build64\obs-studio.sln
- name: 'Package'
Expand Down Expand Up @@ -668,12 +677,16 @@ jobs:
run: |
curl -kL https://cdn-fastly.obsproject.com/downloads/cef_binary_${{ env.CEF_VERSION }}_windows32_minimal.zip -f --retry 5 -o cef.zip
7z x cef.zip -o"${{ github.workspace }}/cmbuild"
- name: 'Installing prerequisites: Libcaffeine'
run: |
curl -kLO https://github.com/caffeinetv/libcaffeine/releases/download/v${{ env.LIBCAFFEINE_VERSION }}/libcaffeine-v${{ env.LIBCAFFEINE_VERSION }}-windows.7z
7z x libcaffeine-v${{ env.LIBCAFFEINE_VERSION }}-windows.7z -o"${{ github.workspace }}/cmbuild"
- name: 'Configure'
run: |
mkdir ./build
mkdir ./build32
cd ./build32
cmake -G"${{ env.CMAKE_GENERATOR }}" -A"Win32" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DENABLE_VLC=ON -DBUILD_BROWSER=true -DCOMPILE_D3D12_HOOK=true -DVLCPath="${{ github.workspace }}/cmbuild/vlc" -DDepsPath="${{ github.workspace }}/cmbuild/deps/win32" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2019" -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows32_minimal" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE -DVIRTUALCAM_GUID=${{ env.VIRTUALCAM-GUID }} ..
cmake -G"${{ env.CMAKE_GENERATOR }}" -A"Win32" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DENABLE_VLC=ON -DBUILD_BROWSER=true -DCOMPILE_D3D12_HOOK=true -DVLCPath="${{ github.workspace }}/cmbuild/vlc" -DDepsPath="${{ github.workspace }}/cmbuild/deps/win32" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2019" -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows32_minimal" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE -DVIRTUALCAM_GUID=${{ env.VIRTUALCAM-GUID }} -DLIBCAFFEINE_DIR="${{ github.workspace }}/cmbuild/libcaffeine-v${{ env.LIBCAFFEINE_VERSION }}-windows" ..
- name: 'Build'
run: msbuild /m /p:Configuration=RelWithDebInfo .\build32\obs-studio.sln
- name: 'Package'
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
.ninja*
.dirstamp

#dependencies
/libcaffeine-v0.6.1-macos/
/vlc-3.0.8/
/CI/scripts/macos/Brewfile.lock.json

#xcode
*.xcodeproj/

Expand Down
52 changes: 33 additions & 19 deletions CI/full-build-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#
# Environment Variables (optional):
# MACOS_DEPS_VERSION : Pre-compiled macOS dependencies version
# CEF_BUILD_VERSION : Chromium Embedded Framework version
# MACOS_CEF_BUILD_VERSION : Chromium Embedded Framework version
# VLC_VERISON : VLC version
# SPARKLE_VERSION : Sparke Framework version
# BUILD_DIR : Alternative directory to build OBS in
Expand All @@ -41,20 +41,22 @@ BUILD_DIR="${BUILD_DIR:-build}"
BUILD_CONFIG=${BUILD_CONFIG:-RelWithDebInfo}
CI_SCRIPTS="${CHECKOUT_DIR}/CI/scripts/macos"
CI_WORKFLOW="${CHECKOUT_DIR}/.github/workflows/main.yml"
CI_CEF_VERSION=$(cat ${CI_WORKFLOW} | sed -En "s/[ ]+CEF_BUILD_VERSION: '([0-9]+)'/\1/p")
CI_MACOS_CEF_VERSION=$(cat ${CI_WORKFLOW} | sed -En "s/[ ]+MACOS_CEF_BUILD_VERSION: '([0-9]+)'/\1/p")
CI_DEPS_VERSION=$(cat ${CI_WORKFLOW} | sed -En "s/[ ]+MACOS_DEPS_VERSION: '([0-9\-]+)'/\1/p")
CI_VLC_VERSION=$(cat ${CI_WORKFLOW} | sed -En "s/[ ]+VLC_VERSION: '([0-9\.]+)'/\1/p")
CI_SPARKLE_VERSION=$(cat ${CI_WORKFLOW} | sed -En "s/[ ]+SPARKLE_VERSION: '([0-9\.]+)'/\1/p")
CI_QT_VERSION=$(cat ${CI_WORKFLOW} | sed -En "s/[ ]+QT_VERSION: '([0-9\.]+)'/\1/p" | head -1)
CI_MIN_MACOS_VERSION=$(cat ${CI_WORKFLOW} | sed -En "s/[ ]+MIN_MACOS_VERSION: '([0-9\.]+)'/\1/p")
CI_LIBCAFFEINE_VERSION=$(cat ${CI_WORKFLOW} | sed -En "s/[ ]+LIBCAFFEINE_VERSION: '([0-9\.]+)'/\1/p")
NPROC="${NPROC:-$(sysctl -n hw.ncpu)}"

BUILD_DEPS=(
"obs-deps ${MACOS_DEPS_VERSION:-${CI_DEPS_VERSION}}"
"qt-deps ${QT_VERSION:-${CI_QT_VERSION}} ${MACOS_DEPS_VERSION:-${CI_DEPS_VERSION}}"
"cef ${CEF_BUILD_VERSION:-${CI_CEF_VERSION}}"
"obs_deps ${MACOS_DEPS_VERSION:-${CI_DEPS_VERSION}}"
"qt_deps ${QT_VERSION:-${CI_QT_VERSION}} ${MACOS_DEPS_VERSION:-${CI_DEPS_VERSION}}"
"cef ${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}"
"vlc ${VLC_VERSION:-${CI_VLC_VERSION}}"
"sparkle ${SPARKLE_VERSION:-${CI_SPARKLE_VERSION}}"
"libcaffeine ${LIBCAFFEINE_VERSION:-${CI_LIBCAFFEINE_VERSION}}"
)

if [ -n "${TERM-}" ]; then
Expand Down Expand Up @@ -165,7 +167,7 @@ check_ccache() {
info "${CCACHE_STATUS}"
}

install_obs-deps() {
install_obs_deps() {
hr "Setting up pre-built macOS OBS dependencies v${1}"
ensure_dir ${DEPS_BUILD_DIR}
step "Download..."
Expand All @@ -174,7 +176,7 @@ install_obs-deps() {
tar -xf ./macos-deps-${1}.tar.gz -C /tmp
}

install_qt-deps() {
install_qt_deps() {
hr "Setting up pre-built dependency QT v${1}"
ensure_dir ${DEPS_BUILD_DIR}
step "Download..."
Expand Down Expand Up @@ -208,6 +210,16 @@ install_sparkle() {
fi
}

install_libcaffeine() {
hr "Setting up dependency libcaffeine v${1}"
ensure_dir ${DEPS_BUILD_DIR}
step "Download..."
${CURLCMD} --progress-bar -L -C - -O https://github.com/caffeinetv/libcaffeine/releases/download/v${1}/libcaffeine-v${1}-macos.7z
step "Unpack ..."
brew list p7zip || brew install p7zip
7za x libcaffeine-v${1}-macos.7z
}

install_cef() {
hr "Building dependency CEF v${1}"
ensure_dir ${DEPS_BUILD_DIR}
Expand All @@ -218,7 +230,7 @@ install_cef() {
cd ./cef_binary_${1}_macosx64
step "Fix tests..."
sed -i '.orig' '/add_subdirectory(tests\/ceftests)/d' ./CMakeLists.txt
sed -i '.orig' 's/"'$(test "${CEF_BUILD_VERSION:-${CI_CEF_VERSION}}" -le 3770 && echo "10.9" || echo "10.10")'"/"'${MIN_MACOS_VERSION:-${CI_MIN_MACOS_VERSION}}'"/' ./cmake/cef_variables.cmake
sed -i '.orig' 's/"'$(test "${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 && echo "10.9" || echo "10.10")'"/"'${MIN_MACOS_VERSION:-${CI_MIN_MACOS_VERSION}}'"/' ./cmake/cef_variables.cmake
ensure_dir ./build
step "Run CMAKE..."
cmake \
Expand Down Expand Up @@ -277,11 +289,13 @@ configure_obs_build() {
-DSWIGDIR="/tmp/obsdeps" \
-DDepsPath="/tmp/obsdeps" \
-DVLCPath="${DEPS_BUILD_DIR}/vlc-${VLC_VERSION:-${CI_VLC_VERSION}}" \
-DENABLE_VLC=ON \
-DBUILD_BROWSER=ON \
-DBROWSER_LEGACY="$(test "${CEF_BUILD_VERSION:-${CI_CEF_VERSION}}" -le 3770 && echo "ON" || echo "OFF")" \
-DBROWSER_LEGACY="$(test "${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 && echo "ON" || echo "OFF")" \
-DWITH_RTMPS=ON \
-DCEF_ROOT_DIR="${DEPS_BUILD_DIR}/cef_binary_${CEF_BUILD_VERSION:-${CI_CEF_VERSION}}_macosx64" \
-DCEF_ROOT_DIR="${DEPS_BUILD_DIR}/cef_binary_${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}_macosx64" \
-DCMAKE_BUILD_TYPE="${BUILD_CONFIG}" \
-DLIBCAFFEINE_DIR="${DEPS_BUILD_DIR}/libcaffeine-v${LIBCAFFEINE_VERSION:-${CI_LIBCAFFEINE_VERSION}}-macos" \
..

}
Expand Down Expand Up @@ -329,7 +343,7 @@ bundle_dylibs() {
./OBS.app/Contents/PlugIns/text-freetype2.so
./OBS.app/Contents/PlugIns/obs-outputs.so
)
if ! [ "${CEF_BUILD_VERSION:-${CI_CEF_VERSION}}" -le 3770 ]; then
if ! [ "${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 ]; then
${CI_SCRIPTS}/app/dylibbundler -cd -of -a ./OBS.app -q -f \
-s ./OBS.app/Contents/MacOS \
-s "${DEPS_BUILD_DIR}/sparkle/Sparkle.framework" \
Expand Down Expand Up @@ -371,7 +385,7 @@ install_frameworks() {

hr "Adding Chromium Embedded Framework"
step "Copy Framework..."
cp -R "${DEPS_BUILD_DIR}/cef_binary_${CEF_BUILD_VERSION:-${CI_CEF_VERSION}}_macosx64/Release/Chromium Embedded Framework.framework" ./OBS.app/Contents/Frameworks/
cp -R "${DEPS_BUILD_DIR}/cef_binary_${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}_macosx64/Release/Chromium Embedded Framework.framework" ./OBS.app/Contents/Frameworks/
chown -R $(whoami) ./OBS.app/Contents/Frameworks/
}

Expand All @@ -395,7 +409,7 @@ prepare_macos_bundle() {
cp rundir/${BUILD_CONFIG}/bin/obs ./OBS.app/Contents/MacOS
cp rundir/${BUILD_CONFIG}/bin/obs-ffmpeg-mux ./OBS.app/Contents/MacOS
cp rundir/${BUILD_CONFIG}/bin/libobsglad.0.dylib ./OBS.app/Contents/MacOS
if ! [ "${CEF_BUILD_VERSION:-${CI_CEF_VERSION}}" -le 3770 ]; then
if ! [ "${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 ]; then
cp -R "rundir/${BUILD_CONFIG}/bin/OBS Helper.app" "./OBS.app/Contents/Frameworks/OBS Helper.app"
cp -R "rundir/${BUILD_CONFIG}/bin/OBS Helper (GPU).app" "./OBS.app/Contents/Frameworks/OBS Helper (GPU).app"
cp -R "rundir/${BUILD_CONFIG}/bin/OBS Helper (Plugin).app" "./OBS.app/Contents/Frameworks/OBS Helper (Plugin).app"
Expand Down Expand Up @@ -524,7 +538,7 @@ codesign_bundle() {
codesign --force --options runtime --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libswiftshader_libEGL.dylib"
codesign --force --options runtime --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libGLESv2.dylib"
codesign --force --options runtime --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libswiftshader_libGLESv2.dylib"
if ! [ "${CEF_BUILD_VERSION:-${CI_CEF_VERSION}}" -le 3770 ]; then
if ! [ "${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 ]; then
codesign --force --options runtime --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libvk_swiftshader.dylib"
fi

Expand All @@ -540,7 +554,7 @@ codesign_bundle() {
codesign --force --options runtime --entitlements "${CI_SCRIPTS}/app/entitlements.plist" --sign "${CODESIGN_IDENT}" --deep ./OBS.app
echo -n "${COLOR_RESET}"

if ! [ "${CEF_BUILD_VERSION:-${CI_CEF_VERSION}}" -le 3770 ]; then
if ! [ "${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 ]; then
step "Code-sign CEF helper apps..."
echo -n "${COLOR_ORANGE}"
codesign --force --options runtime --sign "${CODESIGN_IDENT}" --deep "./OBS.app/Contents/Frameworks/OBS Helper.app"
Expand Down Expand Up @@ -578,7 +592,7 @@ codesign_image() {
}

## BUILD FROM SOURCE META FUNCTION ##
full-build-macos() {
full_build_macos() {
if [ -n "${SKIP_BUILD}" ]; then step "Skipping full build"; return; fi

if [ ! -n "${SKIP_DEPS}" ]; then
Expand Down Expand Up @@ -664,7 +678,7 @@ print_usage() {
exit 0
}

obs-build-main() {
obs_build_main() {
ensure_dir ${CHECKOUT_DIR}
check_macos_version
step "Fetching OBS tags..."
Expand Down Expand Up @@ -701,7 +715,7 @@ obs-build-main() {
esac
done

full-build-macos
full_build_macos
bundle_macos
codesign_bundle
package_macos
Expand All @@ -711,4 +725,4 @@ obs-build-main() {
cleanup
}

obs-build-main $*
obs_build_main $*
2 changes: 1 addition & 1 deletion CI/scripts/macos/Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ tap "akeru-inc/tap"
brew "cmake"
brew "freetype"
brew "cmocka"
brew "akeru-inc/tap/xcnotary"
brew "akeru-inc/tap/xcnotary"
12 changes: 12 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,18 @@ if(NOT INSTALLER_RUN)
endif()

find_package(Qt5Widgets ${FIND_MODE})

option(BUILD_CAFFEINE "Enables streaming to Caffeine.tv" ON)
if (BUILD_CAFFEINE)
find_package(libcaffeine)
if (LIBCAFFEINE_FOUND)
set(CAFFEINE_ENABLED TRUE)
else()
set(CAFFEINE_ENABLED FALSE)
endif()
else()
set(CAFFEINE_ENABLED FALSE)
endif()
endif()

add_subdirectory(deps)
Expand Down
Loading