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

arm linux remove cuda-llvm option (#8735)

Browse Source 
Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
21pages 2024-07-17 17:19:21 +08:00 committed by GitHub
parent e283d33f28
commit bc672b3367
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/scrap/build.rs
View File

@ -188,7 +188,7 @@ fn gen_vcpkg_package(package: &str, ffi_header: &str, generated: &str, regex: &s
generate_bindings(&ffi_header, &includes, &ffi_rs, &exact_file, regex); generate_bindings(&ffi_header, &includes, &ffi_rs, &exact_file, regex);
} }
// If you have problems installing ffmpeg, you can disable hwcodec feature and disable this function. // If you have problems installing ffmpeg, you can download $VCPKG_ROOT/installed from ci
fn ffmpeg() { fn ffmpeg() {
// ffmpeg // ffmpeg
let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap(); let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();

6
res/vcpkg/ffmpeg/portfile.cmake
View File

@ -103,7 +103,6 @@ if(VCPKG_TARGET_IS_LINUX)
--target-os=linux \ --target-os=linux \
--enable-pthreads \ --enable-pthreads \
--enable-cuda \ --enable-cuda \
--enable-cuda_llvm \
--enable-ffnvcodec \ --enable-ffnvcodec \
--enable-encoder=h264_nvenc \ --enable-encoder=h264_nvenc \
--enable-encoder=hevc_nvenc \ --enable-encoder=hevc_nvenc \
@ -117,6 +116,11 @@ if(VCPKG_TARGET_IS_LINUX)
--enable-encoder=h264_vaapi \ --enable-encoder=h264_vaapi \
--enable-encoder=hevc_vaapi \ --enable-encoder=hevc_vaapi \
") ")
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
string(APPEND OPTIONS "\
--enable-cuda_llvm \
")
endif()
elseif(VCPKG_TARGET_IS_WINDOWS) elseif(VCPKG_TARGET_IS_WINDOWS)
string(APPEND OPTIONS "\ string(APPEND OPTIONS "\
--target-os=win32 \ --target-os=win32 \