libobs: Add texture sharing support for macOS/OpenGL

2026-09-24 23:31:36 +08:00 · 2020-12-16 12:56:43 +01:00
parent ad1b98351c
commit c85bf0fcba
2 changed files with 117 additions and 76 deletions
@@ -15,8 +15,8 @@ on:
      - master

 env:
-  CEF_BUILD_VERSION: '4183'
-  CEF_VERSION: '85.0.0-HEAD.2272+gd5ec257+chromium-85.0.4183.121'
+  CEF_BUILD_VERSION: '3770'
+  CEF_VERSION: '75.1.16+g16a67c4+chromium-75.0.3770.100'

 jobs:
  macos64:
@@ -136,7 +136,8 @@ jobs:
        run: |
          mkdir ./build
          cd ./build
-          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 -DWITH_RTMPS=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_macosx64" ..
+          LEGACY_BROWSER="$(test "${{ env.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.CEF_BUILD_VERSION }}_macosx64" ..
      - name: 'Build'
        shell: bash
        working-directory: ${{ github.workspace }}/build
@@ -173,10 +174,12 @@ jobs:

          cp rundir/RelWithDebInfo/bin/obs ./OBS.app/Contents/MacOS
          cp rundir/RelWithDebInfo/bin/obs-ffmpeg-mux ./OBS.app/Contents/MacOS
-          cp -R "rundir/RelWithDebInfo/bin/OBS Helper.app" "./OBS.app/Contents/Frameworks/OBS Helper.app"
-          cp -R "rundir/RelWithDebInfo/bin/OBS Helper (GPU).app" "./OBS.app/Contents/Frameworks/OBS Helper (GPU).app"
-          cp -R "rundir/RelWithDebInfo/bin/OBS Helper (Plugin).app" "./OBS.app/Contents/Frameworks/OBS Helper (Plugin).app"
-          cp -R "rundir/RelWithDebInfo/bin/OBS Helper (Renderer).app" "./OBS.app/Contents/Frameworks/OBS Helper (Renderer).app"
+          if ! [ "${{ env.CEF_BUILD_VERSION }}" -le 3770 ]; then
+            cp -R "rundir/RelWithDebInfo/bin/OBS Helper.app" "./OBS.app/Contents/Frameworks/OBS Helper.app"
+            cp -R "rundir/RelWithDebInfo/bin/OBS Helper (GPU).app" "./OBS.app/Contents/Frameworks/OBS Helper (GPU).app"
+            cp -R "rundir/RelWithDebInfo/bin/OBS Helper (Plugin).app" "./OBS.app/Contents/Frameworks/OBS Helper (Plugin).app"
+            cp -R "rundir/RelWithDebInfo/bin/OBS Helper (Renderer).app" "./OBS.app/Contents/Frameworks/OBS Helper (Renderer).app"
+          fi
          cp rundir/RelWithDebInfo/bin/libobsglad.0.dylib ./OBS.app/Contents/MacOS
          cp -R rundir/RelWithDebInfo/data ./OBS.app/Contents/Resources
          cp ../CI/scripts/macos/app/AppIcon.icns ./OBS.app/Contents/Resources
@@ -190,34 +193,47 @@ jobs:
            rm -rf ./OBS.app/Contents/Resources/data/obs-scripting/
          fi

+          BUNDLE_PLUGINS=(
+            ./OBS.app/Contents/PlugIns/coreaudio-encoder.so
+            ./OBS.app/Contents/PlugIns/decklink-ouput-ui.so
+            ./OBS.app/Contents/PlugIns/decklink-captions.so
+            ./OBS.app/Contents/PlugIns/frontend-tools.so
+            ./OBS.app/Contents/PlugIns/image-source.so
+            ./OBS.app/Contents/PlugIns/linux-jack.so
+            ./OBS.app/Contents/PlugIns/mac-avcapture.so
+            ./OBS.app/Contents/PlugIns/mac-capture.so
+            ./OBS.app/Contents/PlugIns/mac-decklink.so
+            ./OBS.app/Contents/PlugIns/mac-syphon.so
+            ./OBS.app/Contents/PlugIns/mac-vth264.so
+            ./OBS.app/Contents/PlugIns/mac-virtualcam.so
+            ./OBS.app/Contents/PlugIns/obs-browser.so
+            ./OBS.app/Contents/PlugIns/obs-ffmpeg.so
+            ./OBS.app/Contents/PlugIns/obs-filters.so
+            ./OBS.app/Contents/PlugIns/obs-transitions.so
+            ./OBS.app/Contents/PlugIns/obs-vst.so
+            ./OBS.app/Contents/PlugIns/rtmp-services.so
+            ./OBS.app/Contents/MacOS/obs-ffmpeg-mux
+            ./OBS.app/Contents/MacOS/obslua.so
+            ./OBS.app/Contents/PlugIns/obs-x264.so
+            ./OBS.app/Contents/PlugIns/text-freetype2.so
+            ./OBS.app/Contents/PlugIns/obs-libfdk.so
+            ./OBS.app/Contents/PlugIns/obs-outputs.so
+          )
+
+          if ! [ "${{ env.CEF_BUILD_VERSION }}" -le 3770 ]; then
          ../CI/scripts/macos/app/dylibBundler -cd -of -a ./OBS.app -q -f \
            -s ./OBS.app/Contents/MacOS \
            -s "${{ github.workspace }}/cmbuild/sparkle/Sparkle.framework" \
            -s ./rundir/RelWithDebInfo/bin \
