dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Bump wayland version dependency 

Anything that needed wayland now needs wayland 1.10.0
This commit is contained in:
Derek Foreman 2016-04-11 10:34:23 -05:00 committed by Mike Blumenkrantz
parent cd124f938f
commit f59c52520d
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

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

9
m4/evas_check_engine.m4
View File

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