From 94c7aa0d6711a67d5b18e42ffc7ab7cecb261556 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Fri, 5 Jan 2018 23:02:42 +0100 Subject: [PATCH] Bump wayland-protocols to 1.12 --- .travis.yml | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2448fada..ee8e3dab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,7 @@ script: sudo dpkg -i extra-cmake-modules_5.38.0a-0ubuntu1_amd64.deb; git clone git://anongit.freedesktop.org/wayland/wayland-protocols; pushd wayland-protocols; - git checkout 1.6 && ./autogen.sh --prefix=/usr && make && sudo make install; + git checkout 1.12 && ./autogen.sh --prefix=/usr && make && sudo make install; popd; fi - cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DGLFW_USE_WAYLAND=${USE_WAYLAND} .. diff --git a/CMakeLists.txt b/CMakeLists.txt index 45687bdf..a50c6e3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -277,7 +277,7 @@ if (_GLFW_WAYLAND) find_package(Wayland REQUIRED Client Cursor Egl) find_package(WaylandScanner REQUIRED) - find_package(WaylandProtocols 1.6 REQUIRED) + find_package(WaylandProtocols 1.12 REQUIRED) list(APPEND glfw_PKG_DEPS "wayland-egl")