From 9c23fbaf280e8c24ce02f2bf0d38d4fb0e9d12b1 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Fri, 1 Sep 2017 08:47:55 -0500 Subject: [PATCH] Drop wayland-protocols requirement to 1.9 This is blocking people from using it, and we don't actually support anything 1.10 added (xdg-outputs) yet --- configure.ac | 2 +- meson.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 893551a4e..99be884eb 100644 --- a/configure.ac +++ b/configure.ac @@ -682,7 +682,7 @@ AC_SUBST([SOUND_CFLAGS]) AC_SUBST([SOUND_LIBS]) if test "x${e_cv_want_wayland_only}" != "xno" ;then - PKG_CHECK_MODULES([WAYLAND], [ecore-wl2 >= 1.18 wayland-server >= 1.11.0 wayland-client >= 1.11.0 wayland-protocols >= 1.10 wayland-scanner >= 1.11.0 xkbcommon uuid], + PKG_CHECK_MODULES([WAYLAND], [ecore-wl2 >= 1.18 wayland-server >= 1.11.0 wayland-client >= 1.11.0 wayland-protocols >= 1.9 wayland-scanner >= 1.11.0 xkbcommon uuid], [ have_wayland=yes have_wayland_dep=true diff --git a/meson.build b/meson.build index cdbf1f964..4753b7944 100644 --- a/meson.build +++ b/meson.build @@ -267,7 +267,7 @@ dep_elementary = dependency('elementary' , required: true) dep_wayland = [] if get_option('wayland') == true - wayland_protocols = dependency('wayland-protocols', version: '>= 1.10') + wayland_protocols = dependency('wayland-protocols', version: '>= 1.9') dir_wayland_protocols = wayland_protocols.get_pkgconfig_variable('pkgdatadir') wayland_version = '>= 1.11.0' dep_wayland = [ dependency('ecore-wl2'), @@ -284,7 +284,7 @@ if get_option('wayland') == true requires_drm = 'ecore-drm2' dep_wayland += dep_ecore_drm2 endif - requires_wayland = ' '.join([ 'wayland-protocols >= 1.10', + requires_wayland = ' '.join([ 'wayland-protocols >= 1.9', 'ecore-wl2', requires_drm, ' '.join(['wayland-server' , wayland_version]),