diff options
| author | Philipp Kerling <pkerling@casix.org> | 2018-01-08 13:44:59 +0100 |
|---|---|---|
| committer | Philipp Kerling <pkerling@casix.org> | 2018-01-14 14:30:52 +0100 |
| commit | 9320596c0a805a9a3d42d81a235dcffd3b7c5055 (patch) | |
| tree | eb0e86941b1a691b96993ce9ba7fb02bd3315ed9 | |
| parent | 3c5b1e089f58110d3cc090b1c97caab1efd4bb04 (diff) | |
[cmake] [wayland] Bump waylandpp dependency to 0.2.2
| -rw-r--r-- | cmake/modules/FindWaylandpp.cmake | 6 | ||||
| -rw-r--r-- | cmake/platform/linux/wayland.cmake | 2 | ||||
| -rw-r--r-- | cmake/scripts/linux/ExtraTargets.cmake | 3 | ||||
| -rw-r--r-- | xbmc/windowing/wayland/WinSystemWayland.h | 1 |
4 files changed, 10 insertions, 2 deletions
diff --git a/cmake/modules/FindWaylandpp.cmake b/cmake/modules/FindWaylandpp.cmake index 9393a124dd..336e613a7e 100644 --- a/cmake/modules/FindWaylandpp.cmake +++ b/cmake/modules/FindWaylandpp.cmake @@ -12,10 +12,16 @@ pkg_check_modules(WAYLANDPP wayland-client++ wayland-egl++ wayland-cursor++) pkg_check_modules(PC_WAYLANDPP_SCANNER wayland-scanner++) +if(WAYLANDPP_FOUND) + pkg_get_variable(PC_WAYLANDPP_PKGDATADIR wayland-client++ pkgdatadir) +endif() if(PC_WAYLANDPP_SCANNER_FOUND) pkg_get_variable(PC_WAYLANDPP_SCANNER wayland-scanner++ wayland_scannerpp) endif() +# Promote to cache variables so all code can access it +set(WAYLANDPP_PROTOCOLS_DIR "${PC_WAYLANDPP_PKGDATADIR}/protocols" CACHE INTERNAL "") + # wayland-scanner++ is from native/host system in case of cross-compilation, so # it's ok if we don't find it with pkgconfig find_program(WAYLANDPP_SCANNER wayland-scanner++ PATHS ${PC_WAYLANDPP_SCANNER}) diff --git a/cmake/platform/linux/wayland.cmake b/cmake/platform/linux/wayland.cmake index e4728238d5..f42dbf5e93 100644 --- a/cmake/platform/linux/wayland.cmake +++ b/cmake/platform/linux/wayland.cmake @@ -1,4 +1,4 @@ -set(PLATFORM_REQUIRED_DEPS EGL WaylandProtocols>=1.7 Waylandpp>=0.1.5 LibDRM Xkbcommon>=0.4.1) +set(PLATFORM_REQUIRED_DEPS EGL WaylandProtocols>=1.7 Waylandpp>=0.2.2 LibDRM Xkbcommon>=0.4.1) set(PLATFORM_OPTIONAL_DEPS VAAPI) set(WAYLAND_RENDER_SYSTEM "" CACHE STRING "Render system to use with Wayland: \"gl\" or \"gles\"") diff --git a/cmake/scripts/linux/ExtraTargets.cmake b/cmake/scripts/linux/ExtraTargets.cmake index 4753f7355e..c2e355ee09 100644 --- a/cmake/scripts/linux/ExtraTargets.cmake +++ b/cmake/scripts/linux/ExtraTargets.cmake @@ -17,7 +17,8 @@ endif() if(CORE_PLATFORM_NAME_LC STREQUAL "wayland") # This cannot go into wayland.cmake since it requires the Wayland dependencies # to already be resolved - set(PROTOCOL_XMLS "${WAYLAND_PROTOCOLS_DIR}/unstable/xdg-shell/xdg-shell-unstable-v6.xml" + set(PROTOCOL_XMLS "${WAYLANDPP_PROTOCOLS_DIR}/presentation-time.xml" + "${WAYLAND_PROTOCOLS_DIR}/unstable/xdg-shell/xdg-shell-unstable-v6.xml" "${WAYLAND_PROTOCOLS_DIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml") add_custom_command(OUTPUT "${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}/wayland-extra-protocols.hpp" "${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}/wayland-extra-protocols.cpp" COMMAND "${WAYLANDPP_SCANNER}" ${PROTOCOL_XMLS} "${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}/wayland-extra-protocols.hpp" "${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}/wayland-extra-protocols.cpp" diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h index a0d070becf..87924c559c 100644 --- a/xbmc/windowing/wayland/WinSystemWayland.h +++ b/xbmc/windowing/wayland/WinSystemWayland.h @@ -29,6 +29,7 @@ #include <wayland-client.hpp> #include <wayland-cursor.hpp> +#include <wayland-extra-protocols.hpp> #include "Connection.h" #include "Output.h" |