efl cvs adjust license and configurations, improve dependencies and packaging

(based on a patch by Raster)

diff --git a/packages/efl1/ecore-native_cvs.bb b/packages/efl1/ecore-native_cvs.bb
index 70d9490..52855d9 100644 (file)
--- a/packages/efl1/ecore-native_cvs.bb
+++ b/packages/efl1/ecore-native_cvs.bb
@@ -1,10 +1,14 @@
 require ecore.inc
 inherit native
 DEPENDS = "eet-native evas-native"
-PR = "r0"
+PR = "r2"
 
 EXTRA_OECONF = "\
+                --x-includes=${STAGING_INCDIR}/X11 \
+                --x-libraries=${STAGING_LIBDIR} \
+                               \
                 --enable-ecore-txt \
+                --disable-ecore-config \
                 --disable-ecore-x-xcb \
                 --disable-ecore-x \
                 --enable-ecore-job \
@@ -12,7 +16,7 @@ EXTRA_OECONF = "\
                 --disable-ecore-sdl \
                 --enable-ecore-fb \
                 --enable-ecore-evas \
-                --disable-ecore-evas-gl \
+                --disable-ecore-evas-x11-gl \
                 --disable-ecore-evas-xrender \
                 --disable-ecore-evas-dfb \
                 --disable-openssl \
@@ -24,6 +28,6 @@ EXTRA_OECONF = "\
                 --disable-poll \
                 --disable-curl \
                 --disable-ecore-desktop \
-                --x-includes=${STAGING_INCDIR}/X11 \
-                --x-libraries=${STAGING_LIBDIR} "
-
+                --disable-ecore-imf \
+                --disable-ecore-imf_evas \
+"

diff --git a/packages/efl1/ecore_cvs.bb b/packages/efl1/ecore_cvs.bb
index 6580957..cea3d76 100644 (file)
--- a/packages/efl1/ecore_cvs.bb
+++ b/packages/efl1/ecore_cvs.bb
@@ -1,19 +1,23 @@
 require ecore.inc
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "\
+        --x-includes=${STAGING_INCDIR}/X11 \
+        --x-libraries=${STAGING_LIBDIR} \
+        --enable-simple-x11 \
+\
                --enable-ecore-txt \
+        --enable-ecore-config \
                --disable-ecore-x-xcb \
-               --enable-simple-x11 \
                --enable-ecore-x \
                --enable-ecore-job \
                --disable-ecore-directfb \
                --disable-ecore-sdl \
                --enable-ecore-fb \
                --enable-ecore-evas \
-                --disable-ecore-evas-x11-gl \
+        --disable-ecore-evas-x11-gl \
                --enable-ecore-evas-xrender \
-               --enable-ecore-evas-dfb \
+               --disable-ecore-evas-dfb \
                --disable-openssl \
                --enable-abstract-sockets \
                --enable-ecore-con \
@@ -22,6 +26,5 @@ EXTRA_OECONF = "\
                --enable-inotify \
                --disable-poll \
                --enable-curl \
-               --enable-ecore-desktop \
-               --x-includes=${STAGING_INCDIR}/X11 \
-               --x-libraries=${STAGING_LIBDIR} "
+               --disable-ecore-desktop \
+"

diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb
index 755efcb..28bcbb1 100644 (file)
--- a/packages/efl1/edbus_cvs.bb
+++ b/packages/efl1/edbus_cvs.bb
@@ -1,18 +1,15 @@
 DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
 DEPENDS = "dbus ecore"
-LICENSE = "MIT"
-PR = "r1"
+LICENSE = "MIT BSD"
+PR = "r2"
 
 inherit efl_library
 
 SRC_URI = "${E_CVS};module=e17/libs/e_dbus"
 S = "${WORKDIR}/e_dbus"
 
