Update to EFL 1.0-beta release
authorMarc Andre Tanner <mat@brain-dump.org>
Mon, 4 Oct 2010 16:17:05 +0000 (4 18:17 +0200)
committerMarc Andre Tanner <mat@brain-dump.org>
Mon, 4 Oct 2010 16:17:05 +0000 (4 18:17 +0200)
Signed-off-by: Marc Andre Tanner <mat@brain-dump.org>
download.sh
sources/patches/ecore-fix-build-without-X.patch [new file with mode: 0644]
sources/patches/ecore-use-isfinite-instead-of-finite.patch
sources/patches/eina-calculate-size-of-wchar_t-based-on-wchar.h-not-.patch [new file with mode: 0644]
sources/sections/ecore.sh
sources/sections/eina.sh
sources/sections/evas.sh

index 653c13d..9155d1e 100755 (executable)
@@ -53,16 +53,16 @@ URL=http://download.savannah.gnu.org/releases/freetype/freetype-2.4.2.tar.bz2 \
 SHA1=cc257ceda2950b8c80950d780ccf3ce665a815d1 \
 download || dienow
 
-URL=http://download.enlightenment.org/snapshots/2009-12-02/eina-0.9.9.063.tar.bz2 \
-SHA1=574a405bec4ea60e5f2c7e28684e5d30ae42bf92 \
+URL=http://download.enlightenment.org/releases/eina-1.0.0.beta.tar.bz2 \
+SHA1=a02474ae627f3a20cae5439f39c631c0447ae7d5 \
 download || dienow
 
-URL=http://download.enlightenment.org/snapshots/2009-12-02/evas-0.9.9.063.tar.bz2 \
-SHA1=40ff48de8f716e84440e267219a9df8afa9c9f88 \
+URL=http://download.enlightenment.org/releases/evas-1.0.0.beta.tar.bz2 \
+SHA1=0bdef4fdeb3a0a787771f8ac044e2354a1937214 \
 download || dienow
 
-URL=http://download.enlightenment.org/snapshots/2009-12-02/ecore-0.9.9.063.tar.bz2 \
-SHA1=c35a546e578c8bd59a1cdd349f67f58f37ada048 \
+URL=http://download.enlightenment.org/releases/ecore-1.0.0.beta.tar.bz2 \
+SHA1=57d9ed899f0581504d64583708de58da076d7d64 \
 download || dienow
 
 URL=http://matt.ucc.asn.au/dropbear/releases/dropbear-0.52.tar.bz2 \
