merge: and now Evas
I've tested make -j 3 install and it works nicely
I've tested expedite with software and opengl xlib,
and it works. Not tested other engines, so please
report any problems (engines or other) on the ML.
TODO: examples and tests, I'll add them later
ISSUE: Eina_Unicode size check. It indirectly depends on
eina_config.h, which is created at the end of the
configure script. So its size is always 0. I don't
know how that size is used, so I can't do a lot,
for now.
SVN revision: 78895
This commit is contained in:
parent
a5ac6a987c
commit
c15e9c6575
46
AUTHORS
46
AUTHORS
|
|
@ -63,6 +63,52 @@ Lionel Orry <lionel.orry@gmail.com>
|
|||
Jérôme Pinot <ngc891@gmail.com>
|
||||
Leandro Santiago <leandrosansilva@gmail.com>
|
||||
|
||||
Evas
|
||||
----
|
||||
|
||||
Carsten Haitzler <raster@rasterman.com>
|
||||
Till Adam <till@adam-lilienthal.de>
|
||||
Steve Ireland <sireland@pobox.com>
|
||||
Brett Nash <nash@fluffyspider.com.au>
|
||||
Tilman Sauerbeck <tilman@code-monkey.de>
|
||||
Corey Donohoe <atmos@atmos.org>
|
||||
Yuri Hudobin <glassy_ape@users.sourceforge.net>
|
||||
Nathan Ingersoll <ningerso@d.umn.edu>
|
||||
Willem Monsuwe <willem@stack.nl>
|
||||
Jose O Gonzalez <jose_ogp@juno.com>
|
||||
Bernhard Nemec <Bernhard.Nemec@viasyshc.com>
|
||||
Jorge Luis Zapata Muga <jorgeluis.zapata@gmail.com>
|
||||
Cedric Bail <cedric.bail@free.fr>
|
||||
Gustavo Sverzut Barbieri <barbieri@gmail.com>
|
||||
Vincent Torri <vtorri at univ-evry dot fr>
|
||||
Tim Horton <hortont424@gmail.com>
|
||||
Tom Hacohen <tom@stosb.com>
|
||||
Mathieu Taillefumier <mathieu.taillefumier@free.fr>
|
||||
Iván Briano <ivan@profusion.mobi>
|
||||
Gustavo Lima Chaves <glima@profusion.mobi>
|
||||
Samsung Electronics
|
||||
Samsung SAIT
|
||||
Sung W. Park <sungwoo@gmail.com>
|
||||
Jiyoun Park <jy0703.park@samsung.com>
|
||||
Myoungwoon Roy Kim(roy_kim) <myoungwoon.kim@samsung.com> <myoungwoon@gmail.com>
|
||||
Thierry el Borgi <thierry@substantiel.fr>
|
||||
Shilpa Singh <shilpa.singh@samsung.com> <shilpasingh.o@gmail.com>
|
||||
ChunEon Park <hermet@hermet.pe.kr>
|
||||
Christopher 'devilhorns' Michael <cpmichael1@comcast.net>
|
||||
Seungsoo Woo <om101.woo@samsung.com>
|
||||
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
|
||||
Jim Kukunas <james.t.kukunas@linux.intel.com>
|
||||
Nicolas Aguirre <aguirre.nicolas@gmail.com>
|
||||
Rafal Krypa <r.krypa@samsung.com>
|
||||
Hyoyoung Chang <hyoyoung@gmail.com>
|
||||
Jérôme Pinot <ngc891@gmail.com>
|
||||
Rafael Antognolli <antognolli@profusion.mobi>
|
||||
Daniel Zaoui <daniel.zaoui@samsung.com>
|
||||
Christophe Sadoine <chris@indefini.org>
|
||||
Igor Murzov <e-mail@date.by>
|
||||
Sohyun Kim <anna1014.kim@samsung.com>
|
||||
Boris Faure <billiob@gmail.com>
|
||||
|
||||
Embryo
|
||||
------
|
||||
|
||||
|
|
|
|||
1
COPYING
1
COPYING
|
|
@ -5,4 +5,5 @@ evil: licenses/COPYING.BSD
|
|||
eet: licenses/COPYING.BSD
|
||||
eina: licenses/COPYING.LGPL
|
||||
eo: licenses/COPYING.BSD
|
||||
evas: licenses/COPYING.BSD
|
||||
embryo: licenses/COPYING.BSD
|
||||
|
|
|
|||
68
Makefile.am
68
Makefile.am
|
|
@ -6,6 +6,7 @@ MAINTAINERCLEANFILES = \
|
|||
Makefile.in \
|
||||
aclocal.m4 \
|
||||
compile \
|
||||
config.cache-env \
|
||||
config.guess \
|
||||
config.h.in \
|
||||
config.h.in~ \
|
||||
|
|
@ -33,6 +34,7 @@ m4/evil_windows.m4 \
|
|||
m4/eina_check.m4
|
||||
|
||||
EXTRA_DIST += \
|
||||
autogen.sh \
|
||||
licenses/COPYING.LGPL \
|
||||
licenses/COPYING.GPL \
|
||||
licenses/COPYING.BSD \
|
||||
|
|
@ -50,6 +52,19 @@ pc/evil.pc \
|
|||
pc/eina.pc \
|
||||
pc/eet.pc \
|
||||
pc/eo.pc \
|
||||
pc/evas.pc \
|
||||
pc/evas-directfb.pc \
|
||||
pc/evas-fb.pc \
|
||||
pc/evas-opengl-x11.pc \
|
||||
pc/evas-opengl-sdl.pc \
|
||||
pc/evas-software-buffer.pc \
|
||||
pc/evas-software-x11.pc \
|
||||
pc/evas-software-gdi.pc \
|
||||
pc/evas-software-ddraw.pc \
|
||||
pc/evas-direct3d.pc \
|
||||
pc/evas-psl1ght.pc \
|
||||
pc/evas-wayland-shm.pc \
|
||||
pc/evas-wayland-egl.pc \
|
||||
pc/embryo.pc
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
|
|
@ -63,8 +78,61 @@ pkgconfig_DATA += \
|
|||
pc/eina.pc \
|
||||
pc/eo.pc \
|
||||
pc/eet.pc \
|
||||
pc/evas.pc \
|
||||
pc/embryo.pc
|
||||
|
||||
if BUILD_ENGINE_SOFTWARE_X11
|
||||
pkgconfig_DATA += pc/evas-software-x11.pc
|
||||
endif
|
||||
|
||||
if BUILD_ENGINE_DIRECTFB
|
||||
pkgconfig_DATA += pc/evas-directfb.pc
|
||||
endif
|
||||
|
||||
if BUILD_ENGINE_FB
|
||||
pkgconfig_DATA += pc/evas-fb.pc
|
||||
endif
|
||||
|
||||
if BUILD_ENGINE_BUFFER
|
||||
pkgconfig_DATA += pc/evas-software-buffer.pc
|
||||
endif
|
||||
|
||||
if BUILD_ENGINE_GL_X11
|
||||
pkgconfig_DATA += pc/evas-opengl-x11.pc
|
||||
endif
|
||||
|
||||
if BUILD_ENGINE_GL_SDL
|
||||
pkgconfig_DATA += pc/evas-opengl-sdl.pc
|
||||
endif
|
||||
|
||||
if BUILD_ENGINE_GL_COCOA
|
||||
pkgconfig_DATA += pc/evas-opengl-cocoa.pc
|
||||
endif
|
||||
|
||||
if BUILD_ENGINE_SOFTWARE_GDI
|
||||
pkgconfig_DATA += pc/evas-software-gdi.pc
|
||||
endif
|
||||
|
||||
if BUILD_ENGINE_SOFTWARE_DDRAW
|
||||
pkgconfig_DATA += pc/evas-software-ddraw.pc
|
||||
endif
|
||||
|
||||
if BUILD_ENGINE_DIRECT3D
|
||||
pkgconfig_DATA += pc/evas-direct3d.pc
|
||||
endif
|
||||
|
||||
if BUILD_ENGINE_PSL1GHT
|
||||
pkgconfig_DATA += pc/evas-psl1ght.pc
|
||||
endif
|
||||
|
||||
if BUILD_ENGINE_WAYLAND_SHM
|
||||
pkgconfig_DATA += pc/evas-wayland-shm.pc
|
||||
endif
|
||||
|
||||
if BUILD_ENGINE_WAYLAND_EGL
|
||||
pkgconfig_DATA += pc/evas-wayland-egl.pc
|
||||
endif
|
||||
|
||||
|
||||
.PHONY: doc benchmark examples install-examples
|
||||
|
||||
|
|
|
|||
967
configure.ac
967
configure.ac
File diff suppressed because it is too large
Load Diff
|
|
@ -1,6 +1,9 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
filesdir = $(datadir)/embryo/include
|
||||
files_DATA = embryo/default.inc
|
||||
embryofilesdir = $(datadir)/embryo/include
|
||||
embryofiles_DATA = embryo/default.inc
|
||||
|
||||
EXTRA_DIST = $(files_DATA)
|
||||
evasfilesdir = $(datadir)/evas
|
||||
evasfiles_DATA = evas/checkme
|
||||
|
||||
EXTRA_DIST = embryo/default.inc evas/checkme
|
||||
|
|
|
|||
|
|
@ -29,4 +29,55 @@ if test "x${have_attribute_vector}" = "xyes" ; then
|
|||
fi
|
||||
])
|
||||
|
||||
dnl Usage: EFL_ATTRIBUTE_ALWAYS_INLINE
|
||||
dnl call AC_DEFINE for alway_inline if __attribute__((always_inline)) is available
|
||||
|
||||
AC_DEFUN([EFL_ATTRIBUTE_ALWAYS_INLINE],
|
||||
[
|
||||
|
||||
have_attribute_forceinline="no"
|
||||
|
||||
AC_MSG_CHECKING([for __forceinline])
|
||||
|
||||
AC_COMPILE_IFELSE(
|
||||
[AC_LANG_PROGRAM(
|
||||
[[
|
||||
#include <windows.h>
|
||||
static __forceinline void foo(void) {}
|
||||
]],
|
||||
[[
|
||||
]])],
|
||||
[
|
||||
have_attribute_always_inline="yes"
|
||||
have_attribute_forceinline="yes"
|
||||
],
|
||||
[have_attribute_always_inline="no"])
|
||||
|
||||
AC_MSG_RESULT([${have_attribute_always_inline}])
|
||||
|
||||
if test "x${have_attribute_always_inline}" = "xno" ; then
|
||||
AC_MSG_CHECKING([for __attribute__ ((__always_inline__))])
|
||||
AC_COMPILE_IFELSE(
|
||||
[AC_LANG_PROGRAM(
|
||||
[[
|
||||
static __attribute__((__always_inline__)) inline void foo(void) {}
|
||||
]],
|
||||
[[
|
||||
]])],
|
||||
[have_attribute_always_inline="yes"],
|
||||
[have_attribute_always_inline="no"])
|
||||
AC_MSG_RESULT([${have_attribute_always_inline}])
|
||||
fi
|
||||
|
||||
if test "x${have_attribute_always_inline}" = "xyes" ; then
|
||||
if test "x${have_attribute_forceinline}" = "xyes" ; then
|
||||
AC_DEFINE([EFL_ALWAYS_INLINE], [__forceinline], [Macro declaring a function to always be inlined.])
|
||||
else
|
||||
AC_DEFINE([EFL_ALWAYS_INLINE], [__attribute__ ((__always_inline__)) inline], [Macro declaring a function to always be inlined.])
|
||||
fi
|
||||
else
|
||||
AC_DEFINE([EFL_ALWAYS_INLINE], [static inline], [Macro declaring a function to always be inlined.])
|
||||
fi
|
||||
])
|
||||
|
||||
dnl End of efl_attribute.m4
|
||||
|
|
|
|||
|
|
@ -53,11 +53,14 @@ LIBS="${LIBS} $2"
|
|||
AC_LINK_IFELSE(
|
||||
[AC_LANG_PROGRAM(
|
||||
[[
|
||||
#define _GNU_SOURCE
|
||||
#ifndef _GNU_SOURCE
|
||||
# define _GNU_SOURCE
|
||||
#endif
|
||||
#include <stdlib>
|
||||
#include <dlfcn.h>
|
||||
]],
|
||||
[[
|
||||
int res = dladdr(0, 0);
|
||||
int res = dladdr(NULL, NULL);
|
||||
]])],
|
||||
[
|
||||
m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} $2"
|
||||
|
|
@ -171,6 +174,75 @@ m4_popdef([DOWNEFL])
|
|||
m4_popdef([UPEFL])
|
||||
])
|
||||
|
||||
dnl _EFL_CHECK_FUNC_DLSYM_PRIV is for internal use
|
||||
dnl _EFL_CHECK_FUNC_DLSYM_PRIV(EFL, LIB, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
|
||||
|
||||
AC_DEFUN([_EFL_CHECK_FUNC_DLSYM_PRIV],
|
||||
[
|
||||
m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl
|
||||
m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
|
||||
|
||||
LIBS_save="${LIBS}"
|
||||
LIBS="${LIBS} $2"
|
||||
AC_LINK_IFELSE(
|
||||
[AC_LANG_PROGRAM(
|
||||
[[
|
||||
#ifndef _GNU_SOURCE
|
||||
# define _GNU_SOURCE
|
||||
#endif
|
||||
#include <stdlib.h>
|
||||
#include <dlfcn.h>
|
||||
]],
|
||||
[[
|
||||
void *res = dlsym(NULL, NULL);
|
||||
]])],
|
||||
[
|
||||
m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} $2"
|
||||
requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} $2"
|
||||
_efl_have_fct="yes"
|
||||
],
|
||||
[_efl_have_fct="no"])
|
||||
|
||||
LIBS="${LIBS_save}"
|
||||
|
||||
AS_IF([test "x${_efl_have_fct}" = "xyes"], [$3], [$4])
|
||||
|
||||
m4_popdef([DOWNEFL])
|
||||
m4_popdef([UPEFL])
|
||||
])
|
||||
|
||||
dnl _EFL_CHECK_FUNC_DLSYM is for internal use
|
||||
dnl _EFL_CHECK_FUNC_DLSYM(EFL, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
|
||||
|
||||
AC_DEFUN([_EFL_CHECK_FUNC_DLSYM],
|
||||
[
|
||||
m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl
|
||||
m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
|
||||
|
||||
case "$host_os" in
|
||||
mingw*)
|
||||
_efl_have_fct="yes"
|
||||
requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ldl"
|
||||
;;
|
||||
*)
|
||||
_efl_have_fct="no"
|
||||
|
||||
dnl Check is dlsym is in libc
|
||||
_EFL_CHECK_FUNC_DLSYM_PRIV([$1], [], [_efl_have_fct="yes"], [_efl_have_fct="no"])
|
||||
|
||||
dnl Check is dlopen is in libdl
|
||||
if test "x${_efl_have_fct}" = "xno" ; then
|
||||
_EFL_CHECK_FUNC_DLSYM_PRIV([$1], [-ldl], [_efl_have_fct="yes"], [_efl_have_fct="no"])
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
AS_IF([test "x${_efl_have_fct}" = "xyes"], [$2], [$3])
|
||||
|
||||
m4_popdef([DOWNEFL])
|
||||
m4_popdef([UPEFL])
|
||||
])
|
||||
|
||||
dnl _EFL_CHECK_FUNC_FNMATCH_PRIV is for internal use
|
||||
dnl _EFL_CHECK_FUNC_FNMATCH_PRIV(EFL, LIB, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
|
||||
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ AC_DEFUN([EINA_CONFIG],
|
|||
if $2; then
|
||||
EINA_CONFIGURE_$1="#define EINA_$1"
|
||||
fi
|
||||
AC_SUBST(EINA_CONFIGURE_$1)
|
||||
AC_SUBST([EINA_CONFIGURE_$1])
|
||||
])
|
||||
|
|
|
|||
|
|
@ -53,6 +53,11 @@ if test "x${have_dep}" = "xyes" ; then
|
|||
evas_engine_[]$1[]_libs="${x_libs}"
|
||||
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}"
|
||||
fi
|
||||
|
||||
AC_SUBST([evas_engine_$1_cflags])
|
||||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
|
|
@ -123,15 +128,15 @@ if test "x${have_dep}" = "xyes" ; then
|
|||
fi
|
||||
|
||||
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)
|
||||
AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], [-lX11 -lXext -lXrender -lm $gl_pt_lib])
|
||||
fi
|
||||
|
||||
if test "x$gl_flavor_gles" = "xyes" ; then
|
||||
if test "x${gl_flavor_gles}" = "xyes" ; then
|
||||
have_dep=no
|
||||
fi
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"])
|
||||
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"
|
||||
|
|
@ -168,7 +173,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.6.99], [have_dep="yes"], [have_dep="no"])
|
||||
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"
|
||||
|
|
@ -181,6 +186,11 @@ 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}"
|
||||
fi
|
||||
|
||||
AC_SUBST([evas_engine_$1_cflags])
|
||||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
|
|
@ -208,20 +218,20 @@ PKG_CHECK_MODULES([XCB],
|
|||
[
|
||||
have_dep="yes"
|
||||
requirement="xcb xcb-shm xcb-image pixman-1"
|
||||
evas_engine_[]$1[]_cflags="${XCB_CFLAGS}"
|
||||
evas_engine_[]$1[]_libs="${XCB_LIBS}"
|
||||
],[
|
||||
have_dep="no"
|
||||
]
|
||||
)
|
||||
],
|
||||
[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}"
|
||||
fi
|
||||
|
||||
AC_SUBST([evas_engine_$1_cflags])
|
||||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x$3" = "xstatic" ; then
|
||||
requirement_evas="${requirement} ${requirement_evas}"
|
||||
fi
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
|
|
@ -236,6 +246,8 @@ dnl use: EVAS_CHECK_ENGINE_DEP_GL_XCB(engine, simple, want_static[, ACTION-IF-FO
|
|||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_XCB],
|
||||
[
|
||||
|
||||
requirement=""
|
||||
have_dep="no"
|
||||
evas_engine_[]$1[]_cflags=""
|
||||
evas_engine_[]$1[]_libs=""
|
||||
|
||||
|
|
@ -293,19 +305,18 @@ PKG_CHECK_MODULES([XCB_GL],
|
|||
[
|
||||
have_dep="yes"
|
||||
requirement="x11-xcb xcb xcb-glx xcb-render xcb-renderutil"
|
||||
evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS}"
|
||||
evas_engine_[]$1[]_libs="${XCB_GL_LIBS}"
|
||||
],[
|
||||
have_dep="no"
|
||||
]
|
||||
)
|
||||
],
|
||||
[have_dep="no"])
|
||||
|
||||
evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS}"
|
||||
evas_engine_[]$1[]_libs="${XCB_GL_LIBS}"
|
||||
|
||||
if test "x$gl_flavor_gles" = "xyes" ; then
|
||||
have_dep=no
|
||||
fi
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"])
|
||||
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"
|
||||
|
|
@ -337,7 +348,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.6.99], [have_dep="yes"], [have_dep="no"])
|
||||
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"
|
||||
|
|
@ -350,6 +361,13 @@ 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])
|
||||
|
||||
|
|
@ -375,8 +393,12 @@ AC_CHECK_HEADER([windows.h],
|
|||
[
|
||||
have_dep="yes"
|
||||
evas_engine_[]$1[]_libs="-lgdi32"
|
||||
]
|
||||
)
|
||||
])
|
||||
|
||||
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
|
||||
|
||||
AC_SUBST([evas_engine_$1_cflags])
|
||||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
|
@ -402,8 +424,12 @@ AC_CHECK_HEADER([ddraw.h],
|
|||
[
|
||||
have_dep="yes"
|
||||
evas_engine_[]$1[]_libs="-lddraw"
|
||||
]
|
||||
)
|
||||
])
|
||||
|
||||
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
|
||||
|
||||
AC_SUBST([evas_engine_$1_cflags])
|
||||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
|
@ -429,8 +455,12 @@ AC_CHECK_HEADERS([d3d9.h d3dx9.h],
|
|||
have_dep="yes"
|
||||
evas_engine_[]$1[]_libs="-ld3d9 -ld3dx9 -lgdi32"
|
||||
],
|
||||
[have_dep="no"; break]
|
||||
)
|
||||
[have_dep="no"; break])
|
||||
|
||||
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
|
||||
|
||||
AC_SUBST([evas_engine_$1_cflags])
|
||||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
|
@ -481,7 +511,12 @@ LIBS="$LIBS_save"
|
|||
AC_LANG_POP([Objective C])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"])
|
||||
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}"
|
||||
fi
|
||||
|
||||
AC_SUBST([evas_engine_$1_cflags])
|
||||
|
|
@ -510,10 +545,10 @@ PKG_CHECK_MODULES([SDL],
|
|||
[
|
||||
have_dep="yes"
|
||||
requirement="sdl"
|
||||
evas_engine_[]$1[]_cflags="${SDL_CFLAGS}"
|
||||
evas_engine_[]$1[]_libs="${SDL_LIBS}"
|
||||
]
|
||||
)
|
||||
])
|
||||
|
||||
evas_engine_[]$1[]_cflags="${SDL_CFLAGS}"
|
||||
evas_engine_[]$1[]_libs="${SDL_LIBS}"
|
||||
|
||||
gl_pt_lib="";
|
||||
have_gl_pt="no"
|
||||
|
|
@ -577,6 +612,13 @@ 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])
|
||||
|
||||
|
|
@ -631,52 +673,16 @@ PKG_CHECK_MODULES([DIRECTFB],
|
|||
requirement="directfb"
|
||||
evas_engine_[]$1[]_cflags="${DIRECTFB_CFLAGS}"
|
||||
evas_engine_[]$1[]_libs="${DIRECTFB_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}"
|
||||
fi
|
||||
|
||||
AC_SUBST([evas_engine_$1_cflags])
|
||||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
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
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_8_X11(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_8_X11],
|
||||
[
|
||||
|
||||
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],
|
||||
[
|
||||
have_dep="yes"
|
||||
requirement="xcb xcb-shm xcb-image pixman-1"
|
||||
evas_engine_[]$1[]_cflags="${XCB_CFLAGS}"
|
||||
evas_engine_[]$1[]_libs="${XCB_LIBS}"
|
||||
],[
|
||||
have_dep="no"
|
||||
]
|
||||
)
|
||||
|
||||
AC_SUBST([evas_engine_$1_cflags])
|
||||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x$3" = "xstatic" ; then
|
||||
requirement_evas="${requirement} ${requirement_evas}"
|
||||
fi
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
|
|
@ -745,27 +751,27 @@ else
|
|||
gl_library="gl"
|
||||
fi
|
||||
|
||||
PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"])
|
||||
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],
|
||||
[
|
||||
have_dep="yes"
|
||||
requirement="egl >= 7.10 ${gl_library} wayland-client wayland-egl"
|
||||
evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
|
||||
evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS}"
|
||||
],[
|
||||
have_dep="no"
|
||||
]
|
||||
)
|
||||
requirement="egl ${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}"
|
||||
fi
|
||||
|
||||
AC_SUBST([evas_engine_$1_cflags])
|
||||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x$3" = "xstatic" ; then
|
||||
requirement_evas="${requirement} ${requirement_evas}"
|
||||
fi
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
|
|
@ -0,0 +1,534 @@
|
|||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_BMP(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_BMP],
|
||||
[
|
||||
|
||||
have_dep="yes"
|
||||
evas_image_loader_[]$1[]_cflags=""
|
||||
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
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_EET(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_EET],
|
||||
[
|
||||
|
||||
requirement=""
|
||||
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}"
|
||||
|
||||
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
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_GENERIC(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_GENERIC],
|
||||
[
|
||||
|
||||
have_dep="yes"
|
||||
evas_image_loader_[]$1[]_cflags=""
|
||||
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
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_GIF(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_GIF],
|
||||
[
|
||||
|
||||
have_dep="no"
|
||||
evas_image_loader_[]$1[]_cflags=""
|
||||
evas_image_loader_[]$1[]_libs=""
|
||||
|
||||
AC_CHECK_HEADER([gif_lib.h], [have_dep="yes"])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
AC_CHECK_LIB([gif],
|
||||
[DGifOpenFileName],
|
||||
[
|
||||
evas_image_loader_[]$1[]_libs="-lgif"
|
||||
],
|
||||
[have_dep="no"]
|
||||
)
|
||||
|
||||
if test "x${have_dep}" = "xno" ; then
|
||||
AC_CHECK_LIB([ungif],
|
||||
[DGifOpenFileName],
|
||||
[
|
||||
have_dep="yes"
|
||||
evas_image_loader_[]$1[]_libs="-lungif"
|
||||
]
|
||||
)
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
|
||||
requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
|
||||
requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
|
||||
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
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_ICO(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_ICO],
|
||||
[
|
||||
|
||||
have_dep="yes"
|
||||
evas_image_loader_[]$1[]_cflags=""
|
||||
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
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_JPEG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_JPEG],
|
||||
[
|
||||
|
||||
have_dep="no"
|
||||
evas_image_loader_[]$1[]_cflags=""
|
||||
evas_image_loader_[]$1[]_libs=""
|
||||
|
||||
AC_CHECK_HEADER([jpeglib.h], [have_dep="yes"])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
AC_CHECK_LIB([jpeg],
|
||||
[jpeg_CreateDecompress],
|
||||
[
|
||||
evas_image_loader_[]$1[]_libs="-ljpeg"
|
||||
AC_COMPILE_IFELSE(
|
||||
[AC_LANG_PROGRAM(
|
||||
[[
|
||||
#include <stdio.h>
|
||||
#include <jpeglib.h>
|
||||
#include <setjmp.h>
|
||||
]],
|
||||
[[
|
||||
struct jpeg_decompress_struct decomp;
|
||||
decomp.region_x = 0;
|
||||
]])],
|
||||
[have_jpeg_region="yes"],
|
||||
[have_jpeg_region="no"])
|
||||
],
|
||||
[have_dep="no"]
|
||||
)
|
||||
if test "x${have_jpeg_region}" = "xyes" ; then
|
||||
AC_DEFINE(BUILD_LOADER_JPEG_REGION, [1], [JPEG Region Decode Support])
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
|
||||
requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
|
||||
requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
|
||||
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
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_PMAPS(loader, want_static[[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_PMAPS],
|
||||
[
|
||||
|
||||
have_dep="yes"
|
||||
evas_image_loader_[]$1[]_cflags=""
|
||||
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
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_PNG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_PNG],
|
||||
[
|
||||
|
||||
requirement=""
|
||||
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"],
|
||||
[have_dep="no"])
|
||||
|
||||
if test "x${have_dep}" = "xno" ; then
|
||||
PKG_CHECK_MODULES([PNG],
|
||||
[libpng15],
|
||||
[have_dep="yes" requirement="libpng15"],
|
||||
[have_dep="no"])
|
||||
fi
|
||||
|
||||
if test "x${have_dep}" = "xno" ; then
|
||||
PKG_CHECK_MODULES([PNG],
|
||||
[libpng14],
|
||||
[have_dep="yes" requirement="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"],
|
||||
[have_dep="no"])
|
||||
fi
|
||||
|
||||
evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}"
|
||||
evas_image_loader_[]$1[]_libs="${PNG_LIBS}"
|
||||
|
||||
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
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_PSD(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_PSD],
|
||||
[
|
||||
|
||||
have_dep="yes"
|
||||
evas_image_loader_[]$1[]_cflags=""
|
||||
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
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_SVG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_SVG],
|
||||
[
|
||||
|
||||
requirement=""
|
||||
have_esvg="no"
|
||||
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}"],
|
||||
[have_dep="no"])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
evas_image_loader_[]$1[]_cflags="${SVG_CFLAGS}"
|
||||
evas_image_loader_[]$1[]_libs="${SVG_LIBS}"
|
||||
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
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_TGA(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_TGA],
|
||||
[
|
||||
|
||||
have_dep="yes"
|
||||
evas_image_loader_[]$1[]_cflags=""
|
||||
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
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_TIFF(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_TIFF],
|
||||
[
|
||||
|
||||
have_dep="no"
|
||||
evas_image_loader_[]$1[]_cflags=""
|
||||
evas_image_loader_[]$1[]_libs=""
|
||||
|
||||
AC_CHECK_HEADER([tiffio.h], [have_dep="yes"])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
AC_CHECK_LIB([tiff],
|
||||
[TIFFReadScanline],
|
||||
[
|
||||
evas_image_loader_[]$1[]_libs="-ltiff"
|
||||
],
|
||||
[have_dep="no"]
|
||||
)
|
||||
|
||||
if test "x${have_dep}" = "xno" ; then
|
||||
AC_CHECK_LIB([tiff],
|
||||
[TIFFReadScanline],
|
||||
[
|
||||
have_dep="yes"
|
||||
evas_image_loader_[]$1[]_libs="-ltiff -ljpeg -lz -lm"
|
||||
]
|
||||
)
|
||||
fi
|
||||
|
||||
if test "x${have_dep}" = "xno" ; then
|
||||
AC_CHECK_LIB([tiff34],
|
||||
[TIFFReadScanline],
|
||||
[
|
||||
have_dep="yes"
|
||||
evas_image_loader_[]$1[]_libs="-ltiff34 -ljpeg -lz -lm"
|
||||
]
|
||||
)
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
|
||||
requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
|
||||
requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
|
||||
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
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_WBMP(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_WBMP],
|
||||
[
|
||||
|
||||
have_dep="yes"
|
||||
evas_image_loader_[]$1[]_cflags=""
|
||||
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
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_WEBP(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_WEBP],
|
||||
[
|
||||
|
||||
have_dep="no"
|
||||
evas_image_loader_[]$1[]_cflags=""
|
||||
evas_image_loader_[]$1[]_libs=""
|
||||
|
||||
AC_CHECK_HEADER([webp/decode.h], [have_dep="yes"])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
AC_CHECK_LIB([webp],
|
||||
[WebPDecodeRGBA],
|
||||
[
|
||||
evas_image_loader_[]$1[]_libs="-lwebp"
|
||||
],
|
||||
[have_dep="no"]
|
||||
)
|
||||
fi
|
||||
|
||||
if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
|
||||
requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
|
||||
requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
|
||||
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
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_XPM(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_XPM],
|
||||
[
|
||||
|
||||
have_dep="yes"
|
||||
evas_image_loader_[]$1[]_cflags=""
|
||||
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
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_IMAGE_LOADER(loader, want_loader, macro)
|
||||
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_IMAGE_LOADER],
|
||||
[
|
||||
|
||||
m4_pushdef([UP], m4_toupper([$1]))
|
||||
m4_pushdef([DOWN], m4_tolower([$1]))
|
||||
|
||||
want_loader="$2"
|
||||
want_static_loader="no"
|
||||
have_loader="no"
|
||||
have_evas_image_loader_[]DOWN="no"
|
||||
|
||||
AC_MSG_CHECKING([whether to enable $1 image loader])
|
||||
AC_MSG_RESULT([${want_loader}])
|
||||
|
||||
if test "x${want_loader}" = "xyes" -o "x${want_loader}" = "xstatic" -o "x${want_loader}" = "xauto"; then
|
||||
m4_default([EVAS_CHECK_LOADER_DEP_]m4_defn([UP]))(DOWN, ${want_loader}, [have_loader="yes"], [have_loader="no"])
|
||||
fi
|
||||
|
||||
if test "x${have_loader}" = "xno" -a "x${want_loader}" = "xyes" -a "x${use_strict}" = "xyes" ; then
|
||||
AC_MSG_ERROR([$1 dependencies not found (strict dependencies checking)])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([whether $1 image loader will be built])
|
||||
AC_MSG_RESULT([${have_loader}])
|
||||
|
||||
if test "x${have_loader}" = "xyes" ; then
|
||||
if test "x${want_loader}" = "xstatic" ; then
|
||||
have_evas_image_loader_[]DOWN="static"
|
||||
want_static_loader="yes"
|
||||
else
|
||||
have_evas_image_loader_[]DOWN="yes"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x${have_loader}" = "xyes" ; then
|
||||
AC_DEFINE(BUILD_LOADER_[]UP, [1], [UP Image Loader Support])
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(BUILD_LOADER_[]UP, [test "x${have_loader}" = "xyes"])
|
||||
|
||||
if test "x${want_static_loader}" = "xyes" ; then
|
||||
AC_DEFINE(EVAS_STATIC_BUILD_[]UP, [1], [Build $1 image loader inside libevas])
|
||||
have_static_module="yes"
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(EVAS_STATIC_BUILD_[]UP, [test "x${want_static_loader}" = "xyes"])
|
||||
|
||||
m4_popdef([UP])
|
||||
m4_popdef([DOWN])
|
||||
|
||||
])
|
||||
|
|
@ -5,8 +5,8 @@ includedir=@includedir@
|
|||
|
||||
Name: evas
|
||||
Description: Evas canvas display library
|
||||
@pkgconfig_requires_private@: @requirement_evas@
|
||||
Requires.private: @requirements_pc_evas@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -levas @EINA_LIBS@ @shm_open_libs@
|
||||
Libs.private: @EFL_FNMATCH_LIBS@ @pthread_libs@ @shm_open_libs@
|
||||
Libs: -L${libdir} -levas
|
||||
Libs.private: @requirements_libs_evas@
|
||||
Cflags: -I${includedir}/evas-@VMAJ@
|
||||
|
|
@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
|
|||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
SUBDIRS = . scripts benchmarks tests examples
|
||||
SUBDIRS = . benchmarks tests examples
|
||||
|
||||
lib_LTLIBRARIES =
|
||||
bin_PROGRAMS =
|
||||
|
|
@ -15,6 +15,7 @@ endif
|
|||
include Makefile_Eina.am
|
||||
include Makefile_Eo.am
|
||||
include Makefile_Eet.am
|
||||
include Makefile_Evas.am
|
||||
include Makefile_Embryo.am
|
||||
|
||||
.PHONY: benchmark examples
|
||||
|
|
|
|||
|
|
@ -239,3 +239,7 @@ EXTRA_DIST += \
|
|||
lib/eina/eina_config.h.in \
|
||||
lib/eina/eina_strbuf_template_c.x \
|
||||
lib/eina/eina_binbuf_template_c.x
|
||||
|
||||
### Script
|
||||
|
||||
bin_SCRIPTS = scripts/eina/eina-bench-cmp
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -115,7 +115,7 @@ _cserve2_shm_unmap(void *map, size_t length)
|
|||
*/
|
||||
|
||||
static Error_Type
|
||||
image_open(const char *file __UNUSED__, const char *key __UNUSED__, Slave_Msg_Image_Opened *result)
|
||||
image_open(const char *file EINA_UNUSED, const char *key EINA_UNUSED, Slave_Msg_Image_Opened *result)
|
||||
{
|
||||
memset(result, 0, sizeof(*result));
|
||||
result->w = 32;
|
||||
|
|
@ -352,7 +352,7 @@ _open_request_build(File_Data *f, int *bufsize)
|
|||
}
|
||||
|
||||
static void
|
||||
_request_free(void *msg, void *data __UNUSED__)
|
||||
_request_free(void *msg, void *data EINA_UNUSED)
|
||||
{
|
||||
free(msg);
|
||||
}
|
||||
|
|
@ -381,7 +381,7 @@ _open_request_response(File_Data *e, Slave_Msg_Image_Opened *resp, int *size)
|
|||
}
|
||||
|
||||
static void
|
||||
_request_failed(Entry *e, Error_Type type __UNUSED__)
|
||||
_request_failed(Entry *e, Error_Type type EINA_UNUSED)
|
||||
{
|
||||
Eina_List *l;
|
||||
Reference *ref;
|
||||
|
|
@ -628,7 +628,7 @@ _file_watch_free(void *data)
|
|||
}
|
||||
|
||||
static int
|
||||
_font_entry_cmp(const Font_Entry *k1, int k1_length __UNUSED__, const Font_Entry *k2, int k2_length __UNUSED__)
|
||||
_font_entry_cmp(const Font_Entry *k1, int k1_length EINA_UNUSED, const Font_Entry *k2, int k2_length EINA_UNUSED)
|
||||
{
|
||||
if (k1->src->key == k2->src->key)
|
||||
{
|
||||
|
|
@ -644,7 +644,7 @@ _font_entry_cmp(const Font_Entry *k1, int k1_length __UNUSED__, const Font_Entry
|
|||
}
|
||||
|
||||
static int
|
||||
_font_entry_key_hash(const Font_Entry *key, int key_length __UNUSED__)
|
||||
_font_entry_key_hash(const Font_Entry *key, int key_length EINA_UNUSED)
|
||||
{
|
||||
int hash;
|
||||
hash = eina_hash_djb2(key->src->key, eina_stringshare_strlen(key->src->key) + 1);
|
||||
|
|
@ -978,7 +978,7 @@ _image_msg_new(Client *client, Msg_Setopts *msg)
|
|||
}
|
||||
|
||||
static void
|
||||
_file_changed_cb(const char *path __UNUSED__, Eina_Bool deleted __UNUSED__, void *data)
|
||||
_file_changed_cb(const char *path EINA_UNUSED, Eina_Bool deleted EINA_UNUSED, void *data)
|
||||
{
|
||||
File_Watch *fw = data;
|
||||
File_Data *e;
|
||||
|
|
@ -1067,7 +1067,7 @@ _font_load_request_build(void *data, int *size)
|
|||
}
|
||||
|
||||
static void
|
||||
_font_load_request_free(void *msg, void *data __UNUSED__)
|
||||
_font_load_request_free(void *msg, void *data EINA_UNUSED)
|
||||
{
|
||||
free(msg);
|
||||
}
|
||||
|
|
@ -1097,7 +1097,7 @@ _font_load_request_response(Font_Entry *fe, Slave_Msg_Font_Loaded *msg, int *siz
|
|||
}
|
||||
|
||||
static void
|
||||
_font_load_request_failed(Font_Entry *fe, Error_Type error __UNUSED__)
|
||||
_font_load_request_failed(Font_Entry *fe, Error_Type error EINA_UNUSED)
|
||||
{
|
||||
Eina_List *l;
|
||||
Reference *ref;
|
||||
|
|
@ -1405,7 +1405,7 @@ _glyphs_load_request_prepare(Glyphs_Request *req)
|
|||
}
|
||||
|
||||
static void *
|
||||
_glyphs_load_request_build(void *data, int *size __UNUSED__)
|
||||
_glyphs_load_request_build(void *data, int *size EINA_UNUSED)
|
||||
{
|
||||
Glyphs_Request *req = data;
|
||||
Slave_Msg_Font_Glyphs_Load *msg = NULL;
|
||||
|
|
@ -1516,7 +1516,7 @@ _glyphs_load_request_response(Glyphs_Request *req, Slave_Msg_Font_Glyphs_Loaded
|
|||
}
|
||||
|
||||
static void
|
||||
_glyphs_load_request_failed(void *data __UNUSED__, Error_Type error __UNUSED__)
|
||||
_glyphs_load_request_failed(void *data EINA_UNUSED, Error_Type error EINA_UNUSED)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -1528,7 +1528,7 @@ static Slave_Request_Funcs _glyphs_load_funcs = {
|
|||
};
|
||||
|
||||
static Eina_Bool
|
||||
_font_entry_stats_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
|
||||
_font_entry_stats_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata)
|
||||
{
|
||||
Font_Entry *fe = data;
|
||||
Msg_Stats *msg = fdata;
|
||||
|
|
@ -1577,7 +1577,7 @@ _font_entry_stats_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED_
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_image_file_entry_stats_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
|
||||
_image_file_entry_stats_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata)
|
||||
{
|
||||
Msg_Stats *msg = fdata;
|
||||
File_Data *fd = data;
|
||||
|
|
@ -1601,7 +1601,7 @@ _image_file_entry_stats_cb(const Eina_Hash *hash __UNUSED__, const void *key __U
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_image_data_entry_stats_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
|
||||
_image_data_entry_stats_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata)
|
||||
{
|
||||
Msg_Stats *msg = fdata;
|
||||
Image_Data *id = data;
|
||||
|
|
@ -1648,7 +1648,7 @@ struct _debug_info
|
|||
};
|
||||
|
||||
static Eina_Bool
|
||||
_font_entry_debug_size_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
|
||||
_font_entry_debug_size_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata)
|
||||
{
|
||||
struct _debug_info *di = fdata;
|
||||
unsigned int size = di->size;
|
||||
|
|
@ -1713,7 +1713,7 @@ _font_entry_debug_size_cb(const Eina_Hash *hash __UNUSED__, const void *key __UN
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_font_entry_debug_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
|
||||
_font_entry_debug_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata)
|
||||
{
|
||||
char **pos = fdata;
|
||||
char *buf = *pos;
|
||||
|
|
@ -2222,7 +2222,7 @@ cserve2_cache_font_load(Client *client, const char *source, unsigned int sourcel
|
|||
}
|
||||
|
||||
int
|
||||
cserve2_cache_font_unload(Client *client, const char *source, unsigned int sourcelen, const char *name, unsigned int namelen, unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned int rid __UNUSED__)
|
||||
cserve2_cache_font_unload(Client *client, const char *source, unsigned int sourcelen, const char *name, unsigned int namelen, unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned int rid EINA_UNUSED)
|
||||
{
|
||||
Font_Entry *fe;
|
||||
char *fullname;
|
||||
|
|
@ -2276,7 +2276,7 @@ cserve2_cache_font_glyphs_load(Client *client, const char *source, unsigned int
|
|||
}
|
||||
|
||||
int
|
||||
cserve2_cache_font_glyphs_used(Client *client, const char *source, unsigned int sourcelen, const char *name, unsigned int namelen, unsigned int hint, unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned int *glyphs, unsigned int nglyphs, unsigned int rid __UNUSED__)
|
||||
cserve2_cache_font_glyphs_used(Client *client, const char *source, unsigned int sourcelen, const char *name, unsigned int namelen, unsigned int hint, unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned int *glyphs, unsigned int nglyphs, unsigned int rid EINA_UNUSED)
|
||||
{
|
||||
Glyphs_Group *gg;
|
||||
Eina_List *groups;
|
||||
|
|
@ -239,7 +239,7 @@ _font_slave_int_load(const Slave_Msg_Font_Load *msg, Font_Source_Info *fsi)
|
|||
}
|
||||
|
||||
static Slave_Msg_Font_Loaded *
|
||||
_font_slave_load(const void *cmddata, void *data __UNUSED__)
|
||||
_font_slave_load(const void *cmddata, void *data EINA_UNUSED)
|
||||
{
|
||||
const Slave_Msg_Font_Load *msg = cmddata;
|
||||
Slave_Msg_Font_Loaded *response;
|
||||
|
|
@ -450,7 +450,7 @@ _timeval_sub(const struct timeval *tv2, const struct timeval *tv1)
|
|||
#endif
|
||||
|
||||
static Slave_Msg_Font_Glyphs_Loaded *
|
||||
_font_slave_glyphs_load(const void *cmddata, void *data __UNUSED__)
|
||||
_font_slave_glyphs_load(const void *cmddata, void *data EINA_UNUSED)
|
||||
{
|
||||
const Slave_Msg_Font_Glyphs_Load *msg = cmddata;
|
||||
Slave_Msg_Font_Glyphs_Loaded *response;
|
||||
|
|
@ -559,7 +559,7 @@ _font_slave_glyphs_load(const void *cmddata, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
void *
|
||||
cserve2_font_slave_cb(Slave_Thread_Data *sd __UNUSED__, Slave_Command *cmd, const void *cmddata, void *data)
|
||||
cserve2_font_slave_cb(Slave_Thread_Data *sd EINA_UNUSED, Slave_Command *cmd, const void *cmddata, void *data)
|
||||
{
|
||||
void *response = NULL;
|
||||
|
||||
|
|
@ -309,7 +309,7 @@ _clients_finish(void)
|
|||
}
|
||||
|
||||
int
|
||||
main(int argc __UNUSED__, const char *argv[] __UNUSED__)
|
||||
main(int argc EINA_UNUSED, const char *argv[] EINA_UNUSED)
|
||||
{
|
||||
eina_init();
|
||||
|
||||
|
|
@ -65,7 +65,7 @@ static Main_Loop_Child_Dead_Cb reap_children_func = NULL;
|
|||
#endif
|
||||
|
||||
static void
|
||||
_signal_handle_child(struct signalfd_siginfo *sinfo __UNUSED__)
|
||||
_signal_handle_child(struct signalfd_siginfo *sinfo EINA_UNUSED)
|
||||
{
|
||||
int status;
|
||||
pid_t pid;
|
||||
|
|
@ -90,21 +90,21 @@ _signal_handle_child(struct signalfd_siginfo *sinfo __UNUSED__)
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_handle_int(struct signalfd_siginfo *sinfo __UNUSED__)
|
||||
_signal_handle_int(struct signalfd_siginfo *sinfo EINA_UNUSED)
|
||||
{
|
||||
DBG("Received SIGINT. Honoring request.");
|
||||
terminate = EINA_TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
_signal_handle_term(struct signalfd_siginfo *sinfo __UNUSED__)
|
||||
_signal_handle_term(struct signalfd_siginfo *sinfo EINA_UNUSED)
|
||||
{
|
||||
DBG("Received SIGTERM. Honoring request.");
|
||||
terminate = EINA_TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
_signalfd_handler(int fd, Fd_Flags flags __UNUSED__, void *data __UNUSED__)
|
||||
_signalfd_handler(int fd, Fd_Flags flags EINA_UNUSED, void *data EINA_UNUSED)
|
||||
{
|
||||
struct signalfd_siginfo sinfo;
|
||||
ssize_t ret;
|
||||
|
|
@ -180,7 +180,7 @@ _signalfd_finish(void)
|
|||
}
|
||||
|
||||
static void
|
||||
_socketfd_handler(int fd __UNUSED__, Fd_Flags flags __UNUSED__, void *data __UNUSED__)
|
||||
_socketfd_handler(int fd EINA_UNUSED, Fd_Flags flags EINA_UNUSED, void *data EINA_UNUSED)
|
||||
{
|
||||
struct sockaddr_un remote;
|
||||
unsigned int len;
|
||||
|
|
@ -283,7 +283,7 @@ _socketfd_finish(void)
|
|||
}
|
||||
|
||||
static void
|
||||
_inotifyfd_handler(int fd, Fd_Flags flags, void *data __UNUSED__)
|
||||
_inotifyfd_handler(int fd, Fd_Flags flags, void *data EINA_UNUSED)
|
||||
{
|
||||
char buffer[16384];
|
||||
int i = 0;
|
||||
|
|
@ -67,7 +67,7 @@ _client_msg_read(Client *client, int done)
|
|||
}
|
||||
|
||||
void
|
||||
cserve2_message_handler(int fd __UNUSED__, Fd_Flags flags, void *data)
|
||||
cserve2_message_handler(int fd EINA_UNUSED, Fd_Flags flags, void *data)
|
||||
{
|
||||
Client *client = data;
|
||||
int len;
|
||||
|
|
@ -325,7 +325,7 @@ _cserve2_request_failed(Slave_Request *req, Error_Type type)
|
|||
}
|
||||
|
||||
static void
|
||||
_slave_read_cb(Slave *s __UNUSED__, Slave_Command cmd, void *msg, void *data)
|
||||
_slave_read_cb(Slave *s EINA_UNUSED, Slave_Command cmd, void *msg, void *data)
|
||||
{
|
||||
Slave_Worker *sw = data;
|
||||
Slave_Request *dep, *req = sw->data;
|
||||
|
|
@ -395,7 +395,7 @@ free_it:
|
|||
}
|
||||
|
||||
static void
|
||||
_slave_dead_cb(Slave *s __UNUSED__, void *data)
|
||||
_slave_dead_cb(Slave *s EINA_UNUSED, void *data)
|
||||
{
|
||||
Slave_Worker *sw = data;
|
||||
Slave_Request *req = sw->data;
|
||||
|
|
@ -124,7 +124,7 @@ _slave_thread_free(Slave_Thread *s)
|
|||
}
|
||||
|
||||
static void
|
||||
_slave_proc_dead_cb(int pid, int status __UNUSED__)
|
||||
_slave_proc_dead_cb(int pid, int status EINA_UNUSED)
|
||||
{
|
||||
Slave_Proc *s;
|
||||
|
||||
|
|
@ -167,7 +167,7 @@ _slave_write(Slave *s, const char *data, size_t size)
|
|||
}
|
||||
|
||||
static void
|
||||
_slave_write_cb(int fd __UNUSED__, Fd_Flags flags __UNUSED__, void *data)
|
||||
_slave_write_cb(int fd EINA_UNUSED, Fd_Flags flags EINA_UNUSED, void *data)
|
||||
{
|
||||
Slave *s = data;
|
||||
size_t sent;
|
||||
|
|
@ -91,7 +91,7 @@ read_mem(unsigned char *map, size_t length, size_t *position, void *buffer, int
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
evas_image_load_file_head_bmp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
|
||||
evas_image_load_file_head_bmp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
|
||||
{
|
||||
Eina_File *f;
|
||||
void *map = NULL;
|
||||
|
|
@ -368,7 +368,7 @@ evas_image_load_file_head_bmp(Evas_Img_Load_Params *ilp, const char *file, const
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
evas_image_load_file_data_bmp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
|
||||
evas_image_load_file_data_bmp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
|
||||
{
|
||||
Eina_File *f;
|
||||
void *map = NULL;
|
||||
|
|
@ -35,7 +35,7 @@ _JPEGFatalErrorHandler(j_common_ptr cinfo)
|
|||
}
|
||||
|
||||
static void
|
||||
_JPEGErrorHandler(j_common_ptr cinfo __UNUSED__)
|
||||
_JPEGErrorHandler(j_common_ptr cinfo EINA_UNUSED)
|
||||
{
|
||||
/* emptr errmgr; */
|
||||
|
||||
|
|
@ -46,7 +46,7 @@ _JPEGErrorHandler(j_common_ptr cinfo __UNUSED__)
|
|||
}
|
||||
|
||||
static void
|
||||
_JPEGErrorHandler2(j_common_ptr cinfo __UNUSED__, int msg_level __UNUSED__)
|
||||
_JPEGErrorHandler2(j_common_ptr cinfo EINA_UNUSED, int msg_level EINA_UNUSED)
|
||||
{
|
||||
/* emptr errmgr; */
|
||||
|
||||
|
|
@ -66,7 +66,7 @@ struct jpeg_membuf_src
|
|||
};
|
||||
|
||||
static void
|
||||
_evas_jpeg_membuf_src_init(j_decompress_ptr cinfo __UNUSED__)
|
||||
_evas_jpeg_membuf_src_init(j_decompress_ptr cinfo EINA_UNUSED)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -1031,7 +1031,7 @@ done:
|
|||
|
||||
Eina_Bool
|
||||
evas_image_load_file_head_jpeg(Evas_Img_Load_Params *ilp,
|
||||
const char *file, const char *key __UNUSED__,
|
||||
const char *file, const char *key EINA_UNUSED,
|
||||
int *error)
|
||||
{
|
||||
Eina_File *f;
|
||||
|
|
@ -1064,7 +1064,7 @@ evas_image_load_file_head_jpeg(Evas_Img_Load_Params *ilp,
|
|||
|
||||
static Eina_Bool
|
||||
evas_image_load_file_data_jpeg(Evas_Img_Load_Params *ilp,
|
||||
const char *file, const char *key __UNUSED__,
|
||||
const char *file, const char *key EINA_UNUSED,
|
||||
int *error)
|
||||
{
|
||||
Eina_File *f;
|
||||
|
|
@ -60,7 +60,7 @@ static size_t pmaps_buffer_raw_update(Pmaps_Buffer *b);
|
|||
static int pmaps_buffer_comment_skip(Pmaps_Buffer *b);
|
||||
|
||||
static Eina_Bool
|
||||
evas_image_load_file_head_pmaps(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
|
||||
evas_image_load_file_head_pmaps(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
|
||||
{
|
||||
Pmaps_Buffer b;
|
||||
|
||||
|
|
@ -85,7 +85,7 @@ evas_image_load_file_head_pmaps(Evas_Img_Load_Params *ilp, const char *file, con
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
evas_image_load_file_data_pmaps(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
|
||||
evas_image_load_file_data_pmaps(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
|
||||
{
|
||||
Pmaps_Buffer b;
|
||||
int pixels;
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
|
||||
static Eina_Bool
|
||||
evas_image_load_file_head_png(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
|
||||
evas_image_load_file_head_png(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
|
||||
{
|
||||
png_uint_32 w32, h32;
|
||||
FILE *f;
|
||||
|
|
@ -127,7 +127,7 @@ evas_image_load_file_head_png(Evas_Img_Load_Params *ilp, const char *file, const
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
evas_image_load_file_data_png(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
|
||||
evas_image_load_file_data_png(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
|
||||
{
|
||||
unsigned char *surface;
|
||||
png_uint_32 w32, h32;
|
||||
|
|
@ -153,7 +153,7 @@ is_psd(PSD_Header *header)
|
|||
|
||||
static Eina_Bool
|
||||
evas_image_load_file_head_psd(Evas_Img_Load_Params *ilp, const char *FileName,
|
||||
const char *key __UNUSED__, int *error)
|
||||
const char *key EINA_UNUSED, int *error)
|
||||
{
|
||||
Eina_File *f;
|
||||
void *map;
|
||||
|
|
@ -201,7 +201,7 @@ evas_image_load_file_head_psd(Evas_Img_Load_Params *ilp, const char *FileName,
|
|||
|
||||
static unsigned int
|
||||
read_compressed_channel(const unsigned char *map, size_t length, size_t *position,
|
||||
const unsigned int channel_length __UNUSED__,
|
||||
const unsigned int channel_length EINA_UNUSED,
|
||||
unsigned int size,
|
||||
unsigned char* channel)
|
||||
{
|
||||
|
|
@ -865,7 +865,7 @@ read_psd_cmyk(Evas_Img_Load_Params *ilp, PSD_Header *head, const unsigned char *
|
|||
static Eina_Bool
|
||||
evas_image_load_file_data_psd(Evas_Img_Load_Params *ilp,
|
||||
const char *file,
|
||||
const char *key __UNUSED__,
|
||||
const char *key EINA_UNUSED,
|
||||
int *error)
|
||||
{
|
||||
Eina_File *f;
|
||||
|
|
@ -60,7 +60,7 @@ struct _tga_footer
|
|||
|
||||
|
||||
static Eina_Bool
|
||||
evas_image_load_file_head_tga(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
|
||||
evas_image_load_file_head_tga(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
|
||||
{
|
||||
Eina_File *f;
|
||||
unsigned char *seg = NULL, *filedata;
|
||||
|
|
@ -159,7 +159,7 @@ close_file:
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
evas_image_load_file_data_tga(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
|
||||
evas_image_load_file_data_tga(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
|
||||
{
|
||||
Eina_File *f;
|
||||
unsigned char *seg = NULL, *filedata;
|
||||
|
|
@ -26,7 +26,7 @@ struct TIFFRGBAImage_Extra {
|
|||
};
|
||||
|
||||
static Eina_Bool
|
||||
evas_image_load_file_head_tiff(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
|
||||
evas_image_load_file_head_tiff(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
|
||||
{
|
||||
char txt[1024];
|
||||
TIFFRGBAImage tiff_image;
|
||||
|
|
@ -109,7 +109,7 @@ evas_image_load_file_head_tiff(Evas_Img_Load_Params *ilp, const char *file, cons
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
evas_image_load_file_data_tiff(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
|
||||
evas_image_load_file_data_tiff(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
|
||||
{
|
||||
char txt[1024];
|
||||
TIFFRGBAImage_Extra rgba_image;
|
||||
|
|
@ -32,7 +32,7 @@ read_mb(unsigned int *data, void *map, size_t length, size_t *position)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
evas_image_load_file_head_wbmp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
|
||||
evas_image_load_file_head_wbmp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
|
||||
{
|
||||
Eina_File *f;
|
||||
void *map = NULL;
|
||||
|
|
@ -86,7 +86,7 @@ bail:
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
evas_image_load_file_data_wbmp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
|
||||
evas_image_load_file_data_wbmp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
|
||||
{
|
||||
Eina_File *f;
|
||||
void *map = NULL;
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
|
||||
static Eina_Bool
|
||||
evas_image_load_file_head_webp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
|
||||
evas_image_load_file_head_webp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
|
||||
{
|
||||
WebPDecoderConfig config;
|
||||
FILE *f;
|
||||
|
|
@ -57,7 +57,7 @@ evas_image_load_file_head_webp(Evas_Img_Load_Params *ilp, const char *file, cons
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
evas_image_load_file_data_webp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
|
||||
evas_image_load_file_data_webp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
|
||||
{
|
||||
FILE *f;
|
||||
size_t file_size;
|
||||
|
|
@ -111,7 +111,7 @@ struct _CMap {
|
|||
};
|
||||
|
||||
Eina_Rbtree_Direction
|
||||
_cmap_cmp_node_cb(const Eina_Rbtree *left, const Eina_Rbtree *right, void *data __UNUSED__)
|
||||
_cmap_cmp_node_cb(const Eina_Rbtree *left, const Eina_Rbtree *right, void *data EINA_UNUSED)
|
||||
{
|
||||
CMap *lcm;
|
||||
CMap *rcm;
|
||||
|
|
@ -125,7 +125,7 @@ _cmap_cmp_node_cb(const Eina_Rbtree *left, const Eina_Rbtree *right, void *data
|
|||
}
|
||||
|
||||
int
|
||||
_cmap_cmp_key_cb(const Eina_Rbtree *node, const void *key, int length __UNUSED__, void *data __UNUSED__)
|
||||
_cmap_cmp_key_cb(const Eina_Rbtree *node, const void *key, int length EINA_UNUSED, void *data EINA_UNUSED)
|
||||
{
|
||||
CMap *root = EINA_RBTREE_CONTAINER_GET(node, CMap);
|
||||
|
||||
|
|
@ -134,7 +134,7 @@ _cmap_cmp_key_cb(const Eina_Rbtree *node, const void *key, int length __UNUSED__
|
|||
|
||||
/** FIXME: clean this up and make more efficient **/
|
||||
static Eina_Bool
|
||||
evas_image_load_file_xpm(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int load_data, int *error)
|
||||
evas_image_load_file_xpm(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int load_data, int *error)
|
||||
{
|
||||
DATA32 *ptr, *end;
|
||||
Eina_File *f;
|
||||
|
|
@ -239,7 +239,7 @@ evas_cache_engine_image_dup(const Evas_Cache_Engine_Image_Func *cb, Evas_Cache_E
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_evas_cache_engine_image_free_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, void *fdata)
|
||||
_evas_cache_engine_image_free_cb(EINA_UNUSED const Eina_Hash *hash, EINA_UNUSED const void *key, void *data, void *fdata)
|
||||
{
|
||||
Eina_List **delete_list = fdata;
|
||||
|
||||
|
|
@ -490,7 +490,7 @@ evas_cache_image_init(const Evas_Cache_Image_Func *cb)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_evas_cache_image_free_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, void *fdata)
|
||||
_evas_cache_image_free_cb(EINA_UNUSED const Eina_Hash *hash, EINA_UNUSED const void *key, void *data, void *fdata)
|
||||
{
|
||||
Eina_List **delete_list = fdata;
|
||||
*delete_list = eina_list_prepend(*delete_list, data);
|
||||
|
|
@ -1022,7 +1022,7 @@ evas_cache_image_unload_data(Image_Entry *im)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_evas_cache_image_unload_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, __UNUSED__ void *fdata)
|
||||
_evas_cache_image_unload_cb(EINA_UNUSED const Eina_Hash *hash, EINA_UNUSED const void *key, void *data, EINA_UNUSED void *fdata)
|
||||
{
|
||||
evas_cache_image_unload_data(data);
|
||||
return EINA_TRUE;
|
||||
|
|
@ -1084,7 +1084,7 @@ _dump_img(Image_Entry *im, const char *type)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_dump_cache_active(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, void *fdata __UNUSED__)
|
||||
_dump_cache_active(EINA_UNUSED const Eina_Hash *hash, EINA_UNUSED const void *key, void *data, void *fdata EINA_UNUSED)
|
||||
{
|
||||
Image_Entry *im = data;
|
||||
_dump_img(im, "ACTIVE");
|
||||
|
|
@ -51,7 +51,7 @@ _evas_preload_thread_end(void *data)
|
|||
}
|
||||
|
||||
static void
|
||||
_evas_preload_thread_done(void *target __UNUSED__, Evas_Callback_Type type __UNUSED__, void *event_info)
|
||||
_evas_preload_thread_done(void *target EINA_UNUSED, Evas_Callback_Type type EINA_UNUSED, void *event_info)
|
||||
{
|
||||
Evas_Preload_Pthread_Worker *work = event_info;
|
||||
if (work->cancel)
|
||||
|
|
@ -65,7 +65,7 @@ _evas_preload_thread_done(void *target __UNUSED__, Evas_Callback_Type type __UNU
|
|||
}
|
||||
|
||||
static void *
|
||||
_evas_preload_thread_worker(void *data, Eina_Thread thread __UNUSED__)
|
||||
_evas_preload_thread_worker(void *data, Eina_Thread thread EINA_UNUSED)
|
||||
{
|
||||
Evas_Preload_Pthread_Data *pth = data;
|
||||
Evas_Preload_Pthread_Worker *work;
|
||||
|
|
@ -489,7 +489,7 @@ evas_cache2_init(const Evas_Cache2_Image_Func *cb)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_evas_cache_image_free_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, void *fdata)
|
||||
_evas_cache_image_free_cb(EINA_UNUSED const Eina_Hash *hash, EINA_UNUSED const void *key, void *data, void *fdata)
|
||||
{
|
||||
Eina_List **delete_list = fdata;
|
||||
*delete_list = eina_list_prepend(*delete_list, data);
|
||||
|
|
@ -475,31 +475,31 @@ evas_object_filter_param_int_get(Evas_Object *o, const char *param)
|
|||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_filter_param_str_set(Evas_Object *o __UNUSED__,
|
||||
const char *param __UNUSED__,
|
||||
const char *val __UNUSED__)
|
||||
evas_object_filter_param_str_set(Evas_Object *o EINA_UNUSED,
|
||||
const char *param EINA_UNUSED,
|
||||
const char *val EINA_UNUSED)
|
||||
{
|
||||
return EINA_FALSE;
|
||||
}
|
||||
|
||||
EAPI const char *
|
||||
evas_object_filter_param_str_get(Evas_Object *o __UNUSED__,
|
||||
const char *param __UNUSED__)
|
||||
evas_object_filter_param_str_get(Evas_Object *o EINA_UNUSED,
|
||||
const char *param EINA_UNUSED)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_filter_param_obj_set(Evas_Object *o __UNUSED__,
|
||||
const char *param __UNUSED__,
|
||||
Evas_Object *val __UNUSED__)
|
||||
evas_object_filter_param_obj_set(Evas_Object *o EINA_UNUSED,
|
||||
const char *param EINA_UNUSED,
|
||||
Evas_Object *val EINA_UNUSED)
|
||||
{
|
||||
return EINA_FALSE;
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
evas_object_filter_param_obj_get(Evas_Object *o __UNUSED__,
|
||||
const char *param __UNUSED__)
|
||||
evas_object_filter_param_obj_get(Evas_Object *o EINA_UNUSED,
|
||||
const char *param EINA_UNUSED)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1241,7 +1241,7 @@ negation_filter(Evas_Filter_Info *info, RGBA_Image *src, RGBA_Image *dst)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
sepia_filter(Evas_Filter_Info *info __UNUSED__, RGBA_Image *src, RGBA_Image *dst)
|
||||
sepia_filter(Evas_Filter_Info *info EINA_UNUSED, RGBA_Image *src, RGBA_Image *dst)
|
||||
{
|
||||
uint32_t *in, *out;
|
||||
int i, j;
|
||||
|
|
@ -1278,7 +1278,7 @@ sepia_filter(Evas_Filter_Info *info __UNUSED__, RGBA_Image *src, RGBA_Image *dst
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
greyscale_filter(Evas_Filter_Info *info __UNUSED__, RGBA_Image *src, RGBA_Image *dst)
|
||||
greyscale_filter(Evas_Filter_Info *info EINA_UNUSED, RGBA_Image *src, RGBA_Image *dst)
|
||||
{
|
||||
uint32_t *in, *out;
|
||||
int i, j;
|
||||
|
|
@ -1399,7 +1399,7 @@ brightness_filter(Evas_Filter_Info *info, RGBA_Image *src, RGBA_Image *dst)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
contrast_filter(Evas_Filter_Info *info __UNUSED__, RGBA_Image *src, RGBA_Image *dst)
|
||||
contrast_filter(Evas_Filter_Info *info EINA_UNUSED, RGBA_Image *src, RGBA_Image *dst)
|
||||
{
|
||||
uint32_t *in, *out;
|
||||
int i, j;
|
||||
|
|
@ -875,7 +875,7 @@ evas_font_dir_available_list_free(Eina_List *available)
|
|||
|
||||
/* private stuff */
|
||||
static Eina_Bool
|
||||
font_cache_dir_free(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata __UNUSED__)
|
||||
font_cache_dir_free(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata EINA_UNUSED)
|
||||
{
|
||||
object_text_font_cache_dir_del((char *) key, data);
|
||||
return 1;
|
||||
|
|
@ -1154,7 +1154,7 @@ object_text_font_cache_dir_add(char *dir)
|
|||
}
|
||||
|
||||
static void
|
||||
object_text_font_cache_dir_del(char *dir __UNUSED__, Evas_Font_Dir *fd)
|
||||
object_text_font_cache_dir_del(char *dir EINA_UNUSED, Evas_Font_Dir *fd)
|
||||
{
|
||||
if (fd->lookup) eina_hash_free(fd->lookup);
|
||||
while (fd->fonts)
|
||||
|
|
@ -116,7 +116,7 @@ _evas_object_box_accessor_free(Evas_Object_Box_Accessor *it)
|
|||
}
|
||||
|
||||
static void
|
||||
_on_child_resize(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUSED__, void *einfo __UNUSED__)
|
||||
_on_child_resize(void *data, Evas *evas EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *einfo EINA_UNUSED)
|
||||
{
|
||||
Evas_Object *box = data;
|
||||
EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(box, priv);
|
||||
|
|
@ -124,7 +124,7 @@ _on_child_resize(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUSED__, v
|
|||
}
|
||||
|
||||
static void
|
||||
_on_child_del(void *data, Evas *evas __UNUSED__, Evas_Object *o, void *einfo __UNUSED__)
|
||||
_on_child_del(void *data, Evas *evas EINA_UNUSED, Evas_Object *o, void *einfo EINA_UNUSED)
|
||||
{
|
||||
Evas_Object *box = data;
|
||||
|
||||
|
|
@ -136,7 +136,7 @@ _on_child_del(void *data, Evas *evas __UNUSED__, Evas_Object *o, void *einfo __U
|
|||
}
|
||||
|
||||
static void
|
||||
_on_child_hints_changed(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUSED__, void *einfo __UNUSED__)
|
||||
_on_child_hints_changed(void *data, Evas *evas EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *einfo EINA_UNUSED)
|
||||
{
|
||||
Evas_Object *box = data;
|
||||
EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(box, priv);
|
||||
|
|
@ -147,7 +147,7 @@ _on_child_hints_changed(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUS
|
|||
}
|
||||
|
||||
static void
|
||||
_on_hints_changed(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *o , void *einfo __UNUSED__)
|
||||
_on_hints_changed(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *o , void *einfo EINA_UNUSED)
|
||||
{
|
||||
_sizing_eval(o);
|
||||
}
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h" /* so that EAPI in Evas.h is correctly defined */
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#ifdef HAVE_SYS_MMAN_H
|
||||
# include <sys/mman.h>
|
||||
#endif
|
||||
|
|
@ -12,9 +12,9 @@
|
|||
|
||||
#include "evas_common.h"
|
||||
#include "evas_private.h"
|
||||
#include "../engines/common/evas_convert_color.h"
|
||||
#include "../engines/common/evas_convert_colorspace.h"
|
||||
#include "../engines/common/evas_convert_yuv.h"
|
||||
#include "../common/evas_convert_color.h"
|
||||
#include "../common/evas_convert_colorspace.h"
|
||||
#include "../common/evas_convert_yuv.h"
|
||||
|
||||
#include <Eo.h>
|
||||
|
||||
|
|
@ -4308,7 +4308,7 @@ evas_object_image_get_opaque_rect(Evas_Object *eo_obj, Evas_Object_Protected_Dat
|
|||
}
|
||||
|
||||
static int
|
||||
evas_object_image_can_map(Evas_Object *obj __UNUSED__)
|
||||
evas_object_image_can_map(Evas_Object *obj EINA_UNUSED)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -4372,7 +4372,7 @@ evas_object_image_data_convert_internal(Evas_Object_Image *o, void *data, Evas_C
|
|||
}
|
||||
|
||||
static void
|
||||
evas_object_image_filled_resize_listener(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *einfo __UNUSED__)
|
||||
evas_object_image_filled_resize_listener(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *einfo EINA_UNUSED)
|
||||
{
|
||||
Evas_Coord w, h;
|
||||
|
||||
|
|
@ -246,14 +246,14 @@ _evas_object_table_option_del(Evas_Object *o)
|
|||
}
|
||||
|
||||
static void
|
||||
_on_child_del(void *data, Evas *evas __UNUSED__, Evas_Object *child, void *einfo __UNUSED__)
|
||||
_on_child_del(void *data, Evas *evas EINA_UNUSED, Evas_Object *child, void *einfo EINA_UNUSED)
|
||||
{
|
||||
Evas_Object *table = data;
|
||||
evas_object_table_unpack(table, child);
|
||||
}
|
||||
|
||||
static void
|
||||
_on_child_hints_changed(void *data, Evas *evas __UNUSED__, Evas_Object *child __UNUSED__, void *einfo __UNUSED__)
|
||||
_on_child_hints_changed(void *data, Evas *evas EINA_UNUSED, Evas_Object *child EINA_UNUSED, void *einfo EINA_UNUSED)
|
||||
{
|
||||
Evas_Object *table = data;
|
||||
EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(table, priv);
|
||||
|
|
@ -261,7 +261,7 @@ _evas_object_text_horiz_advance_get(const Evas_Object *eo_obj,
|
|||
}
|
||||
|
||||
static Evas_Coord
|
||||
_evas_object_text_vert_advance_get(const Evas_Object *obj __UNUSED__,
|
||||
_evas_object_text_vert_advance_get(const Evas_Object *obj EINA_UNUSED,
|
||||
const Evas_Object_Text *o)
|
||||
{
|
||||
return o->max_ascent + o->max_descent;
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue