From bc672b336705290ac9dafd35b44fb6378acda63c Mon Sep 17 00:00:00 2001 From: 21pages Date: Wed, 17 Jul 2024 17:19:21 +0800 Subject: [PATCH] arm linux remove cuda-llvm option (#8735) Signed-off-by: 21pages --- libs/scrap/build.rs | 2 +- res/vcpkg/ffmpeg/portfile.cmake | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/scrap/build.rs b/libs/scrap/build.rs index d84d24a58..84b8631f3 100644 --- a/libs/scrap/build.rs +++ b/libs/scrap/build.rs @@ -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); } -// 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() { // ffmpeg let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap(); diff --git a/res/vcpkg/ffmpeg/portfile.cmake b/res/vcpkg/ffmpeg/portfile.cmake index b56debb3e..d8ea95bd2 100644 --- a/res/vcpkg/ffmpeg/portfile.cmake +++ b/res/vcpkg/ffmpeg/portfile.cmake @@ -103,7 +103,6 @@ if(VCPKG_TARGET_IS_LINUX) --target-os=linux \ --enable-pthreads \ --enable-cuda \ ---enable-cuda_llvm \ --enable-ffnvcodec \ --enable-encoder=h264_nvenc \ --enable-encoder=hevc_nvenc \ @@ -117,6 +116,11 @@ if(VCPKG_TARGET_IS_LINUX) --enable-encoder=h264_vaapi \ --enable-encoder=hevc_vaapi \ ") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + string(APPEND OPTIONS "\ +--enable-cuda_llvm \ +") + endif() elseif(VCPKG_TARGET_IS_WINDOWS) string(APPEND OPTIONS "\ --target-os=win32 \