From fed5f7943352b7bdd153c4a5564f6030728ee15e Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 17 Mar 2012 06:25:41 +0000 Subject: [PATCH] and work more on getting release in shape - version requirements. (god this is a pain in the butt) SVN revision: 69484 --- legacy/ecore/configure.ac | 92 +++++++++---------- legacy/edje/configure.ac | 36 ++++---- .../src/modules/eet_snd_reader/Makefile.am | 4 +- legacy/eet/configure.ac | 4 +- legacy/eeze/configure.ac | 8 +- legacy/efreet/configure.ac | 4 +- legacy/eio/configure.ac | 2 +- legacy/embryo/configure.ac | 2 +- legacy/emotion/configure.ac | 22 ++--- legacy/ethumb/configure.ac | 16 ++-- legacy/evas/configure.ac | 4 +- legacy/evas/m4/evas_check_engine.m4 | 12 +-- legacy/evas/m4/evas_check_loader.m4 | 6 +- 13 files changed, 106 insertions(+), 106 deletions(-) diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index 80dc7f8bcf..3d93c9b094 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -538,26 +538,26 @@ AC_SUBST(rt_libs) # Eina library -PKG_CHECK_MODULES(EINA, [eina >= 1.1.0]) +PKG_CHECK_MODULES(EINA, [eina >= 1.2.0]) #FIXME check all the requirements when the eina move will be finished -requirements_ecore="eina >= 1.1.0 ${requirements_ecore}" -requirements_ecore_con="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_con}" -#requirements_ecore_config="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_config}" -requirements_ecore_directfb="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_directfb}" -requirements_ecore_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_evas}" -requirements_ecore_fb="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_fb}" -requirements_ecore_file="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_file}" -requirements_ecore_imf="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_imf}" -requirements_ecore_imf_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_imf_evas}" -requirements_ecore_input="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_input}" -requirements_ecore_input_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_input_evas}" -requirements_ecore_ipc="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_ipc}" -requirements_ecore_cocoa="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_cocoa}" -requirements_ecore_sdl="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_sdl}" -requirements_ecore_psl1ght="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_sdl}" -requirements_ecore_win32="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_win32}" -requirements_ecore_wince="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_wince}" -requirements_ecore_x="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_x}" +requirements_ecore="eina >= 1.2.0 ${requirements_ecore}" +requirements_ecore_con="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_con}" +#requirements_ecore_config="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_config}" +requirements_ecore_directfb="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_directfb}" +requirements_ecore_evas="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_evas}" +requirements_ecore_fb="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_fb}" +requirements_ecore_file="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_file}" +requirements_ecore_imf="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_imf}" +requirements_ecore_imf_evas="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_imf_evas}" +requirements_ecore_input="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_input}" +requirements_ecore_input_evas="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_input_evas}" +requirements_ecore_ipc="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_ipc}" +requirements_ecore_cocoa="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_cocoa}" +requirements_ecore_sdl="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_sdl}" +requirements_ecore_psl1ght="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_sdl}" +requirements_ecore_win32="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_win32}" +requirements_ecore_wince="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_wince}" +requirements_ecore_x="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_x}" # glib support (main loop integration) @@ -1199,7 +1199,7 @@ AM_CONDITIONAL(BUILD_ECORE_X_XCB, test $have_ecore_x_xcb = yes) # Evas library (ecore_config, ecore_input_evas, ecore_imf_evas and ecore_evas) -PKG_CHECK_MODULES([EVAS], [evas >= 1.1.99], +PKG_CHECK_MODULES([EVAS], [evas >= 1.2.0], [have_evas="yes"], [have_evas="no"]) @@ -1583,8 +1583,8 @@ AM_CONDITIONAL([HAVE_CARES], [test "x${have_cares}" = "xyes"]) # ecore_ipc ECORE_CHECK_MODULE([ipc], [${want_ecore_ipc}], [Ipc], [${have_ecore_con}], [ - requirements_ecore_ipc="ecore-con >= 1.1.99 ${requirements_ecore_ipc}" - requirements_ecore_evas="ecore-ipc >= 1.1.99 ${requirements_ecore_evas}" + requirements_ecore_ipc="ecore-con >= 1.2.0 ${requirements_ecore_ipc}" + requirements_ecore_evas="ecore-ipc >= 1.2.0 ${requirements_ecore_evas}" ]) # ecore_file @@ -1599,7 +1599,7 @@ if test "x${have_ecore_file}" = "xyes" ; then ECORE_CHECK_NOTIFY_WIN32([${want_notify_win32}], [have_notify_win32="yes"], [have_notify_win32="no"]) if test "x${have_ecore_con}" = "xyes" ; then - requirements_ecore_file="ecore-con >= 1.1.99 ${requirements_ecore_file}" + requirements_ecore_file="ecore-con >= 1.2.0 ${requirements_ecore_file}" else ECORE_CHECK_CURL([${want_curl}], [ @@ -1618,7 +1618,7 @@ fi #fi #ECORE_CHECK_MODULE([config], [${want_ecore_config}], [Config], [${ecore_config_deps}], -# [requirements_ecore_config="ecore-ipc >= 1.1.99 evas >= 1.1.99 eet >= 1.5.0 ${requirements_ecore_config}"]) +# [requirements_ecore_config="ecore-ipc >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 ${requirements_ecore_config}"]) AM_CONDITIONAL(BUILD_ECORE_CONFIG, false) @@ -1634,12 +1634,12 @@ if test "x${have_ecore_imf}" = "xyes" -a "x${have_evas}" = "xyes" ; then fi ECORE_CHECK_MODULE([imf-evas], [${want_ecore_imf}], [Imf_Evas], [${ecore_imf_evas_deps}], - [requirements_ecore_imf_evas="ecore-imf >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_imf_evas}"]) + [requirements_ecore_imf_evas="ecore-imf >= 1.2.0 evas >= 1.2.0 ${requirements_ecore_imf_evas}"]) # ecore_input{_evas} ECORE_CHECK_MODULE([input], [${want_ecore_input}], [Input]) ECORE_CHECK_MODULE([input-evas], [${want_ecore_input}], [Input_Evas], [${have_evas}], - [requirements_ecore_input_evas="ecore-input >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_input}"]) + [requirements_ecore_input_evas="ecore-input >= 1.2.0 evas >= 1.2.0 ${requirements_ecore_input}"]) # ecore_imf_xim AM_CONDITIONAL(BUILD_ECORE_IMF_XIM, false) @@ -1653,7 +1653,7 @@ if test "x${have_ecore_imf}" = "xyes" \ fi ECORE_CHECK_MODULE([imf-xim], [${want_ecore_imf}], [Imf_XIM], [${ecore_imf_xim_deps}], - [requirements_ecore_imf_xim="ecore-imf >= 1.1.99 ecore-x >= 1.1.99 ecore-input >= 1.1.99 ${requirements_ecore_imf_xim}"]) + [requirements_ecore_imf_xim="ecore-imf >= 1.2.0 ecore-x >= 1.2.0 ecore-input >= 1.2.0 ${requirements_ecore_imf_xim}"]) # ecore_imf_scim PKG_CHECK_MODULES([SCIM], [scim], [have_scim="yes"], [have_scim="no"]) @@ -1669,7 +1669,7 @@ if test "x${have_ecore_imf}" = "xyes" \ fi ECORE_CHECK_MODULE([imf-scim], [${want_ecore_imf}], [Imf_SCIM], [${ecore_imf_scim_deps}], - [requirements_ecore_imf_scim="ecore-imf >= 1.1.0 ecore-x >= 1.1.0 ecore-input >= 1.1.0 ${requirements_ecore_imf_scim}"]) + [requirements_ecore_imf_scim="ecore-imf >= 1.2.0 ecore-x >= 1.2.0 ecore-input >= 1.2.0 ${requirements_ecore_imf_scim}"]) ## Graphic systems @@ -1684,7 +1684,7 @@ fi ECORE_CHECK_MODULE([x], [${want_ecore_x}], [X], [${ecore_x_deps}], [ ecore_x_libs="$ecore_x_libs $x_libs" - requirements_ecore_x="ecore-input >= 1.1.99 ${requirements_ecore_x}" + requirements_ecore_x="ecore-input >= 1.2.0 ${requirements_ecore_x}" ]) # ecore_win32 @@ -1692,7 +1692,7 @@ ECORE_CHECK_MODULE([x], [${want_ecore_x}], [X], [${ecore_x_deps}], ECORE_CHECK_MODULE([win32], [${want_ecore_win32}], [Win32], [${have_ecore_input}], [ ecore_win32_libs="-lole32 -lgdi32" - requirements_ecore_win32="ecore-input >= 1.1.99 ${requirements_ecore_win32}" + requirements_ecore_win32="ecore-input >= 1.2.0 ${requirements_ecore_win32}" ]) AC_SUBST(ecore_win32_libs) @@ -1704,7 +1704,7 @@ if test "x${have_ecore_input}" = "xyes" -a "x${have_cocoa}" = "xyes" ; then fi ECORE_CHECK_MODULE([cocoa], [${want_ecore_cocoa}], [Cocoa], [${ecore_cocoa_deps}], - [requirements_ecore_cocoa="ecore-input >= 1.1.99 ${requirements_ecore_cocoa}"]) + [requirements_ecore_cocoa="ecore-input >= 1.2.0 ${requirements_ecore_cocoa}"]) # ecore_sdl @@ -1714,10 +1714,10 @@ if test "x${have_sdl}" = "xyes" -a "x${have_ecore_input}" = "xyes" ; then fi ECORE_CHECK_MODULE([sdl], [${want_ecore_sdl}], [Sdl], [${ecore_sdl_deps}], - [requirements_ecore_sdl="ecore-input >= 1.1.99 ${requirements_ecore_sdl}"]) + [requirements_ecore_sdl="ecore-input >= 1.2.0 ${requirements_ecore_sdl}"]) ECORE_CHECK_MODULE([psl1ght], [${want_ecore_psl1ght}], [psl1ght], [${ecore_psl1ght_deps}], - [requirements_ecore_psl1ght="ecore-input >= 1.1.99 ${requirements_ecore_psl1ght}"]) + [requirements_ecore_psl1ght="ecore-input >= 1.2.0 ${requirements_ecore_psl1ght}"]) # ecore_fb ECORE_CHECK_MODULE([fb], [${want_ecore_fb}], [FB], [$have_fb]) @@ -1739,7 +1739,7 @@ ECORE_CHECK_MODULE([directfb], [${want_ecore_directfb}], [DirectFB], [${have_dir # ecore_wince ECORE_CHECK_MODULE([wince], [${want_ecore_wince}], [WinCE], [${have_ecore_input}], - [requirements_ecore_win32="ecore-input >= 1.1.99 ${requirements_ecore_win32}"]) + [requirements_ecore_win32="ecore-input >= 1.2.0 ${requirements_ecore_win32}"]) ## Ecore Evas @@ -1751,7 +1751,7 @@ if test "x${have_evas}" = "xyes" && test "x${have_ecore_input}" = "xyes" && test fi ECORE_CHECK_MODULE([evas], [${want_ecore_evas}], [Evas], [${ecore_evas_deps}], - [requirements_ecore_evas="ecore-input >= 1.1.99 ecore-input-evas >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_evas}"]) + [requirements_ecore_evas="ecore-input >= 1.2.0 ecore-input-evas >= 1.2.0 evas >= 1.2.0 ${requirements_ecore_evas}"]) # ecore_evas_buffer @@ -1841,7 +1841,7 @@ if test "x$have_ecore_evas_software_x11" = "xyes" -o \ "x$have_ecore_evas_software_16_x11" = "xyes" -o \ "x$have_ecore_evas_software_xcb" = "xyes"; then AC_DEFINE(BUILD_ECORE_EVAS_X11, 1, [Support for X Window Engines in Ecore_Evas]) - requirements_ecore_evas="ecore-x >= 1.1.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-x >= 1.2.0 ${requirements_ecore_evas}" fi # ecore_evas_win32 @@ -1877,17 +1877,17 @@ if test "x${have_ecore_evas_software_gdi}" = "xyes" -o \ "x${have_ecore_evas_opengl_glew}" = "xyes" -o \ "x${have_ecore_evas_software_16_ddraw}" = "xyes" ; then AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas]) - requirements_ecore_evas="ecore-win32 >= 1.1.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-win32 >= 1.2.0 ${requirements_ecore_evas}" fi # ecore_evas_software_sdl have_ecore_evas_software_sdl="no" if test "x${have_ecore_sdl}" = "xyes"; then - requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-sdl >= 1.2.0 ${requirements_ecore_evas}" have_ecore_evas_software_sdl="yes" AC_DEFINE(BUILD_ECORE_EVAS_SOFTWARE_SDL, 1, [Support for Software SDL Engine in Ecore_Evas]) - requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}" + requirements_ecore_evas="ecore-sdl >= 1.2.0 ${requirements_ecore_evas}" fi # ecore_evas_gl_sdl @@ -1896,7 +1896,7 @@ ECORE_EVAS_CHECK_MODULE([opengl-sdl], [${want_ecore_evas_gl_sdl}], [OpenGL SDL], [${have_ecore_sdl}], - [requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}"]) + [requirements_ecore_evas="ecore-sdl >= 1.2.0 ${requirements_ecore_evas}"]) # ecore_evas_cocoa @@ -1904,7 +1904,7 @@ ECORE_EVAS_CHECK_MODULE([opengl-cocoa], [${want_ecore_evas_gl_cocoa}], [OpenGL Cocoa], [${have_ecore_cocoa}], - [requirements_ecore_evas="ecore-cocoa >= 1.1.99 ${requirements_ecore_evas}"]) + [requirements_ecore_evas="ecore-cocoa >= 1.2.0 ${requirements_ecore_evas}"]) # ecore_evas_directfb @@ -1912,7 +1912,7 @@ ECORE_EVAS_CHECK_MODULE([directfb], [${want_ecore_evas_directfb}], [DirectFB], [${have_ecore_directfb}], - [requirements_ecore_evas="ecore-directfb >= 1.1.99 ${requirements_ecore_evas}"]) + [requirements_ecore_evas="ecore-directfb >= 1.2.0 ${requirements_ecore_evas}"]) # ecore_evas_fb @@ -1920,7 +1920,7 @@ ECORE_EVAS_CHECK_MODULE([fb], [${want_ecore_evas_fb}], [Linux Framebuffer], [${have_ecore_fb}], - [requirements_ecore_evas="ecore-fb >= 1.1.99 ${requirements_ecore_evas}"]) + [requirements_ecore_evas="ecore-fb >= 1.2.0 ${requirements_ecore_evas}"]) # ecore_evas_wince @@ -1928,7 +1928,7 @@ ECORE_EVAS_CHECK_MODULE([software-16-wince], [${want_ecore_evas_software_16_wince}], [16 bpp Software Windows CE], [${have_ecore_wince}], - [requirements_ecore_evas="ecore-wince >= 1.1.99 ${requirements_ecore_evas}"]) + [requirements_ecore_evas="ecore-wince >= 1.2.0 ${requirements_ecore_evas}"]) # ecore_evas_ews @@ -1961,7 +1961,7 @@ ECORE_EVAS_CHECK_MODULE([psl1ght], [${want_ecore_evas_psl1ght}], [PSL1GHT], [${have_ecore_psl1ght}], - [requirements_ecore_evas="ecore-psl1ght >= 1.1.99 ${requirements_ecore_evas}"]) + [requirements_ecore_evas="ecore-psl1ght >= 1.2.0 ${requirements_ecore_evas}"]) ### WAYLAND @@ -1976,7 +1976,7 @@ fi ECORE_CHECK_MODULE([wayland], [${want_ecore_wayland}], [Wayland], [${ecore_wayland_deps}]) if test "x${have_ecore_wayland}" = "xyes" ; then - requirements_ecore_wayland="ecore-input >= 1.1.0 egl wayland-egl wayland-client xkbcommon ${requirements_ecore_wayland}" + requirements_ecore_wayland="ecore-input >= 1.2.0 egl wayland-egl wayland-client xkbcommon ${requirements_ecore_wayland}" fi ECORE_EVAS_CHECK_MODULE_FULL([wayland-shm], [wayland-shm], diff --git a/legacy/edje/configure.ac b/legacy/edje/configure.ac index 5feb334b75..8ac6b7c38d 100644 --- a/legacy/edje/configure.ac +++ b/legacy/edje/configure.ac @@ -258,37 +258,37 @@ fi PKG_CHECK_MODULES([MINIMAL], [ - eina >= 1.1.0 - eet >= 1.5.0 + eina >= 1.2.0 + eet >= 1.6.0 ]) PKG_CHECK_MODULES([EDJE], [ - eina >= 1.1.0 - eet >= 1.5.0 - evas >= 1.1.0 - ecore >= 1.1.0 - ecore-evas >= 1.1.0 - ecore-file >= 1.1.0 - embryo >= 1.1.0 + eina >= 1.2.0 + eet >= 1.6.0 + evas >= 1.2.0 + ecore >= 1.2.0 + ecore-evas >= 1.2.0 + ecore-file >= 1.2.0 + embryo >= 1.2.0 ]) EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}" EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}" -requirement_edje="embryo >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0 ${requirement_edje}" +requirement_edje="embryo >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0 ${requirement_edje}" requirement_edje="${requirement_lua} ${requirement_edje}" have_ecore_imf="no" PKG_CHECK_MODULES([ECORE_IMF], [ - ecore-imf >= 1.1.0 - ecore-imf-evas >= 1.1.0 + ecore-imf >= 1.2.0 + ecore-imf-evas >= 1.2.0 ], [ AC_DEFINE([HAVE_ECORE_IMF], [1], [Input Method Support for Edje Entry]) have_ecore_imf="yes" - requirement_edje="ecore-imf-evas >= 1.1.0 ecore-imf >= 1.1.0 ${requirement_edje}" + requirement_edje="ecore-imf-evas >= 1.2.0 ecore-imf >= 1.2.0 ${requirement_edje}" ], [have_ecore_imf="no"]) @@ -445,26 +445,26 @@ fi # Dependencies for the binaries if test "x$have_edje_cc" = "xyes"; then - PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0]) + PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0]) EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}" fi AM_CONDITIONAL([BUILD_EPP], [test "x$have_edje_cc" = "xyes"]) if test "x$have_edje_decc" = "xyes"; then - PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0]) + PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0]) fi if test "x$have_edje_player" = "xyes"; then - PKG_CHECK_MODULES([EDJE_PLAYER], [ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0]) + PKG_CHECK_MODULES([EDJE_PLAYER], [ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0]) fi if test "x$have_edje_inspector" = "xyes"; then - PKG_CHECK_MODULES([EDJE_INSPECTOR], [ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0]) + PKG_CHECK_MODULES([EDJE_INSPECTOR], [ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0]) fi if test "x$have_edje_external_inspector" = "xyes"; then - PKG_CHECK_MODULES([EDJE_EXTERNAL_INSPECTOR], [ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0]) + PKG_CHECK_MODULES([EDJE_EXTERNAL_INSPECTOR], [ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0]) fi diff --git a/legacy/edje/src/modules/eet_snd_reader/Makefile.am b/legacy/edje/src/modules/eet_snd_reader/Makefile.am index c154dc2348..c5ef7c90fe 100644 --- a/legacy/edje/src/modules/eet_snd_reader/Makefile.am +++ b/legacy/edje/src/modules/eet_snd_reader/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -pkglibdir = $(REMIX_PLUGIN_DIR) +pkglibdir = $(DESTDIR)$(REMIX_PLUGIN_DIR) AM_CPPFLAGS = \ -I. \ @@ -9,7 +9,7 @@ AM_CPPFLAGS = \ @EDJE_CFLAGS@ \ @REMIX_CFLAGS@ -pkgdir = $(REMIX_PLUGIN_DIR) +pkgdir = $(DESTDIR)$(REMIX_PLUGIN_DIR) pkg_LTLIBRARIES = libeet_sndfile_reader.la libeet_sndfile_reader_la_SOURCES = eet_snd_reader.c diff --git a/legacy/eet/configure.ac b/legacy/eet/configure.ac index 35992acf3d..eb3c7e5229 100644 --- a/legacy/eet/configure.ac +++ b/legacy/eet/configure.ac @@ -231,8 +231,8 @@ AC_SUBST(EET_LIBS) # Eina library -PKG_CHECK_MODULES(EINA, [eina >= 1.1.0]) -requirement_eet="eina >= 1.1.0 ${requirement_eet}" +PKG_CHECK_MODULES(EINA, [eina >= 1.2.0]) +requirement_eet="eina >= 1.2.0 ${requirement_eet}" ### Checks for portability layer diff --git a/legacy/eeze/configure.ac b/legacy/eeze/configure.ac index 7202a75e73..5441416b4a 100644 --- a/legacy/eeze/configure.ac +++ b/legacy/eeze/configure.ac @@ -58,7 +58,7 @@ AC_SUBST(VMAJ) AC_CANONICAL_BUILD AC_CANONICAL_HOST -requirement_eeze="ecore >= 1.1.0 eina >= 1.1.0 libudev" +requirement_eeze="ecore >= 1.2.0 eina >= 1.2.0 libudev" ### Checks for programs @@ -111,9 +111,9 @@ if test "x$eeze_mount" = "xyes";then AC_ARG_WITH([eject], [AS_HELP_STRING([--with-eject], [specify eject bin @<:@default=detect@:>@])], [with_eject=$withval], [with_eject="detect"]) PKG_CHECK_MODULES([LIBMOUNT], [mount >= 2.18.0]) mount_v=$(pkg-config --modversion mount) - PKG_CHECK_MODULES([ECORE_FILE], [ecore-file >= 1.1.0]) - PKG_CHECK_MODULES([EET], [eet >= 1.5.0]) - PKG_CHECK_MODULES([ECORE_CON], [ecore-con >= 1.1.0]) + PKG_CHECK_MODULES([ECORE_FILE], [ecore-file >= 1.2.0]) + PKG_CHECK_MODULES([EET], [eet >= 1.6.0]) + PKG_CHECK_MODULES([ECORE_CON], [ecore-con >= 1.2.0]) if test "x$with_mount" = "xdetect";then AC_PATH_PROG([with_mount], [mount], []) diff --git a/legacy/efreet/configure.ac b/legacy/efreet/configure.ac index 839535b173..6f7005f08f 100644 --- a/legacy/efreet/configure.ac +++ b/legacy/efreet/configure.ac @@ -147,9 +147,9 @@ AC_SUBST(EFL_EFREET_BUILD) AC_SUBST(EFL_EFREET_MIME_BUILD) AC_SUBST(EFL_EFREET_TRASH_BUILD) -requirement_efreet="ecore-file >= 1.1.0 ecore >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0 ${requirement_efreet}" +requirement_efreet="ecore-file >= 1.2.0 ecore >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0 ${requirement_efreet}" PKG_CHECK_MODULES(EFREET, [${requirement_efreet}]) -PKG_CHECK_MODULES(EINA, [eina >= 1.1.0]) +PKG_CHECK_MODULES(EINA, [eina >= 1.2.0]) ### Checks for header files diff --git a/legacy/eio/configure.ac b/legacy/eio/configure.ac index 082425e8de..67008ee526 100644 --- a/legacy/eio/configure.ac +++ b/legacy/eio/configure.ac @@ -92,7 +92,7 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) ### Checks for libraries -requirements_eio="eet >= 1.5.0 eina >= 1.0.0 ecore >= 1.0.0" +requirements_eio="eet >= 1.6.0 eina >= 1.2.0 ecore >= 1.2.0" PKG_CHECK_MODULES([EIO], [${requirements_eio}]) diff --git a/legacy/embryo/configure.ac b/legacy/embryo/configure.ac index c509422faf..09bd04e51f 100644 --- a/legacy/embryo/configure.ac +++ b/legacy/embryo/configure.ac @@ -107,7 +107,7 @@ esac AC_SUBST(EFL_EMBRYO_BUILD) # For embryo_cc_prefix.c -PKG_CHECK_MODULES([EINA], [eina >= 1.1.0]) +PKG_CHECK_MODULES([EINA], [eina >= 1.2.0]) ### Checks for portability layer diff --git a/legacy/emotion/configure.ac b/legacy/emotion/configure.ac index d41d5cc32f..37edf6ac3b 100644 --- a/legacy/emotion/configure.ac +++ b/legacy/emotion/configure.ac @@ -108,16 +108,16 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) ### Checks for libraries -PKG_CHECK_MODULES(EMOTION, [eina >= 1.0.0 evas >= 1.0.0 ecore >= 1.0.0 eet >= 1.4.0]) -requirement_emotion="ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0 eet >= 1.4.0" +PKG_CHECK_MODULES(EMOTION, [eina >= 1.2.0 evas >= 1.2.0 ecore >= 1.2.0 eet >= 1.6.0]) +requirement_emotion="ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0 eet >= 1.6.0" if test "x${have_emotion_test}" = "xyes" ; then - PKG_CHECK_MODULES(EMOTION_BIN, [eina >= 1.0.0 evas >= 1.0.0 ecore >= 1.0.0 ecore-evas >= 1.0.0 edje >= 1.0.0]) + PKG_CHECK_MODULES(EMOTION_BIN, [eina >= 1.2.0 evas >= 1.2.0 ecore >= 1.2.0 ecore-evas >= 1.2.0 edje >= 1.2.0]) fi -PKG_CHECK_MODULES(ECORE_X, [ecore-x >= 1.0.0 ecore-evas >= 1.0.0], [have_ecore_x="yes"], [have_ecore_x="no"]) +PKG_CHECK_MODULES(ECORE_X, [ecore-x >= 1.2.0 ecore-evas >= 1.2.0], [have_ecore_x="yes"], [have_ecore_x="no"]) -PKG_CHECK_MODULES(ECORE_FB, [ecore-fb >= 1.0.0], [have_ecore_fb="yes"], [have_ecore_fb="no"]) +PKG_CHECK_MODULES(ECORE_FB, [ecore-fb >= 1.2.0], [have_ecore_fb="yes"], [have_ecore_fb="no"]) if test "x${have_ecore_x}" = "xyes" ; then AC_DEFINE(EMOTION_HAVE_ECORE_X, 1, [Define to 1 if Ecore_X is enabled]) @@ -127,13 +127,13 @@ if test "x${have_ecore_fb}" = "xyes" ; then AC_DEFINE(EMOTION_HAVE_ECORE_FB, 1, [Define to 1 if Ecore_Fb is enabled]) fi -PKG_CHECK_EXISTS([evas-software-x11 >= 1.0.0], [AC_DEFINE(HAVE_EVAS_SOFWARE_X11, 1, [Evas Software Xlib Engine Support])]) +PKG_CHECK_EXISTS([evas-software-x11 >= 1.2.0], [AC_DEFINE(HAVE_EVAS_SOFWARE_X11, 1, [Evas Software Xlib Engine Support])]) -PKG_CHECK_EXISTS([evas-xrender-x11 >= 1.0.0], [AC_DEFINE(HAVE_EVAS_XRENDER_X11, 1, [Evas Software Xlib Engine Support])]) +PKG_CHECK_EXISTS([evas-xrender-x11 >= 1.2.0], [AC_DEFINE(HAVE_EVAS_XRENDER_X11, 1, [Evas Software Xlib Engine Support])]) -PKG_CHECK_EXISTS([evas-opengl-x11 >= 1.0.0], [AC_DEFINE(HAVE_EVAS_OPENGL_X11, 1, [Evas OpenGL Xlib Engine Support])]) +PKG_CHECK_EXISTS([evas-opengl-x11 >= 1.2.0], [AC_DEFINE(HAVE_EVAS_OPENGL_X11, 1, [Evas OpenGL Xlib Engine Support])]) -PKG_CHECK_EXISTS([evas-fb >= 1.0.0], [AC_DEFINE(HAVE_EVAS_FB, 1, [Evas Framebuffer Engine Support])]) +PKG_CHECK_EXISTS([evas-fb >= 1.2.0], [AC_DEFINE(HAVE_EVAS_FB, 1, [Evas Framebuffer Engine Support])]) EFL_EDJE_EXTERNAL([have_edje_external="yes"], [have_edje_external="no"]) @@ -241,11 +241,11 @@ AC_ARG_ENABLE([ecore-x], if test "x$want_ecore_x" != "xno"; then PKG_CHECK_MODULES([ECORE_X], - [ecore-x >= 1.0.0], + [ecore-x >= 1.2.0], [ AC_DEFINE(HAVE_ECORE_X, 1, [X11 support for Ecore]) have_ecore_x="yes" - requirement_elm="ecore-x >= 1.0.0 ${requirement_elm}" + requirement_elm="ecore-x >= 1.2.0 ${requirement_elm}" ], [have_ecore_x="no"] ) diff --git a/legacy/ethumb/configure.ac b/legacy/ethumb/configure.ac index 9cebec55ee..baf04aef0d 100644 --- a/legacy/ethumb/configure.ac +++ b/legacy/ethumb/configure.ac @@ -121,16 +121,16 @@ AC_SUBST(EFL_ETHUMB_BUILD) AC_SUBST(EFL_ETHUMB_CLIENT_BUILD) AC_SUBST(lt_enable_auto_import) -PKG_CHECK_MODULES(EINA, [eina >= 1.0.0]) -PKG_CHECK_MODULES(EVAS, [evas >= 1.0.0]) -PKG_CHECK_MODULES(ECORE, [ecore >= 1.0.0]) -PKG_CHECK_MODULES(ECORE_EVAS, [ecore-evas >= 1.0.0]) -PKG_CHECK_MODULES(ECORE_FILE, [ecore-file >= 1.0.0 ]) -PKG_CHECK_MODULES(EDJE, [edje >= 1.0.0]) -PKG_CHECK_MODULES(EET, [eet >= 1.4.0]) +PKG_CHECK_MODULES(EINA, [eina >= 1.2.0]) +PKG_CHECK_MODULES(EVAS, [evas >= 1.2.0]) +PKG_CHECK_MODULES(ECORE, [ecore >= 1.2.0]) +PKG_CHECK_MODULES(ECORE_EVAS, [ecore-evas >= 1.2.0]) +PKG_CHECK_MODULES(ECORE_FILE, [ecore-file >= 1.2.0 ]) +PKG_CHECK_MODULES(EDJE, [edje >= 1.2.0]) +PKG_CHECK_MODULES(EET, [eet >= 1.6.0]) EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) -requirement_ethumb="eina >= 1.0.0 evas >= 1.0.0 ecore >= 1.0.0 ecore-evas >= 1.0.0 ecore-file >= 1.0.0 edje >= 1.0.0" +requirement_ethumb="eina >= 1.2.0 evas >= 1.2.0 ecore >= 1.2.0 ecore-evas >= 1.2.0 ecore-file >= 1.2.0 edje >= 1.2.0" requirement_ethumb_client="" AM_CONDITIONAL(HAVE_EMOTION, false) diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac index 182ac3e5ba..c8323842bc 100644 --- a/legacy/evas/configure.ac +++ b/legacy/evas/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/legacy/evas/m4/evas_check_engine.m4 b/legacy/evas/m4/evas_check_engine.m4 index 06feef04fe..627579542d 100644 --- a/legacy/evas/m4/evas_check_engine.m4 +++ b/legacy/evas/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/legacy/evas/m4/evas_check_loader.m4 b/legacy/evas/m4/evas_check_loader.m4 index e1fb5a9cdc..a26509403c 100644 --- a/legacy/evas/m4/evas_check_loader.m4 +++ b/legacy/evas/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])