Updates to the evas builds.

BKrev: 40b586f60inTr32jmBDz_k1k3WX8fg

diff --git a/evas/evas/flags.patch b/evas/evas/flags.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/evas/evas_1.0.0-pre5.oe b/evas/evas_1.0.0-pre5.oe
index c890a5e..ff940e7 100644 (file)
--- a/evas/evas_1.0.0-pre5.oe
+++ b/evas/evas_1.0.0-pre5.oe
@@ -1,16 +1,18 @@
-DEPENDS = "virtual/libc libpng jpeg freetype"
-DESCRIPTION = "Evas is a hardware-accelerated canvas API \
-that can draw anti-aliased text, smooth super and sub-sampled \
-images, alpha-blend, as well as drop down to using normal X11 \
-primitives such as pixmaps, lines and rectangles for speed \
-if your CPU or graphics hardware are too slow."
+DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw \
+anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
+down to using normal X11 primitives such as pixmaps, lines and rectangles if \
+your CPU or graphics hardware are too slow."
+HOMEPAGE = "http://www.enlightenment.org"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libpng jpeg freetype"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/enlightenment/evas-1.0.0_pre5.tar.gz \
            file://configure.patch;patch=1 \
            file://pkg.m4"
 S = "${WORKDIR}/evas-1.0.0_pre5"
 
-inherit autotools 
+inherit autotools pkgconfig
 
 EXTRA_OECONF = "--enable-fb \
                --enable-image-loader-png \
@@ -22,7 +24,30 @@ EXTRA_OECONF = "--enable-fb \
                --enable-convert-16-rgb-ipq \
                --enable-convert-16-rgb-rot-0 \
                --enable-convert-16-rgb-rot-270"
+export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config"
 