-            -x ./OBS.app/Contents/PlugIns/coreaudio-encoder.so \
-            -x ./OBS.app/Contents/PlugIns/decklink-ouput-ui.so \
-            -x ./OBS.app/Contents/PlugIns/decklink-captions.so \
-            -x ./OBS.app/Contents/PlugIns/frontend-tools.so \
-            -x ./OBS.app/Contents/PlugIns/image-source.so \
-            -x ./OBS.app/Contents/PlugIns/linux-jack.so \
-            -x ./OBS.app/Contents/PlugIns/mac-avcapture.so \
-            -x ./OBS.app/Contents/PlugIns/mac-capture.so \
-            -x ./OBS.app/Contents/PlugIns/mac-decklink.so \
-            -x ./OBS.app/Contents/PlugIns/mac-syphon.so \
-            -x ./OBS.app/Contents/PlugIns/mac-vth264.so \
-            -x ./OBS.app/Contents/PlugIns/mac-virtualcam.so \
-            -x ./OBS.app/Contents/PlugIns/obs-browser.so \
-            -x ./OBS.app/Contents/PlugIns/obs-ffmpeg.so \
-            -x ./OBS.app/Contents/PlugIns/obs-filters.so \
-            -x ./OBS.app/Contents/PlugIns/obs-transitions.so \
-            -x ./OBS.app/Contents/PlugIns/obs-vst.so \
-            -x ./OBS.app/Contents/PlugIns/rtmp-services.so \
-            -x ./OBS.app/Contents/MacOS/obs-ffmpeg-mux \
-            -x ./OBS.app/Contents/MacOS/obslua.so \
-            -x ./OBS.app/Contents/PlugIns/obs-x264.so \
-            -x ./OBS.app/Contents/PlugIns/text-freetype2.so \
-            -x ./OBS.app/Contents/PlugIns/obs-libfdk.so \
-            -x ./OBS.app/Contents/PlugIns/obs-outputs.so
+            $(echo "${BUNDLE_PLUGINS[@]/#/-x }")
+          else
+          ../CI/scripts/macos/app/dylibBundler -cd -of -a ./OBS.app -q -f \
+            -s ./OBS.app/Contents/MacOS \
+            -s "${{ github.workspace }}/cmbuild/sparkle/Sparkle.framework" \
+            -s ./rundir/RelWithDebInfo/bin \
+            $(echo "${BUNDLE_PLUGINS[@]/#/-x }") \
+            -x ./OBS.app/Contents/PlugIns/obs-browser-page
+          fi

          mv ./libobs-opengl/libobs-opengl.so ./OBS.app/Contents/Frameworks

@@ -254,16 +270,21 @@ jobs:
          codesign --force --options runtime --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libswiftshader_libEGL.dylib"
          codesign --force --options runtime --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libGLESv2.dylib"
          codesign --force --options runtime --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libswiftshader_libGLESv2.dylib"
-          codesign --force --options runtime --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libvk_swiftshader.dylib"
+          if ! [ "${{ env.CEF_BUILD_VERSION }}" -le 3770 ]; then
+            codesign --force --options runtime --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libvk_swiftshader.dylib"
+          fi
          codesign --force --options runtime --sign "${SIGN_IDENTITY:--}" --deep "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework"

          codesign --force --options runtime --deep --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Resources/data/obs-mac-virtualcam.plugin"

          codesign --force --options runtime --entitlements "../CI/scripts/macos/app/entitlements.plist" --sign "${SIGN_IDENTITY:--}" --deep ./OBS.app

-          codesign --force --options runtime --entitlements "../CI/scripts/macos/helpers/helper-gpu-entitlements.plist" --sign "${SIGN_IDENTITY:--}" --deep "./OBS.app/Contents/Frameworks/OBS Helper (GPU).app"
-          codesign --force --options runtime --entitlements "../CI/scripts/macos/helpers/helper-plugin-entitlements.plist" --sign "${SIGN_IDENTITY:--}" --deep "./OBS.app/Contents/Frameworks/OBS Helper (Plugin).app"
-          codesign --force --options runtime --entitlements "../CI/scripts/macos/helpers/helper-renderer-entitlements.plist" --sign "${SIGN_IDENTITY:--}" --deep "./OBS.app/Contents/Frameworks/OBS Helper (Renderer).app"
+          if ! [ "${{ env.CEF_BUILD_VERSION }}" -le 3770 ]; then
+            codesign --force --options runtime --sign "${SIGN_IDENTITY:--}" --deep "./OBS.app/Contents/Frameworks/OBS Helper.app"
+            codesign --force --options runtime --entitlements "../CI/scripts/macos/helpers/helper-gpu-entitlements.plist" --sign "${SIGN_IDENTITY:--}" --deep "./OBS.app/Contents/Frameworks/OBS Helper (GPU).app"
+            codesign --force --options runtime --entitlements "../CI/scripts/macos/helpers/helper-plugin-entitlements.plist" --sign "${SIGN_IDENTITY:--}" --deep "./OBS.app/Contents/Frameworks/OBS Helper (Plugin).app"
+            codesign --force --options runtime --entitlements "../CI/scripts/macos/helpers/helper-renderer-entitlements.plist" --sign "${SIGN_IDENTITY:--}" --deep "./OBS.app/Contents/Frameworks/OBS Helper (Renderer).app"
+          fi

          codesign -dvv ./OBS.app
      - name: 'Package'