[oe-commits] org.oe.dev efl cvs adjust license and configurations, improve dependencies and packaging

mickeyl commit openembedded-commits at lists.openembedded.org
Fri Jan 18 05:22:36 UTC 2008


efl cvs adjust license and configurations, improve dependencies and packaging
(based on a patch by Raster)

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: e53d4f5277f28701d3f5b6607be7a75664bb1887
ViewMTN: http://monotone.openembedded.org/revision/info/e53d4f5277f28701d3f5b6607be7a75664bb1887
Files:
1
packages/efl1/ecore-native_cvs.bb
packages/efl1/ecore_cvs.bb
packages/efl1/edbus_cvs.bb
packages/efl1/edje-native_cvs.bb
packages/efl1/edje_cvs.bb
packages/efl1/eet_cvs.bb
packages/efl1/efreet_cvs.bb
packages/efl1/embryo_cvs.bb
packages/efl1/evas.inc
packages/efl1/evas_cvs.bb
Diffs:

#
# mt diff -r9005ec7475f13738f08b14c023c457704df3f4af -re53d4f5277f28701d3f5b6607be7a75664bb1887
#
# 
# 
# patch "packages/efl1/ecore-native_cvs.bb"
#  from [4a00d1d0cad23d61b7411ae50b847f83086398ce]
#    to [5bd60a7af1398231f76c6398fe56302fd0365b70]
# 
# patch "packages/efl1/ecore_cvs.bb"
#  from [e5059f4bf4f7c76e1c65effb2dcd11b7e18a4c0c]
#    to [d5252beb6447db426e62970a50a59407b9c1dc8b]
# 
# patch "packages/efl1/edbus_cvs.bb"
#  from [c1a0f93864dece01ef62aab214eb056162154ffa]
#    to [132848ec2182987753b4827a0c27d567ca12cce7]
# 
# patch "packages/efl1/edje-native_cvs.bb"
#  from [61b907b3153cd9a90f2727727c2eb99ff6a16c59]
#    to [3af2a3c86daed707172b160f5352e4e1f92518ed]
# 
# patch "packages/efl1/edje_cvs.bb"
#  from [354d625fd1e123d1629c55a11d24421decfc22a5]
#    to [ac767ddd6ef3e33594e36c32d80fcb551a3bb380]
# 
# patch "packages/efl1/eet_cvs.bb"
#  from [63e1fa0da683beda5648ae75c2cc04153f06b92b]
#    to [869675713b0e92b00b79fd8ff8fe0bbd329e76cc]
# 
# patch "packages/efl1/efreet_cvs.bb"
#  from [9493180d2ccf9d967fe7bd6096988708028f0eb0]
#    to [5fa16dafdd558aa8bf82a006243cb7c86950003a]
# 
# patch "packages/efl1/embryo_cvs.bb"
#  from [be59294be518936cb4e0986abd744b4a70e86e3e]
#    to [3004da545ec73d718d11b18e16c97a533af9ae75]
# 
# patch "packages/efl1/evas.inc"
#  from [cc99e778d7f3640905f0dc835736906c5393874c]
#    to [b5cd048c85bc9f9f299682fb9fc1db9a8a381a45]
# 
# patch "packages/efl1/evas_cvs.bb"
#  from [7ac3a08c9fc17a3cc7a34dc582fc93b978ab9144]
#    to [8c14a37af3d4c6356ba37624a420d4dc7b485196]
# 
============================================================
--- packages/efl1/ecore-native_cvs.bb	4a00d1d0cad23d61b7411ae50b847f83086398ce
+++ packages/efl1/ecore-native_cvs.bb	5bd60a7af1398231f76c6398fe56302fd0365b70
@@ -1,10 +1,14 @@ DEPENDS = "eet-native evas-native"
 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 \
