enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

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
This commit is contained in:
Derek Foreman 2017-09-01 08:47:55 -05:00
parent 9ae24a3a4a
commit 9c23fbaf28
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.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

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