[oe-commits] org.oe.dev merge of '2eadd91fadb429f90d6d5b0714a7265811f206b6'

oe commit openembedded-commits at lists.openembedded.org
Fri Jan 18 05:23:37 UTC 2008


merge of '2eadd91fadb429f90d6d5b0714a7265811f206b6'
     and 'a17466e62ff1000054de2b883169fb332ceb8d66'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 7c236f6b6bb9d8147baf2a817b83c0dc2a3a1893
ViewMTN: http://monotone.openembedded.org/revision/info/7c236f6b6bb9d8147baf2a817b83c0dc2a3a1893
Files:
1
conf/checksums.ini
packages/e17/e-wm_0.16.999.038.bb
packages/e17/e-wm_cvs.bb
packages/e17/e-utils_cvs.bb
packages/e17/e-wm_0.16.999.041.bb
packages/e17/edje-editor_cvs.bb
packages/e17/edje-viewer_cvs.bb
packages/e17/entice_cvs.bb
packages/e17/entrance_0.9.0.010.bb
packages/e17/examine_cvs.bb
packages/e17/exhibit_cvs.bb
packages/e17/expedite_cvs.bb
packages/e17/rage_0.2.0.005.bb
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 -r2eadd91fadb429f90d6d5b0714a7265811f206b6 -r7c236f6b6bb9d8147baf2a817b83c0dc2a3a1893
#
# 
# 
# patch "conf/checksums.ini"
#  from [6107a0e5221d7dd5b1ba6940f49cfd2a8d3e256c]
#    to [f05da39a10f23c8142329999e0bd7acc81e8dea6]
# 
============================================================
--- conf/checksums.ini	6107a0e5221d7dd5b1ba6940f49cfd2a8d3e256c
+++ conf/checksums.ini	f05da39a10f23c8142329999e0bd7acc81e8dea6
@@ -590,6 +590,10 @@ sha256=0aa0084a74f912f4002f1c40a815ce62a
 md5=9d7cde75aecf4b85478c0e47343d4293
 sha256=0aa0084a74f912f4002f1c40a815ce62ac13331ec84787a954d8bea06e1c96c5
 
