The ecore libraries options and modules were
corrected.
However, the ecore_evas needs the evas package to
build.
Signed-off-by: Ryan M. Raasch <ryan.raa...@gmail.com>
---
rules/ecore.in | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
rules/ecore.make | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 408 insertions(+), 14 deletions(-)
diff --git a/rules/ecore.in b/rules/ecore.in
index 94183cb..a895224 100644
--- a/rules/ecore.in
+++ b/rules/ecore.in
@@ -1,11 +1,26 @@
## SECTION=multimedia_efl
menuconfig ECORE
- tristate "ecore "
+ tristate "ecore "
select EINA
+ select XORG if ECORE_XINPUT
+ select XORG_APP_XINPUT if ECORE_XINPUT
+ select LIBCURL if ECORE_CURL
select OPENSSL if ECORE_SSL
- select XORG_LIB_X11
- select XORG_PROTO_INPUT if ECORE_ENABLE_INPUT
+ select EVAS if ECORE_EVAS
+ select ECORE_INPUT if ECORE_EVAS
+ select ECORE_EVAS_INPUT if ECORE_EVAS
+ select ECORE_CON if ECORE_IPC
+ select EVAS if ECORE_IMF_EVAS
+ select ECORE_INPUT if ECORE_X
+ select XORG_LIB_X11 if ECORE_X
+ select DIRECTFB if ECORE_EVAS_DIRECTFB
+ select TSLIB if ECORE_EVAS_FB
+ select XORG_LIB_X11 if ECORE_EVAS_SOFTWARE_X11
+ select SDL if ECORE_EVAS_SOFTWARE_SDL
+ select SDL_OPENGL if ECORE_EVAS_OPENGL_SDL
+ select XORG_LIB_XRENDER if ECORE_EVAS_XRENDER_XCB
+ select XORG_LIB_XRENDER if ECORE_EVAS_XRENDER_X11
help
Ecore is the core event abstraction layer that makes event
loops, timeouts and idle handlers fast, optimized, and
@@ -13,12 +28,199 @@ menuconfig ECORE
if ECORE
+menu "ecore options "
+
config ECORE_SSL
bool
- prompt "ssl support"
+ prompt "ssl"
+ help
+ Enable OpenSSL support for ecore.
+
+config ECORE_XINPUT
+ bool
+ prompt "xinput"
+ help
+ Enable xinput support for ecore.
+
+config ECORE_CURL
+ bool
+ prompt "curl support"
+ help
+ Allow ecore to use libcurl.
+
+config ECORE_TESTS
+ bool
+ prompt "tests"
+ help
+ Build ecore tests to the platform.
+
+config ECORE_ABSTRACT_SOCKETS
+ bool
+ prompt "abstract sockets"
+ help
+ Enable abstract sockets support for ecore.
+
+config ECORE_XTEST
+ bool
+ prompt "xtest"
+ help
+ ecore_x support for Xtest extension.
+
+endmenu
+
+menu "ecore modules "
+
+config ECORE_X
+ bool
+ prompt "ecore-x"
+ help
+ enable the ecore_x module
+
+config ECORE_FILE
+ bool
+ prompt "ecore-file"
+ help
+ Files utility functions.
+
+config ECORE_CON
+ bool
+ prompt "ecore-con"
+ help
+ The Ecore Connection Library ( Ecore_Con ) provides
+ simple mechanisms for communications between programs
+ using reliable sockets. It saves the programmer from
+ having to worry about file descripters and waiting for
+ incoming connections.
+
+config ECORE_IMF
+ bool
+ prompt "ecore-imf"
+ help
+ A core event abstracter layer and X abstraction layer
+ that makes doing selections, Xdnd, general X stuff,
+ and event loops, timeouts and idle handlers fast, optimised,
+ and convenient.
+
+config ECORE_INPUT
+ bool
+ prompt "ecore-input"
+ help
+ Enable the ecore_input module
+
+config ECORE_IPC
+ bool
+ prompt "ecore-ipc"
+ help
+ Enable the ecore_ipc module
+
+config ECORE_EVAS
+ tristate
+ prompt "Ecore Evas"
+ help
+ enable the ecore_evas module
+
+if ECORE_IMF
+
+config ECORE_IMF_EVAS
+ bool
+ prompt "ecore-evas-imf"
+ help
+ enable the ecore_imf_evas module.
+
+endif
+
+endmenu
+
+if ECORE_EVAS && ECORE_X
+
+menu "ecore-evas X options "
+
+config ECORE_EVAS_SOFTWARE_X11
+ bool
+ prompt "software-x11"
+ help
+ enable Software x11 support in the ecore_evas module
+
+config ECORE_EVAS_XRENDER_X11
+ bool
+ prompt "xrender-x11"
+ help
+ enable xrender x11 support in the ecore_evas module
+
+config ECORE_EVAS_OPENGL_X11
+ bool
+ prompt "opengl-x11"
+ help
+ enable opengl x11 support in the ecore_evas module
-config ECORE_ENABLE_INPUT
+config ECORE_EVAS_SOFTWARE_16_X11
bool
- prompt "xinput support"
+ prompt "software 16 bit"
+ help
+ enable software 16 bit x11 support in the ecore_evas module
+
+config ECORE_EVAS_SOFTWARE_8_X11
+ bool
+ prompt "software 8 bit"
+ help
+ enable software 8 bit x11 support in the ecore_evas module
+
+config ECORE_EVAS_XRENDER_XCB
+ bool
+ prompt "xrender xcb"
+ help
+ enable xrender xcb support in the ecore_evas module
+
+endmenu
+endif
+
+if ECORE_EVAS
+
+menu "ecore-evas options "
+config ECORE_EVAS_SOFTWARE_BUFF
+ bool
+ prompt "software-buffer"
+ help
+ enable Software Buffer support in the ecore_evas module
+
+config ECORE_EVAS_OPENGL_GLEW
+ bool
+ prompt "opengl glew"
+ depends on BROKEN
+ help
+ enable opengl glew support in the ecore_evas module
+
+config ECORE_EVAS_SOFTWARE_SDL
+ bool
+ prompt "software sdl"
+ help
+ enable software sdl support in the ecore_evas module
+
+config ECORE_EVAS_OPENGL_SDL
+ bool
+ prompt "opengl sdl"
+ help
+ enable opengl sdl support in the ecore_evas module
+
+config ECORE_EVAS_DIRECTFB
+ bool
+ prompt "directfb"
+ help
+ enable directfb support in the ecore_evas module
+
+config ECORE_EVAS_FB
+ bool
+ prompt "fb"
+ help
+ enable framebuffer support in the ecore_evas module
+
+config ECORE_EVAS_INPUT
+ bool
+ prompt "ecore-evas-input"
+ help
+ enable the ecore_input_evas module
+
+endmenu
+endif
endif
diff --git a/rules/ecore.make b/rules/ecore.make
index 85882e4..2c154a0 100644
--- a/rules/ecore.make
+++ b/rules/ecore.make
@@ -27,22 +27,183 @@ ECORE_DIR := $(BUILDDIR)/$(ECORE)
ECORE_CONF_TOOL := autoconf
-ECORE_CONF_OPT = \
+ECORE_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
- --disable-ecore-file \
- --disable-ecore-con \
- --disable-ecore-config \
- --disable-abstract-sockets \
- --disable-ecore-imf
+ --disable-ecore-evas-cocoa \
+ --disable-ecore-evas-software-gdi \
+ --disable-ecore-evas-software-ddraw \
+ --disable-ecore-evas-software-16-ddraw \
+ --disable-ecore-evas-software-16-wince \
+ --disable-doc
+
+ifdef PTXCONF_ECORE_XTEST
+ECORE_CONF_OPT += --enable-ecore-x-xtest
+else
+ECORE_CONF_OPT += --disable-ecore-x-xtest
+endif
+
+ifdef PTXCONF_ECORE_FILE
+ECORE_CONF_OPT += --enable-ecore-file
+else
+ECORE_CONF_OPT += --disable-ecore-file
+endif
+
+ifdef PTXCONF_ECORE_CON
+ECORE_CONF_OPT += --enable-ecore-con
+else
+ECORE_CONF_OPT += --disable-ecore-con
+endif
ifdef PTXCONF_ECORE_SSL
ECORE_CONF_OPT += --enable-openssl
+else
+ECORE_CONF_OPT += --disable-openssl
+endif
+
+ifdef PTXCONF_ECORE_XINPUT
+ECORE_CONF_OPT += --enable-ecore-x-input
+else
+ECORE_CONF_OPT += --disable-ecore-x-input
+endif
+
+ifndef PTXCONF_ECORE_TESTS
+ECORE_CONF_OPT += --enable-tests
+else
+ECORE_CONF_OPT += --disable-tests
+endif
+
+ifdef PTXCONF_ECORE_CURL
+ECORE_CONF_OPT += --enable-curl
+else
+ECORE_CONF_OPT += --disable-curl
+endif
+
+ifdef PTXCONF_ECORE_IMF
+ECORE_CONF_OPT += --enable-ecore-imf
+else
+ECORE_CONF_OPT += --disable-ecore-imf
+endif
+
+ifdef PTXCONF_ECORE_CONFIG
+ECORE_CONF_OPT += --enable-ecore-config
+else
+ECORE_CONF_OPT += --disable-ecore-config
+endif
+
+ifdef PTXCONF_ECORE_ABSTRACT_SOCKETS
+ECORE_CONF_OPT += --enable-abstract-sockets
+else
+ECORE_CONF_OPT += --disable-abstract-sockets
endif
-ifndef PTXCONF_ECORE_ENABLE_INPUT
+ifdef PTXCONF_ECORE_INPUT
+ECORE_CONF_OPT += --enable-ecore-input
+else
ECORE_CONF_OPT += --disable-ecore-input
endif
+ifdef PTXCONF_ECORE_X
+ECORE_CONF_OPT += --enable-ecore-x
+else
+ECORE_CONF_OPT += --disable-ecore-x
+endif
+
+ifdef PTXCONF_ECORE_IPC
+ECORE_CONF_OPT += --enable-ecore-ipc
+else
+ECORE_CONF_OPT += --disable-ecore-ipc
+endif
+
+#Ecore-Evas
+ifdef PTXCONF_ECORE_EVAS
+ECORE_CONF_OPT += --enable-ecore-evas
+
+ifdef PTXCONF_ECORE_EVAS_INPUT
+ECORE_CONF_OPT += --enable-ecore-input-evas
+else
+ECORE_CONF_OPT += --disable-ecore-input-evas
+endif
+
+ifdef PTXCONF_ECORE_EVAS_SOFTWARE_BUFFER
+ECORE_CONF_OPT += --enable-ecore-evas-software-buffer
+else
+ECORE_CONF_OPT += --disable-ecore-evas-software-buffer
+endif
+
+ifdef PTXCONF_ECORE_EVAS_SOFTWARE_X11
+ECORE_CONF_OPT += --enable-ecore-evas-software-x11
+else
+ECORE_CONF_OPT += --disable-ecore-evas-software-x11
+endif
+
+ifdef PTXCONF_ECORE_EVAS_XRENDER_X11
+ECORE_CONF_OPT += --enable-ecore-evas-xrender-x11
+else
+ECORE_CONF_OPT += --disable-ecore-evas-xrender-x11
+endif
+
+ifdef PTXCONF_ECORE_EVAS_OPENGL_X11
+ECORE_CONF_OPT += --enable-ecore-evas-opengl-x11
+else
+ECORE_CONF_OPT += --disable-ecore-evas-opengl-x11
+endif
+
+ifdef PTXCONF_ECORE_EVAS_SOFTWARE_16_X11
+ECORE_CONF_OPT += --enable-ecore-evas-software-16-x11
+else
+ECORE_CONF_OPT += --disable-ecore-evas-software-16-x11
+endif
+
+ifdef PTXCONF_ECORE_EVAS_SOFTWARE_8_X11
+ECORE_CONF_OPT += --enable-ecore-evas-software-8-x11
+endif
+
+ifdef PTXCONF_ECORE_EVAS_XRENDER_XCB
+ECORE_CONF_OPT += --enable-ecore-evas-xrender-xcb
+else
+ECORE_CONF_OPT += --disable-ecore-evas-xrender-xcb
+endif
+
+ifdef PTXCONF_ECORE_EVAS_OPENGL_GLEW
+ECORE_CONF_OPT += --enable-ecore-evas-opengl-glew
+else
+ECORE_CONF_OPT += --disable-ecore-evas-opengl-glew
+endif
+
+ifdef PTXCONF_ECORE_EVAS_SOFTWARE_SDL
+ECORE_CONF_OPT += --enable-ecore-evas-software-sdl
+else
+ECORE_CONF_OPT += --disable-ecore-evas-software-sdl
+endif
+
+ifdef PTXCONF_ECORE_EVAS_OPENGL_SDL
+ECORE_CONF_OPT += --enable-ecore-evas-opengl-sdl
+else
+ECORE_CONF_OPT += --disable-ecore-evas-opengl-sdl
+endif
+
+ifdef PTXCONF_ECORE_EVAS_DIRECTFB
+ECORE_CONF_OPT += --enable-ecore-evas-directfb
+else
+ECORE_CONF_OPT += --disable-ecore-evas-directfb
+endif
+
+ifdef PTXCONF_ECORE_EVAS_FB
+ECORE_CONF_OPT += --enable-ecore-evas-fb
+else
+ECORE_CONF_OPT += --disable-ecore-evas-fb
+endif
+
+ifdef PTXCONF_ECORE_IMF_EVAS
+ECORE_CONF_OPT += --enable-ecore-imf-evas
+else
+ECORE_CONF_OPT += --disable-ecore-imf-evas
+endif
+
+else
+ECORE_CONF_OPT += --disable-ecore-evas
+endif
+
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
@@ -55,8 +216,39 @@ $(STATEDIR)/ecore.targetinstall:
@$(call install_fixup, ecore, AUTHOR, "Ryan Raasch
<ryan.raa...@gmail.com>")
@$(call install_fixup, ecore, DESCRIPTION, missing)
- @$(call install_lib, ecore, 0, 0, 0644, libecore-ver-svn-06)
+ @$(call install_lib, ecore, 0, 0, 0644, libecore-ver-svn-06)
+ifdef PTXCONF_ECORE_IPC
+ @$(call install_lib, ecore, 0, 0, 0644, libecore_ipc-ver-svn-06)
+endif
+
+ifdef PTXCONF_ECORE_CON
+ @$(call install_lib, ecore, 0, 0, 0644, libecore_con-ver-svn-06)
+endif
+
+ifdef PTXCONF_ECORE_EVAS_FB
+ @$(call install_lib, ecore, 0, 0, 0644, libecore_fb-ver-svn-06)
+endif
+
+ifdef PTXCONF_ECORE_FILE
+ @$(call install_lib, ecore, 0, 0, 0644, libecore_file-ver-svn-06)
+endif
+
+ifdef PTXCONF_ECORE_INPUT
+ @$(call install_lib, ecore, 0, 0, 0644, libecore_input-ver-svn-06)
+endif
+
+ifdef PTXCONF_ECORE_XINPUT
+ @$(call install_lib, ecore, 0, 0, 0644, libecore_x_input-ver-svn-06)
+endif
+
+ifdef PTXCONF_ECORE_EVAS
+ @$(call install_lib, ecore, 0, 0, 0644, libecore_evas-ver-svn-06)
+endif
+
+ifdef PTXCONF_ECORE_EVAS_INPUT
+ @$(call install_lib, ecore, 0, 0, 0644, libecore_input_evas-ver-svn-06)
+endif
@$(call install_finish, ecore)
@$(call touch)
--
1.7.1.rc1.GIT
--
ptxdist mailing list
ptxdist@pengutronix.de
