expedite, evas: don't turn of the GL engine forcefully

3 files changed, 28 insertions, 11 deletions

diff --git a/recipes/e17/expedite_svn.bb b/recipes/e17/expedite_svn.bb
index c4dfa5afed..2bcc6d9877 100644
--- a/recipes/e17/expedite_svn.bb
+++ b/recipes/e17/expedite_svn.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas"
 DEPENDS = "eet evas"
-RDEPENDS = "evas-engine-buffer evas-engine-fb evas-engine-software-generic evas-engine-software-x11 evas-loader-png"
+RDEPENDS = "expedite-themes evas-engine-buffer evas-engine-fb evas-engine-software-generic evas-engine-software-x11 evas-loader-png"
 LICENSE = "MIT BSD"
 PV = "0.6.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r3"
 
 inherit e
 
@@ -13,7 +13,6 @@ EXTRA_OECONF = "\
   --enable-simple-x11 \
 \
   --disable-opengl-glew \
-  --disable-opengl-x11 \
   --enable-software-x11 \
   --enable-xrender-x11 \
   --enable-software-16-x11 \
diff --git a/recipes/efl1/evas.inc b/recipes/efl1/evas.inc
index 55774ee7ad..833d38f240 100644
--- a/recipes/efl1/evas.inc
+++ b/recipes/efl1/evas.inc
@@ -29,12 +29,12 @@ do_install_append() {
     find "${D}" -name .debug -type d -exec rm -rf {} \;
 }
 
-FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
-FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
+FILES_${SRCNAME}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
+FILES_${SRCNAME}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
 
 PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-*"
 
-RRECOMMENDS_${PN} = "\
+RRECOMMENDS_${SRCNAME} = "\
   evas-engine-buffer \
   evas-engine-fb \
   evas-engine-software-generic \
@@ -51,9 +51,9 @@ RRECOMMENDS_${PN} = "\
 # Some upgrade path tweaking
 AUTO_LIBNAME_PKGS = ""
 
-RREPLACES_${PN} = "libevas-ver-pre-svn-00-0 libevas-ver-pre-svn-01-0"
+RREPLACES_${SRCNAME} = "libevas-ver-pre-svn-00-0 libevas-ver-pre-svn-01-0"
 
-RREPLACES_${PN}-tests = "libevas-ver-pre-svn-00-tests libevas-ver-pre-svn-01-tests"
+RREPLACES_${SRCNAME}-tests = "libevas-ver-pre-svn-00-tests libevas-ver-pre-svn-01-tests"
 
 RREPLACES_evas-loader-pmaps = "liblibevas-ver-pre-svn-00-loader-pmaps libevas-ver-pre-svn-00-loader-pmaps "
 RREPLACES_evas-loader-eet = "liblibevas-ver-pre-svn-00-loader-eet libevas-ver-pre-svn-00-loader-eet "
@@ -79,6 +79,6 @@ RREPLACES_evas-engine-software-x11 = "liblibevas-ver-pre-svn-00-engine-software-
 
 
 # disabling this, since (due to OE bugs) it drags in whole Gtk+
-#RRECOMMENDS_${PN} += "\
+#RRECOMMENDS_${SRCNAME} += "\
 #  libevas-loader-svg \
 #"
diff --git a/recipes/efl1/evas_svn.bb b/recipes/efl1/evas_svn.bb
index f84bd48f7a..21779818ca 100644
--- a/recipes/efl1/evas_svn.bb
+++ b/recipes/efl1/evas_svn.bb
@@ -1,5 +1,8 @@
 require evas.inc
-PR = "r3"
+PR = "r4"
+
+EVAS_CPU_TWEAKS = ""
+EVAS_CPU_TWEAKS_armv7a = "--enable-cpu-neon"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
@@ -60,4 +63,19 @@ EXTRA_OECONF = "\
 		--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-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} \
+"
+