discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=f59c52520de6007990e04dbc5572353a326ada29

commit f59c52520de6007990e04dbc5572353a326ada29
Author: Derek Foreman <der...@osg.samsung.com>
Date:   Mon Apr 11 10:34:23 2016 -0500

    build: Bump wayland version dependency
    
    Anything that needed wayland now needs wayland 1.10.0
---
 configure.ac            | 6 +++---
 m4/evas_check_engine.m4 | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index bdf765c..cac8850 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3331,7 +3331,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_WL2], [efl])
 EFL_INTERNAL_DEPEND_PKG([ECORE_WL2], [eina])
 
 EFL_DEPEND_PKG([ECORE_WL2], [WAYLAND],
-   [wayland-server >= 1.8.0 wayland-client >= 1.8.0 wayland-cursor >= 1.8.0 
xkbcommon >= 0.5.0])
+   [wayland-server >= 1.10.0 wayland-client >= 1.10.0 wayland-cursor >= 1.10.0 
xkbcommon >= 0.5.0])
 
 EFL_EVAL_PKGS([ECORE_WL2])
 
@@ -5094,7 +5094,7 @@ EFL_LIB_END_OPTIONAL([Efl_Js])
 
 ### Add Wayland server library if test is enabled
 if test "x${want_tests}" = "xyes" -a "x${want_wayland}" = "xyes"; then
-   EFL_DEPEND_PKG([ECORE_WAYLAND_SRV], [WAYLAND], [wayland-server >= 1.8.0])
+   EFL_DEPEND_PKG([ECORE_WAYLAND_SRV], [WAYLAND], [wayland-server >= 1.10.0])
    EFL_EVAL_PKGS([ECORE_WAYLAND_SRV])
 fi
 
@@ -5133,7 +5133,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_BUFFER], [eo])
 EFL_INTERNAL_DEPEND_PKG([ECORE_BUFFER], [efl])
 EFL_INTERNAL_DEPEND_PKG([ECORE_BUFFER], [ecore])
 EFL_DEPEND_PKG([ECORE_BUFFER], [WAYLAND],
-               [wayland-server >= 1.5.0 wayland-client >= 1.5.0])
+               [wayland-server >= 1.10.0 wayland-client >= 1.10.0])
 
 PKG_CHECK_MODULES([X11_DRI_COMMON],
    [
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index e38589c..448a210 100644
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -1,3 +1,4 @@
+AC_DEFUN([REQUIRED_WAYLAND_VERSION], [1.10.0])
 
 dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_XLIB(engine, simple, want_static[, 
ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
 
@@ -519,7 +520,7 @@ have_dep="no"
 evas_engine_[]$1[]_cflags=""
 evas_engine_[]$1[]_libs=""
 
-PKG_CHECK_EXISTS([wayland-client >= 1.3.0],
+PKG_CHECK_EXISTS([wayland-client >= REQUIRED_WAYLAND_VERSION],
    [
     have_dep="yes"
     requirement="wayland-client"
@@ -560,7 +561,7 @@ else
     gl_library="gl"
 fi
 
-PKG_CHECK_EXISTS([egl ${gl_library} wayland-client >= 1.3.0 wayland-egl],
+PKG_CHECK_EXISTS([egl ${gl_library} wayland-client >= REQUIRED_WAYLAND_VERSION 
wayland-egl],
    [
     have_dep="yes"
     requirement="egl ${gl_library} wayland-client wayland-egl"
@@ -635,10 +636,10 @@ else
    AC_MSG_ERROR([We currently do not support GL DRM without OpenGL ES. Please 
consider OpenGL ES if you want to use it.])
 fi
 
-PKG_CHECK_EXISTS([egl ${gl_library} gbm wayland-client >= 1.3.0],
+PKG_CHECK_EXISTS([egl ${gl_library} gbm wayland-client >= 
REQUIRED_WAYLAND_VERSION],
    [
     have_dep="yes"
-    requirement="egl ${gl_library} gbm wayland-client >= 1.3.0"
+    requirement="egl ${gl_library} gbm wayland-client >= 
REQUIRED_WAYLAND_VERSION"
    ],
    [have_dep="no"])
 

-- 


Reply via email to