visionos is arm64 only

Author: wang-bin

.github/workflows/build.yml

@@ -160,6 +160,7 @@ jobs:
             sdk=${sdk/xrOSS/xrs}
             EXTRA_OPTS="-DCMAKE_OSX_SYSROOT=${sdk}"
         }
+        [ ${{ matrix.os }} == visionOS ] && archs=arm64
         cmake -GNinja -DFFMPEG_EMBED=1 -DMIN_SIZE=1 -DUSE_LTO=1 -DWITH_DEB_INFO=1 -DCMAKE_SYSTEM_NAME=${{ matrix.os }} $EXTRA_OPTS -DCMAKE_OSX_DEPLOYMENT_TARGET=$minver -DCMAKE_OSX_ARCHITECTURES="$archs" -Bbuild/${TARGET_OS} -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DCMAKE_INSTALL_PREFIX=$PWD/mdk-sdk -DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_IOS_INSTALL_COMBINED=YES -DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=NO # FFMPEG_EMBED=0 to copy libffmpeg.5.dylib
     - name: Configure CMake
       if: ${{ matrix.os == 'macCatalyst' }}
@@ -616,7 +617,7 @@ jobs:
 
 
   ClangCL:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     env:
       TARGET_OS: ${{ matrix.os }}
       VCDIR: '/tmp/winsysroot/msvcrt-dev'
@@ -656,11 +657,8 @@ jobs:
         SYSROOT_CACHE_HIT: ${{ steps.sysroot-cache.outputs.cache-hit }}
         EXTERNAL_DEP_CACHE_HIT: ${{ steps.external-dep-cache.outputs.cache-hit }}
       working-directory: mdk
-      run: |
-        sudo apt remove -y libc++1-14 libc++abi1-14 libunwind-14 python3-lldb-14 # conflict with latest llvm
-        ../ci-before-build.sh
+      run: ../ci-before-build.sh
     - name: Configure for win arm64
-      shell: bash
       env:
         ARCH: arm64
       working-directory: mdk
@@ -669,11 +667,9 @@ jobs:
         export WindowsSDKVersion=$(cat ${WINDOWSSDKDIR}/.version)
         cmake -DCMAKE_SYSTEM_PROCESSOR=${ARCH} -DCMAKE_TOOLCHAIN_FILE=$PWD/cmake/tools/windows.clang.cmake -GNinja -H$PWD -B$PWD/build/${TARGET_OS}-${ARCH} -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DCMAKE_INSTALL_PREFIX=$PWD/mdk-sdk-${ARCH} -DCMAKE_VERBOSE_MAKEFILE=1
     - name: Build for arm64
-      shell: bash
       working-directory: mdk
       run: cmake --build build/${TARGET_OS}-arm64
     - name: Configure for win x86
-      shell: bash
       env:
         ARCH: x86
       working-directory: mdk
@@ -682,11 +678,9 @@ jobs:
         export WindowsSDKVersion=$(cat ${WINDOWSSDKDIR}/.version)
         cmake -DR3DSDK=$PWD/external/R3DSDK -DCMAKE_SYSTEM_PROCESSOR=${ARCH} -DCMAKE_TOOLCHAIN_FILE=$PWD/cmake/tools/windows.clang.cmake -GNinja -H$PWD -B$PWD/build/${TARGET_OS}-${ARCH} -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DCMAKE_INSTALL_PREFIX=$PWD/mdk-sdk-${ARCH} -DCMAKE_VERBOSE_MAKEFILE=1
     - name: Build for x86
-      shell: bash
       working-directory: mdk
       run: cmake --build build/${TARGET_OS}-x86
     - name: Configure for win x64
-      shell: bash
       env:
         ARCH: x64
       working-directory: mdk
@@ -695,11 +689,9 @@ jobs:
         export WindowsSDKVersion=$(cat ${WINDOWSSDKDIR}/.version)
         cmake -DR3DSDK=$PWD/external/R3DSDK -DCMAKE_SYSTEM_PROCESSOR=${ARCH} -DCMAKE_TOOLCHAIN_FILE=$PWD/cmake/tools/windows.clang.cmake -GNinja -H$PWD -B$PWD/build/${TARGET_OS}-${ARCH} -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DCMAKE_INSTALL_PREFIX=$PWD/mdk-sdk-${ARCH} -DCMAKE_VERBOSE_MAKEFILE=1
     - name: Build for x64
-      shell: bash
       working-directory: mdk
       run: cmake --build build/${TARGET_OS}-x64
     - name: Make SDK
-      shell: bash
       working-directory: mdk
       run: |
         ../ci-after-build.sh
@@ -716,7 +708,6 @@ jobs:
         path: mdk-sdk-${{ env.TARGET_OS }}-clang.7z
     - name: Upload to SourceForge
       if: ${{ matrix.config == 'MinSizeRel' && env.SF_UPLOAD == 'true' }}
-      shell: bash
       run: sshpass -p ${SF_PW} scp -o StrictHostKeyChecking=no mdk-sdk-${TARGET_OS}-clang.7z ${SF_USER}@frs.sourceforge.net:/home/frs/project/mdk-sdk/nightly/
 
   NuGet:

ci-before-build.sh

@@ -44,13 +44,13 @@ elif [ `which brew` ]; then
     export HOMEBREW_NO_AUTO_UPDATE=true
     #time brew update --preinstall
     export HOMEBREW_NO_AUTO_UPDATE=1
-    pkgs="p7zip ninja vulkan-headers dav1d gnu-tar" #
-    pkgs+=" cmake" # visionOS simulator requires cmake 3.28.4
+    pkgs="ninja vulkan-headers dav1d" # p7zip  gnu-tar
+    #pkgs+=" cmake" # visionOS simulator requires cmake 3.28.4
     if [[ "$DEVTOOLS_CACHE_HIT" != "true" ]]; then
         pkgs+=" hudochenkov/sshpass/sshpass"
     fi
     if [ "$TARGET_OS" == "macOS" ]; then
-        pkgs+=" glfw3 sdl2"
+        pkgs+=" glfw sdl2"
         echo "$TARGET_ARCH" |grep arm >/dev/null || { # FIXME: arm64 host build
           pkgs+=" xquartz pulseaudio" # no more cask
         }

mdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name              = 'mdk'
-    s.version           = '0.27.0'
+    s.version           = '0.28.0'
     s.summary           = 'Multimedia Development Kit'
     s.homepage          = 'https://github.com/wang-bin/mdk-sdk'
 
@@ -23,6 +23,8 @@ Pod::Spec.new do |s|
     s.visionos.deployment_target = '1.0'
     s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=*simulator*]' => 'i386'}
     s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=*simulator*]' => 'i386', 'OTHER_CODE_SIGN_FLAGS' => '$(inherited) --deep'}
+    s.visionos.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=*simulator*]' => 'x86_64'} # optional?
+    s.visionos.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=*simulator*]' => 'x86_64'}
 #    s.user_target_xcconfig = { 'VALID_ARCHS[sdk=iphonesimulator*]' => '' }
 #    s.pod_target_xcconfig = { 'VALID_ARCHS[sdk=iphonesimulator*]' => '' } # VALID_ARCHS is removed in xcode12.0
     #s.pod_target_xcconfig = { 'ARCHS[sdk=iphonesimulator*]' => '$(ARCHS_STANDARD_64_BIT)' }