styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump wayland-protocols requirement 

We need a newer version for the dmabuf changes, so let's just depend on the
latest released.
This commit is contained in:
Derek Foreman 2017-08-14 11:20:19 -05:00
parent bf146faf72
commit 55e13da654
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -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

4
meson.build
View File

@ -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]),