sync with upstream

1 files changed, 12 insertions, 6 deletions

diff --git a/cmake/modules/FindVAAPI.cmake b/cmake/modules/FindVAAPI.cmake
index 5b57d23..157cec4 100644
--- a/cmake/modules/FindVAAPI.cmake
+++ b/cmake/modules/FindVAAPI.cmake
@@ -11,7 +11,7 @@
 # VAAPI_DEFINITIONS - the VAAPI definitions
 
 if(PKG_CONFIG_FOUND)
-  pkg_check_modules(PC_VAAPI libva libva-drm libva-x11 QUIET)
+  pkg_check_modules(PC_VAAPI libva libva-drm libva-wayland libva-x11 QUIET)
 endif()
 
 set(REQUIRED_VARS "VAAPI_libva_LIBRARY" "VAAPI_libva-drm_LIBRARY" "VAAPI_libva_INCLUDE_DIR" "VAAPI_libva-drm_INCLUDE_DIR")
@@ -24,7 +24,13 @@ find_path(VAAPI_libva-drm_INCLUDE_DIR va/va_drm.h
                                 PATHS ${PC_VAAPI_libva-drm_INCLUDEDIR})
 find_library(VAAPI_libva-drm_LIBRARY NAMES va-drm
                                      PATHS ${PC_VAAPI_libva-drm_LIBDIR})
-
+if(CORE_PLATFORM_NAME_LC STREQUAL "wayland")
+  find_path(VAAPI_libva-wayland_INCLUDE_DIR va/va_wayland.h
+                                      PATHS ${PC_VAAPI_libva-wayland_INCLUDEDIR})
+  find_library(VAAPI_libva-wayland_LIBRARY NAMES va-wayland
+                                           PATHS ${PC_VAAPI_libva-wayland_LIBDIR})
+  list(APPEND REQUIRED_VARS "VAAPI_libva-wayland_INCLUDE_DIR" "VAAPI_libva-wayland_LIBRARY")
+endif()
 if(CORE_PLATFORM_NAME_LC STREQUAL "x11")
   find_path(VAAPI_libva-x11_INCLUDE_DIR va/va_x11.h
                                   PATHS ${PC_VAAPI_libva-x11_INCLUDEDIR})
@@ -51,10 +57,10 @@ find_package_handle_standard_args(VAAPI
                                   VERSION_VAR VAAPI_VERSION_STRING)
 
 if(VAAPI_FOUND)
-  set(VAAPI_INCLUDE_DIRS ${VAAPI_INCLUDE_DIR} ${VAAPI_DRM_INCLUDE_DIR} ${VAAPI_X11_INCLUDE_DIR})
-  set(VAAPI_LIBRARIES ${VAAPI_libva_LIBRARY} ${VAAPI_libva-drm_LIBRARY} ${VAAPI_libva-x11_LIBRARY})
+  set(VAAPI_INCLUDE_DIRS ${VAAPI_INCLUDE_DIR} ${VAAPI_DRM_INCLUDE_DIR} ${VAAPI_WAYLAND_INCLUDE_DIR} ${VAAPI_X11_INCLUDE_DIR})
+  set(VAAPI_LIBRARIES ${VAAPI_libva_LIBRARY} ${VAAPI_libva-drm_LIBRARY} ${VAAPI_libva-wayland_LIBRARY} ${VAAPI_libva-x11_LIBRARY})
   set(VAAPI_DEFINITIONS -DHAVE_LIBVA=1)
 endif()
 
-mark_as_advanced(VAAPI_libva_INCLUDE_DIR VAAPI_libva-drm_INCLUDE_DIR VAAPI_libva-x11_INCLUDE_DIR
-                 VAAPI_libva_LIBRARY VAAPI_libva-drm_LIBRARY VAAPI_libva-x11_LIBRARY)
+mark_as_advanced(VAAPI_libva_INCLUDE_DIR VAAPI_libva-drm_INCLUDE_DIR VAAPI_libva-wayland_INCLUDE_DIR VAAPI_libva-x11_INCLUDE_DIR
+                 VAAPI_libva_LIBRARY VAAPI_libva-drm_LIBRARY VAAPI_libva-wayland_LIBRARY VAAPI_libva-x11_LIBRARY)