evas: introduce 1.0.0

* evas_svn is now D_P -1

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

5 files changed, 123 insertions, 161 deletions

diff --git a/recipes/efl1/evas-native_svn.bb b/recipes/efl1/evas-native_svn.bb
deleted file mode 100644
index c587c1260d..0000000000
--- a/recipes/efl1/evas-native_svn.bb
+++ /dev/null
@@ -1,65 +0,0 @@
-require evas.inc
-inherit native
-DEPENDS = "freetype-native libxext-native libpng-native jpeg-native eet-native eina-native libfribidi-native"
-PACKAGES_DYNAMIC = ""
-PR = "r4"
-
-EXTRA_OECONF = "\
-		--x-includes=${STAGING_INCDIR}/X11  \
-		--x-libraries=${STAGING_LIBDIR} \
-		--enable-evas-magic-debug \
-		\
-		--enable-fb				\
-		--disable-directfb			\
-		--disable-sdl				\
-		--enable-buffer				\
-		--disable-software-ddraw	\
-		--disable-software-qtopia	\
-		--disable-software-x11		\
-		--disable-software-16-x11	\
-		--disable-software-xcb		\
-		--disable-gl-x11			\
-		--disable-xrender-x11		\
-		--disable-xrender-xcb		\
-		--disable-glitz-x11			\
-		--enable-image-loader-eet	\
-		--disable-image-loader-edb	\
-		--disable-image-loader-gif	\
-		--enable-image-loader-png	\
-		--enable-image-loader-jpeg	\
-		--enable-image-loader-tiff	\
-		--enable-image-loader-xpm	\
-		--disable-image-loader-svg	\
-		--enable-cpu-c				\
-		--enable-fontconfig			\
-		--enable-font-loader-eet	\
-		--enable-scale-sample		\
-		--enable-scale-smooth		\
-		--enable-convert-yuv		\
-		--enable-small-dither-mask	\
-		--disable-no-dither-mask	\
-		--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	\
-		--disable-convert-32-rgbx-8888	\
-		--disable-convert-32-bgr-8888	\
-		--disable-convert-32-bgrx-8888	\
-		--disable-convert-32-rgb-rot-0	\
-		--disable-convert-32-rgb-rot-90	\
-		--disable-convert-32-rgb-rot-270"
-
-
diff --git a/recipes/efl1/evas.inc b/recipes/efl1/evas.inc
index d8454980af..eb64d7a060 100644
--- a/recipes/efl1/evas.inc
+++ b/recipes/efl1/evas.inc
@@ -2,18 +2,13 @@ DESCRIPTION = "Evas is the Enlightenment canvas API"
 LICENSE = "MIT BSD"
 # can also depend on valgrind, libsdl-x11, directfb
 DEPENDS = "librsvg eina eet freetype jpeg libpng virtual/libx11 libxext libxrender fontconfig libfribidi giflib"
