From 68d4df918037e912724ae1b04a1158a68ba9a02b Mon Sep 17 00:00:00 2001
From: PatTheMav <patthemav+github@gmail.com>
Date: Thu, 16 Jul 2020 19:23:20 +0200
Subject: [PATCH] CI: Disable building OBS with Python scripting support on
 macOS

---
 .github/workflows/main.yml |  7 +++----
 CI/full-build-macos.sh     | 13 ++++---------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e5346e18b..fd1d8a3d9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -140,7 +140,7 @@ jobs:
         run: |
           mkdir ./build
           cd ./build
-          cmake -DENABLE_UNIT_TESTS=YES -DENABLE_SPARKLE_UPDATER=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DQTDIR="/tmp/obsdeps" -DSWIGDIR="/tmp/obsdeps" -DDepsPath="/tmp/obsdeps" -DVLCPath="${{ github.workspace }}/cmbuild/vlc-${{ env.VLC_VERSION }}" -DENABLE_VLC=ON -DBUILD_BROWSER=ON -DBROWSER_DEPLOY=ON -DBUILD_CAPTIONS=ON -DWITH_RTMPS=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_macosx64" ..
+          cmake -DENABLE_UNIT_TESTS=YES -DENABLE_SPARKLE_UPDATER=ON -DDISABLE_PYTHON=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DQTDIR="/tmp/obsdeps" -DSWIGDIR="/tmp/obsdeps" -DDepsPath="/tmp/obsdeps" -DVLCPath="${{ github.workspace }}/cmbuild/vlc-${{ env.VLC_VERSION }}" -DENABLE_VLC=ON -DBUILD_BROWSER=ON -DBROWSER_DEPLOY=ON -DBUILD_CAPTIONS=ON -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
@@ -180,8 +180,8 @@ jobs:
 
           if [ -d ./OBS.app/Contents/Resources/data/obs-scripting ]; then
             mv ./OBS.app/Contents/Resources/data/obs-scripting/obslua.so ./OBS.app/Contents/MacOS/
-            mv ./OBS.app/Contents/Resources/data/obs-scripting/_obspython.so ./OBS.app/Contents/MacOS/
-            mv ./OBS.app/Contents/Resources/data/obs-scripting/obspython.py ./OBS.app/Contents/MacOS/
+            # mv ./OBS.app/Contents/Resources/data/obs-scripting/_obspython.so ./OBS.app/Contents/MacOS/
+            # mv ./OBS.app/Contents/Resources/data/obs-scripting/obspython.py ./OBS.app/Contents/MacOS/
             rm -rf ./OBS.app/Contents/Resources/data/obs-scripting/
           fi
 
@@ -208,7 +208,6 @@ jobs:
             -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/MacOS/_obspython.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 \
diff --git a/CI/full-build-macos.sh b/CI/full-build-macos.sh
index 84aa2c0e0..c50c87f4c 100755
--- a/CI/full-build-macos.sh
+++ b/CI/full-build-macos.sh
@@ -231,7 +231,8 @@ configure_obs_build() {
 
     hr "Run CMAKE for OBS..."
     cmake -DENABLE_SPARKLE_UPDATER=ON \
-        -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 \
+        -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 \
+        -DDISABLE_PYTHON=ON  \
         -DQTDIR="/tmp/obsdeps" \
         -DSWIGDIR="/tmp/obsdeps" \
         -DDepsPath="/tmp/obsdeps" \
@@ -262,11 +263,6 @@ bundle_dylibs() {
 
     hr "Bundle dylibs for macOS application"
 
-    # step "Fix mbedtls for obs-outputs..."
-    # install_name_tool -change libmbedtls.12.dylib @executable_path/../Frameworks/libmbedtls.12.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
-    # install_name_tool -change libmbedcrypto.3.dylib @executable_path/../Frameworks/libmbedcrypto.3.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
-    # install_name_tool -change libmbedx509.0.dylib @executable_path/../Frameworks/libmbedx509.0.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
-
     step "Run dylibBundler.."
     ${CI_SCRIPTS}/app/dylibBundler -cd -of -a ./OBS.app -q -f \
         -s ./OBS.app/Contents/MacOS \
@@ -291,7 +287,6 @@ bundle_dylibs() {
         -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/MacOS/_obspython.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 \
@@ -340,8 +335,8 @@ prepare_macos_bundle() {
     # Scripting plugins are required to be placed in same directory as binary
     if [ -d ./OBS.app/Contents/Resources/data/obs-scripting ]; then
         mv ./OBS.app/Contents/Resources/data/obs-scripting/obslua.so ./OBS.app/Contents/MacOS/
-        mv ./OBS.app/Contents/Resources/data/obs-scripting/_obspython.so ./OBS.app/Contents/MacOS/
-        mv ./OBS.app/Contents/Resources/data/obs-scripting/obspython.py ./OBS.app/Contents/MacOS/
+        # mv ./OBS.app/Contents/Resources/data/obs-scripting/_obspython.so ./OBS.app/Contents/MacOS/
+        # mv ./OBS.app/Contents/Resources/data/obs-scripting/obspython.py ./OBS.app/Contents/MacOS/
         rm -rf ./OBS.app/Contents/Resources/data/obs-scripting/
     fi