diff options
| author | Derek Foreman <derekf@osg.samsung.com> | 2017-09-01 08:47:55 -0500 |
|---|---|---|
| committer | Derek Foreman <derekf@osg.samsung.com> | 2017-09-01 08:48:36 -0500 |
| commit | 9c23fbaf280e8c24ce02f2bf0d38d4fb0e9d12b1 (patch) | |
| tree | 2e7ea64af5b759b76bd1bb0283be2dc4769f37a2 | |
| parent | 9ae24a3a4a93827f6bce1c565a00926aa8ea1460 (diff) | |
| download | enlightenment-9c23fbaf280e8c24ce02f2bf0d38d4fb0e9d12b1.tar.gz | |
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
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | meson.build | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 893551a4ef..99be884eb3 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.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 diff --git a/meson.build b/meson.build index cdbf1f9641..4753b79444 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.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]), |