summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2017-08-14 11:20:19 -0500
committerDerek Foreman <derekf@osg.samsung.com>2017-08-14 11:22:18 -0500
commit55e13da6549e92f859d9807351e3ce0764f3c66f (patch)
tree5336430079ba4287fbebbfa8bde2173e61047f9a
parentbf146faf7289035eade9875735869de4da7622d4 (diff)
Bump wayland-protocols requirement
We need a newer version for the dmabuf changes, so let's just depend on the latest released.
-rw-r--r--configure.ac2
-rw-r--r--meson.build4
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index d6028d9..07021c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -682,7 +682,7 @@ AC_SUBST([SOUND_CFLAGS])
682AC_SUBST([SOUND_LIBS]) 682AC_SUBST([SOUND_LIBS])
683 683
684if test "x${e_cv_want_wayland_only}" != "xno" ;then 684if test "x${e_cv_want_wayland_only}" != "xno" ;then
685 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], 685 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],
686 [ 686 [
687 have_wayland=yes 687 have_wayland=yes
688 have_wayland_dep=true 688 have_wayland_dep=true
diff --git a/meson.build b/meson.build
index 1617ed2..07e62da 100644
--- a/meson.build
+++ b/meson.build
@@ -267,7 +267,7 @@ dep_elementary = dependency('elementary' , required: true)
267 267
268dep_wayland = [] 268dep_wayland = []
269if get_option('wayland') == true 269if get_option('wayland') == true
270 wayland_protocols = dependency('wayland-protocols', version: '>= 1.7') 270 wayland_protocols = dependency('wayland-protocols', version: '>= 1.10')
271 dir_wayland_protocols = wayland_protocols.get_pkgconfig_variable('pkgdatadir') 271 dir_wayland_protocols = wayland_protocols.get_pkgconfig_variable('pkgdatadir')
272 wayland_version = '>= 1.11.0' 272 wayland_version = '>= 1.11.0'
273 dep_wayland = [ dependency('ecore-wl2'), 273 dep_wayland = [ dependency('ecore-wl2'),
@@ -284,7 +284,7 @@ if get_option('wayland') == true
284 requires_drm = 'ecore-drm2' 284 requires_drm = 'ecore-drm2'
285 dep_wayland += dep_ecore_drm2 285 dep_wayland += dep_ecore_drm2
286 endif 286 endif
287 requires_wayland = ' '.join([ 'wayland-protocols >= 1.7', 287 requires_wayland = ' '.join([ 'wayland-protocols >= 1.10',
288 'ecore-wl2', 288 'ecore-wl2',
289 requires_drm, 289 requires_drm,
290 ' '.join(['wayland-server' , wayland_version]), 290 ' '.join(['wayland-server' , wayland_version]),