Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (840d76c2015601c78c62a0370d48ae09d2fff7b7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (840d76c2015601c78c62a0370d48ae09d2fff7b7)
  • Date: Sat, 12 Nov 2011 19:47:08 -0600

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

e-17/ecore/BUILD | 14 ++++++
e-17/ecore/CONFIGURE | 20 ++++++---
e-17/ecore/DEPENDS | 106
++++++++++++++++++++++++++++++++++++---------------
e-17/ecore/HISTORY | 9 ++++
4 files changed, 112 insertions(+), 37 deletions(-)

New commits:
commit 840d76c2015601c78c62a0370d48ae09d2fff7b7
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

ecore: updated to current configure options and depends

diff --git a/e-17/ecore/BUILD b/e-17/ecore/BUILD
index 6775203..255e7e3 100755
--- a/e-17/ecore/BUILD
+++ b/e-17/ecore/BUILD
@@ -1,2 +1,14 @@
-OPTS="$ECORE_DESKTOP $ECORE_TXT $OPTS" &&
+if [ "$ECORE_CRYPTO" == "none" ]; then
+ OPTS="--disable-gnutls --disable-openssl $OPTS"
+fi &&
+
+if [[ $(get_spell_provider $SPELL OPENGL) ]] && is_depends_enabled $SPELL
sdl; then
+ ECORE_OPENGL_SDL="--enable-ecore-evas-opengl-sdl"
+else
+ ECORE_OPENGL_SDL="--disable-ecore-evas-opengl-sdl"
+fi &&
+
+OPTS="$ECORE_FB $ECORE_IPV6 $ECORE_OPENGL_SDL $OPTS" &&
+OPTS="$ECORE_PTHREADS $ECORE_THREAD_SAFETY $OPTS" &&
+
default_build
diff --git a/e-17/ecore/CONFIGURE b/e-17/ecore/CONFIGURE
index 03164a8..6f2791b 100755
--- a/e-17/ecore/CONFIGURE
+++ b/e-17/ecore/CONFIGURE
@@ -1,7 +1,15 @@
-config_query_option ECORE_DESKTOP "Build Ecore_Desktop module?" n \
- "--enable-ecore-desktop" \
- "--disable-ecore-desktop" &&
+config_query_option ECORE_PTHREADS "Enable POSIX thread code?" y
\
+ "--enable-posix-threads" "--disable-posix-threads"
&&

-config_query_option ECORE_TXT "Build Ecore_Txt module?" n \
- "--enable-ecore-txt" \
- "--disable-ecore-txt"
+config_query_option ECORE_THREAD_SAFETY "Enable thread safety?" n
\
+ "--enable-thread-safety" "--disable-thread-safety"
&&
+
+config_query_option ECORE_FB "Build Ecore_fb module for linux framebuffer?"
n \
+ "--enable-ecore-fb --enable-ecore-evas-fb"
\
+ "--disable-ecore-fb --disable-ecore-evas-fb"
&&
+
+config_query_option ECORE_IPV6 "Enable IPv6 functionality?" n
\
+ "--enable-ipv6" "--disable-ipv6"
&&
+
+config_query_list ECORE_CRYPTO "Use which cryptographic library?"
\
+ gnutls openssl none

diff --git a/e-17/ecore/DEPENDS b/e-17/ecore/DEPENDS
index b72e1a2..78bcee4 100755
--- a/e-17/ecore/DEPENDS
+++ b/e-17/ecore/DEPENDS
@@ -1,41 +1,87 @@
-depends curl '--enable-curl' &&
-depends dbus '--enable-ecore-dbus' &&
-depends eina &&
-depends evas &&
-depends libxcursor &&
+depends curl '--enable-curl' &&
+depends dbus &&
+depends eina &&
+depends evas &&

if [ "$ECORE_BRANCH" = "scm" ]; then
- depends subversion &&
- depends libtool &&
- depends automake
+ depends subversion &&
+ depends libtool &&
+ depends automake &&
+ depends subversion
fi &&

-optional_depends openssl \
- "--enable-openssl" \
- "--disable-openssl" \
- "for OpenSSL connection support" &&
+optional_depends glib2 \
+ "" "--disable-glib" \
+ "Enable glib support?"
&&

-optional_depends xorg-libs \
- "--enable-ecore-x" \
- "--disable-ecore-x" \
- "for X11 ecore_x module" &&
+optional_depends xorg-libs \
+ "--enable-ecore-x" "--disable-ecore-x" \
+ "for X11 ecore_x module"
&&

-optional_depends libxdamage '' '' 'for DAMAGE support' &&
+optional_depends libxcursor \
+ "" "--disable-ecore-x-cursor" \
+ "Enable ecore_x support for Xcursor extension?"
&&

-optional_depends libxrender '' \
- '--disable-ecore-evas-xrender' \
- 'for xrender support' &&
+optional_depends libxdamage \
+ "" "--disable-ecore-x-damage" \
+ "Enable ecore_x support for Xdamage extension?"
&&

-optional_depends libxrandr '' '' 'for xrandr support' &&
+optional_depends libxrender \
+ "" "--disable-ecore-x-render" \
+ "Enable ecore_x support for Xrender extension?"
&&

-optional_depends libxinerama '' '' 'for xinerama support' &&
+optional_depends libxrandr \
+ "" "--disable-ecore-x-randr" \
+ "Enable ecore_x support for Xrandr extension?"
&&

-optional_depends xscreensaver \
- "" \
- "" \
- "for XScreenSaver screen locking"
+optional_depends libxscrnsaver \
+ "" "--disable-ecore-x-screensaver" \
+ "Enable ecore_x support for Xscreensaver?"
&&

-optional_depends directfb \
- "--enable-ecore-fb --enable-ecore-evas-fb" \
- "--disable-ecore-fb --disable-ecore-evas-fb" \
- "for DirectFB ecore_fb module"
+optional_depends libxfixes \
+ "" "--disable-ecore-x-xfixes" \
+ "Enable ecore_x support for Xfixes extension?"
&&
+
+optional_depends libxinerama \
+ "" "--disable-ecore-x-xinerama" \
+ "Enable ecore_x support for Xinerama extension?"
&&
+
+optional_depends libxtst \
+ "" "--disable-ecore-x-xtest" \
+ "Enable ecore_x support for Xtest extension?"
&&
+
+optional_depends libxi \
+ "" "--disable-ecore-x-input" \
+ "Enable ecore_x support for Xinput/Xinput2 extension?"
&&
+
+optional_depends libxdmcp \
+ "" "--disable-ecore-x-dpms" \
+ "Enable ecore_x support for Xdpms extension?"
&&
+
+optional_depends libdrm \
+ "" "--disable-ecore-x-dri" \
+ "Enable ecore_x support for DRI extension?"
&&
+
+optional_depends libxcb \
+ "--enable-ecore-x-xcb" "" \
+ "Enable ecore_x module with XCB backend?"
&&
+
+optional_depends directfb \
+ "--enable-ecore-directfb --enable-ecore-evas-directfb" \
+ "--disable-ecore-directfb --disable-ecore-evas-directfb" \
+ "Enable DirectFB ecore_directfb module?"
&&
+
+optional_depends OPENGL \
+ "--enable-ecore-evas-opengl-x11" \
+ "--disable-ecore-evas-opengl-x11" \
+ "Enable OpenGL Xlib support in ecore_evas?"
&&
+
+optional_depends sdl \
+ "--enable-ecore-sdl" "--disable-ecore-sdl" \
+ "Enable SDL ecore_sdl module?"
&&
+
+if [ "$ECORE_CRYPTO" == "gnutls" ]; then
+ depends gnutls "--enable-gnutls --disable-openssl"
+elif [ "$ECORE_CRYPTO" == "openssl" ]; then
+ depends openssl "--enable-openssl --disable-gnutls"
+fi
diff --git a/e-17/ecore/HISTORY b/e-17/ecore/HISTORY
index 37f3b5d..afc215a 100644
--- a/e-17/ecore/HISTORY
+++ b/e-17/ecore/HISTORY
@@ -1,3 +1,12 @@
+2011-11-12 Robin Cook <rcook AT wyrms.net>
+ * BUILD: remove no longer used options, added ECORE_FB, ECORE_IPV6,
+ ECORE_CRYPTO, ECORE_OPENGL_SDL, ECORE_PTHREADS, ECORE_TREADS_SAFETY
+ * CONFIGURE: removed no longer used options, added ECORE_FB,
+ ECORE_IPV6, ECORE_CRYPTO, ECORE_PTHERADS, ECORE_TREADS_SAFETY
+ * DEPENDS: removed no longer used switches, adde ECORE_CRYPTO option,
+ corrected configure switches, added missing configure switches,
+ added many optional_depends
+
2011-11-03 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.0.1
* DEPENDS: Don't list subversion twice



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (840d76c2015601c78c62a0370d48ae09d2fff7b7), Robin Cook, 11/12/2011

Archive powered by MHonArc 2.6.24.

Top of Page