efl: merge with Mamona

diff --git a/classes/efl.bbclass b/classes/efl.bbclass
new file mode 100644 (file)
index 0000000..eee28dd
--- /dev/null
+++ b/classes/efl.bbclass
@@ -0,0 +1,40 @@
+SECTION = "e/libs"
+HOMEPAGE = "http://www.enlightenment.org"
+LICENSE = "MIT BSD"
+SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
+SRC_URI = "${E_CVS};module=e17/libs/${SRCNAME}"
+S = "${WORKDIR}/${SRCNAME}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+       autotools_stage_all
+}
+
+PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-tests"
+
+FILES_${PN} = "${libdir}/*.so.*"
+
+FILES_${PN}-themes = "${datadir}/${PN}/themes \
+                      ${datadir}/${PN}/data \
+                      ${datadir}/${PN}/fonts \
+                      ${datadir}/${PN}/pointers \
+                      ${datadir}/${PN}/images \
+                      ${datadir}/${PN}/users \
+                      ${datadir}/${PN}/images \
+                      ${datadir}/${PN}/styles"
+
+FILES_${PN}-dev   += "${bindir}/${PN}-config \
+                      ${libdir}/pkgconfig/* \
+                      ${libdir}/lib*.la \
+                      ${libdir}/lib*.a \
+                      ${libdir}/*.so \
+                      ${libdir}/${PN}/*.a \
+                      ${libdir}/${PN}/*.la \
+                      ${libdir}/${PN}/*/*.a \
+                      ${libdir}/${PN}/*/*.la"
+
+FILES_${PN}-tests  = "${bindir}/${PN} \
+                      ${bindir}/*_* \
+                      ${datadir}"
+

diff --git a/classes/efl_base.bbclass b/classes/efl_base.bbclass
deleted file mode 100644 (file)
index 023b2ed..0000000
--- a/classes/efl_base.bbclass
+++ /dev/null
@@ -1,14 +0,0 @@
-inherit autotools pkgconfig
-
-SECTION = "e/libs"
-HOMEPAGE = "http://www.enlightenment.org"
-SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
-SRC_URI = "http://download.enlightenment.org/snapshots/2008-01-25/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-do_stage() {
-       autotools_stage_all
-}
-
-PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev"
-FILES_${PN}-dev += "${bindir}/${PN}-config ${libdir}/pkgconfig/* ${libdir}/lib*.?a ${libdir}/lib*.a"

diff --git a/classes/efl_library.bbclass b/classes/efl_library.bbclass
deleted file mode 100644 (file)
index c2b6938..0000000
--- a/classes/efl_library.bbclass
+++ /dev/null
@@ -1,9 +0,0 @@
-inherit efl_base
-
-SRC_URI = "${E_CVS};module=e17/libs/${SRCNAME}"
-S = "${WORKDIR}/${SRCNAME}"
-
-PACKAGES =+ "${PN}-tests"
-FILES_${PN}-tests = "${bindir}/${PN} ${bindir}/*_* ${datadir}"
-FILES_${PN}-dev += "${bindir}/*-config ${libdir}/${PN}/*.a ${libdir}/${PN}/*.la ${libdir}/${PN}/*/*.a ${libdir}/${PN}/*/*.la"
-FILES_${PN} = "${libdir}/*.so*"

diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index ae83f51473ffca3705173bb7b51bdcf294691c0c..13498ac7bca8ac2800e11a0fd2ffaf0c8053cc89 100644 (file)
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE = "20080311"
+EFL_SRCDATE = "20080321"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"

diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc
index 6175c605c0fb8776cf2ff374612c508bcec5daec..84c0b90c29ff1e337e22224198f6e6e96aae3990 100644 (file)
--- 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 97dafb3931eb7e505f2f0ebbe3024639dc80b36e..8ad9c361a059e80771432d2a9cf6e19680913609 100644 (file)
--- 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 feb940f4ec963d7270afe41de3dfbd295f17db1b..0a4e04e5582918175e093513c9f701051bce2e21 100644 (file)
--- 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 e930fc4795460f70a579080d6a8cd65772f5488c..d0a1848c9316125f2cff0cde4a828533b2fe9a4a 100644 (file)
--- 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 370b385bf85f74c3fe8d4754085786a7b7bd2df9..c834cfa60af573724b65027898b65e8f294e7376 100644 (file)
--- 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 ce01d891128e53a7d63a290f7cd4af6715f116d8..19db2ef41e951a360a7a15c71985c95fe1338991 100644 (file)
--- 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 a1a027fc8f72d672b140475546030d8df2233da6..308739131276653ccf981d2ac18d48f0379b5e75 100644 (file)
--- 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 2f5ab176ce3ab133cd17cfc16f9631e10dc57cf7..6befb0c065fc931c226d9dbaceddfd30fcf090d4 100644 (file)
--- 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 7ee7c384d60b0509efb019fa93b11c8a29cf23dd..826f2017796e88a155a979661fab3bb3cf304b44 100644 (file)
--- 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 689e254fc1eb6b9227e4feae2692592177c40ef4..ec391894102dacc6d642cbc18871f0ba49ad80d9 100644 (file)
--- 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 728beb61ec321e02b719b5f2887c4f7a458d3f36..8c73fbe1d87434680b8d37afff749519aabc4c6b 100644 (file)
--- 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 fa4f4282e1f4888ca713806dde243e94cca3ff65..e48c36606e1a13b26b85fc7ac8f9362dec231cee 100644 (file)
--- 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 3991dd3d211f061189cf5d61a47e5f9b96496e11..16d1c333a9d3abb6d2054bafc412cbccdb19f9da 100644 (file)
--- 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 4674e1913c721dcb68294e75673c0e213fc465cb..0c12621d33b15b772e6ac9442f9aff4384e7c760 100644 (file)
--- 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 fa35d60d30f4aa675415ce5113d32c7a31d6bb43..6cdae5754ddcb9eaf7a8b1cb4a6981f25a684227 100644 (file)
--- 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 6770be4ab3ff672d9ed1ecb05c3fefe2135739a0..eedb832141b03b13fb6872a222d9d58560346257 100644 (file)
--- 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 90df74e61c7fda072fdf9431228235154fb019b9..a39129fc69fd55db90dfb70aac3359c2937be900 100644 (file)
--- 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 77ec2db3089907f021c0aa8fb9c5a83b507794ac..e4779d5b447a8970c117df6d1494fa41c0ec9d82 100644 (file)
--- 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 272d90002eac7e8507c795724b3e07c0d017d6b3..02706eb9782c6a3567d1821d4d553f54c4ec49ea 100644 (file)
--- 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 15a777df675cc2117beb8647b5185c768292a792..eb0021589140b02856e740e98f16f39df9180b6f 100644 (file)
--- 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 b94af05833fbd7637b33f2fa0236ef1bff9d0207..d63fa056bb244709d487661a6f4a921e6ca1bba1 100644 (file)
--- 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 e17f3c04c106248a9c4c8f936dab18f1ba03710e..c1d1f72791123fbc81630518c57513ab47276c2f 100644 (file)
--- 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"