efl: merge with Mamona

22 files changed, 50 insertions, 31 deletions

diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc
index 6175c605c0..84c0b90c29 100644
--- a/packages/efl1/ecore.inc
+++ b/packages/efl1/ecore.inc
@@ -5,7 +5,7 @@ DEPENDS = "curl eet evas tslib"
 # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv"
 PV = "0.9.9.042+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
 
 SRC_URI += "file://fix-directfb-include.patch;patch=1"
 
diff --git a/packages/efl1/edb_cvs.bb b/packages/efl1/edb_cvs.bb
index 97dafb3931..8ad9c361a0 100644
--- a/packages/efl1/edb_cvs.bb
+++ b/packages/efl1/edb_cvs.bb
@@ -3,4 +3,4 @@ LICENSE = "MIT BSD"
 DEPENDS = "zlib"
 PV = "1.0.5.042+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb
index feb940f4ec..0a4e04e558 100644
--- a/packages/efl1/edbus_cvs.bb
+++ b/packages/efl1/edbus_cvs.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 PV = "0.1.0.042+cvs${SRCDATE}"
 PR = "r3"
 
-inherit efl_library
+inherit efl
 
 SRC_URI = "${E_CVS};module=e17/libs/e_dbus"
 S = "${WORKDIR}/e_dbus"
diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_cvs.bb
index e930fc4795..d0a1848c93 100644
--- a/packages/efl1/edje_cvs.bb
+++ b/packages/efl1/edje_cvs.bb
@@ -2,9 +2,13 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
 DEPENDS = "eet evas ecore embryo edje-native"
 LICENSE = "MIT BSD"
 PV = "0.5.0.042+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
-inherit efl_library
+inherit efl
 
-PACKAGES =+ "${PN}-tools"
-FILES_${PN}-tools = "${bindir}/edje_*"
+PACKAGES =+ "${PN}-utils"
+DEBIAN_NOAUTONAME_${PN}-utils = "1"
+FILES_${PN}-utils = "\
+  ${bindir}/edje_* \
+  ${datadir}/edje/include/edje.inc \
+"
diff --git a/packages/efl1/eet_cvs.bb b/packages/efl1/eet_cvs.bb
index 370b385bf8..c834cfa60a 100644
--- a/packages/efl1/eet_cvs.bb
+++ b/packages/efl1/eet_cvs.bb
@@ -4,4 +4,4 @@ LICENSE = "MIT BSD"
 PV = "0.9.10.042+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/eflpp_cvs.bb b/packages/efl1/eflpp_cvs.bb
index ce01d89112..19db2ef41e 100644
--- a/packages/efl1/eflpp_cvs.bb
+++ b/packages/efl1/eflpp_cvs.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 DEPENDS = "evas ecore edje emotion esmart etk ewl libsigc++-2.0"
 PV = "0.1.0+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
diff --git a/packages/efl1/efreet_cvs.bb b/packages/efl1/efreet_cvs.bb
index a1a027fc8f..3087391312 100644
--- a/packages/efl1/efreet_cvs.bb
+++ b/packages/efl1/efreet_cvs.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 PV = "0.0.3.042+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
 
 PACKAGES =+ "${PN}-mime"
 FILES_${PN}-mime = "${libdir}/libefreet_mime.so.*"
diff --git a/packages/efl1/embryo_cvs.bb b/packages/efl1/embryo_cvs.bb
index 2f5ab176ce..6befb0c065 100644
--- a/packages/efl1/embryo_cvs.bb
+++ b/packages/efl1/embryo_cvs.bb
@@ -1,6 +1,9 @@
 DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
 LICENSE = "MIT BSD"
 PV = "0.9.1.042+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
-inherit efl_library
+inherit efl
+
+# HACK alert: When compiling for VFP embryo emits bugs -- maybe gcc bug
+#FULL_OPTIMIZATION_arm =+ "-O0"
diff --git a/packages/efl1/emotion_cvs.bb b/packages/efl1/emotion_cvs.bb
index 7ee7c384d6..826f201779 100644
--- a/packages/efl1/emotion_cvs.bb
+++ b/packages/efl1/emotion_cvs.bb
@@ -5,7 +5,7 @@ DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base"
 PV = "0.1.0+cvs${SRCDATE}"
 PR = "r1"
 
-inherit efl_library
+inherit efl
 
 EXTRA_OECONF = "--disable-xine --enable-gstreamer"
 
diff --git a/packages/efl1/engrave_cvs.bb b/packages/efl1/engrave_cvs.bb
index 689e254fc1..ec39189410 100644
--- a/packages/efl1/engrave_cvs.bb
+++ b/packages/efl1/engrave_cvs.bb
@@ -4,4 +4,4 @@ LICENSE = "MIT"
 DEPENDS = "evas ecore"
 PV = "0.0.0+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/enhance_cvs.bb b/packages/efl1/enhance_cvs.bb
index 728beb61ec..8c73fbe1d8 100644
--- a/packages/efl1/enhance_cvs.bb
+++ b/packages/efl1/enhance_cvs.bb
@@ -3,4 +3,4 @@ LICENSE = "MIT"
 DEPENDS = "exml"
 PV = "0.0.0+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/epdf_cvs.bb b/packages/efl1/epdf_cvs.bb
index fa4f4282e1..e48c36606e 100644
--- a/packages/efl1/epdf_cvs.bb
+++ b/packages/efl1/epdf_cvs.bb
@@ -4,7 +4,7 @@ DEPENDS = "poppler evas ecore etk ewl"
 PV = "0.1.0+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
 
 SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME} \
            file://fix-plugin-path-check.patch;HACK=1;patch=1"