diff --git a/sources/patches/ecore-fix-build-without-X.patch b/sources/patches/ecore-fix-build-without-X.patch
new file mode 100644 (file)
index 0000000..b882d18
--- /dev/null
@@ -0,0 +1,26 @@
+From 0b5455f594112eb9b912643c0ab4c10ae990546e Mon Sep 17 00:00:00 2001
+From: cedric <cedric@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
+Date: Mon, 4 Oct 2010 09:35:06 +0000
+Subject: [PATCH 1/2]   * ecore: fix build without X.
+
+git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@53015 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
+---
+ src/lib/ecore_evas/ecore_evas_x.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/ecore_evas/ecore_evas_x.c b/src/lib/ecore_evas/ecore_evas_x.c
+index 5f29678..393e6f1 100644
+--- a/src/lib/ecore_evas/ecore_evas_x.c
++++ b/src/lib/ecore_evas/ecore_evas_x.c
+@@ -4468,7 +4468,6 @@ ecore_evas_x11_leader_default_set(Ecore_Evas *ee)
+ #else
+    return;
+    ee = NULL;
+-   win = 0;
+-#endif   
++#endif
+ }
+-- 
+1.6.5
+
dissimilarity index 95%
index 67a6e8b..e81dc9a 100644 (file)
@@ -1,12 +1,26 @@
-diff -ruN ecore-r40853.orig/src/lib/ecore/ecore_main.c ecore-r40853/src/lib/ecore/ecore_main.c
---- ecore-r40853.orig/src/lib/ecore/ecore_main.c       2009-05-31 16:27:25.000000000 +0200
-+++ ecore-r40853/src/lib/ecore/ecore_main.c    2009-05-31 19:58:56.000000000 +0200
-@@ -337,7 +337,7 @@
-    Ecore_Fd_Handler *fdh;
-    t = NULL;
--   if ((!finite(timeout)) || (timeout == 0.0))  /* finite() tests for NaN, too big, too small, and infinity.  */
-+   if ((!isfinite(timeout)) || (timeout == 0.0))  /* finite() tests for NaN, too big, too small, and infinity.  */
-      {
-       tv.tv_sec = 0;
-       tv.tv_usec = 0;
+From 0b7a76b531f11f48a9ff1854f95f77e8f4212503 Mon Sep 17 00:00:00 2001
+From: Marc Andre Tanner <mat@brain-dump.org>
+Date: Mon, 4 Oct 2010 12:59:19 +0200
+Subject: [PATCH] ecore: replace finite with isfinite the latter is C99 and POSIX
+
+Signed-off-by: Marc Andre Tanner <mat@brain-dump.org>
+---
+ src/lib/ecore/ecore_main.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
+index de507da..a93d729 100644
+--- a/src/lib/ecore/ecore_main.c
++++ b/src/lib/ecore/ecore_main.c
+@@ -853,7 +853,7 @@ _ecore_main_select(double timeout)
+    int            ret;
+    t = NULL;
+-   if ((!finite(timeout)) || (timeout == 0.0)) /* finite() tests for NaN, too big, too small, and infinity.  */
++   if ((!isfinite(timeout)) || (timeout == 0.0)) /* isfinite() tests for NaN, too big, too small, and infinity.  */
+      {
+         tv.tv_sec = 0;
+         tv.tv_usec = 0;
+-- 
+1.6.5
+
diff --git a/sources/patches/eina-calculate-size-of-wchar_t-based-on-wchar.h-not-.patch b/sources/patches/eina-calculate-size-of-wchar_t-based-on-wchar.h-not-.patch
new file mode 100644 (file)
index 0000000..cebf14a
--- /dev/null
@@ -0,0 +1,26 @@
+From 113e476f330c74f83bb7dc496dcbb31c5c677338 Mon Sep 17 00:00:00 2001
+From: Marc Andre Tanner <mat@brain-dump.org>
+Date: Mon, 4 Oct 2010 14:56:45 +0200
+Subject: [PATCH] eina: calculate size of wchar_t based on wchar.h not stddef.h
+
+Signed-off-by: Marc Andre Tanner <mat@brain-dump.org>
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4ed3ee1..9e20360 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -302,7 +302,7 @@ AC_CHECK_HEADER([stdint.h],
+               [EINA_CONFIGURE_HAVE_STDINT_H="#define EINA_HAVE_STDINT_H"])
+ AC_SUBST(EINA_CONFIGURE_HAVE_STDINT_H)
+-AC_CHECK_SIZEOF(wchar_t)
++AC_CHECK_SIZEOF([wchar_t],[],[#include <wchar.h>])
+ EINA_SIZEOF_WCHAR_T=$ac_cv_sizeof_wchar_t
+ AC_SUBST(EINA_SIZEOF_WCHAR_T)
+-- 
+1.6.5
+
index 867acf8..e0777f0 100644 (file)
@@ -8,7 +8,6 @@ LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" ./configure $CROSS_CONFIGURE_FLAGS --prefix=
        --disable-ecore-x-xcb \
        --disable-atfile-source \
        --disable-ecore-con \
-       --disable-ecore-config \
        --disable-ecore-ipc \
        --disable-abstract-sockets \
        --disable-curl \
@@ -27,7 +26,6 @@ LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" ./configure $CROSS_CONFIGURE_FLAGS --prefix=
        --disable-ecore-evas-direct3d \
        --disable-ecore-evas-opengl-glew \
        --disable-ecore-evas-software-16-ddraw \
-       --disable-ecore-evas-quartz \
        --disable-ecore-evas-software-sdl \
        --disable-ecore-evas-directfb \
        --disable-ecore-evas-software-16-wince \
@@ -37,8 +35,6 @@ LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" ./configure $CROSS_CONFIGURE_FLAGS --prefix=
        --enable-ecore-evas-software-buffer \
        --enable-ecore-evas-fb \
        --enable-ecore-fb \
-       --disable-ecore-job \
-       --disable-ecore-txt \
        --disable-ecore-file && 
 make &&
 make DESTDIR="$STAGING_DIR" install || dienow
index b389cde..43dc92b 100644 (file)
@@ -11,14 +11,11 @@ LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" ./configure $CROSS_CONFIGURE_FLAGS --prefix=
        --disable-cpu-altivec \
        --disable-magic-debug \
        --disable-doc \
-       --disable-pthread \
        --disable-tests \
        --disable-benchmark \
-       --disable-fixed-bitmap \
        --disable-safety-checks \
        --disable-assert \
-       --disable-chained-pool \
-       --enable-pass-through=$ENABLE \
+       --disable-mempool-one-big \
        --enable-default-mempool \
        --with-internal-maximum-log-level=0 &&
 make &&
index a052e56..c758265 100644 (file)
@@ -7,19 +7,16 @@ setupfor evas
 LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" ./configure $CROSS_CONFIGURE_FLAGS --prefix=/usr \
        --enable-fb=$ENABLE \
        --disable-directfb \
-       --disable-sdl \
        --enable-buffer=$ENABLE \
        --disable-evas-cserve \
        --enable-static-software-generic \
        --disable-software-ddraw \
-       --disable-software-qtopia \
        --disable-software-xlib \
        --disable-software-16-x11 \
        --disable-software-xcb \
        --disable-gl-x11 \
        --disable-xrender-x11 \
        --disable-xrender-xcb \
-       --disable-glitz-x11 \
        --disable-image-loader-eet \
        --disable-image-loader-edb \
        --disable-image-loader-gif \
@@ -29,6 +26,13 @@ LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" ./configure $CROSS_CONFIGURE_FLAGS --prefix=
        --disable-image-loader-tiff \
        --disable-image-loader-xpm \
        --disable-image-loader-svg \
+       --disable-image-loader-bmp \
+       --disable-image-loader-tga \
+       --disable-pthreads \
+       --disable-pipe-render \
+       --disable-async-render \
+       --disable-async-events \
+       --disable-async-preload \
        --enable-cpu-c \
        --disable-evas-magic-debug \
        --disable-fontconfig \