TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-28 03:43:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert vcpkg ffmpeg (#8751)

Browse Source 
* Revert "fix linux ffmpeg link, still link ffmpeg in hwcodec (#8747)"

This reverts commit 48464835f5.

* Revert "fix linux armv7 ffmpeg arch, linux x64 sciter add hwcodec feature (#8744)"

This reverts commit b68d7a3054.

* Revert "arm linux remove cuda-llvm option (#8735)"

This reverts commit bc672b3367.

* Reapply "try fix arm64 linux ci and publish error log (#8730)" (#8732)

This reverts commit e283d33f28.

* Revert "try fix arm64 linux ci and publish error log (#8730)"

This reverts commit a4565bf0da.

* Revert "F-Droid: enable hwcodec for future builds (#8726)"

This reverts commit 188f85b042.

* Revert "remove unused vcpkg ffmpeg code (#8725)"

This reverts commit 72c96f22b6.

* Revert "install ffmpeg lib with vcpkg (#8724)"

This reverts commit 0143eaf601.

* update hwcodec to reverted

Signed-off-by: 21pages <sunboeasy@gmail.com>

---------

Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
21pages
2024-07-18 22:28:35 +08:00
committed by GitHub
parent 04c175c62e
commit 5c16a8302e
20 changed files with 15 additions and 1577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
res/vcpkg/ffmpeg/vcpkg-cmake-wrapper.cmake
View File

@@ -1,47 +0,0 @@
set(FFMPEG_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
include(SelectLibraryConfigurations)
cmake_policy(SET CMP0012 NEW)
set(vcpkg_no_avcodec_target ON)
set(vcpkg_no_avformat_target ON)
set(vcpkg_no_avutil_target ON)
if(TARGET FFmpeg::avcodec)
set(vcpkg_no_avcodec_target OFF)
endif()
if(TARGET FFmpeg::avformat)
set(vcpkg_no_avformat_target OFF)
endif()
if(TARGET FFmpeg::avutil)
set(vcpkg_no_avutil_target OFF)
endif()
_find_package(${ARGS})
if(WIN32)
set(PKG_CONFIG_EXECUTABLE "${CMAKE_CURRENT_LIST_DIR}/../../../@_HOST_TRIPLET@/tools/pkgconf/pkgconf.exe" CACHE STRING "" FORCE)
endif()
set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON) # Required for CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1 which otherwise ignores CMAKE_PREFIX_PATH
if(@WITH_MFX@)
find_package(PkgConfig )
pkg_check_modules(libmfx IMPORTED_TARGET libmfx)
list(APPEND FFMPEG_LIBRARIES PkgConfig::libmfx)
if(vcpkg_no_avcodec_target AND TARGET FFmpeg::avcodec)
target_link_libraries(FFmpeg::avcodec INTERFACE PkgConfig::libmfx)
endif()
if(vcpkg_no_avutil_target AND TARGET FFmpeg::avutil)
target_link_libraries(FFmpeg::avutil INTERFACE PkgConfig::libmfx)
endif()
endif()
set(FFMPEG_LIBRARY ${FFMPEG_LIBRARIES})
set(CMAKE_MODULE_PATH ${FFMPEG_PREV_MODULE_PATH})
unset(vcpkg_no_avformat_target)
unset(vcpkg_no_avcodec_target)
unset(vcpkg_no_avutil_target)