diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-03-28 11:34:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 20:34:59 -0700 |
| commit | 9efff1124a3ce8d648146a0b69c7cb38fb9ebe1e (patch) | |
| tree | f1e7e443eb7abe0b8402d33606c5d01088cc09b4 | |
| parent | 7b0dea5b36cd7f7f0e599bd7178e8c654c8d2094 (diff) | |
| download | vcpkg-9efff1124a3ce8d648146a0b69c7cb38fb9ebe1e.tar.gz vcpkg-9efff1124a3ce8d648146a0b69c7cb38fb9ebe1e.zip | |
[ffmpeg] Disable vdpau in UNIX (#10161)
* [ffmpeg] Disable vdpau in UNIX
* [ffmpeg] Disable vdpau in OSX only
* [freerdp] Add warning message when building in non-windows
* revert 1ec77854917e513c7bdf17c8301fcd0a15aa685f changes
| -rw-r--r-- | ports/ffmpeg/FindFFMPEG.cmake.in | 2 | ||||
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ports/ffmpeg/FindFFMPEG.cmake.in b/ports/ffmpeg/FindFFMPEG.cmake.in index bb4706985..cd61ffcc8 100644 --- a/ports/ffmpeg/FindFFMPEG.cmake.in +++ b/ports/ffmpeg/FindFFMPEG.cmake.in @@ -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@) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 94736a79d..a87ea6a01 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -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() |