mirror of
https://github.com/rustdesk/rustdesk.git
synced 2025-12-13 03:28:03 +00:00
Revert vcpkg ffmpeg (#8751)
* Revert "fix linux ffmpeg link, still link ffmpeg in hwcodec (#8747)" This reverts commit48464835f5. * Revert "fix linux armv7 ffmpeg arch, linux x64 sciter add hwcodec feature (#8744)" This reverts commitb68d7a3054. * Revert "arm linux remove cuda-llvm option (#8735)" This reverts commitbc672b3367. * Reapply "try fix arm64 linux ci and publish error log (#8730)" (#8732) This reverts commite283d33f28. * Revert "try fix arm64 linux ci and publish error log (#8730)" This reverts commita4565bf0da. * Revert "F-Droid: enable hwcodec for future builds (#8726)" This reverts commit188f85b042. * Revert "remove unused vcpkg ffmpeg code (#8725)" This reverts commit72c96f22b6. * Revert "install ffmpeg lib with vcpkg (#8724)" This reverts commit0143eaf601. * update hwcodec to reverted Signed-off-by: 21pages <sunboeasy@gmail.com> --------- Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
@@ -43,13 +43,15 @@ arm64-v8a)
|
||||
FLUTTER_TARGET=android-arm64
|
||||
NDK_TARGET=aarch64-linux-android
|
||||
RUST_TARGET=aarch64-linux-android
|
||||
RUSTDESK_FEATURES='flutter,hwcodec'
|
||||
# RUSTDESK_FEATURES='flutter,hwcodec'
|
||||
RUSTDESK_FEATURES='flutter'
|
||||
;;
|
||||
armeabi-v7a)
|
||||
FLUTTER_TARGET=android-arm
|
||||
NDK_TARGET=arm-linux-androideabi
|
||||
RUST_TARGET=armv7-linux-androideabi
|
||||
RUSTDESK_FEATURES='flutter,hwcodec'
|
||||
# RUSTDESK_FEATURES='flutter,hwcodec'
|
||||
RUSTDESK_FEATURES='flutter'
|
||||
;;
|
||||
x86_64)
|
||||
FLUTTER_TARGET=android-x64
|
||||
|
||||
Reference in New Issue
Block a user