enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

merge: evas fixes 

* gl engines were checking for eet module, which does not
   exist when we install first the efl package.
 * fix pkgconfig values for static linking
 * add Evas output to configure


SVN revision: 78918
This commit is contained in:
Vincent Torri 2012-11-05 09:25:44 +00:00
parent 741703b11d
commit 8091219f10
4 changed files with 262 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
configure.ac
View File

@ -1877,6 +1877,75 @@ echo " barrier............: ${efl_have_pthread_barrier}"
echo " affinity...........: ${efl_have_setaffinity}"
echo " Cryptographic System.: ${build_crypto}"
echo
echo "Evas:"
echo
echo " Engines:"
echo " Software Memory Buffer.....: $have_evas_engine_buffer"
echo " Software X11...............: $have_evas_engine_software_x11 (Xlib: $have_evas_engine_software_xlib) (XCB: $have_evas_engine_software_xcb)"
echo $ECHO_N " OpenGL X11.................: $have_evas_engine_gl_x11 (Xlib: $have_evas_engine_gl_xlib) (XCB: $have_evas_engine_gl_xcb) $ECHO_C"
if test "x$have_evas_engine_gl_x11" = "xyes"; then
echo "(GLES: $gl_flavor_gles)"
else
echo
fi
echo " Software GDI...............: $have_evas_engine_software_gdi"
echo " Software DirectDraw........: $have_evas_engine_software_ddraw"
echo " Direct3d...................: $have_evas_engine_direct3d"
echo " OpenGL SDL.................: $have_evas_engine_gl_sdl $ECHO_C"
if test "x$have_evas_engine_gl_sdl" = "xyes"; then
echo "(GLES: $gl_flavor_gles)"
else
echo
fi
echo " OpenGL Cocoa...............: $have_evas_engine_gl_cocoa"
echo " Software Framebuffer.......: $have_evas_engine_fb"
echo " DirectFB...................: $have_evas_engine_directfb"
echo " PSL1GHT....................: $have_evas_engine_psl1ght"
echo " Wayland Shm................: $have_evas_engine_wayland_shm"
echo " Wayland Egl................: $have_evas_engine_wayland_egl"
echo
echo " Image Loaders:"
echo " JPEG region decode......: $have_jpeg_region"
echo " WEBP....................: $have_evas_image_loader_webp"
echo " GIF.....................: $have_evas_image_loader_gif"
echo " TIFF....................: $have_evas_image_loader_tiff"
echo " SVG.....................: $have_evas_image_loader_svg"
echo
echo " Font Searching Systems:"
echo " Fontconfig..............: $have_fontconfig"
echo
echo " Font Rendering Helpers:"
echo " Fribidi.................: $have_fribidi"
echo " Harfbuzz................: $have_harfbuzz"
# FIXME: add non freetype2 font engine support
# FIXME: make freetype2 optional
echo
echo " CPU Specific Extensions:"
echo " MMX/SSE.................: $build_cpu_mmx"
echo " SSE3....................: $build_cpu_sse3"
echo " ALTIVEC.................: $build_cpu_altivec"
echo " NEON....................: $build_cpu_neon"
echo
echo " Features:"
echo " MAGIC_DEBUG.............: $want_evas_magic_debug"
echo " Cache Server 2..........: $want_evas_cserve2"
echo " Threaded Pipe Rendering.: $build_pipe_render"
echo
echo " Optional pixman rendering path:"
echo " Pixman..................: $have_pixman"
echo " Pixman Fonts............: $have_pixman_font"
echo " Pixman Rects............: $have_pixman_rect"
echo " Pixman Lines............: $have_pixman_line"
echo " Pixman Polygons.........: $have_pixman_poly"
echo " Pixman Images...........: $have_pixman_image"
echo " Pixman Image ScaleSample: $have_pixman_image_scale_sample"
echo
echo " Conversion Options:"
echo " Smaller Dither Mask.....: $conv_small_dither"
echo " Line Dither Mask........: $conv_line_dither"
echo " No Dither Mask for 16bpp: $conv_no_dither"
echo " Tiled 32BPP rotate......: $have_tile_rotate"
echo
echo "Tests..................: make check (Coverage: ${_efl_enable_coverage})"
echo "Examples...............: make examples"
echo " installation.......: make install-examples"

