diff --git a/.github/scripts/macOS/install_others.sh b/.github/scripts/macOS/install_others.sh index 592f149d5..638e3e0b4 100755 --- a/.github/scripts/macOS/install_others.sh +++ b/.github/scripts/macOS/install_others.sh @@ -38,15 +38,18 @@ install_aja() {( )} install_deltacast() {( - DELTA_CACHE_INST=${SDK_NONFREE_PATH-nonexistent}/VideoMasterHD_inst - if [ ! -d "$DELTA_CACHE_INST" ]; then - return 0 + if [ ! -f "$SDK_NONFREE_PATH/VideoMaster_SDK_MacOSX.zip" ]; then + return fi - FEATURES="$FEATURES --enable-deltacast" + unzip "$SDK_NONFREE_PATH/VideoMaster_SDK_MacOSX.zip" + sudo installer -pkg VideoMaster_SDK.pkg -target / || true +) + export FEATURES="${FEATURES+$FEATURES }--enable-deltacast" echo "FEATURES=$FEATURES" >> "$GITHUB_ENV" - sudo cp -a "$DELTA_CACHE_INST"/* \ - "$(xcrun --show-sdk-path)/System/Library/Frameworks/" -)} + export COMMON_OSX_FLAGS="${COMMON_OSX_FLAGS+$COMMON_OSX_FLAGS }\ +-F/Library/Frameworks" + printf '%b' "COMMON_OSX_FLAGS=$COMMON_OSX_FLAGS\n" >> "$GITHUB_ENV" +} install_glfw() {( git clone --depth 500 https://github.com/glfw/glfw.git diff --git a/.github/scripts/macOS/prepare_nonfree_sdks.sh b/.github/scripts/macOS/prepare_nonfree_sdks.sh deleted file mode 100755 index 8bbc05162..000000000 --- a/.github/scripts/macOS/prepare_nonfree_sdks.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -eux - -cd /tmp - -# DELTACAST -DELTA_CACHE_INST=$SDK_NONFREE_PATH/VideoMasterHD_inst -if [ ! -f "$SDK_NONFREE_PATH/VideoMaster_SDK_MacOSX.zip" ]; then - return -fi - -unzip "$SDK_NONFREE_PATH/VideoMaster_SDK_MacOSX.zip" -sudo installer -pkg VideoMaster_SDK.pkg -target / || true -cd /Library/Frameworks -sudo install_name_tool -change /Library/Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD @executable_path/../Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD VideoMasterHD.framework/VideoMasterHD -sudo install_name_tool -id @executable_path/../Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD VideoMasterHD.framework/VideoMasterHD -sudo install_name_tool -id @executable_path/../Frameworks/VideoMasterHD_Audio.framework/Versions/A/VideoMasterHD_Audio VideoMasterHD_Audio.framework/Versions/A/VideoMasterHD_Audio -sudo install_name_tool -change /Library/Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD @executable_path/../Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD VideoMasterHD_Audio.framework/Versions/A/VideoMasterHD_Audio -#sudo cp -a VideoMasterHD.framework VideoMasterHD_Audio.framework libVideoMasterHD_SP.dylib $(xcrun --show-sdk-path)/System/Library/Frameworks -mkdir "$DELTA_CACHE_INST" -cp -a VideoMasterHD.framework VideoMasterHD_Audio.framework "$DELTA_CACHE_INST/" -cd "$DELTA_CACHE_INST" -security unlock-keychain -p "$KEY_CHAIN_PASS" "$KEY_CHAIN" -codesign --force -s CESNET VideoMasterHD.framework VideoMasterHD_Audio.framework -cd - -sudo rm -rf /Library/Frameworks/VideoMasterHD* # ensure that only the copy above is used - diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 5000e1341..22bd7d4e9 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -180,7 +180,6 @@ jobs: mkdir -p ${{ env.SDK_NONFREE_PATH }} cd ${{ env.SDK_NONFREE_PATH }} curl -S -f -O $SDK_URL/VideoMaster_SDK_MacOSX.zip || true - $GITHUB_WORKSPACE/.github/scripts/macOS/prepare_nonfree_sdks.sh - name: Cache XIMEA id: cache-macos-ximea uses: actions/cache@main diff --git a/configure.ac b/configure.ac index 2501bc5b4..35e7a457a 100644 --- a/configure.ac +++ b/configure.ac @@ -155,7 +155,6 @@ if test $system = MacOSX; then if test $os_version_major -lt 19; then # Darwin 19.0.0 is macOS 10.15 MACOS_LEGACY=yes fi - COMMON_OSX_FLAGS='-F/Library/Frameworks' CFLAGS="$CFLAGS $COMMON_OSX_FLAGS" CPPFLAGS="$CPPFLAGS $COMMON_OSX_FLAGS" CXXFLAGS="$CXXFLAGS $COMMON_OSX_FLAGS"