derekf pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=55e13da6549e92f859d9807351e3ce0764f3c66f
commit 55e13da6549e92f859d9807351e3ce0764f3c66f Author: Derek Foreman <[email protected]> Date: Mon Aug 14 11:20:19 2017 -0500 Bump wayland-protocols requirement We need a newer version for the dmabuf changes, so let's just depend on the latest released. --- configure.ac | 2 +- meson.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d6028d946..07021c435 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.7 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.10 wayland-scanner >= 1.11.0 xkbcommon uuid], [ have_wayland=yes have_wayland_dep=true diff --git a/meson.build b/meson.build index 1617ed263..07e62da82 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.7') + wayland_protocols = dependency('wayland-protocols', version: '>= 1.10') 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.7', + requires_wayland = ' '.join([ 'wayland-protocols >= 1.10', 'ecore-wl2', requires_drm, ' '.join(['wayland-server' , wayland_version]), --
