Merge pull request #6351 from basilgello/vcpkg-deps

vcpkg-deps fixes

.github/workflows/flutter-build.yml

@@ -403,7 +403,10 @@ jobs:
         if: env.MACOS_P12_BASE64 != null
         run: |
           # Patch create-dmg to give more attempts to unmount image
-          sed -i -e 's/MAXIMUM_UNMOUNTING_ATTEMPTS=3/MAXIMUM_UNMOUNTING_ATTEMPTS=7/' $(command -v create-dmg)
+          CREATE_DMG="$(command -v create-dmg)"
+          CREATE_DMG="$(readlink -f "$CREATE_DMG")"
+          sed -i -e 's/MAXIMUM_UNMOUNTING_ATTEMPTS=3/MAXIMUM_UNMOUNTING_ATTEMPTS=7/' "$CREATE_DMG"
+          # Unlock keychain
           security default-keychain -s rustdesk.keychain
           security unlock-keychain -p ${{ secrets.MACOS_P12_PASSWORD }} rustdesk.keychain
           # start sign the rustdesk.app and dmg

res/vcpkg/libvpx/portfile.cmake

@@ -174,6 +174,7 @@ else()
     set(ENV{AR} ${VCPKG_DETECTED_CMAKE_AR})
     set(ENV{LD} ${VCPKG_DETECTED_CMAKE_LINKER})
     set(ENV{RANLIB} ${VCPKG_DETECTED_CMAKE_RANLIB})
+    set(ENV{STRIP} ${VCPKG_DETECTED_CMAKE_STRIP})
 
     if(VCPKG_TARGET_IS_MINGW)
         if(LIBVPX_TARGET_ARCH STREQUAL "x86")
@@ -186,6 +187,12 @@ else()
         if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm AND NOT VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL arm)
           message(STATUS "Cross-building for arm-linux with arm-linux-gnueabihf")
           set(ENV{CROSS} "arm-linux-gnueabihf-")
+          unset(ENV{CC})
+          unset(ENV{CXX})
+          unset(ENV{AR})
+          unset(ENV{LD})
+          unset(ENV{RANLIB})
+          unset(ENV{STRIP})
         endif()
     elseif(VCPKG_TARGET_IS_ANDROID)
         set(LIBVPX_TARGET "generic-gnu")