enlightenment
/
efl
8
7
Fork 11
Code Issues 14 Pull Requests 6 Projects Releases Wiki Activity

merge: evas

Browse Source 
* remove magic debug output in evas part
 * always use version for pc file, it's actually safe
 * fix compilation of gl-sdl
 * avoid circular dependency of libevas on itself


SVN revision: 78935
devs/devilhorns/wayland_egl
Vincent Torri 11 years ago
parent e1f16731ef
commit e47bd2a9a5
4 changed files with 33 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      configure.ac
  2. 40
      m4/evas_check_engine.m4
  3. 21
      m4/evas_check_loader.m4
  4. 7
      src/Makefile_Evas.am

15
configure.ac
Unescape View File

@ -1248,7 +1248,7 @@ requirements_pc_evas="eo >= ${PACKAGE_VERSION} eet >= ${PACKAGE_VERSION} eina >=
PKG_CHECK_EXISTS([freetype2 >= 9.3.0],
[requirements_pc_evas="freetype2 >= 9.3.0 ${requirements_pc_evas}"])
requirements_pc_deps_evas="freetype2 ${requirements_pc_deps_evas}"
requirements_pc_deps_evas="freetype2 >= 9.3.0 ${requirements_pc_deps_evas}"
## optional dependencies
@ -1259,8 +1259,8 @@ if test "x${want_fontconfig}" = "xyes"; then
[
have_fontconfig="yes"
AC_DEFINE(HAVE_FONTCONFIG, 1, [have fontconfig searching capabilities])
requirements_pc_evas="fontconfig ${requirements_pc_evas}"
requirements_pc_deps_evas="fontconfig ${requirements_pc_deps_evas}"
requirements_pc_evas="fontconfig >= 2.5.0 ${requirements_pc_evas}"
requirements_pc_deps_evas="fontconfig >= 2.5.0 ${requirements_pc_deps_evas}"
])
fi
@ -1271,8 +1271,8 @@ if test "x${want_fribidi}" = "xyes"; then
[
have_fribidi="yes"
AC_DEFINE([HAVE_FRIBIDI], [1], [have fribidi support])
requirements_pc_evas="fribidi ${requirements_pc_evas}"
requirements_pc_deps_evas="fribidi ${requirements_pc_deps_evas}"
requirements_pc_evas="fribidi >= 0.19.2 ${requirements_pc_evas}"
requirements_pc_deps_evas="fribidi >= 0.19.2 ${requirements_pc_deps_evas}"
CPPFLAGS_SAVE="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $FRIBIDI_CFLAGS"
AC_CHECK_SIZEOF([FriBidiChar], [], [#include <fribidi/fribidi.h>])
@ -1287,8 +1287,8 @@ if test "x${want_harfbuzz}" = "xyes" -o "x${want_harfbuzz}" = "xauto" ; then
PKG_CHECK_EXISTS([harfbuzz >= 0.9.0],
[
have_harfbuzz="yes"
requirements_pc_evas="harfbuzz ${requirements_pc_evas}"
requirements_pc_deps_evas="harfbuzz ${requirements_pc_deps_evas}"
requirements_pc_evas="harfbuzz >= 0.9.0 ${requirements_pc_evas}"
requirements_pc_deps_evas="harfbuzz >= 0.9.0 ${requirements_pc_deps_evas}"
],
[
if test "x$want_harfbuzz" = "xyes" && test "x$use_strict" = "xyes" ; then
@ -1927,7 +1927,6 @@ 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

40
m4/evas_check_engine.m4
Unescape View File

@ -190,7 +190,6 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_XCB],
[
requirement=""
requirement_version=""
have_dep="no"
evas_engine_[]$1[]_cflags=""
evas_engine_[]$1[]_libs=""
@ -198,17 +197,16 @@ evas_engine_[]$1[]_libs=""
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"
requirement="xcb xcb-shm xcb-image >= 0.2.1 pixman-1"
],
[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_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
PKG_CHECK_MODULES([XCB], [${requirement_version}])
PKG_CHECK_MODULES([XCB], [${requirement}])
evas_image_loader_[]$1[]_cflags="${XCB_CFLAGS}"
evas_image_loader_[]$1[]_libs="${XCB_LIBS}"
fi
@ -228,7 +226,6 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_XCB],
[
requirement=""
requirement_version=""
have_dep="no"
evas_engine_[]$1[]_cflags=""
evas_engine_[]$1[]_libs=""
@ -282,20 +279,19 @@ 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_EXISTS([xcb xcb-shm xcb-image >= 0.2.1 pixman-1],
PKG_CHECK_EXISTS([x11-xcb xcb xcb-glx xcb-render xcb-renderutil],
[
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_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
PKG_CHECK_MODULES([XCB_GL], [${requirement_version}])
PKG_CHECK_MODULES([XCB_GL], [${requirement}])
evas_image_loader_[]$1[]_cflags="${XCB_CFLAGS}"
evas_image_loader_[]$1[]_libs="${XCB_LIBS}"
fi
@ -499,7 +495,6 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_SDL],
[
requirement=""
requirement_version=""
have_dep="no"
evas_engine_[]$1[]_cflags=""
evas_engine_[]$1[]_libs=""
@ -507,17 +502,16 @@ evas_engine_[]$1[]_libs=""
PKG_CHECK_EXISTS([sdl >= 1.2.0],
[
have_dep="yes"
requirement="sdl"
requirement_version="sdl >= 1.2.0"
requirement="sdl >= 1.2.0"
],
[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_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
PKG_CHECK_MODULES([SDL], [${requirement_version}])
PKG_CHECK_MODULES([SDL], [${requirement}])
evas_image_loader_[]$1[]_cflags="${SDL_CFLAGS}"
evas_image_loader_[]$1[]_libs="${SDL_LIBS}"
fi
@ -618,7 +612,6 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_DIRECTFB],
[
requirement=""
requirement_version=""
have_dep="no"
evas_engine_[]$1[]_cflags=""
evas_engine_[]$1[]_libs=""
@ -626,17 +619,16 @@ evas_engine_[]$1[]_libs=""
PKG_CHECK_EXISTS([directfb >= 0.9.16],
[
have_dep="yes"
requirement="directfb"
requirement_version="directfb >= 0.9.16"
requirement="directfb >= 0.9.16"
],
[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_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
PKG_CHECK_MODULES([DIRECTFB], [${requirement_version}])
PKG_CHECK_MODULES([DIRECTFB], [${requirement}])
evas_image_loader_[]$1[]_cflags="${DIRECTFB_CFLAGS}"
evas_image_loader_[]$1[]_libs="${DIRECTFB_LIBS}"
fi
@ -691,7 +683,6 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_WAYLAND_EGL],
[
requirement=""
requirement_version=""
have_dep="no"
evas_engine_[]$1[]_cflags=""
evas_engine_[]$1[]_libs=""
@ -705,17 +696,16 @@ fi
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"
requirement="egl >= 7.10 ${gl_library} wayland-client wayland-egl"
],
[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_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
PKG_CHECK_MODULES([WAYLAND_EGL], [${requirement_version}])
PKG_CHECK_MODULES([WAYLAND_EGL], [${requirement}])
evas_image_loader_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
evas_image_loader_[]$1[]_libs="${WAYLAND_EGL_LIBS}"
fi

21
m4/evas_check_loader.m4
Unescape View File

@ -181,7 +181,6 @@ AC_DEFUN([EVAS_CHECK_LOADER_DEP_PNG],
[
requirement=""
requirement_version=""
have_dep="no"
evas_image_loader_[]$1[]_cflags=""
evas_image_loader_[]$1[]_libs=""
@ -191,8 +190,7 @@ dnl We check it first.
PKG_CHECK_EXISTS([libpng >= 1.2.10],
[
have_dep="yes"
requirement="libpng"
requirement_version="libpng >= 1.2.10"
requirement="libpng >= 1.2.10"
],
[have_dep="no"])
@ -201,7 +199,6 @@ if test "x${have_dep}" = "xno" ; then
[
have_dep="yes"
requirement="libpng15"
requirement_version="libpng15"
],
[have_dep="no"])
fi
@ -211,7 +208,6 @@ if test "x${have_dep}" = "xno" ; then
[
have_dep="yes"
requirement="libpng14"
requirement_version="libpng14"
],
[have_dep="no"])
fi
@ -220,18 +216,17 @@ if test "x${have_dep}" = "xno" ; then
PKG_CHECK_EXISTS([libpng12 >= 1.2.10],
[
have_dep="yes"
requirement="libpng12"
requirement_version="libpng12"
requirement="libpng12 >= 1.2.10"
],
[have_dep="no"])
fi
if test "x${have_dep}" = "xyes" ; then
if test "x$2" = "xstatic" ; then
requirements_pc_evas="${requirement_version} ${requirements_pc_evas}"
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
PKG_CHECK_MODULES([PNG], [${requirement_version}])
PKG_CHECK_MODULES([PNG], [${requirement}])
evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}"
evas_image_loader_[]$1[]_libs="${PNG_LIBS}"
fi
@ -266,7 +261,6 @@ AC_DEFUN([EVAS_CHECK_LOADER_DEP_SVG],
[
requirement=""
requirement_version=""
evas_image_loader_[]$1[]_cflags=""
evas_image_loader_[]$1[]_libs=""
version_esvg="0.0.18"
@ -275,17 +269,16 @@ version_ender="0.0.6"
PKG_CHECK_EXISTS([esvg >= ${version_esvg} ender >= ${version_ender}],
[
have_dep="yes"
requirement="esvg ender"
requirement_version="esvg >= ${version_esvg} ender >= ${version_ender}"
requirement="esvg ender >= ${version_esvg} ender >= ${version_ender}"
],
[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_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
PKG_CHECK_MODULES([SVG], [${requirement_version}])
PKG_CHECK_MODULES([SVG], [${requirement}])
evas_image_loader_[]$1[]_cflags="${SVG_CFLAGS}"
evas_image_loader_[]$1[]_libs="${SVG_LIBS}"
fi

7
src/Makefile_Evas.am
Unescape View File

@ -724,7 +724,6 @@ lib_evas_libevas_la_CPPFLAGS += \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
@evas_engine_gl_cocoa_cflags@
lib_evas_libevas_la_LIBADD += \
lib/evas/libevas.la \
modules/evas/engines/gl_common/libevas_engine_gl_common.la \
@evas_engine_gl_cocoa_libs@
else
@ -782,6 +781,8 @@ modules_evas_engines_gl_sdl_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 \
@ -1041,7 +1042,7 @@ lib_evas_libevas_la_SOURCES += $(WAYLAND_EGL_SOURCES)
lib_evas_libevas_la_CPPFLAGS += \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
@evas_engine_wayland_egl_cflags@
lib_evas_libevas_la_LIBADD += lib/evas/libevas.la @EFL_LIBS@ @evas_engine_wayland_egl_libs@
lib_evas_libevas_la_LIBADD += @EFL_LIBS@ @evas_engine_wayland_egl_libs@
else
enginewaylandeglpkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH)
enginewaylandeglpkg_LTLIBRARIES = modules/evas/engines/wayland_egl/module.la
@ -1084,7 +1085,7 @@ modules/evas/engines/wayland_shm/evas_engine.h
if EVAS_STATIC_BUILD_WAYLAND_SHM
lib_evas_libevas_la_SOURCES += $(WAYLAND_SHM_SOURCES)
lib_evas_libevas_la_CPPFLAGS += @evas_engine_wayland_shm_cflags@
lib_evas_libevas_la_LIBADD += lib/evas/libevas.la @EFL_LIBS@ @evas_engine_wayland_shm_libs@
lib_evas_libevas_la_LIBADD += @EFL_LIBS@ @evas_engine_wayland_shm_libs@
else
enginewaylandshmpkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARCH)
enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la

Write Preview
Loading…
Cancel
Save