hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6351 from basilgello/vcpkg-deps

Browse Source 
vcpkg-deps fixes
This commit is contained in:
RustDesk 2023-11-09 19:21:45 +08:00 committed by GitHub
commit 6ea0dbc70f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/flutter-build.yml vendored
View File

@ -403,7 +403,10 @@ jobs:
if: env.MACOS_P12_BASE64 != null if: env.MACOS_P12_BASE64 != null
run: | run: |
# Patch create-dmg to give more attempts to unmount image # 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 default-keychain -s rustdesk.keychain
security unlock-keychain -p ${{ secrets.MACOS_P12_PASSWORD }} rustdesk.keychain security unlock-keychain -p ${{ secrets.MACOS_P12_PASSWORD }} rustdesk.keychain
# start sign the rustdesk.app and dmg # start sign the rustdesk.app and dmg

7
res/vcpkg/libvpx/portfile.cmake
View File

@ -174,6 +174,7 @@ else()
set(ENV{AR} ${VCPKG_DETECTED_CMAKE_AR}) set(ENV{AR} ${VCPKG_DETECTED_CMAKE_AR})
set(ENV{LD} ${VCPKG_DETECTED_CMAKE_LINKER}) set(ENV{LD} ${VCPKG_DETECTED_CMAKE_LINKER})
set(ENV{RANLIB} ${VCPKG_DETECTED_CMAKE_RANLIB}) set(ENV{RANLIB} ${VCPKG_DETECTED_CMAKE_RANLIB})
set(ENV{STRIP} ${VCPKG_DETECTED_CMAKE_STRIP})
if(VCPKG_TARGET_IS_MINGW) if(VCPKG_TARGET_IS_MINGW)
if(LIBVPX_TARGET_ARCH STREQUAL "x86") 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) 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") message(STATUS "Cross-building for arm-linux with arm-linux-gnueabihf")
set(ENV{CROSS} "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() endif()
elseif(VCPKG_TARGET_IS_ANDROID) elseif(VCPKG_TARGET_IS_ANDROID)
set(LIBVPX_TARGET "generic-gnu") set(LIBVPX_TARGET "generic-gnu")