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:
parent
9ae24a3a4a
commit
9c23fbaf28
|
@ -682,7 +682,7 @@ AC_SUBST([SOUND_CFLAGS])
|
||||||
AC_SUBST([SOUND_LIBS])
|
AC_SUBST([SOUND_LIBS])
|
||||||
|
|
||||||
if test "x${e_cv_want_wayland_only}" != "xno" ;then
|
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=yes
|
||||||
have_wayland_dep=true
|
have_wayland_dep=true
|
||||||
|
|
|
@ -267,7 +267,7 @@ dep_elementary = dependency('elementary' , required: true)
|
||||||
|
|
||||||
dep_wayland = []
|
dep_wayland = []
|
||||||
if get_option('wayland') == true
|
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')
|
dir_wayland_protocols = wayland_protocols.get_pkgconfig_variable('pkgdatadir')
|
||||||
wayland_version = '>= 1.11.0'
|
wayland_version = '>= 1.11.0'
|
||||||
dep_wayland = [ dependency('ecore-wl2'),
|
dep_wayland = [ dependency('ecore-wl2'),
|
||||||
|
@ -284,7 +284,7 @@ if get_option('wayland') == true
|
||||||
requires_drm = 'ecore-drm2'
|
requires_drm = 'ecore-drm2'
|
||||||
dep_wayland += dep_ecore_drm2
|
dep_wayland += dep_ecore_drm2
|
||||||
endif
|
endif
|
||||||
requires_wayland = ' '.join([ 'wayland-protocols >= 1.10',
|
requires_wayland = ' '.join([ 'wayland-protocols >= 1.9',
|
||||||
'ecore-wl2',
|
'ecore-wl2',
|
||||||
requires_drm,
|
requires_drm,
|
||||||
' '.join(['wayland-server' , wayland_version]),
|
' '.join(['wayland-server' , wayland_version]),
|
||||||
|
|
Loading…
Reference in New Issue