-SRCREV = "${EFL_SRCREV}"
-PV = "0.9.9.060+svnr${SRCPV}"
-PR = "r1"
-
-
-# disable thumb mode for arm
-ARM_INSTRUCTION_SET = "arm"
+DEPENDS_virtclass-native = "freetype-native libxext-native libpng-native jpeg-native eet-native eina-native libfribidi-native"
 
 inherit efl
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
-EXTRA_OECONF = "<override me>"
+BBCLASSEXTEND = "native"
+INC_PR = "r0"
+FILESPATHPKG =. "${BPN}-${PV}:${BPN}:"
 
 python populate_packages_prepend () {
         for plugin_type in "engines loaders savers".split():
@@ -33,9 +28,10 @@ do_install_append() {
 FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
 FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
 
+PACKAGES_DYNAMIC_virtclass-native = ""
 PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-*"
 
-RRECOMMENDS_${PN} = "\
+RRECOMMENDS_${PN} = " \
   evas-engine-buffer \
   evas-engine-fb \
   evas-engine-software-generic \
@@ -43,7 +39,7 @@ RRECOMMENDS_${PN} = "\
   evas-engine-software-16 \
   evas-engine-software-16-x11 \
   evas-engine-xrender-x11 \
-  \
+ \
   evas-loader-png \
   evas-loader-jpeg \
   evas-loader-eet \
@@ -78,9 +74,107 @@ RREPLACES_evas-engine-buffer = "liblibevas-ver-pre-svn-00-engine-buffer libevas-
 RREPLACES_evas-engine-xrender-x11 = "liblibevas-ver-pre-svn-00-engine-xrender-x11 libevas-ver-pre-svn-00-engine-xrender-x11 "
 RREPLACES_evas-engine-software-x11 = "liblibevas-ver-pre-svn-00-engine-software-x11 libevas-ver-pre-svn-00-engine-software-x11 "
 
-
-
 # disabling this, since (due to OE bugs) it drags in whole Gtk+
-#RRECOMMENDS_${PN} += "\
+#RRECOMMENDS_${PN} += " \
 #  libevas-loader-svg \
 #"
+
+EVAS_CPU_TWEAKS = ""
+# Disabled for now, see http://thread.gmane.org/gmane.comp.window-managers.enlightenment.devel/25194
+#EVAS_CPU_TWEAKS_armv7a = "--enable-cpu-neon"
+
+# common options
+EVAS_OECONF = " \
+                --x-includes=${STAGING_INCDIR}/X11 \
+                --x-libraries=${STAGING_LIBDIR} \
+                --enable-evas-magic-debug \
+                --enable-fb \
+                --disable-directfb \
+                --disable-sdl \
+                --enable-buffer \
+                --disable-software-ddraw \
+                --disable-software-qtopia \
+                --disable-software-xcb \
+                --disable-xrender-xcb \
+                --disable-glitz-x11 \
+                --enable-image-loader-eet \
+                --disable-image-loader-edb \
+                --enable-image-loader-png \
+                --enable-image-loader-jpeg \
+                --enable-image-loader-tiff \
+                --enable-image-loader-xpm \
+                --enable-cpu-c \
+                --enable-fontconfig \
+                --enable-font-loader-eet \
+                --enable-scale-sample \
+                --enable-scale-smooth \
+                --enable-convert-yuv \
+                --enable-small-dither-mask \
+                --disable-no-dither-mask \
+                --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 \
+                --enable-convert-16-rgb-rot-90 \
+                --disable-convert-16-rgb-rot-180 \
+                --enable-convert-16-rgb-rot-270 \
+                ${EVAS_CPU_TWEAKS} \
+"
+
+# either sgx or 6410 atm
+GLES ?= "sgx"
+
+# This is a hack to get openGL|ES 2.x support enabled for people that have the SDK headers in staging.
+# We put this in the main recipe, since it will just not build the gl stuff when the headers are missing
+
+# If the above sentence confuse you: everything is built and configured as before if you don't have the SDK
+
+EXTRA_OECONF = "${EVAS_OECONF} \
+                --enable-pthreads \
+                --enable-async-events \
+                --enable-async-preload \
+                --enable-simple-x11 \
+                --enable-software-x11 \
+                --enable-xrender-x11 \
+                --enable-software-16-x11 \
+                --enable-image-loader-gif \
+                --enable-image-loader-svg \
+                --enable-convert-24-rgb-888 \
+                --enable-convert-24-bgr-888 \
+                --enable-convert-32-rgb-8888 \
+                --enable-convert-32-rgbx-8888 \
+                --enable-convert-32-bgr-8888 \
+                --enable-convert-32-bgrx-8888 \
+                --enable-convert-32-rgb-rot-0 \
+                --enable-convert-32-rgb-rot-90 \
+                --disable-convert-32-rgb-rot-180 \
+                --enable-convert-32-rgb-rot-270 \
+                --enable-gl-x11 \
+                --enable-gl-flavor-gles \
+                --enable-gles-variety-${GLES} \
+"
+EXTRA_OECONF_virtclass-native = "${EVAS_OECONF} \
+                --disable-software-x11 \
+                --disable-software-16-x11 \
+                --disable-gl-x11 \
+                --disable-xrender-x11 \
+                --disable-image-loader-gif \
+                --disable-image-loader-svg \
+                --disable-convert-24-rgb-888 \
+                --disable-convert-24-bgr-888 \
+                --disable-convert-32-rgb-8888 \
+                --disable-convert-32-rgbx-8888 \
+                --disable-convert-32-bgr-8888 \
+                --disable-convert-32-bgrx-8888 \
+                --disable-convert-32-rgb-rot-0 \
+                --disable-convert-32-rgb-rot-90 \
+                --disable-convert-32-rgb-rot-270 \
+"
diff --git a/recipes/efl1/evas/.mtn2git_empty b/recipes/efl1/evas/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/recipes/efl1/evas/.mtn2git_empty
+++ /dev/null
diff --git a/recipes/efl1/evas_1.0.0.bb b/recipes/efl1/evas_1.0.0.bb
new file mode 100644
index 0000000000..2460fa34f2
--- /dev/null
+++ b/recipes/efl1/evas_1.0.0.bb
@@ -0,0 +1,10 @@
+require evas.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
+"
+
+SRC_URI[md5sum] = "8bcea881d472d526367f5280df4060a2"
+SRC_URI[sha256sum] = "129d460f314fec43b2c5aad6c5f81e2797bca5e255f4b333b3d0b7b9ef81c4b0"
diff --git a/recipes/efl1/evas_svn.bb b/recipes/efl1/evas_svn.bb
index c93bc84c4e..3712760490 100644
--- a/recipes/efl1/evas_svn.bb
+++ b/recipes/efl1/evas_svn.bb
@@ -1,88 +1,11 @@
 require evas.inc
 
+SRCREV = "${EFL_SRCREV}"
+PV = "1.0.999+svnr${SRCPV}"
+PR = "${INC_PR}.0"
+DEFAULT_PREFERENCE = "-1"
+
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep \
 "
 S = "${WORKDIR}/${SRCNAME}"
-PR = "r8"
-
-EVAS_CPU_TWEAKS = ""
-# Disabled for now, see http://thread.gmane.org/gmane.comp.window-managers.enlightenment.devel/25194
-#EVAS_CPU_TWEAKS_armv7a = "--enable-cpu-neon"
-
-EXTRA_OECONF = "\
-		--x-includes=${STAGING_INCDIR}/X11  \
-		--x-libraries=${STAGING_LIBDIR} \
-		--enable-evas-magic-debug \
-		--enable-pthreads \
-		--enable-async-events \
-		--enable-async-preload \
-		--enable-fb					\
-		--disable-directfb			\
-		--disable-sdl				\
-		--enable-buffer				\
-		--disable-software-ddraw	\
-		--disable-software-qtopia	\
-		--enable-simple-x11		\
-		--enable-software-x11		\
-		--enable-software-16-x11	\
-		--disable-software-xcb		\
-		--enable-xrender-x11		\
-		--disable-xrender-xcb		\
-		--disable-glitz-x11			\
-		--enable-image-loader-eet	\
-		--disable-image-loader-edb	\
-		--enable-image-loader-gif	\
-		--enable-image-loader-png	\
-		--enable-image-loader-jpeg	\
-		--enable-image-loader-tiff	\
-		--enable-image-loader-xpm	\
-		--enable-image-loader-svg	\
-		--enable-cpu-c				\
-		--enable-fontconfig			\
-		--enable-font-loader-eet	\
-		--enable-scale-sample		\
-		--enable-scale-smooth		\
-		--enable-convert-yuv		\
-		--enable-small-dither-mask	\
-		--disable-no-dither-mask	\
-		--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	\
-		--enable-convert-16-rgb-rot-90	\
-		--disable-convert-16-rgb-rot-180 \
-		--enable-convert-16-rgb-rot-270	\
-		--enable-convert-24-rgb-888	\
-		--enable-convert-24-bgr-888	\
-		--enable-convert-32-rgb-8888	\
-		--enable-convert-32-rgbx-8888	\
-		--enable-convert-32-bgr-8888	\
-		--enable-convert-32-bgrx-8888	\
-		--enable-convert-32-rgb-rot-0	\
-		--enable-convert-32-rgb-rot-90	\
-		--disable-convert-32-rgb-rot-180 \
-		--enable-convert-32-rgb-rot-270 \
-		${EVAS_CPU_TWEAKS}"
-
-
-# either sgx or 6410 atm
-GLES ?= "sgx"
-
-# This is a hack to get openGL|ES 2.x support enabled for people that have the SDK headers in staging.
-# We put this in the main recipe, since it will just not build the gl stuff when the headers are missing
-
-# If the above sentence confuse you: everything is built and configured as before if you don't have the SDK
-
-EXTRA_OECONF += "\
-        --enable-gl-x11 --enable-gl-flavor-gles --enable-gles-variety-${GLES} \
-"
-