-do_configure_prepend () {
-       cp ${WORKDIR}/pkg.m4 acinclude.m4
+do_configure () {
+       install -m 0644 ${WORKDIR}/pkg.m4 acinclude.m4
+       autotools_do_configure
+}
+
+headers = "Evas_Engine_Buffer.h \
+           Evas_Engine_DirectFB.h \
+           Evas_Engine_FB.h \
+           Evas_Engine_GL_X11.h \
+           Evas_Engine_Software_Qtopia.h \
+           Evas_Engine_Software_Win32_GDI.h \
+           Evas_Engine_Software_X11.h \
+           Evas.h"
+
+do_stage () {
+       for i in ${headers}; do
+               install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
+       done
+       oe_libinstall -C src libevas ${STAGING_LIBDIR}/
+       cat evas-config | sed -e 's,/usr/include,${STAGING_INCDIR},g; \
+                                     s,/usr/lib,${STAGING_LIBDIR},g; \
+                                     s,/usr/bin,${STAGING_BINDIR},g; \
+                                     s,/usr,${STAGING_LIBDIR}/..,g;' > ${STAGING_BINDIR}/evas-config
+       chmod u+x ${STAGING_BINDIR}/evas-config
 }

diff --git a/evas/evas_cvs.oe b/evas/evas_cvs.oe
index 2ae9dde..8e5f476 100644 (file)
--- a/evas/evas_cvs.oe
+++ b/evas/evas_cvs.oe
@@ -1,47 +1,49 @@
-DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw anti-aliased text, smooth super and sub-sampled \
-images, alpha-blend, as well as drop down to using normal X11 primitives such as pixmaps, lines and rectangles for speed \
-if your CPU or graphics hardware are too slow."
+DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw \
+anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
+down to using normal X11 primitives such as pixmaps, lines and rectangles if \
+your CPU or graphics hardware are too slow."
 HOMEPAGE = "http://www.enlightenment.org"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "libpng jpeg freetype"
-PV = "1.0.0-cvs-${CVSDATE}"
+PV = "${CVSDATE}"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/evas;date=${CVSDATE} \
+           file://flags.patch;patch=1 \
            file://pkg.m4"
 S = "${WORKDIR}/evas"
 
-inherit autotools 
+inherit autotools pkgconfig
 
-EXTRA_OECONF = "--enable-fb \
+EXTRA_OECONF = "--enable-fb                    \
                --disable-directfb              \
                --disable-buffer                \
                --disable-software-qtopia       \
                --disable-gl-x11                \
                --disable-image-loader-eet      \
                --disable-image-loader-edb      \
-               --enable-image-loader-png       \
-               --enable-image-loader-jpeg      \
-               --enable-small-dither-mask      \
-               --enable-cpu-c                  \
+               --enable-image-loader-png       \
+               --enable-image-loader-jpeg      \
+               --enable-small-dither-mask      \
+               --enable-cpu-c                  \
                --disable-font-loader-eet       \
-               --enable-scale-sample           \
+               --enable-scale-sample           \
                --enable-scale-smooth           \
                --enable-convert-yuv            \
-               --disable-convert-8-rgb-332     \
-               --disable-convert-8-rgb-666     \
-               --disable-convert-8-rgb-232     \
-               --disable-convert-8-rgb-222     \
-               --disable-convert-8-rgb-221     \
-               --disable-convert-8-rgb-121     \
-               --disable-convert-8-rgb-111     \
-               --enable-convert-16-rgb-565     \
-               --disable-convert-16-rgb-555    \
-               --disable-convert-16-rgb-444    \
-               --disable-convert-16-rgb-ipq    \
-               --enable-convert-16-rgb-rot-0   \
-               --disable-convert-16-rgb-rot-90 \
-               --enable-convert-16-rgb-rot-270 \
+               --disable-convert-8-rgb-332     \
+               --disable-convert-8-rgb-666     \
+               --disable-convert-8-rgb-232     \
+               --disable-convert-8-rgb-222     \
+               --disable-convert-8-rgb-221     \
+               --disable-convert-8-rgb-121     \
+               --disable-convert-8-rgb-111     \
+               --enable-convert-16-rgb-565     \
+               --disable-convert-16-rgb-555    \
+               --disable-convert-16-rgb-444    \
+               --disable-convert-16-rgb-ipq    \
+               --enable-convert-16-rgb-rot-0   \
+               --disable-convert-16-rgb-rot-90 \
+               --enable-convert-16-rgb-rot-270 \
                --disable-convert-24-rgb-888    \
                --disable-convert-24-bgr-888    \
                --disable-convert-32-rgb-8888   \
@@ -51,7 +53,30 @@ EXTRA_OECONF = "--enable-fb \
                --disable-convert-32-rgb-rot-0  \
                --disable-convert-32-rgb-rot-90 \
                --disable-convert-32-rgb-rot-270"
+export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config"
 
-do_configure_prepend () {
+do_configure () {
        install -m 0644 ${WORKDIR}/pkg.m4 acinclude.m4
+       autotools_do_configure
+}
+
+headers = "Evas_Engine_Buffer.h \
+           Evas_Engine_DirectFB.h \
+           Evas_Engine_FB.h \
+           Evas_Engine_GL_X11.h \
+           Evas_Engine_Software_Qtopia.h \
+           Evas_Engine_Software_Win32_GDI.h \
+           Evas_Engine_Software_X11.h \
+           Evas.h"
+
+do_stage () {
+       for i in ${headers}; do
+               install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
+       done
+       oe_libinstall -C src libevas ${STAGING_LIBDIR}/
+       cat evas-config | sed -e 's,/usr/include,${STAGING_INCDIR},g; \
+                                     s,/usr/lib,${STAGING_LIBDIR},g; \
+                                     s,/usr/bin,${STAGING_BINDIR},g; \
+                                     s,/usr,${STAGING_LIBDIR}/..,g;' > ${STAGING_BINDIR}/evas-config
+       chmod u+x ${STAGING_BINDIR}/evas-config
 }