From 2292165445877e56ba70d3607510662b18f62d6d Mon Sep 17 00:00:00 2001 From: Philipp Kerling Date: Tue, 16 Jan 2018 10:05:09 +0100 Subject: [PATCH 1/2] [wayland] Use xdg-shell.xml from waylandpp Ubuntu 17.10 does not have recent enough wayland-protocols for building with xdg-shell stable. To avoid having to package it or adding ifdefs to support building with older wayland-protocols, use xdg-shell.xml from waylandpp. --- cmake/scripts/linux/ExtraTargets.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/scripts/linux/ExtraTargets.cmake b/cmake/scripts/linux/ExtraTargets.cmake index 095a034ba2cfd..37d196af1a34c 100644 --- a/cmake/scripts/linux/ExtraTargets.cmake +++ b/cmake/scripts/linux/ExtraTargets.cmake @@ -18,7 +18,7 @@ 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 "${WAYLANDPP_PROTOCOLS_DIR}/presentation-time.xml" - "${WAYLAND_PROTOCOLS_DIR}/stable/xdg-shell/xdg-shell.xml" + "${WAYLANDPP_PROTOCOLS_DIR}/xdg-shell.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" @@ -28,4 +28,4 @@ if(CORE_PLATFORM_NAME_LC STREQUAL "wayland") # Dummy target for dependencies add_custom_target(generate-wayland-extra-protocols DEPENDS wayland-extra-protocols.hpp) -endif() \ No newline at end of file +endif() From 27a2e3d362b6ba04e5f1a558ad30a519a3d5a8bb Mon Sep 17 00:00:00 2001 From: Philipp Kerling Date: Tue, 16 Jan 2018 10:06:22 +0100 Subject: [PATCH 2/2] Revert "[cmake] [wayland] Require wayland-protocols >= 1.12 for xdg_wm_base" This reverts commit 6b1e800e11ab82b544b4ff1883b789547d5cc01c. --- cmake/platform/linux/wayland.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/platform/linux/wayland.cmake b/cmake/platform/linux/wayland.cmake index 74837acac1db4..f42dbf5e93a18 100644 --- a/cmake/platform/linux/wayland.cmake +++ b/cmake/platform/linux/wayland.cmake @@ -1,4 +1,4 @@ -set(PLATFORM_REQUIRED_DEPS EGL WaylandProtocols>=1.12 Waylandpp>=0.2.2 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\"")