280
m4/evas_check_engine.m4
View File

@ -11,11 +11,7 @@ evas_engine_[]$1[]_libs=""
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
m4_default([$5], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
])
@ -61,11 +57,7 @@ fi
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
m4_default([$5], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
])
@ -136,19 +128,16 @@ if test "x${gl_flavor_gles}" = "xyes" ; then
fi
if test "x${have_dep}" = "xyes" ; then
PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [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"
else
x_dir=${x_dir:-/usr/X11R6}
x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
fi
if test "x$2" = "xyes" ; then
x_libs="${x_libs} -lX11 -lXext -lXrender"
else
x_dir=${x_dir:-/usr/X11R6}
x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
fi
evas_engine_[]$1[]_cflags="-I/usr/include ${x_cflags}"
evas_engine_[]$1[]_libs="${x_libs} -lGL $gl_pt_lib"
evas_engine_gl_common_libs="-lGL $gl_pt_lib"
fi
else
if test "x$2" = "xyes" ; then
x_libs="${x_libs} -lX11 -lXext -lXrender"
@ -172,21 +161,18 @@ 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 >= ${PACKAGE_VERSION}], [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"
evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
have_dep="yes"
AC_DEFINE(GL_GLES, 1, [GLSL runtime shader GLES2 support])
gles_variety_sgx="yes"
fi
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"
evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
have_dep="yes"
AC_DEFINE(GL_GLES, 1, [GLSL runtime shader GLES2 support])
gles_variety_sgx="yes"
fi
fi
fi
if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
fi
@ -194,12 +180,7 @@ fi
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
m4_default([$5], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
])
@ -209,34 +190,34 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_XCB],
[
requirement=""
requirement_version=""
have_dep="no"
evas_engine_[]$1[]_cflags=""
evas_engine_[]$1[]_libs=""
PKG_CHECK_MODULES([XCB],
[xcb xcb-shm xcb-image >= 0.2.1 pixman-1],
PKG_CHECK_EXISTS([xcb xcb-shm xcb-image >= 0.2.1 pixman-1],
[
have_dep="yes"
requirement="xcb xcb-shm xcb-image pixman-1"
requirement_version="xcb xcb-shm xcb-image >= 0.2.1 pixman-1"
],
[have_dep="no"])
evas_engine_[]$1[]_cflags="${XCB_CFLAGS}"
evas_engine_[]$1[]_libs="${XCB_LIBS}"
if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
if test "x${have_dep}" = "xyes" ; then
if test "x$2" = "xstatic" ; then
requirements_pc_evas="${requirement_version} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
PKG_CHECK_MODULES([XCB], [${requirement_version}])
evas_image_loader_[]$1[]_cflags="${XCB_CFLAGS}"
evas_image_loader_[]$1[]_libs="${XCB_LIBS}"
fi
fi
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
m4_default([$5], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
])
@ -247,6 +228,7 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_XCB],
[
requirement=""
requirement_version=""
have_dep="no"
evas_engine_[]$1[]_cflags=""
evas_engine_[]$1[]_libs=""
@ -300,14 +282,25 @@ if test "x${have_dep}" = "xyes" ; then
AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], -lX11 -lXext -lXrender -lm $gl_pt_lib)
fi
PKG_CHECK_MODULES([XCB_GL],
[x11-xcb xcb xcb-glx xcb-render xcb-renderutil],
PKG_CHECK_EXISTS([xcb xcb-shm xcb-image >= 0.2.1 pixman-1],
[
have_dep="yes"
requirement="x11-xcb xcb xcb-glx xcb-render xcb-renderutil"
requirement_version="x11-xcb xcb xcb-glx xcb-render xcb-renderutil"
],
[have_dep="no"])
if test "x${have_dep}" = "xyes" ; then
if test "x$2" = "xstatic" ; then
requirements_pc_evas="${requirement_version} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
PKG_CHECK_MODULES([XCB_GL], [${requirement_version}])
evas_image_loader_[]$1[]_cflags="${XCB_CFLAGS}"
evas_image_loader_[]$1[]_libs="${XCB_LIBS}"
fi
fi
evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS}"
evas_engine_[]$1[]_libs="${XCB_GL_LIBS}"
@ -316,19 +309,16 @@ if test "x$gl_flavor_gles" = "xyes" ; then
fi
if test "x${have_dep}" = "xyes" ; then
PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [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"
else
x_dir=${x_dir:-/usr/X11R6}
x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
fi
if test "x$2" = "xyes" ; then
x_libs="${x_libs} -lX11 -lXext -lXrender"
else
x_dir=${x_dir:-/usr/X11R6}
x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
fi
evas_engine_[]$1[]_cflags="-I/usr/include ${XCB_GL_CFLAGS} ${x_cflags}"
evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGL $gl_pt_lib"
evas_engine_gl_common_libs="-lGL $gl_pt_lib"
fi
else
if test "x$2" = "xyes" ; then
x_libs="${x_libs} -lX11 -lXext -lXrender"
@ -347,16 +337,13 @@ 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 >= ${PACKAGE_VERSION}], [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"
evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
have_dep="yes"
AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
gles_variety_sgx="yes"
fi
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"
evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
have_dep="yes"
AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
gles_variety_sgx="yes"
fi
fi
fi
@ -371,11 +358,7 @@ fi
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
m4_default([$5], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
])
@ -403,11 +386,7 @@ fi
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
m4_default([$5], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
])
@ -426,7 +405,7 @@ AC_CHECK_HEADER([ddraw.h],
evas_engine_[]$1[]_libs="-lddraw"
])
if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
fi
@ -434,11 +413,7 @@ fi
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
m4_default([$5], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
])
@ -465,11 +440,7 @@ fi
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
m4_default([$5], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
])
@ -510,10 +481,6 @@ LIBS="$LIBS_save"
AC_LANG_POP([Objective C])
if test "x${have_dep}" = "xyes" ; then
PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"])
fi
if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
@ -522,11 +489,7 @@ fi
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
m4_default([$5], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
])
@ -536,19 +499,29 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_SDL],
[
requirement=""
requirement_version=""
have_dep="no"
evas_engine_[]$1[]_cflags=""
evas_engine_[]$1[]_libs=""
PKG_CHECK_MODULES([SDL],
[sdl >= 1.2.0],
PKG_CHECK_EXISTS([sdl >= 1.2.0],
[
have_dep="yes"
requirement="sdl"
])
requirement_version="sdl >= 1.2.0"
],
[have_dep="no"])
evas_engine_[]$1[]_cflags="${SDL_CFLAGS}"
evas_engine_[]$1[]_libs="${SDL_LIBS}"
if test "x${have_dep}" = "xyes" ; then
if test "x$2" = "xstatic" ; then
requirements_pc_evas="${requirement_version} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
PKG_CHECK_MODULES([SDL], [${requirement_version}])
evas_image_loader_[]$1[]_cflags="${SDL_CFLAGS}"
evas_image_loader_[]$1[]_libs="${SDL_LIBS}"
fi
fi
gl_pt_lib="";
have_gl_pt="no"
@ -588,8 +561,7 @@ if test "x$gl_flavor_gles" = "xyes" ; then
fi
if test "x${have_dep}" = "xyes" ; then
evas_engine_[]$1[]_cflags="${SDL_CFLAGS}"
evas_engine_[]$1[]_libs="${SDL_LIBS} -lGL -lm $gl_pt_lib"
evas_engine_[]$1[]_libs="${evas_engine_[]$1[]_libs} -lGL -lm $gl_pt_lib"
evas_engine_gl_common_libs="-lGL -lm $gl_pt_lib"
else
AC_CHECK_HEADER([SDL/SDL_opengles.h],
@ -602,8 +574,7 @@ else
if test "x${have_egl}" = "xyes" ; then
AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm $gl_pt_lib)
if test "x${have_glesv2}" = "xyes" ; then
evas_engine_[]$1[]_cflags="${SDL_CFLAGS}"
evas_engine_[]$1[]_libs="${SDL_LIBS} -lGLESv2 -lEGL -lm $gl_pt_lib"
evas_engine_[]$1[]_libs="${evas_engine_[]$1[]_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
have_dep="yes"
AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
@ -612,13 +583,6 @@ else
fi
fi
if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
fi
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
@ -626,11 +590,7 @@ if test "x$3" = "xstatic" ; then
requirement_evas="${requirement} ${requirement_evas}"
fi
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
m4_default([$5], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
])
@ -648,11 +608,7 @@ AC_CHECK_HEADER([linux/fb.h], [have_dep="yes"])
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
m4_default([$5], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
])
@ -662,32 +618,34 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_DIRECTFB],
[
requirement=""
requirement_version=""
have_dep="no"
evas_engine_[]$1[]_cflags=""
evas_engine_[]$1[]_libs=""
PKG_CHECK_MODULES([DIRECTFB],
[directfb >= 0.9.16],
PKG_CHECK_EXISTS([directfb >= 0.9.16],
[
have_dep="yes"
requirement="directfb"
evas_engine_[]$1[]_cflags="${DIRECTFB_CFLAGS}"
evas_engine_[]$1[]_libs="${DIRECTFB_LIBS}"
])
requirement_version="directfb >= 0.9.16"
],
[have_dep="no"])
if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
if test "x${have_dep}" = "xyes" ; then
if test "x$2" = "xstatic" ; then
requirements_pc_evas="${requirement_version} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
PKG_CHECK_MODULES([DIRECTFB], [${requirement_version}])
evas_image_loader_[]$1[]_cflags="${DIRECTFB_CFLAGS}"
evas_image_loader_[]$1[]_libs="${DIRECTFB_LIBS}"
fi
fi
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
m4_default([$5], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
])
@ -705,11 +663,7 @@ AC_CHECK_HEADER([rsx/rsx.h], [have_dep="yes"])
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
m4_default([$5], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
])
@ -726,11 +680,7 @@ evas_engine_[]$1[]_libs=""
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
m4_default([$5], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
])
@ -741,6 +691,7 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_WAYLAND_EGL],
[
requirement=""
requirement_version=""
have_dep="no"
evas_engine_[]$1[]_cflags=""
evas_engine_[]$1[]_libs=""
@ -751,32 +702,29 @@ else
gl_library="gl"
fi
PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"])
PKG_CHECK_MODULES([WAYLAND_EGL],
[egl >= 7.10 ${gl_library} wayland-client wayland-egl],
PKG_CHECK_EXISTS([egl >= 7.10 ${gl_library} wayland-client wayland-egl],
[
have_dep="yes"
requirement="egl ${gl_library} wayland-client wayland-egl"
requirement_version="egl >= 7.10 ${gl_library} wayland-client wayland-egl"
],
[have_dep="no"])
evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS}"
if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
if test "x${have_dep}" = "xyes" ; then
if test "x$2" = "xstatic" ; then
requirements_pc_evas="${requirement_version} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
PKG_CHECK_MODULES([WAYLAND_EGL], [${requirement_version}])
evas_image_loader_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
evas_image_loader_[]$1[]_libs="${WAYLAND_EGL_LIBS}"
fi
fi
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
m4_default([$5], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
])

