diff options
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index de2413843..c98c17607 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -518,6 +518,10 @@ set(FFmpeg_COMPONENTS | |||
| 518 | avutil | 518 | avutil |
| 519 | swscale) | 519 | swscale) |
| 520 | 520 | ||
| 521 | if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") | ||
| 522 | Include(FindPkgConfig REQUIRED) | ||
| 523 | pkg_check_modules(LIBVA libva) | ||
| 524 | endif() | ||
| 521 | if (NOT YUZU_USE_BUNDLED_FFMPEG) | 525 | if (NOT YUZU_USE_BUNDLED_FFMPEG) |
| 522 | # Use system installed FFmpeg | 526 | # Use system installed FFmpeg |
| 523 | find_package(FFmpeg QUIET COMPONENTS ${FFmpeg_COMPONENTS}) | 527 | find_package(FFmpeg QUIET COMPONENTS ${FFmpeg_COMPONENTS}) |
| @@ -583,10 +587,6 @@ if (YUZU_USE_BUNDLED_FFMPEG) | |||
| 583 | "${FFmpeg_PREFIX};${FFmpeg_BUILD_DIR}" | 587 | "${FFmpeg_PREFIX};${FFmpeg_BUILD_DIR}" |
| 584 | CACHE PATH "Path to FFmpeg headers" FORCE) | 588 | CACHE PATH "Path to FFmpeg headers" FORCE) |
| 585 | 589 | ||
| 586 | if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") | ||
| 587 | Include(FindPkgConfig REQUIRED) | ||
| 588 | pkg_check_modules(LIBVA libva) | ||
| 589 | endif() | ||
| 590 | if(LIBVA_FOUND) | 590 | if(LIBVA_FOUND) |
| 591 | pkg_check_modules(LIBDRM libdrm REQUIRED) | 591 | pkg_check_modules(LIBDRM libdrm REQUIRED) |
| 592 | find_package(X11 REQUIRED) | 592 | find_package(X11 REQUIRED) |
| @@ -670,7 +670,7 @@ if (YUZU_USE_BUNDLED_FFMPEG) | |||
| 670 | endif() | 670 | endif() |
| 671 | else() # WIN32 | 671 | else() # WIN32 |
| 672 | # Use yuzu FFmpeg binaries | 672 | # Use yuzu FFmpeg binaries |
| 673 | set(FFmpeg_EXT_NAME "ffmpeg-4.3.1") | 673 | set(FFmpeg_EXT_NAME "ffmpeg-4.4") |
| 674 | set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") | 674 | set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") |
| 675 | download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") | 675 | download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") |
| 676 | set(FFmpeg_FOUND YES) | 676 | set(FFmpeg_FOUND YES) |