kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sync with upstreaming.

This commit is contained in:
Hermet Park 2019-05-23 17:36:16 +09:00
parent 1522ca4e57
commit f524ff072e
9 changed files with 11 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -2603,7 +2603,7 @@ esac
ARG_ENABLE_EVAS_VG_LOADER(SVG, static)
ARG_ENABLE_EVAS_VG_LOADER(EET, static)
ARG_ENABLE_EVAS_VG_LOADER(JSON, auto)
ARG_ENABLE_EVAS_IMAGE_LOADER(BMP, static)
ARG_ENABLE_EVAS_IMAGE_LOADER(Eet, static)
@ -2894,7 +2894,6 @@ AM_CONDITIONAL([BUILD_ENGINE_WAYLAND_COMMON], [test "x${have_evas_engine_wayland
EVAS_CHECK_VG_LOADER([SVG], [${want_evas_vg_loader_svg}])
EVAS_CHECK_VG_LOADER([EET], [${want_evas_vg_loader_eet}])
EVAS_CHECK_VG_LOADER([JSON], [${want_evas_vg_loader_json}])
## Image Loaders

34
m4/evas_check_loader.m4
View File

@ -58,37 +58,6 @@ AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
])
dnl use: EVAS_CHECK_VG_LOADER_DEP_JSON(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
AC_DEFUN([EVAS_CHECK_VG_LOADER_DEP_JSON],
[
have_dep="no"
evas_vg_loader_[]$1[]_cflags=""
evas_vg_loader_[]$1[]_libs=""
AC_CHECK_HEADER([rlottie_capi.h], [have_dep="yes"])
if test "x${have_dep}" = "xyes" ; then
AC_CHECK_LIB([rlottie],
[lottie_animation_from_file],
[
evas_vg_loader_[]$1[]_libs="-lrlottie"
]
)
fi
if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
requirements_libs_evas="${evas_vg_loader_[]$1[]_libs} ${requirements_libs_evas}"
fi
AC_SUBST([evas_vg_loader_$1_cflags])
AC_SUBST([evas_vg_loader_$1_libs])
AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
])
dnl use: ARG_ENABLE_EVAS_IMAGE_LOADER(loader, default_value)
AC_DEFUN([ARG_ENABLE_EVAS_IMAGE_LOADER],
@ -688,12 +657,11 @@ if test "x${have_loader}" = "xyes" ; then
want_static_loader="yes"
else
have_evas_vg_loader_[]DOWN="yes"
want_static_loader="yes"
fi
fi
if test "x${have_loader}" = "xyes" ; then
AC_DEFINE(BUILD_VG_LOADER_[]UP, [1], [UP VG Loader Support])
AC_DEFINE(BUILD_VG_LOADER_[]UP, [1], [UP Image Loader Support])
fi
AM_CONDITIONAL(BUILD_VG_LOADER_[]UP, [test "x${have_loader}" = "xyes"])

7
src/Makefile_Elementary.am
View File

@ -3,7 +3,6 @@
elm_public_eolian_files = \
lib/elementary/efl_ui_widget.eo \
lib/elementary/efl_ui_animation_view.eo \
lib/elementary/efl_ui_bg.eo \
lib/elementary/efl_ui_button.eo \
lib/elementary/efl_ui_calendar.eo \
@ -647,7 +646,6 @@ $(elm_legacy_eo_headers_pub)
includesdir = $(includedir)/elementary-@VMAJ@
includesunstable_HEADERS = \
lib/elementary/efl_ui_animation_view_private.h \
lib/elementary/elm_gen_common.h \
lib/elementary/efl_access_object.h \
lib/elementary/efl_access_text.h \
@ -802,10 +800,6 @@ includesub_HEADERS = \
lib/elementary/elm_access.h \
lib/elementary/elm_actionslider.h \
lib/elementary/elm_actionslider_legacy.h \
lib/elementary/efl_ui_animation_view.h \
lib/elementary/efl_ui_animation_view_legacy.h \
lib/elementary/efl_ui_animation_view.eo.h \
lib/elementary/efl_ui_animation_view_eo.legacy.h \
lib/elementary/elm_app.h \
lib/elementary/elm_atspi_app_object.h \
lib/elementary/elm_atspi_bridge.h \
@ -1016,7 +1010,6 @@ lib_elementary_libelementary_la_SOURCES = \
lib/elementary/elc_scrolled_entry.c \
lib/elementary/elm_access.c \
lib/elementary/elm_actionslider.c \
lib/elementary/efl_ui_animation_view.c \
lib/elementary/elm_atspi_app_object.c \
lib/elementary/elm_atspi_bridge.c \
lib/elementary/efl_ui_legacy.c \

30
src/Makefile_Evas.am
View File

@ -1627,36 +1627,6 @@ modules_evas_vg_savers_eet_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
endif
if BUILD_VG_LOADER_JSON
if EVAS_STATIC_BUILD_VG_JSON
lib_evas_libevas_la_SOURCES += modules/evas/vg_loaders/json/evas_vg_load_json.c \
static_libs/vg_common/vg_common_json.c \
static_libs/vg_common/vg_common.h
lib_evas_libevas_la_CPPFLAGS += -I$(top_srcdir)/src/static_libs/vg_common \
@evas_vg_loader_json_cflags@
lib_evas_libevas_la_LIBADD += @evas_vg_loader_json_libs@
else
vgloaderjsonpkgdir = $(libdir)/evas/modules/vg_loaders/json/$(MODULE_ARCH)
vgloaderjsonpkg_LTLIBRARIES = modules/evas/vg_loaders/json/module.la
# Workaround for broken parallel install support in automake (relink issue)
# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
install_vgloaderjsonpkgLTLIBRARIES = install-vgloaderjsonpkgLTLIBRARIES
$(install_vgloaderjsonpkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_vg_loaders_json_module_la_SOURCES = modules/evas/vg_loaders/json/evas_vg_load_json.c
modules_evas_vg_loaders_json_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
@EVAS_CFLAGS@ \
@evas_vg_loader_json_cflags@
modules_evas_vg_loaders_json_module_la_LIBADD = \
@USE_EVAS_LIBS@ \
@evas_vg_loader_json_libs@
modules_evas_vg_loaders_json_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_vg_loaders_json_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_vg_loaders_json_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
endif
if BUILD_LOADER_BMP
if EVAS_STATIC_BUILD_BMP

4
src/examples/evas.mk
View File

@ -206,10 +206,6 @@ EXTRA_PROGRAMS += evas/evas_vg_batman
evas_evas_vg_batman_SOURCES = evas/evas-vg-batman.c
evas_evas_vg_batman_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
EXTRA_PROGRAMS += evas/evas_vg_json
evas_evas_vg_json_SOURCES = evas/evas-vg-json.c
evas_evas_vg_json_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
EXTRA_PROGRAMS += evas/evas_aspect_hints
evas_evas_aspect_hints_DEPS = $(srcdir)/aspect.edc
evas_evas_aspect_hints_SOURCES = evas/evas-aspect-hints.c

5
src/examples/evas/Makefile.examples
View File

@ -26,10 +26,7 @@ EXAMPLES= evas-aspect-hints \
evas-stacking \
evas-table \
evas-text \
evas-textblock-obstacles \
evas-vg-batman \
evas-vg-json \
evas-vg-simple
evas-textblock-obstacles
all: edje examples
edje: $(EDJE_OBJS)

5
src/examples/evas/meson.build
View File

@ -47,8 +47,9 @@ examples = [
'evas-textblock-obstacles',
'evas-text',
'evas-transparent',
# 'evas-vg-batman',
# 'evas-vg-simple',
'evas-vg-batman',
'evas-vg-simple',
'evas-vg-json',
]
foreach example : examples

10
src/lib/evas/Evas_Legacy.h
View File

@ -3618,7 +3618,7 @@ EAPI Evas_Object *evas_object_vg_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_N
*
* @return The number of frames. 0, if it's not animated.
*
* @since 1.22
* @since 1.23
*/
EAPI int evas_object_vg_animated_frame_count_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
@ -3638,7 +3638,7 @@ EAPI int evas_object_vg_animated_frame_count_get(const Evas_Object *obj) EINA_AR
* @return Duration in seconds.
*
* @see evas_object_vg_animated_frame_count_get()
* @since 1.22
* @since 1.23
*/
EAPI double evas_object_vg_animated_frame_duration_get(const Evas_Object *obj, int start_frame EINA_UNUSED, int frame_num EINA_UNUSED) EINA_ARG_NONNULL(1);
@ -3657,7 +3657,7 @@ NULL, otherwise.
*
* @return @c EINA_TRUE if it's succeed to read file, @c EINA_FALSE otherwise.
*
* @since 1.22
* @since 1.23
*/
EAPI Eina_Bool evas_object_vg_file_set(Evas_Object *obj, const char *file, const char *key);
@ -3672,7 +3672,7 @@ EAPI Eina_Bool evas_object_vg_file_set(Evas_Object *obj, const char *file, const
*
* @see evas_object_vg_animated_frame_count_get()
*
* @since 1.22
* @since 1.23
*/
EAPI Eina_Bool evas_object_vg_animated_frame_set(Evas_Object *obj, int frame_index) EINA_ARG_NONNULL(1, 2);
@ -3684,7 +3684,7 @@ EAPI Eina_Bool evas_object_vg_animated_frame_set(Evas_Object *obj, int frame_ind
* @see evas_object_vg_animated_frame_set()
* @see evas_object_vg_animated_frame_count_get()
*
* @since 1.22
* @since 1.23
*/
EAPI int evas_object_vg_animated_frame_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);

2
src/static_libs/vg_common/meson.build
View File

@ -18,5 +18,3 @@ vg_common = declare_dependency(
include_directories: vg_common_inc_dir,
sources: vg_common_src,
)