+[http://files.chumby.com/source/ironforge/build396/align.pl]
+md5=d1cbac52c52b956d9cbe6277a7f9a8c5
+sha256=67695e9af2b0938b6406eeed41954bf8317693aa7ef8ad2e30fcea5bea59777f
+
 [ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.11.tar.bz2]
 md5=ef7ae78a0ef08cbeacb295f2518886ab
 sha256=6b25f3d22cdb2476233f6dd74880fd88fb65124d4c282704bb9f0bf3fbd4c8d2
@@ -1890,6 +1894,10 @@ sha256=963cc8a1f7e73a0929b7b527f6b4cfc5f
 md5=074cf116cc2c7194f2d100bc5f743833
 sha256=963cc8a1f7e73a0929b7b527f6b4cfc5f78c932d673b5c13c889108d3182811a
 
+[https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h]
+md5=c0124afc760d4fe8c24ffcf15ba7f391
+sha256=4e0c1726f9c565deec6d6af9eebda47ca6dea473f3280cc89beb321ae33ff962
+
 [http://downloads.sourceforge.net/devio/devio-1.0.tar.gz]
 md5=3f421c80bce00b8bfe68ef9f453932b7
 sha256=25380c3722c75b993d530c09d48f5941c0a640a4382f6a0e1878c4ee8459dd16
@@ -2398,11 +2406,11 @@ sha256=6f51ebdf0e18bea58d18f79e8ffebb797
 md5=cf25d5d4c943ebf2293fe6f23ecba0fd
 sha256=6f51ebdf0e18bea58d18f79e8ffebb797fe57bdf44b96dff9d84b70467af7841
 
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.7.1.tar.gz]
+[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.7.1.tar.gz]
 md5=3654bbbf01deeb0d804df194e1b1a2b3
 sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
 
-[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.7.1.tar.gz]
+[ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.7.1.tar.gz]
 md5=3654bbbf01deeb0d804df194e1b1a2b3
 sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
 
@@ -2786,11 +2794,6 @@ sha256=63a3d6413182817b91eea327b58c243f1
 md5=f035852f521b54677f2b5c9e2f6d54a4
 sha256=63a3d6413182817b91eea327b58c243f1865acfc40bef61fc52d2b0431341363
 
-[https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h]
-md5=c0124afc760d4fe8c24ffcf15ba7f391
-sha256=4e0c1726f9c565deec6d6af9eebda47ca6dea473f3280cc89beb321ae33ff962
-
-
 [http://openzaurus.org/mirror/fonts-bitstream-vera-sans-mono.tar.gz]
 md5=890615fa4b3e6c82cd1b9807b106f042
 sha256=42c15ed555719c27f67990454cdda791cbcd26ab98712fd88ca7e20e6ce3f1fd
@@ -7123,6 +7126,10 @@ sha256=cc56285834bed461fd405c00a34d3c309
 md5=66d02cbd723876c6d69846a067875a22
 sha256=cc56285834bed461fd405c00a34d3c3095673333b94621580eeeb0c65237af15
 
+[http://files.chumby.com/source/ironforge/build396/linux-2.6.16-chumby-1.2.tar.gz]
+md5=efb128aed7aba5d47b72bfa8d42d97c4
+sha256=69468ffe7dade5448c498230bd67fd5a9b843ef1b11ea3fe7161b2c7fc26ea77
+
 [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2]
 md5=9a91b2719949ff0856b40bc467fd47be
 sha256=1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7
@@ -9735,6 +9742,10 @@ sha256=a677291149687339396fed06c46cc08fd
 md5=f4131d670920a878b4d4a0f5d4d8b93a
 sha256=a677291149687339396fed06c46cc08fd76fcb62d0f4459cae02c6cf54b4eb39
 
+[http://files.chumby.com/source/ironforge/build396/rt73-chumby-1.2.tar.gz]
+md5=0340e1ceba72330111e6fc85679c75bf
+sha256=94beb93da6dabd16892c899f496eeec745fc69b856abd0d19896b2a4b0fb7c72
+
 [http://music.mcgill.ca/~gary/rtaudio/release/rtaudio-3.0.1.tar.gz]
 md5=5b60500bc9605d2409b71124e48aa929
 sha256=59cc003bab753335b3ce14a908e663ea782514b3531dc7030379ff753ef1a78c


#
# mt diff -ra17466e62ff1000054de2b883169fb332ceb8d66 -r7c236f6b6bb9d8147baf2a817b83c0dc2a3a1893
#
# 
# 
# delete "packages/e17/e-wm_0.16.999.038.bb"
# 
# add_file "packages/e17/e-wm_cvs.bb"
#  content [529ec72e179f26986c7e4391d4699e598b77096a]
# 
# patch "packages/e17/e-utils_cvs.bb"
#  from [e6eb282e49d65f3e06eb55ea717c134fba7af668]
#    to [13eda31345812ee61f2c570492ae524db13ae518]
# 
# patch "packages/e17/e-wm_0.16.999.041.bb"
#  from [5b5487dd36444b2311993eda6fd92201cc77756c]
#    to [3e2fd3edf15b79ca5ab6153ffedff83c9a4377d9]
# 
# patch "packages/e17/edje-editor_cvs.bb"
#  from [cfa6ec43d5f9faae882abbe2efa486f7fa6523f3]
#    to [534fc5e91d55fb8c29bd354a5e05e3cea2306190]
# 
# patch "packages/e17/edje-viewer_cvs.bb"
#  from [81171cf34f4ee80dedbbea9870abd1936cd37058]
#    to [c67aeed187c3498ae31201e23527742188a003ff]
# 
# patch "packages/e17/entice_cvs.bb"
#  from [274be844e586453c60181c552aaf67eaa4ce68f0]
#    to [33eec12af3a8a595505dee84d6347f9b5838ecf0]
# 
# patch "packages/e17/entrance_0.9.0.010.bb"
#  from [ed458d1dc2cf8825ad4757aebd77cb0b2b29e7db]
#    to [3a66d6b8fa5fb38b7fd0bb185a6767b5b47343ed]
# 
# patch "packages/e17/examine_cvs.bb"
#  from [870495278ea331e527bb9645ba0d19caec0672c8]
#    to [61fe2242600f8ed7c398a64d329d89d6208c6a10]
# 
# patch "packages/e17/exhibit_cvs.bb"
#  from [0fb73195eb74fba616a7e95d1b0fc13facb15932]
#    to [692c70acbd1a0589a77ca74304075419d2c345f4]
# 
# patch "packages/e17/expedite_cvs.bb"
#  from [a3eb9e6385c5b2460ac7c5d0c3509a4e97e5820f]
#    to [cfee447f9ceb3541ddb38d005d85add8ae8ad60b]
# 
# patch "packages/e17/rage_0.2.0.005.bb"
#  from [be8c5ba108c7b91ce0516d15c10fa44c67f9be4d]
#    to [04c645b7d3b04bcdf13b9188cb1283d991a72e39]
# 
# 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/e17/e-wm_cvs.bb	529ec72e179f26986c7e4391d4699e598b77096a
+++ packages/e17/e-wm_cvs.bb	529ec72e179f26986c7e4391d4699e598b77096a
@@ -0,0 +1,61 @@
+DESCRIPTION = "E17 - the Enlightenment Window Mananger"
+DEPENDS = "eet evas ecore edje efreet"
+LICENSE = "MIT BSD"
+PV = "0.16.999.041+cvs${SRCDATE}"
+PR = "r0"
+
+inherit e update-alternatives
+
+SRC_URI = "${E_CVS};module=e17/apps/e \
+           file://Xsession.d/98enlightenment \
+           file://applications.menu \
+           file://Makefile.in.in \
+"
+S = "${WORKDIR}/e"
+
+EXTRA_OECONF = "\
+  --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+  --x-includes=${STAGING_INCDIR}/X11 \
+  --x-libraries=${STAGING_LIBDIR} \
+  --enable-simple-x11 \
+"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/Makefile.in.in po/
+	echo "install -d $*" >./mkinstalldirs
+	chmod a+rx ./mkinstalldirs
+}
+
+do_stage() {
+    autotools_stage_all
+    for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done
+    for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done
+    for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done
+    for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done
+}
+
+do_install_append() {
+    # customising - should rather make this simple upstream
+    install -d ${D}/${sysconfdir}/X11/Xsession.d
+    install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d
+    install -d ${D}/${sysconfdir}/xdg/menus
+    install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/
+}
+
+FILES_${PN} = "\
+  ${bindir}/* \
+  ${libdir}/enlightenment/modules/*/*.* \
+  ${libdir}/enlightenment/modules/*/*/* \
+  ${libdir}/enlightenment/preload/*.so \
+  ${datadir} \
+  ${sysconfdir} \
+"
+FILES_${PN}-dbg += "\
+  ${libdir}/enlightenment/modules/*/*/.debug/ \
+  ${libdir}/enlightenment/preload/.debug/ \
+"
+
+ALTERNATIVE_PATH = "${bindir}/enlightenment_start"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "16"
============================================================
--- packages/e17/e-utils_cvs.bb	e6eb282e49d65f3e06eb55ea717c134fba7af668
+++ packages/e17/e-utils_cvs.bb	13eda31345812ee61f2c570492ae524db13ae518
@@ -1,6 +1,6 @@ DEPENDS = "eet evas ecore edje esmart ew
 DESCRIPTION = "Enlightenment Window Manager Utilities"
 DEPENDS = "eet evas ecore edje esmart ewl engrave"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
 
============================================================
--- packages/e17/e-wm_0.16.999.041.bb	5b5487dd36444b2311993eda6fd92201cc77756c
+++ packages/e17/e-wm_0.16.999.041.bb	3e2fd3edf15b79ca5ab6153ffedff83c9a4377d9
@@ -1,8 +1,10 @@ DEPENDS = "eet evas ecore edje efreet"
 DESCRIPTION = "E17 - the Enlightenment Window Mananger"
 DEPENDS = "eet evas ecore edje efreet"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 PR = "r0"
 
+DEFAULT_PREFERENCE = "-1"
+
 inherit e update-alternatives
 
 SRC_URI = "http://download.enlightenment.org/snapshots/2007-08-26/enlightenment-${PV}.tar.gz \
============================================================
--- packages/e17/edje-editor_cvs.bb	cfa6ec43d5f9faae882abbe2efa486f7fa6523f3
+++ packages/e17/edje-editor_cvs.bb	534fc5e91d55fb8c29bd354a5e05e3cea2306190
@@ -1,5 +1,5 @@ DESCRIPTION = "Edje-Editor is just that.
 DESCRIPTION = "Edje-Editor is just that."
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 DEPENDS = "etk"
 PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
============================================================
--- packages/e17/edje-viewer_cvs.bb	81171cf34f4ee80dedbbea9870abd1936cd37058
+++ packages/e17/edje-viewer_cvs.bb	c67aeed187c3498ae31201e23527742188a003ff
@@ -1,6 +1,6 @@ DEPENDS = "etk"
 DESCRIPTION = "Edje_Viewer is just that."
 DEPENDS = "etk"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 PV = "0.0.0+cvs${SRCDATE}"
 PR = "r3"
 
============================================================
--- packages/e17/entice_cvs.bb	274be844e586453c60181c552aaf67eaa4ce68f0
+++ packages/e17/entice_cvs.bb	33eec12af3a8a595505dee84d6347f9b5838ecf0
@@ -1,6 +1,6 @@ DESCRIPTION = "Entice is the E17 picture
 DESCRIPTION = "Entice is the E17 picture viewer"
 # can also depend on GIMP for editing
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 DEPENDS = "edb evas ecore edje epsilon esmart"
 PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
============================================================
--- packages/e17/entrance_0.9.0.010.bb	ed458d1dc2cf8825ad4757aebd77cb0b2b29e7db
+++ packages/e17/entrance_0.9.0.010.bb	3a66d6b8fa5fb38b7fd0bb185a6767b5b47343ed
@@ -1,5 +1,5 @@ DESCRIPTION = "Entrance is the Enlighten
 DESCRIPTION = "Entrance is the Enlightenment login manager"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 # can also use pam and crypt
 DEPENDS = "evas ecore edje esmart bash keylaunch xserver-common login-manager"
 RDEPENDS += "glibc-gconv-iso8859-1 entrance-themes"
============================================================
--- packages/e17/examine_cvs.bb	870495278ea331e527bb9645ba0d19caec0672c8
+++ packages/e17/examine_cvs.bb	61fe2242600f8ed7c398a64d329d89d6208c6a10
@@ -1,6 +1,6 @@ DEPENDS = "ewl"
 DESCRIPTION = "Examine, the program configurator"
 DEPENDS = "ewl"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
 
============================================================
--- packages/e17/exhibit_cvs.bb	0fb73195eb74fba616a7e95d1b0fc13facb15932
+++ packages/e17/exhibit_cvs.bb	692c70acbd1a0589a77ca74304075419d2c345f4
@@ -1,6 +1,6 @@ DEPENDS = "evas ecore epsilon edje eet e
 DESCRIPTION = "Exhibit is the ETK picture viewer"
 DEPENDS = "evas ecore epsilon edje eet etk efreet"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
 
============================================================
--- packages/e17/expedite_cvs.bb	a3eb9e6385c5b2460ac7c5d0c3509a4e97e5820f
+++ packages/e17/expedite_cvs.bb	cfee447f9ceb3541ddb38d005d85add8ae8ad60b
@@ -1,7 +1,7 @@ RDEPENDS = "libevas-engine-buffer libeva
 DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas"
 DEPENDS = "eet evas"
 RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 PV = "0.6.0+cvs${SRCDATE}"
 PR = "r0"
 
@@ -11,9 +11,25 @@ S = "${WORKDIR}/${PN}"
            file://hack-disable-opengl.patch;patch=1"
 S = "${WORKDIR}/${PN}"
 
+EXTRA_OECONF = "\
+  --x-includes=${STAGING_INCDIR}/X11 \
+  --x-libraries=${STAGING_LIBDIR} \
+  --enable-simple-x11 \
+\
+  --disable-opengl-glew \
+  --disable-opengl-x11 \
+  --enable-software-x11 \
+  --enable-xrender-x11 \
+  --enable-software-16-x11 \
+  --enable-fb \
+  --disable-software-ddraw \
+  --disable-software-16-ddraw \
+  --disable-direct3d \
+  --disable-software-sdl \
+"
+
 do_configure_append() {
         find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
 }
 
 FILES_${PN} += "${datadir}"
-
============================================================
--- packages/e17/rage_0.2.0.005.bb	be8c5ba108c7b91ce0516d15c10fa44c67f9be4d
+++ packages/e17/rage_0.2.0.005.bb	04c645b7d3b04bcdf13b9188cb1283d991a72e39
@@ -1,11 +1,10 @@ HOMEPAGE = "http://www.rasterman.com"
 DESCRIPTION = "Rage is a media center application based on EFL"
 AUTHOR = "Carsten 'The Rasterman' Heitzler"
 HOMEPAGE = "http://www.rasterman.com"
-LICENSE = "GPL"
+LICENSE = "MIT BSD"
 DEPENDS = "evas ecore edje"
 SECTION = "x11/multimedia"
 
 SRC_URI = "http://download.enlightenment.org/snapshots/2007-08-26/rage-${PV}.tar.gz"
 
 inherit autotools
-
============================================================
--- 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.%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list