mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-04 03:19:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[ffmpeg] Disable vdpau in UNIX (#10161)

Browse Source 
* [ffmpeg] Disable vdpau in UNIX

* [ffmpeg] Disable vdpau in OSX only

* [freerdp] Add warning message when building in non-windows

* revert 1ec7785491 changes
This commit is contained in:
Jack·Boos·Yu 2020-03-28 11:34:59 +08:00 committed by GitHub
parent 7b0dea5b36
commit 9efff1124a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/ffmpeg/FindFFMPEG.cmake.in
View File

@ -33,7 +33,7 @@ set(FFMPEG_VERSION "4.2")
find_dependency(Threads)
if(UNIX)
list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS -pthread -lvdpau -lX11)
list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS -pthread -lX11)
endif()
if(@ENABLE_BZIP2@)

8
ports/ffmpeg/portfile.cmake
View File

@ -131,6 +131,10 @@ if("avresample" IN_LIST FEATURES)
set(OPTIONS "${OPTIONS} --enable-avresample")
endif()
if (VCPKG_TARGET_IS_OSX)
set(OPTIONS "${OPTIONS} --disable-vdpau") # disable vdpau in OSX
endif()
if("nvcodec" IN_LIST FEATURES)
set(OPTIONS "${OPTIONS} --enable-cuda --enable-nvenc --enable-cuvid --disable-libnpp")
else()
@ -152,7 +156,7 @@ else()
message(FATAL_ERROR "Unsupported architecture")
endif()
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
if(VCPKG_TARGET_IS_UWP)
set(ENV{LIBPATH} "$ENV{LIBPATH};$ENV{_WKITS10}references\\windows.foundation.foundationcontract\\2.0.0.0\\;$ENV{_WKITS10}references\\windows.foundation.universalapicontract\\3.0.0.0\\")
set(OPTIONS "${OPTIONS} --disable-programs")
set(OPTIONS "${OPTIONS} --extra-cflags=-DWINAPI_FAMILY=WINAPI_FAMILY_APP --extra-cflags=-D_WIN32_WINNT=0x0A00")
@ -166,7 +170,7 @@ set(OPTIONS "${OPTIONS} ${OPTIONS_CROSS}")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(OPTIONS "${OPTIONS} --disable-static --enable-shared")
if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
if (VCPKG_TARGET_IS_UWP)
set(OPTIONS "${OPTIONS} --extra-ldflags=-APPCONTAINER --extra-ldflags=WindowsApp.lib")
endif()
endif()