-# TODO increase package granularity
-
 PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal"
 FILES_${PN}-enotify = "${libdir}/libenotify.so.*"
 FILES_${PN}-edbus = "${libdir}/libedbus.so.*"
 FILES_${PN}-enm = "${libdir}/libenm.so.*"
 FILES_${PN}-ehal = "${libdir}/libehal.so.*"
-

diff --git a/packages/efl1/edje-native_cvs.bb b/packages/efl1/edje-native_cvs.bb
index 2c52b69..519476b 100644 (file)
--- a/packages/efl1/edje-native_cvs.bb
+++ b/packages/efl1/edje-native_cvs.bb
@@ -3,7 +3,6 @@ inherit native
 PR = "r0"
 
 DEPENDS = "evas-native ecore-native eet-native embryo-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
 
 do_configure_prepend() {
        sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c

diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_cvs.bb
index 0a5521f..734dccf 100644 (file)
--- a/packages/efl1/edje_cvs.bb
+++ b/packages/efl1/edje_cvs.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "Edje is a complex graphical design & layout library."
 # can also install vim data files
 DEPENDS = "eet evas ecore embryo edje-native"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 PV = "0.5.0.41+cvs${SRCDATE}"
-PR = "r0"
+PR = "r2"
 
 inherit efl_library
 
-# NOTE: Packaging needs work. edje_cc should actually be in the -dev package etc.
-
+PACKAGES =+ "${PN}-tools"
+FILES_${PN}-tools = "${bindir}/edje_*"

diff --git a/packages/efl1/eet_cvs.bb b/packages/efl1/eet_cvs.bb
index cd12daf..f2ab6a7 100644 (file)
--- a/packages/efl1/eet_cvs.bb
+++ b/packages/efl1/eet_cvs.bb
@@ -3,8 +3,8 @@ arbitary set of chunks of data to a file and optionally compress \
 each chunk (very much like a zip file) and allow fast \
 random-access reading of the file later on."
 DEPENDS = "zlib jpeg"
-LICENSE = "BSD"
+LICENSE = "MIT BSD"
 PV = "0.9.10.041+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 inherit efl_library

diff --git a/packages/efl1/efreet_cvs.bb b/packages/efl1/efreet_cvs.bb
index 3f903d3..248dadd 100644 (file)
--- a/packages/efl1/efreet_cvs.bb
+++ b/packages/efl1/efreet_cvs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "An implementation of freedesktop.org specs for the \
 Enlightenment Foundation Libraries"
 DEPENDS = "ecore"
-LICENSE = "BSD"
+LICENSE = "MIT BSD"
 PV = "0.0.3.003+cvs${SRCDATE}"
 PR = "r0"
 

diff --git a/packages/efl1/embryo_cvs.bb b/packages/efl1/embryo_cvs.bb
index dcba855..15546e2 100644 (file)
--- a/packages/efl1/embryo_cvs.bb
+++ b/packages/efl1/embryo_cvs.bb
@@ -3,8 +3,8 @@ of the Enlightenment project, namely Edje. Embryo's scripting language is based
 CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \
 Embryo allows scripting capabilities in places that otherwise wouldn't support \
 basic programming structures such as in Edje EDCs."
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 PV = "0.9.1.041+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 inherit efl_library

diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index 0dc8f2d..e053970 100644 (file)
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -2,9 +2,9 @@ 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."
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 # can also depend on valgrind, libsdl-x11, directfb
-DEPENDS = "eet freetype jpeg virtual/libx11 libxext libxrender"
+DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender"
 PV = "0.9.9.041+cvs${SRCDATE}"
 
 inherit efl_library

diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb
index 0734967..d30a03d 100644 (file)
--- a/packages/efl1/evas_cvs.bb
+++ b/packages/efl1/evas_cvs.bb
@@ -1,5 +1,5 @@
 require evas.inc
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "\
                --x-includes=${STAGING_INCDIR}/X11  \
@@ -46,15 +46,15 @@ EXTRA_OECONF = "\
                --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-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"
+               --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  \
+               --enable-convert-32-rgb-rot-270"