diff --git a/packages/efl1/epeg_cvs.bb b/packages/efl1/epeg_cvs.bb
index 3991dd3d21..16d1c333a9 100644
--- a/packages/efl1/epeg_cvs.bb
+++ b/packages/efl1/epeg_cvs.bb
@@ -4,4 +4,4 @@ DEPENDS = "jpeg"
 PV = "0.9.0+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/epsilon_cvs.bb b/packages/efl1/epsilon_cvs.bb
index 4674e1913c..0c12621d33 100644
--- a/packages/efl1/epsilon_cvs.bb
+++ b/packages/efl1/epsilon_cvs.bb
@@ -6,7 +6,7 @@ DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native"
 PV = "0.3.0.012+cvs${SRCDATE}"
 PR = "r1"
 
-inherit efl_library
+inherit efl
 
 SRC_URI += "file://fix_alignment_error.patch;patch=1"
 
diff --git a/packages/efl1/esmart_cvs.bb b/packages/efl1/esmart_cvs.bb
index fa35d60d30..6cdae5754d 100644
--- a/packages/efl1/esmart_cvs.bb
+++ b/packages/efl1/esmart_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT BSD"
 DEPENDS = "evas ecore edje imlib2 epsilon libtool"
 PV = "0.9.0.042+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
diff --git a/packages/efl1/etk-native_cvs.bb b/packages/efl1/etk-native_cvs.bb
index 6770be4ab3..eedb832141 100644
--- a/packages/efl1/etk-native_cvs.bb
+++ b/packages/efl1/etk-native_cvs.bb
@@ -3,8 +3,3 @@ inherit native
 DEPENDS = "evas-native ecore-native edje-native"
 
 SRC_URI += "file://no-tests.patch;patch=1"
-
-do_stage_append() {
-	mv ${STAGING_DIR}/include/etk ${STAGING_INCDIR}
-}
-
diff --git a/packages/efl1/etk_cvs.bb b/packages/efl1/etk_cvs.bb
index 90df74e61c..a39129fc69 100644
--- a/packages/efl1/etk_cvs.bb
+++ b/packages/efl1/etk_cvs.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 PV = "0.1.0.042+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
 
 # TODO package engines seperatly (do_split_packages)
 
@@ -16,3 +16,21 @@ FILES_${PN}-dev += "${libdir}/etk/engines/*.a ${libdir}/etk/engines/*.la"
 FILES_${PN}-dbg += "${libdir}/etk/engines/.debug/"
 
 RRECOMMENDS_${PN} = "${PN}-engines"
+
+PACKAGES += "etk-engines-software-x11"
+FILES_${PN}-engines-software-x11 = "${libdir}/etk/engines/ecore_evas_software_x11.so"
+
+#PACKAGES =+ "etk-engines-gl-x11"
+#FILES_${PN}-engines-gl-x11 = "${libdir}/etk/engines/ecore_evas_gl_x11.so"
+
+PACKAGES =+ "etk-engines-evas"
+FILES_${PN}-engines-evas = "${libdir}/etk/engines/ecore_evas.so"
+
+PACKAGES =+ "etk-engines-fb"
+FILES_${PN}-engines-fb = "${libdir}/etk/engines/ecore_fb.so"
+
+PACKAGES =+ "etk-engines-x11"
+FILES_${PN}-engines-x11 = "${libdir}/etk/engines/ecore_evas_x11.so"
+
+PACKAGES =+ "etk-engines-software-x11-16"
+FILES_${PN}-engines-software-x11-16 = "${libdir}/etk/engines/ecore_evas_software_x11_16.so"
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index 77ec2db308..e4779d5b44 100644
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender"
 PV = "0.9.9.042+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
 EXTRA_OECONF = "<override me>"
@@ -26,7 +26,6 @@ do_install_append() {
 
 FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
 FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
-FILES_${PN} = "${libdir}/libevas*.so*"
 
 PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*"
 
diff --git a/packages/efl1/evolve_cvs.bb b/packages/efl1/evolve_cvs.bb
index 272d90002e..02706eb978 100644
--- a/packages/efl1/evolve_cvs.bb
+++ b/packages/efl1/evolve_cvs.bb
@@ -3,4 +3,4 @@ LICENSE = "MIT"
 DEPENDS = "etk evolve-native"
 PV = "0.0.0+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_cvs.bb
index 15a777df67..eb00215891 100644
--- a/packages/efl1/ewl_cvs.bb
+++ b/packages/efl1/ewl_cvs.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 PV = "0.5.2.042+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
 
 EXTRA_OECONF = "\
   --enable-software-x11 \
diff --git a/packages/efl1/exml_cvs.bb b/packages/efl1/exml_cvs.bb
index b94af05833..d63fa056bb 100644
--- a/packages/efl1/exml_cvs.bb
+++ b/packages/efl1/exml_cvs.bb
@@ -3,5 +3,5 @@ LICENSE = "MIT"
 DEPENDS = "libxml2 libxslt ecore"
 PV = "0.1.1+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
 
diff --git a/packages/efl1/imlib2_cvs.bb b/packages/efl1/imlib2_cvs.bb
index e17f3c04c1..c1d1f72791 100644
--- a/packages/efl1/imlib2_cvs.bb
+++ b/packages/efl1/imlib2_cvs.bb
@@ -5,7 +5,7 @@ DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
 PV = "1.4.1.000+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
 
 SRC_URI += "file://remove-local-includes.patch;patch=1"