180
m4/evas_check_loader.m4
View File

@ -11,11 +11,7 @@ evas_image_loader_[]$1[]_libs=""
AC_SUBST([evas_image_loader_$1_cflags])
AC_SUBST([evas_image_loader_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$3], [:])
else
m4_default([$4], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
])
@ -29,23 +25,13 @@ have_dep="no"
evas_image_loader_[]$1[]_cflags=""
evas_image_loader_[]$1[]_libs=""
PKG_CHECK_MODULES([EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes" requirement="eet >= ${PACKAGE_VERSION}"], [have_dep="no"])
evas_image_loader_[]$1[]_cflags="${EET_CFLAGS}"
evas_image_loader_[]$1[]_libs="${EET_LIBS}"
dnl Eet is required
have_dep="yes"
AC_SUBST([evas_image_loader_$1_cflags])
AC_SUBST([evas_image_loader_$1_libs])
if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirements_pc_deps_evas}"
fi
if test "x${have_dep}" = "xyes" ; then
m4_default([$3], [:])
else
m4_default([$4], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
])
@ -61,11 +47,7 @@ evas_image_loader_[]$1[]_libs=""
AC_SUBST([evas_image_loader_$1_cflags])
AC_SUBST([evas_image_loader_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$3], [:])
else
m4_default([$4], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
])
@ -108,11 +90,7 @@ fi
AC_SUBST([evas_image_loader_$1_cflags])
AC_SUBST([evas_image_loader_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$3], [:])
else
m4_default([$4], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
])
@ -128,11 +106,7 @@ evas_image_loader_[]$1[]_libs=""
AC_SUBST([evas_image_loader_$1_cflags])
AC_SUBST([evas_image_loader_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$3], [:])
else
m4_default([$4], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
])
@ -181,11 +155,7 @@ fi
AC_SUBST([evas_image_loader_$1_cflags])
AC_SUBST([evas_image_loader_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$3], [:])
else
m4_default([$4], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
])
@ -201,11 +171,7 @@ evas_image_loader_[]$1[]_libs=""
AC_SUBST([evas_image_loader_$1_cflags])
AC_SUBST([evas_image_loader_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$3], [:])
else
m4_default([$4], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
])
@ -215,54 +181,66 @@ AC_DEFUN([EVAS_CHECK_LOADER_DEP_PNG],
[
requirement=""
requirement_version=""
have_dep="no"
evas_image_loader_[]$1[]_cflags=""
evas_image_loader_[]$1[]_libs=""
dnl libpng.pc is the latest version of libpng that ahs been installed.
dnl We check it first.
PKG_CHECK_MODULES([PNG],
[libpng >= 1.2.10],
[have_dep="yes" requirement="libpng"],
PKG_CHECK_EXISTS([libpng >= 1.2.10],
[
have_dep="yes"
requirement="libpng"
requirement_version="libpng >= 1.2.10"
],
[have_dep="no"])
if test "x${have_dep}" = "xno" ; then
PKG_CHECK_MODULES([PNG],
[libpng15],
[have_dep="yes" requirement="libpng15"],
PKG_CHECK_EXISTS([libpng15],
[
have_dep="yes"
requirement="libpng15"
requirement_version="libpng15"
],
[have_dep="no"])
fi
if test "x${have_dep}" = "xno" ; then
PKG_CHECK_MODULES([PNG],
[libpng14],
[have_dep="yes" requirement="libpng14"],
PKG_CHECK_EXISTS([libpng14],
[
have_dep="yes"
requirement="libpng14"
requirement_version="libpng14"
],
[have_dep="no"])
fi
if test "x${have_dep}" = "xno" ; then
PKG_CHECK_MODULES([PNG],
[libpng12 >= 1.2.10],
[have_dep="yes" requirement="libpng12"],
PKG_CHECK_EXISTS([libpng12 >= 1.2.10],
[
have_dep="yes"
requirement="libpng12"
requirement_version="libpng12"
],
[have_dep="no"])
fi
evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}"
evas_image_loader_[]$1[]_libs="${PNG_LIBS}"
if test "x${have_dep}" = "xyes" ; then
if test "x$2" = "xstatic" ; then
requirements_pc_evas="${requirement_version} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
PKG_CHECK_MODULES([PNG], [${requirement_version}])
evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}"
evas_image_loader_[]$1[]_libs="${PNG_LIBS}"
fi
fi
AC_SUBST([evas_image_loader_$1_cflags])
AC_SUBST([evas_image_loader_$1_libs])
if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
fi
if test "x${have_dep}" = "xyes" ; then
m4_default([$3], [:])
else
m4_default([$4], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
])
@ -278,11 +256,7 @@ evas_image_loader_[]$1[]_libs=""
AC_SUBST([evas_image_loader_$1_cflags])
AC_SUBST([evas_image_loader_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$3], [:])
else
m4_default([$4], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
])
@ -292,35 +266,35 @@ AC_DEFUN([EVAS_CHECK_LOADER_DEP_SVG],
[
requirement=""
have_esvg="no"
requirement_version=""
evas_image_loader_[]$1[]_cflags=""
evas_image_loader_[]$1[]_libs=""
version_esvg="0.0.18"
version_ender="0.0.6"
PKG_CHECK_MODULES([SVG],
[esvg >= ${version_esvg} ender >= ${version_ender}],
[have_dep="yes" have_esvg="yes" requirement="esvg >= ${version_esvg} ender >= ${version_ender}"],
PKG_CHECK_EXISTS([esvg >= ${version_esvg} ender >= ${version_ender}],
[
have_dep="yes"
requirement="esvg ender"
requirement_version="esvg >= ${version_esvg} ender >= ${version_ender}"
],
[have_dep="no"])
if test "x${have_dep}" = "xyes" ; then
evas_image_loader_[]$1[]_cflags="${SVG_CFLAGS}"
evas_image_loader_[]$1[]_libs="${SVG_LIBS}"
if test "x$2" = "xstatic" ; then
requirements_pc_evas="${requirement_version} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
PKG_CHECK_MODULES([SVG], [${requirement_version}])
evas_image_loader_[]$1[]_cflags="${SVG_CFLAGS}"
evas_image_loader_[]$1[]_libs="${SVG_LIBS}"
fi
fi
AC_SUBST([evas_image_loader_$1_cflags])
AC_SUBST([evas_image_loader_$1_libs])
if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
fi
if test "x${have_dep}" = "xyes" ; then
m4_default([$3], [:])
else
m4_default([$4], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
])
@ -336,11 +310,7 @@ evas_image_loader_[]$1[]_libs=""
AC_SUBST([evas_image_loader_$1_cflags])
AC_SUBST([evas_image_loader_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$3], [:])
else
m4_default([$4], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
])
@ -393,11 +363,7 @@ fi
AC_SUBST([evas_image_loader_$1_cflags])
AC_SUBST([evas_image_loader_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$3], [:])
else
m4_default([$4], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
])
@ -413,11 +379,7 @@ evas_image_loader_[]$1[]_libs=""
AC_SUBST([evas_image_loader_$1_cflags])
AC_SUBST([evas_image_loader_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$3], [:])
else
m4_default([$4], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
])
@ -450,11 +412,7 @@ fi
AC_SUBST([evas_image_loader_$1_cflags])
AC_SUBST([evas_image_loader_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$3], [:])
else
m4_default([$4], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
])
@ -470,11 +428,7 @@ evas_image_loader_[]$1[]_libs=""
AC_SUBST([evas_image_loader_$1_cflags])
AC_SUBST([evas_image_loader_$1_libs])
if test "x${have_dep}" = "xyes" ; then
m4_default([$3], [:])
else
m4_default([$4], [:])
fi
AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
])

