enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

make emotion as well as elm requirements, ecore-imf is not used anymore.

This commit is contained in:
Carsten Haitzler 2013-10-31 16:58:26 +09:00
parent 7f78ae9e53
commit 6eca480e76
8 changed files with 17 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
configure.ac
View File

@ -533,6 +533,8 @@ PKG_CHECK_MODULES(E, [
eina >= ${efl_version}
eldbus >= ${efl_version}
eio >= ${efl_version}
elementary >= ${efl_version}
emotion >= ${efl_version}
$eeze_mount
$udisks_mount
$device_backend
@ -551,51 +553,14 @@ efreet >= ${efl_version} \
efreet-mime >= ${efl_version} \
efreet-trash >= ${efl_version} \
eina >= ${efl_version} \
eldbus \
eldbus >= ${efl_version} \
eio >= ${efl_version} \
elementary >= ${efl_version} \
emotion >= ${efl_version} \
$udisks_mount \
$eeze_mount \
$device_backend"
want_elementary=auto
have_elementary=no
AC_ARG_ENABLE(elementary,
AC_HELP_STRING([--enable-elementary], [enable Elementary support @<:@default=detect@:>@]),
[want_elementary=$enableval],
[want_elementary=auto]
)
if test "x$want_elementary" != "xno"; then
PKG_CHECK_MODULES(ELM, [elementary >= ${efl_version}],
[have_elementary=yes], [have_elementary=no])
if test "x$want_elementary" = "xyes" -a "x$have_elementary" = "xno"; then
AC_MSG_ERROR([Elementary support requested but it was not found])
fi
if test "x$have_elementary" = "xyes"; then
AC_DEFINE([HAVE_ELEMENTARY], 1, "Have Elementary support")
requirements_e="${requirements_e} elementary > 1.6.9.0"
fi
fi
want_emotion=auto
have_emotion=no
AC_ARG_ENABLE(emotion,
AC_HELP_STRING([--enable-emotion], [enable emotion support @<:@default=detect@:>@]),
[want_emotion=$enableval],
[want_emotion=auto]
)
if test "x$want_emotion" != "xno"; then
PKG_CHECK_MODULES(EMOTION, [emotion >= ${efl_version}],
[have_emotion=yes], [have_emotion=no])
if test "x$want_emotion" = "xyes" -a "x$have_emotion" = "xno"; then
AC_MSG_ERROR([emotion support requested but it was not found])
fi
if test "x$have_emotion" = "xyes"; then
AC_DEFINE([HAVE_EMOTION], 1, "Have emotion support")
requirements_e="${requirements_e} emotion >= ${efl_version}"
fi
fi
PKG_CHECK_MODULES(E_OPEN, [
eina >= ${efl_version}
ecore >= ${efl_version}
@ -603,10 +568,8 @@ PKG_CHECK_MODULES(E_OPEN, [
efreet-mime >= ${efl_version}
])
AC_E_CHECK_PKG(ECORE_IMF, [ ecore-imf >= ${efl_version} ecore-imf-evas >= ${efl_version} ], [], [:])
e_libs="$E_LIBS $LIBINTL $fnmatch_libs $ECORE_IMF_LIBS $execinfo_libs"
e_cflags="-DUSE_E_CONFIG_H $E_CFLAGS $ECORE_IMF_CFLAGS"
e_libs="$E_LIBS $LIBINTL $fnmatch_libs $execinfo_libs"
e_cflags="-DUSE_E_CONFIG_H $E_CFLAGS"
e_configflags="-DUSE_E_CONFIG_H"
AC_SUBST(e_libs)
@ -894,7 +857,7 @@ AC_E_OPTIONAL_MODULE([fileman], true)
AC_E_OPTIONAL_MODULE([fileman_opinfo], true)
AC_E_OPTIONAL_MODULE([wizard], true)
AC_E_OPTIONAL_MODULE([conf], true)
AC_E_OPTIONAL_MODULE([conf2], $have_elementary)
AC_E_OPTIONAL_MODULE([conf2], true)
AC_E_OPTIONAL_MODULE([conf_comp], true)
AC_E_OPTIONAL_MODULE([conf_wallpaper2], true)
AC_E_OPTIONAL_MODULE([conf_theme], true, true)

4
src/bin/Makefile.am
View File

@ -12,8 +12,6 @@ AM_CPPFLAGS = \
@cf_cflags@ \
@VALGRIND_CFLAGS@ \
@EDJE_DEF@ \
@ELM_CFLAGS@ \
@EMOTION_CFLAGS@ \
@WAYLAND_CFLAGS@ \
@WAYLAND_EGL_CFLAGS@ \
-DE_BINDIR=\"$(bindir)\" \
@ -386,7 +384,7 @@ e_main.c \
$(enlightenment_src)
enlightenment_LDFLAGS = -export-dynamic
enlightenment_LDADD = @e_libs@ @ELM_LIBS@ @EMOTION_LIBS@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @WAYLAND_EGL_LIBS@ -lm
enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @WAYLAND_EGL_LIBS@ -lm
enlightenment_imc_SOURCES = \
e.h \

28
src/bin/e_main.c
View File

@ -1,7 +1,6 @@
#include "e.h"
#ifdef HAVE_ECORE_IMF
# include <Ecore_IMF.h>
#endif
#include <Elementary.h>
#include <Emotion.h>
#define MAX_LEVEL 80
@ -18,14 +17,6 @@ static double t0, t1, t2;
# define TS(x)
#endif
#ifdef HAVE_ELEMENTARY
#include <Elementary.h>
#endif
#ifdef HAVE_EMOTION
#include <Emotion.h>
#endif
/*
* i need to make more use of these when i'm baffled as to when something is
* up. other hooks:
@ -389,17 +380,6 @@ main(int argc, char **argv)
_xdg_data_dirs_augment();
#ifdef HAVE_ECORE_IMF
TS("Ecore_IMF Init");
if (!ecore_imf_init())
{
e_error_message_show(_("Enlightenment cannot initialize Ecore_IMF!\n"));
_e_main_shutdown(-1);
}
TS("Ecore_IMF Init Done");
_e_main_shutdown_push(ecore_imf_shutdown);
#endif
TS("Ecore_Evas Init");
if (!ecore_evas_init())
{
@ -409,7 +389,6 @@ main(int argc, char **argv)
TS("Ecore_Evas Init Done");
// _e_main_shutdown_push(ecore_evas_shutdown);
#ifdef HAVE_ELEMENTARY
TS("Elementary Init");
if (!elm_init(argc, argv))
{
@ -418,9 +397,7 @@ main(int argc, char **argv)
}
TS("Elementary Init Done");
_e_main_shutdown_push(elm_shutdown);
#endif
#ifdef HAVE_EMOTION
TS("Emotion Init");
if (!emotion_init())
{
@ -429,7 +406,6 @@ main(int argc, char **argv)
}
TS("Emotion Init Done");
_e_main_shutdown_push((void *)emotion_shutdown);
#endif
/* e doesn't sync to compositor - it should be one */
ecore_evas_app_comp_sync_set(0);

10
src/bin/e_widget_filepreview.c
View File

@ -1,9 +1,7 @@
#include "e.h"
#include "e_fm_device.h"
#include <sys/statvfs.h>
#ifdef HAVE_EMOTION
# include <Emotion.h>
#endif
#include <Emotion.h>
#define FILEPREVIEW_TEXT_PREVIEW_SIZE 2048
@ -216,8 +214,6 @@ _e_wid_fprev_clear_widgets(E_Widget_Data *wd)
wd->preview_text_file_thread = NULL;
}
#ifdef HAVE_EMOTION
static void
_e_wid_fprev_preview_video_position(E_Widget_Data *wd, Evas_Object *obj, void *event_info __UNUSED__)
{
@ -362,8 +358,6 @@ _e_wid_fprev_preview_video_widgets(E_Widget_Data *wd)
#undef WIDROW
}
#endif
static void
_e_wid_fprev_preview_fs_widgets(E_Widget_Data *wd, Eina_Bool mount_point)
{
@ -647,7 +641,6 @@ _e_wid_fprev_preview_file(E_Widget_Data *wd)
}
if (desktop) efreet_desktop_free(desktop);
}
#ifdef HAVE_EMOTION
else if (wd->mime && (emotion_object_extension_may_play_get(wd->path)))
{
size_t sz;
@ -667,7 +660,6 @@ _e_wid_fprev_preview_file(E_Widget_Data *wd)
e_widget_entry_text_set(wd->o_preview_size_entry, _("Unknown"));
is_fs = EINA_TRUE;
}
#endif
if (is_fs) return;
wd->mime_icon = EINA_FALSE;

11
src/bin/e_win.c
View File

@ -12,9 +12,6 @@ static void _e_win_cb_state(Ecore_Evas *ee);
/* local subsystem globals */
static Eina_List *wins = NULL;
#ifdef HAVE_ELEMENTARY
/* intercept elm_win operations so we talk directly to e_border */
#include <Elementary.h>
typedef struct _Elm_Win_Trap_Ctx
@ -233,8 +230,6 @@ static const Elm_Win_Trap _elm_win_trap = {
/* urgent_set */ NULL,
/* withdrawn_set */ NULL
};
#endif
static void
_e_win_hide(void *obj)
@ -250,9 +245,7 @@ _e_win_hide(void *obj)
EINTERN int
e_win_init(void)
{
#ifdef HAVE_ELEMENTARY
if (!elm_win_trap_set(&_elm_win_trap)) return 0;
#endif
return 1;
}
@ -271,11 +264,7 @@ e_win_shutdown(void)
EAPI Eina_Bool
e_win_elm_available(void)
{
#ifdef HAVE_ELEMENTARY
return EINA_TRUE;
#else
return EINA_FALSE;
#endif
}
EAPI E_Win *

4
src/modules/Makefile_conf2.am
View File

@ -17,8 +17,8 @@ conf2_module_la_SOURCES = conf2/e_mod_main.c \
conf2/e_mod_main.h \
conf2/e_conf2.c
conf2_module_la_CFLAGS = $(AM_CFLAGS) @ELM_CFLAGS@
conf2_module_la_LIBADD = @ELM_LIBS@
conf2_module_la_CFLAGS = $(AM_CFLAGS)
conf2_module_la_LIBADD =
CONF2_EDJE_FLAGS = $(EDJE_FLAGS) -id $(srcdir)/conf2/images -id $(top_srcdir)/data/themes/img

6
src/modules/Makefile_teamwork.am
View File

@ -7,10 +7,8 @@ EXTRA_DIST += $(teamwork_DATA)
teamworkpkgdir = $(MDIR)/teamwork/$(MODULE_ARCH)
teamworkpkg_LTLIBRARIES = teamwork/module.la
teamwork_module_la_CPPFLAGS = $(AM_CPPFLAGS) \
@EMOTION_CFLAGS@
teamwork_module_la_LIBADD = $(LIBS) \
@EMOTION_LIBS@
teamwork_module_la_CPPFLAGS = $(AM_CPPFLAGS)
teamwork_module_la_LIBADD = $(LIBS)
teamwork_module_la_SOURCES = teamwork/e_mod_main.c \
teamwork/e_mod_config.c \

24
src/modules/teamwork/e_mod_tw.c
View File

@ -1,7 +1,5 @@
#include "e_mod_main.h"
#ifdef HAVE_EMOTION
# include <Emotion.h>
#endif
#include <Emotion.h>
#define IMAGE_FETCH_TRIES 5
@ -60,12 +58,10 @@ static Ecore_Timer *tw_hide_timer = NULL;
static Eldbus_Service_Interface *tw_dbus_iface = NULL;
#ifdef HAVE_EMOTION
static Eina_Stringshare *tw_tmpfile = NULL;
static int tw_tmpfd = -1;
static Ecore_Thread *tw_tmpthread = NULL;
static Media *tw_tmpthread_media = NULL;
#endif
typedef enum
{
@ -469,9 +465,7 @@ dbus_link_mouse_out_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const
{
if (tw_mod->pop && (!tw_mod->sticky) &&
(
#ifdef HAVE_EMOTION
(tw_tmpfile && (!e_util_strcmp(e_object_data_get(E_OBJECT(tw_mod->pop)), tw_tmpfile))) ||
#endif
(!e_util_strcmp(e_object_data_get(E_OBJECT(tw_mod->pop)), uri))
))
{
@ -484,10 +478,8 @@ dbus_link_mouse_out_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const
tw_hide(NULL);
tw_mod->force = 0;
}
#ifdef HAVE_EMOTION
else if (tw_tmpthread || tw_tmpfile)
tw_hide(NULL);
#endif
tw_mod->hidden = !tw_mod->pop;
}
return eldbus_message_method_return_new(msg);
@ -850,8 +842,6 @@ tw_show_helper(Evas_Object *o, int w, int h)
E_OBJECT_DEL_SET(tw_mod->pop, tw_popup_del);
}
#ifdef HAVE_EMOTION
static Eina_Bool
stupid_obj_del_workaround_hack(void *data)
{
@ -995,8 +985,6 @@ tw_video_thread_cb(void *data, Ecore_Thread *eth)
}
}
#endif
static void
tw_show(Media *i)
{
@ -1009,7 +997,6 @@ tw_show(Media *i)
download_media_add(i->addr);
return;
}
#ifdef HAVE_EMOTION
if (i->video)
{
char buf[PATH_MAX];
@ -1069,7 +1056,6 @@ tw_show(Media *i)
return;
}
else
#endif
{
prev = e_livethumb_add(e_util_comp_current_get()->evas);
o = evas_object_image_filled_add(e_livethumb_evas_get(prev));
@ -1100,9 +1086,7 @@ tw_show_local_file(const char *uri)
int w, h;
Eina_Bool video = EINA_FALSE;
#ifdef HAVE_EMOTION
video = emotion_object_extension_may_play_get(uri);
#endif
if (video)
{
if (tw_config->disable_video) return;
@ -1112,14 +1096,12 @@ tw_show_local_file(const char *uri)
if (!evas_object_image_extension_can_load_get(uri)) return;
}
prev = e_livethumb_add(e_util_comp_current_get()->evas);
#ifdef HAVE_EMOTION
if (video)
{
tw_show_video(prev, uri);
return;
}
else
#endif
{
o = e_icon_add(e_livethumb_evas_get(prev));
e_icon_file_set(o, uri);
@ -1152,7 +1134,6 @@ focus_out(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Border_Focus_Out
EINTERN Eina_Bool
tw_hide(void *d EINA_UNUSED)
{
#ifdef HAVE_EMOTION
if (tw_tmpthread)
{
ecore_thread_local_data_add(tw_tmpthread, "dead", (void*)1, NULL, 0);
@ -1165,7 +1146,6 @@ tw_hide(void *d EINA_UNUSED)
tw_tmpfd = -1;
}
eina_stringshare_replace(&tw_tmpfile, NULL);
#endif
tw_win = 0;
E_FREE_FUNC(tw_mod->pop, e_object_del);
last_coords.x = last_coords.y = 0;
@ -1253,7 +1233,6 @@ e_tw_shutdown(void)
E_FREE_FUNC(dummies, eet_close);
E_FREE_FUNC(cleaner_edd, eet_data_descriptor_free);
E_FREE_FUNC(cache_edd, eet_data_descriptor_free);
#ifdef HAVE_EMOTION
if (tw_tmpfd != -1)
{
close(tw_tmpfd);
@ -1262,7 +1241,6 @@ e_tw_shutdown(void)
eina_stringshare_replace(&tw_tmpfile, NULL);
E_FREE_FUNC(tw_tmpthread, ecore_thread_cancel);
tw_tmpthread_media = NULL;
#endif
tw_hide(NULL);
last_coords.x = last_coords.y = 0;
eina_hash_free(tw_mod->media);