mirror of
https://github.com/rustdesk/rustdesk.git
synced 2026-04-21 12:33:19 +03: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:
39
vcpkg.json
39
vcpkg.json
@@ -51,44 +51,13 @@
|
||||
{
|
||||
"name": "libyuv",
|
||||
"host": false
|
||||
},
|
||||
{
|
||||
"name": "ffmpeg",
|
||||
"host": true,
|
||||
"features": [
|
||||
{
|
||||
"name": "amf",
|
||||
"platform": "((windows | linux) & static)"
|
||||
},
|
||||
{
|
||||
"name": "nvcodec",
|
||||
"platform": "((windows | linux) & static)"
|
||||
},
|
||||
{
|
||||
"name": "qsv",
|
||||
"platform": "(windows & static)"
|
||||
}
|
||||
],
|
||||
"platform": "((windows | (linux & !arm32) | osx) & static)"
|
||||
},
|
||||
{
|
||||
"name": "ffmpeg",
|
||||
"host": false,
|
||||
"platform": "((android | ios | (linux & arm32)) & static)"
|
||||
}
|
||||
],
|
||||
"vcpkg-configuration": {
|
||||
"default-registry": {
|
||||
"kind": "builtin",
|
||||
"baseline": "f7423ee180c4b7f40d43402c2feb3859161ef625"
|
||||
"baseline": ""
|
||||
},
|
||||
"overlay-ports": [
|
||||
"./res/vcpkg"
|
||||
]
|
||||
},
|
||||
"overrides": [
|
||||
{ "name": "ffnvcodec", "version": "11.1.5.2" },
|
||||
{ "name": "amd-amf", "version": "1.4.29" },
|
||||
{ "name": "mfx-dispatch", "version": "1.35.1" }
|
||||
]
|
||||
}
|
||||
"overlay-ports": [ "./res/vcpkg" ]
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user