From: raster Date: Sat, 17 Mar 2012 06:25:41 +0000 (+0000) Subject: and work more on getting release in shape - version requirements. X-Git-Tag: submit/trunk/20120815.174732~459 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7f6fd2ea0904395e56f7a463705951bb5e84775;p=profile%2Fivi%2Fevas.git and work more on getting release in shape - version requirements. (god this is a pain in the butt) git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@69484 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/configure.ac b/configure.ac index 182ac3e..c832384 100644 --- a/configure.ac +++ b/configure.ac @@ -260,7 +260,7 @@ AM_CONDITIONAL([EVAS_HAVE_EXOTIC], [test "x${enable_exotic}" = "xyes"]) ## strong dependencies # Eina -PKG_CHECK_MODULES([EINA], [eina >= 1.1.0]) +PKG_CHECK_MODULES([EINA], [eina >= 1.2.0]) CPPFLAGS_SAVE="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $EINA_CFLAGS" AC_CHECK_SIZEOF(Eina_Unicode,, [#include ]) @@ -269,7 +269,7 @@ CPPFLAGS="$CPPFLAGS_SAVE" # Freetype PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 9.3.0]) -requirement_evas="freetype2 eina >= 1.1.0 ${requirement_evas}" +requirement_evas="freetype2 eina >= 1.2.0 ${requirement_evas}" ## optional dependencies diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4 index 06feef0..6275795 100644 --- a/m4/evas_check_engine.m4 +++ b/m4/evas_check_engine.m4 @@ -131,7 +131,7 @@ if test "x$gl_flavor_gles" = "xyes" ; then fi if test "x${have_dep}" = "xyes" ; then - PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) + PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) if test "x${have_dep}" = "xyes" ; then if test "x$2" = "xyes" ; then x_libs="${x_libs} -lX11 -lXext -lXrender" @@ -168,7 +168,7 @@ else if test "x${have_egl}" = "xyes" ; then AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) if test "x${have_glesv2}" = "xyes" ; then - PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) + PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) if test "x${have_dep}" = "xyes" ; then evas_engine_[]$1[]_cflags="${x_cflags}" evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" @@ -305,7 +305,7 @@ if test "x$gl_flavor_gles" = "xyes" ; then fi if test "x${have_dep}" = "xyes" ; then - PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) + PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) if test "x${have_dep}" = "xyes" ; then if test "x$2" = "xyes" ; then x_libs="${x_libs} -lX11 -lXext -lXrender" @@ -337,7 +337,7 @@ else if test "x${have_egl}" = "xyes" ; then AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) if test "x${have_glesv2}" = "xyes" ; then - PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) + PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) if test "x${have_dep}" = "xyes" ; then evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}" evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" @@ -481,7 +481,7 @@ LIBS="$LIBS_save" AC_LANG_POP([Objective C]) if test "x${have_dep}" = "xyes" ; then - PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) + PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) fi AC_SUBST([evas_engine_$1_cflags]) @@ -878,7 +878,7 @@ PKG_CHECK_MODULES([WAYLAND_EGL], ) if test "x${have_dep}" = "xyes" ; then - PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) + PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm) if test "x${have_glesv2}" = "xyes" ; then evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}" diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4 index e1fb5a9..a265094 100644 --- a/m4/evas_check_loader.m4 +++ b/m4/evas_check_loader.m4 @@ -37,7 +37,7 @@ have_dep="no" evas_image_loader_[]$1[]_cflags="" evas_image_loader_[]$1[]_libs="" -PKG_CHECK_MODULES([EET], [eet >= 1.5.0], [have_dep="yes" requirement="eet >= 1.4.0"], [have_dep="no"]) +PKG_CHECK_MODULES([EET], [eet >= 1.6.0], [have_dep="yes" requirement="eet >= 1.4.0"], [have_dep="no"]) evas_image_loader_[]$1[]_cflags="${EET_CFLAGS}" evas_image_loader_[]$1[]_libs="${EET_LIBS}" @@ -542,7 +542,7 @@ AC_MSG_CHECKING([whether to enable Eet font loader]) AC_MSG_RESULT([${want_loader}]) if test "x$want_loader" = "xyes" -o "x$want_loader" = "xauto"; then - PKG_CHECK_MODULES([EET], [eet >= 1.5.0], [have_evas_font_loader_eet="yes"], [have_evas_font_loader_eet="no"]) + PKG_CHECK_MODULES([EET], [eet >= 1.6.0], [have_evas_font_loader_eet="yes"], [have_evas_font_loader_eet="no"]) fi if test "x${have_evas_font_loader_eet}" = "xno" -a "x$want_loader" = "xyes" -a "x$use_strict" = "xyes" ; then @@ -551,7 +551,7 @@ fi if test "x$have_evas_font_loader_eet" = "xyes" ; then AC_DEFINE([BUILD_FONT_LOADER_EET], [1], [EET Font Loader Support]) - requirement_evas="eet >= 1.5.0 ${requirement_evas}" + requirement_evas="eet >= 1.6.0 ${requirement_evas}" fi popdef([UP])