24
src/Makefile_Evas.am
View File

@ -684,7 +684,7 @@ modules/evas/engines/gl_common/shader/yuy2_vert.h \
modules/evas/engines/gl_common/shader/yuy2_vert.shd
if EVAS_STATIC_BUILD_GL_COMMON
lib_evas_libevas_la_SOURCES += $(GL_COMMON_SOURCES)
lib_evas_libevas_la_LIBADD += @GL_EET_LIBS@ @evas_engine_gl_common_libs@
lib_evas_libevas_la_LIBADD += @evas_engine_gl_common_libs@
else
noinst_LTLIBRARIES = modules/evas/engines/gl_common/libevas_engine_gl_common.la
modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES)
@ -693,19 +693,20 @@ modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \
-I$(top_builddir)/src/lib/eo \
-I$(top_srcdir)/src/lib/eet \
-I$(top_builddir)/src/lib/eet \
-I$(top_srcdir)/src/lib/evas \
-I$(top_builddir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_builddir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_builddir)/src/lib/evas/cserve2 \
@GL_EET_CFLAGS@ \
@EFL_CFLAGS@ \
@EVAS_CFLAGS@
modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \
lib/eet/libeet.la \
lib/evas/libevas.la \
@EFL_LIBS@ \
@GL_EET_LIBS@
@EFL_LIBS@
modules_evas_engines_gl_common_libevas_engine_gl_common_la_LDFLAGS = -no-undefined -module -avoid-version
modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBTOOLFLAGS = --tag=disable-static
endif
@ -721,12 +722,10 @@ if EVAS_STATIC_BUILD_GL_COCOA
lib_evas_libevas_la_SOURCES += $(GL_COCOA_SOURCES)
lib_evas_libevas_la_CPPFLAGS += \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
@GL_EET_CFLAGS@ \
@evas_engine_gl_cocoa_cflags@
lib_evas_libevas_la_LIBADD += \
lib/evas/libevas.la \
modules/evas/engines/gl_common/libevas_engine_gl_common.la \
@GL_EET_LIBS@ \
@evas_engine_gl_cocoa_libs@
else
engineglcocoapkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH)
@ -737,6 +736,8 @@ modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \
-I$(top_builddir)/src/lib/eo \
-I$(top_srcdir)/src/lib/eet \
-I$(top_builddir)/src/lib/eet \
-I$(top_srcdir)/src/lib/evas \
-I$(top_builddir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
@ -746,13 +747,12 @@ modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
-I$(top_builddir)/src/modules/evas/engines/gl_common \
@evas_engine_gl_cocoa_cflags@ \
@GL_EET_CFLAGS@ \
@EFL_CFLAGS@ \
@EVAS_CFLAGS@
modules_evas_engines_gl_cocoa_module_la_LIBADD = \
modules/evas/engines/gl_common/libevas_engine_gl_common.la \
lib/eet/libeet.la \
lib/evas/libevas.la \
@GL_EET_LIBS@ \
@EFL_LIBS@ \
@evas_engine_gl_cocoa_libs@
modules_evas_engines_gl_cocoa_module_la_LDFLAGS = -no-undefined -module -avoid-version
@ -813,7 +813,6 @@ if EVAS_STATIC_BUILD_GL_X11
lib_evas_libevas_la_SOURCES += $(GL_X11_SOURCES)
lib_evas_libevas_la_CPPFLAGS += \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
@GL_EET_CFLAGS@ \
@evas_engine_gl_xlib_cflags@
lib_evas_libevas_la_LIBADD += \
modules/evas/engines/gl_common/libevas_engine_gl_common.la \
@ -827,6 +826,8 @@ modules_evas_engines_gl_x11_module_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \
-I$(top_builddir)/src/lib/eo \
-I$(top_srcdir)/src/lib/eet \
-I$(top_builddir)/src/lib/eet \
-I$(top_srcdir)/src/lib/evas \
-I$(top_builddir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
@ -836,13 +837,12 @@ modules_evas_engines_gl_x11_module_la_CPPFLAGS = \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
-I$(top_builddir)/src/modules/evas/engines/gl_common \
@evas_engine_gl_xlib_cflags@ \
@GL_EET_CFLAGS@ \
@EFL_CFLAGS@ \
@EVAS_CFLAGS@
modules_evas_engines_gl_x11_module_la_LIBADD = \
modules/evas/engines/gl_common/libevas_engine_gl_common.la \
lib/eet/libeet.la \
lib/evas/libevas.la \
@GL_EET_LIBS@ \
@EFL_LIBS@ \
@evas_engine_gl_xlib_libs@
modules_evas_engines_gl_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version
@ -859,7 +859,7 @@ modules/evas/engines/psl1ght/evas_engine.h \
modules/evas/engines/psl1ght/rsxutil.h
if EVAS_STATIC_BUILD_PSL1GHT
lib_evas_libevas_la_SOURCES += $(PSL1GHT_SOURCES)
lib_evas_libevas_la_CPPFLAGS += @GL_EET_CFLAGS@ @evas_engine_psl1ght_cflags@
lib_evas_libevas_la_CPPFLAGS += @evas_engine_psl1ght_cflags@
lib_evas_libevas_la_LIBADD += @evas_engine_psl1ght_libs@
else
enginepsl1ghtpkgdir = $(libdir)/evas/modules/engines/psl1ght/$(MODULE_ARCH)