Skip to Content.
Sympa Menu

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

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 (8967c1b3e3ead7be1be85c7ac2bebc64f5f3d8d9)
  • Date: Sat, 12 Nov 2011 12:24:16 -0600

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

e-17/evas/BUILD | 14 +++++++++
e-17/evas/CONFIGURE | 21 +++++++++-----
e-17/evas/DEPENDS | 74
+++++++++++++++++++++++++++++++++-------------------
e-17/evas/HISTORY | 7 ++++
4 files changed, 82 insertions(+), 34 deletions(-)

New commits:
commit 8967c1b3e3ead7be1be85c7ac2bebc64f5f3d8d9
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

evas: correct, changed and added optional depends and switches

diff --git a/e-17/evas/BUILD b/e-17/evas/BUILD
index 2e7d424..2f59aed 100755
--- a/e-17/evas/BUILD
+++ b/e-17/evas/BUILD
@@ -1,3 +1,17 @@
+if [[ $(get_spell_provider $SPELL OPENGL) ]] && is_depends_enabled $SPELL
sdl; then
+ EVAS_GL_SDL="--enable-gl-sdl --enable-sdl-primitive"
+else
+ EVAS_GL_SDL="--disable-gl-sdl --disable-sdl-primitive"
+fi &&
+
+if [[ $(get_spell_provider $SPELL OPENGL) ]] && is_depends_enabled $SPELL
libxcb; then
+ EVAS_GL_XCB="--enable-gl-xcb"
+else
+ EVAS_GL_XCB="--disable-gl-xcb"
+fi &&
+
+OPTS="$EVAS_GL_SDL $EVAS_GL_XCB $EVAS_PMAPS $OPTS" &&
+
if [ "$EVAS_BUFFER" = "y" ]; then
OPTS="--enable-buffer $OPTS"
else
diff --git a/e-17/evas/CONFIGURE b/e-17/evas/CONFIGURE
index 259838a..c4414a7 100755
--- a/e-17/evas/CONFIGURE
+++ b/e-17/evas/CONFIGURE
@@ -1,8 +1,13 @@
-config_query EVAS_BUFFER "Enable memory buffer rendering?" y &&
-config_query EVAS_SCALE_SAMPLE "Enable sampling scalar code?" y &&
-config_query EVAS_SCALE_SMOOTH "Enable smooth scalar code?" y &&
-config_query EVAS_YUV "Enable YUV converter code?" y &&
-config_query EVAS_DITHER_MASK "Enable small dither mask code?" n &&
-config_query EVAS_ASYNC_RENDER "Enable asynchrone render?(use
carefully!!)" n &&
-config_query EVAS_PMAPS "Enable portable pixmap support?" y \
- '--enable-image-loader-pmaps' '--disable-image-loader-pmaps'
+config_query EVAS_BUFFER "Enable memory buffer rendering?" y
&&
+config_query EVAS_SCALE_SAMPLE "Enable sampling scalar code?" y
&&
+config_query EVAS_SCALE_SMOOTH "Enable smooth scalar code?" y
&&
+config_query EVAS_YUV "Enable YUV converter code?" y
&&
+config_query EVAS_DITHER_MASK "Enable small dither mask code?" n
&&
+config_query EVAS_ASYNC_RENDER "Enable asynchrone render?(use
carefully!!)" n &&
+
+config_query_option EVAS_PMAPS "Enable portable pixmap support?" y
\
+ '--enable-image-loader-pmaps'
'--disable-image-loader-pmaps' &&
+
+config_query_option EVAS_PTHREADS "Enable threaded rendering?" y
\
+ "--enable-pthreads" "--disable-pthreads"
+
diff --git a/e-17/evas/DEPENDS b/e-17/evas/DEPENDS
index a40d5d1..1289c61 100755
--- a/e-17/evas/DEPENDS
+++ b/e-17/evas/DEPENDS
@@ -1,45 +1,66 @@
-depends automake &&
-depends eina &&
-depends libtool &&
+depends automake &&
+depends eina &&
+depends libtool &&
+depends freetype2 &&

if [[ "$EVAS_BRANCH" == "scm" ]]; then
depends subversion
fi &&

-optional_depends eet \
- "--enable-image-loader-eet --enable-font-loader-eet" \
- "--disable-images-loader-eet --disable-font-loader-eet" \
- "for eet images and font loader support" &&
+optional_depends fontconfig \
+ "--enable-fontconfig" \
+ "--disable-fontconfig" \
+ "Enable fontconfig for finding fonts?" &&

-optional_depends xorg-libs \
- "--enable-software-x11 --with-x" \
- "--disable-software-x11 --without-x" \
- "for software X11 rendering backend" &&
+optional_depends liblinebreak \
+ "--enable-liblinebreak" \
+ "--disable-liblinebreak" \
+ "Enable linking against liblinebreak?" &&

-optional_depends directfb \
- "--enable-directfb" \
- "--disable-directfb" \
- "for DirectFB rendering backend" &&
+optional_depends fribidi \
+ "--enable-fribidi" \
+ "--disable-fribidi" \
+ "Enable bidirectional text support?" &&
+
+optional_depends pixman \
+ "--enable-pixman" \
+ "--disable-pixman" \
+ "Enable pixman for software rendering?" &&

optional_depends fbset \
"--enable-fb" \
"--disable-fb" \
"for kernel frame buffer rendering backend" &&

+optional_depends directfb \
+ "--enable-directfb" \
+ "--disable-directfb" \
+ "for DirectFB rendering backend" &&
+
+optional_depends sdl \
+ "--enable-software-sdl" \
+ "--disable-software-sdl" \
+ "Enable software SDL rendering backend?" &&
+
+optional_depends xorg-libs \
+ "--enable-software-xlib --with-x" \
+ "--disable-software-xlib --without-x" \
+ "for software X11 rendering backend" &&
+
+optional_depends libxcb \
+ "--enable-async-events" \
+ "--disable-async-events" \
+ "Enable software XCB engine and rendering backend?" &&
+
optional_depends OPENGL \
- "--enable-gl-x11" \
- "--disable-gl-x11" \
+ "--enable-gl-xlib" \
+ "--disable-gl-xlib" \
"for OpenGL X11 display engine" &&

-#optional_depends glew \
-# "--enable-gl-glew" \
-# "--disable-gl-glew" \
-# "for OpenGL Extension Wrangler display engine" &&
-
-optional_depends glitz \
- '--enable-glitz-x11' \
- '--disable-glitz-x11' \
- 'for glitz X11 rendering backend' &&
+optional_depends eet \
+ "--enable-image-loader-eet --enable-font-loader-eet" \
+ "--disable-images-loader-eet --disable-font-loader-eet" \
+ "for eet images and font loader support" &&

optional_depends giflib \
'--enable-image-loader-gif' \
@@ -70,3 +91,4 @@ optional_depends valgrind \
"--enable-valgrind" \
"--disable-valgrind" \
"to enable fixes to stop false reports"
+
diff --git a/e-17/evas/HISTORY b/e-17/evas/HISTORY
index f760523..eb70ed1 100644
--- a/e-17/evas/HISTORY
+++ b/e-17/evas/HISTORY
@@ -1,3 +1,10 @@
+2011-11-12 Robin Cook <rcook AT wyrs.net>
+ * BUILD: added sdl and xcb opengl switches, added missing EVAS_PMAPS
+ * CONFIGURE: added pthreads query, corrected config_query to
+ config_query_option
+ * DEPENDS: corrected changed switches, changed some depends to
optional
+ added optional depends
+
2011-11-03 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.0.1




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

Archive powered by MHonArc 2.6.24.

Top of Page