26.0.2.0-rpan

archivedprojects · Dec 7, 2020 · d5c0c62 · d5c0c62
1 parent 3f6e15b
commit d5c0c62
Show file tree

Hide file tree

Showing 1,051 changed files with 58,286 additions and 14,609 deletions.
diff --git a/AUTHORS b/AUTHORS
diff --git a/CI/before-deploy-osx.sh b/CI/before-deploy-osx.sh
@@ -41,8 +41,8 @@ fi
 # Move obspython
 if [ ! -f ./rundir/${BUILD_TYPE}/bin/_obspython.so ] ; then
     hr "Moving OBS Python"
-    mv ./rundir/${BUILD_TYPE}/data/obs-scripting/_obspython.so ./rundir/${BUILD_TYPE}/bin/
-    mv ./rundir/${BUILD_TYPE}/data/obs-scripting/obspython.py ./rundir/${BUILD_TYPE}/bin/
+    #mv ./rundir/${BUILD_TYPE}/data/obs-scripting/_obspython.so ./rundir/${BUILD_TYPE}/bin/
+    #mv ./rundir/${BUILD_TYPE}/data/obs-scripting/obspython.py ./rundir/${BUILD_TYPE}/bin/
 fi
 
 # Package everything into a nice .app
@@ -57,19 +57,33 @@ fi
 ../CI/install/osx-rpan/packageApp.sh
 
 # fix obs outputs plugin it doesn't play nicely with dylibBundler at the moment
-#cp /usr/local/opt/mbedtls/lib/libmbedtls.12.dylib ./RPANStudio.app/Contents/Frameworks/
-#cp /usr/local/opt/mbedtls/lib/libmbedcrypto.3.dylib ./RPANStudio.app/Contents/Frameworks/
-#cp /usr/local/opt/mbedtls/lib/libmbedx509.0.dylib ./RPANStudio.app/Contents/Frameworks/
-#chmod +w ./RPANStudio.app/Contents/Frameworks/*.dylib
-#install_name_tool -id @executable_path/../Frameworks/libmbedtls.12.dylib ./RPANStudio.app/Contents/Frameworks/libmbedtls.12.dylib
-#install_name_tool -id @executable_path/../Frameworks/libmbedcrypto.3.dylib ./RPANStudio.app/Contents/Frameworks/libmbedcrypto.3.dylib
-#install_name_tool -id @executable_path/../Frameworks/libmbedx509.0.dylib ./RPANStudio.app/Contents/Frameworks/libmbedx509.0.dylib
-#install_name_tool -change libmbedtls.12.dylib @executable_path/../Frameworks/libmbedtls.12.dylib ./RPANStudio.app/Contents/Plugins/obs-outputs.so
-#install_name_tool -change libmbedcrypto.3.dylib @executable_path/../Frameworks/libmbedcrypto.3.dylib ./RPANStudio.app/Contents/Plugins/obs-outputs.so
-#install_name_tool -change libmbedx509.0.dylib @executable_path/../Frameworks/libmbedx509.0.dylib ./RPANStudio.app/Contents/Plugins/obs-outputs.so
-#install_name_tool -change /usr/local/opt/curl/lib/libcurl.4.dylib @executable_path/../Frameworks/libcurl.4.dylib ./RPANStudio.app/Contents/Plugins/obs-outputs.so
-#install_name_tool -change @rpath/libobs.0.dylib @executable_path/../Frameworks/libobs.0.dylib ./RPANStudio.app/Contents/Plugins/obs-outputs.so
-#install_name_tool -change /tmp/obsdeps/bin/libjansson.4.dylib @executable_path/../Frameworks/libjansson.4.dylib ./RPANStudio.app/Contents/Plugins/obs-outputs.so
+#if [ -f /usr/local/opt/mbedtls/lib/libmbedtls.12.dylib ]; then
+#    cp /usr/local/opt/mbedtls/lib/libmbedtls.12.dylib ./OBS.app/Contents/Frameworks/
+#    cp /usr/local/opt/mbedtls/lib/libmbedcrypto.3.dylib ./OBS.app/Contents/Frameworks/
+#    cp /usr/local/opt/mbedtls/lib/libmbedx509.0.dylib ./OBS.app/Contents/Frameworks/
+#    chmod +w ./OBS.app/Contents/Frameworks/*.dylib
+#    install_name_tool -id @executable_path/../Frameworks/libmbedtls.12.dylib ./OBS.app/Contents/Frameworks/libmbedtls.12.dylib
+#    install_name_tool -id @executable_path/../Frameworks/libmbedcrypto.3.dylib ./OBS.app/Contents/Frameworks/libmbedcrypto.3.dylib
+#    install_name_tool -id @executable_path/../Frameworks/libmbedx509.0.dylib ./OBS.app/Contents/Frameworks/libmbedx509.0.dylib
+#    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
+#elif [ -f /usr/local/opt/mbedtls/lib/libmbedtls.13.dylib ]; then
+#    cp /usr/local/opt/mbedtls/lib/libmbedtls.13.dylib ./OBS.app/Contents/Frameworks/
+#    cp /usr/local/opt/mbedtls/lib/libmbedcrypto.5.dylib ./OBS.app/Contents/Frameworks/
+#    cp /usr/local/opt/mbedtls/lib/libmbedx509.1.dylib ./OBS.app/Contents/Frameworks/
+#    chmod +w ./OBS.app/Contents/Frameworks/*.dylib
+#    install_name_tool -id @executable_path/../Frameworks/libmbedtls.13.dylib ./OBS.app/Contents/Frameworks/libmbedtls.13.dylib
+#    install_name_tool -id @executable_path/../Frameworks/libmbedcrypto.5.dylib ./OBS.app/Contents/Frameworks/libmbedcrypto.5.dylib
+#    install_name_tool -id @executable_path/../Frameworks/libmbedx509.1.dylib ./OBS.app/Contents/Frameworks/libmbedx509.1.dylib
+#    install_name_tool -change libmbedtls.13.dylib @executable_path/../Frameworks/libmbedtls.13.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
+#    install_name_tool -change libmbedcrypto.5.dylib @executable_path/../Frameworks/libmbedcrypto.5.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
+#    install_name_tool -change libmbedx509.1.dylib @executable_path/../Frameworks/libmbedx509.1.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
+#fi
+#
+#install_name_tool -change /usr/local/opt/curl/lib/libcurl.4.dylib @executable_path/../Frameworks/libcurl.4.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
+#install_name_tool -change @rpath/libobs.0.dylib @executable_path/../Frameworks/libobs.0.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
+#install_name_tool -change /tmp/obsdeps/bin/libjansson.4.dylib @executable_path/../Frameworks/libjansson.4.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
 
 # copy sparkle into the app
 #hr "Copying Sparkle.framework"

diff --git a/CI/before-script-osx.sh b/CI/before-script-osx.sh
@@ -6,7 +6,8 @@ git fetch --tags
 mkdir build
 cd build
 cmake -DENABLE_SPARKLE_UPDATER=ON \
--DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 \
+-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 \
+-DDISABLE_PYTHON=ON \
 -DQTDIR=/usr/local/Cellar/qt/5.14.1 \
 -DDepsPath=/tmp/obsdeps \
 -DVLCPath=$PWD/../../vlc-3.0.8 \