+                --disable-ecore-imf \
+                --disable-ecore-imf_evas \
+"
-                --x-includes=${STAGING_INCDIR}/X11 \
-                --x-libraries=${STAGING_LIBDIR} "
-
============================================================
--- packages/efl1/ecore_cvs.bb	e5059f4bf4f7c76e1c65effb2dcd11b7e18a4c0c
+++ packages/efl1/ecore_cvs.bb	d5252beb6447db426e62970a50a59407b9c1dc8b
@@ -1,19 +1,23 @@ require ecore.inc
 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 \
+		--disable-ecore-desktop \
+"
-		--enable-ecore-desktop \
-		--x-includes=${STAGING_INCDIR}/X11 \
-		--x-libraries=${STAGING_LIBDIR}	"
============================================================
--- packages/efl1/edbus_cvs.bb	c1a0f93864dece01ef62aab214eb056162154ffa
+++ packages/efl1/edbus_cvs.bb	132848ec2182987753b4827a0c27d567ca12cce7
@@ -1,18 +1,15 @@ DEPENDS = "dbus ecore"
 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.*"
-
============================================================
--- packages/efl1/edje-native_cvs.bb	61b907b3153cd9a90f2727727c2eb99ff6a16c59
+++ packages/efl1/edje-native_cvs.bb	3af2a3c86daed707172b160f5352e4e1f92518ed
@@ -1,9 +1,8 @@ DEPENDS = "evas-native ecore-native eet-
 require edje_${PV}.bb
 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
============================================================
--- packages/efl1/edje_cvs.bb	354d625fd1e123d1629c55a11d24421decfc22a5
+++ packages/efl1/edje_cvs.bb	ac767ddd6ef3e33594e36c32d80fcb551a3bb380
@@ -1,11 +1,11 @@ DEPENDS = "eet evas ecore embryo edje-na
 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
 
+PACKAGES =+ "${PN}-tools"
+FILES_${PN}-tools = "${bindir}/edje_*"
-# NOTE: Packaging needs work. edje_cc should actually be in the -dev package etc.
-
============================================================
--- packages/efl1/eet_cvs.bb	63e1fa0da683beda5648ae75c2cc04153f06b92b
+++ packages/efl1/eet_cvs.bb	869675713b0e92b00b79fd8ff8fe0bbd329e76cc
@@ -1,10 +1,10 @@ DEPENDS = "zlib jpeg"
 DESCRIPTION = "EET is a tiny library designed to write an \
 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
============================================================
--- packages/efl1/efreet_cvs.bb	9493180d2ccf9d967fe7bd6096988708028f0eb0
+++ packages/efl1/efreet_cvs.bb	5fa16dafdd558aa8bf82a006243cb7c86950003a
@@ -1,7 +1,7 @@ DEPENDS = "ecore"
 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"
 
============================================================
--- packages/efl1/embryo_cvs.bb	be59294be518936cb4e0986abd744b4a70e86e3e
+++ packages/efl1/embryo_cvs.bb	3004da545ec73d718d11b18e16c97a533af9ae75
@@ -1,10 +1,10 @@ basic programming structures such as in 
 DESCRIPTION = "Embryo implements a C like scripting language used in various parts \
 of the Enlightenment project, namely Edje. Embryo's scripting language is based on \
 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
============================================================
--- packages/efl1/evas.inc	cc99e778d7f3640905f0dc835736906c5393874c
+++ packages/efl1/evas.inc	b5cd048c85bc9f9f299682fb9fc1db9a8a381a45
@@ -1,10 +1,10 @@ your CPU or graphics hardware are too sl
 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
============================================================
--- packages/efl1/evas_cvs.bb	7ac3a08c9fc17a3cc7a34dc582fc93b978ab9144
+++ packages/efl1/evas_cvs.bb	8c14a37af3d4c6356ba37624a420d4dc7b485196
@@ -1,5 +1,5 @@ require evas.inc
 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"
 






More information about the Openembedded-commits mailing list