11 files changed, 94 insertions, 9 deletions
diff --git a/packages/efl1/edje_svn.bb b/packages/efl1/edje_svn.bb
index db4842deee..ec481911d6 100644
--- a/packages/efl1/edje_svn.bb
+++ b/packages/efl1/edje_svn.bb
@@ -2,10 +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.043+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 inherit efl
 
+# gain some extra performance at the expense of RAM
+EXTRA_OECONF = "--enable-edje-program-cache"
+
 PACKAGES =+ "${PN}-utils"
 DEBIAN_NOAUTONAME_${PN}-utils = "1"
 FILES_${PN}-utils = "\
diff --git a/packages/efl1/eet_svn.bb b/packages/efl1/eet_svn.bb
index 20f4946215..379a0420a1 100644
--- a/packages/efl1/eet_svn.bb
+++ b/packages/efl1/eet_svn.bb
@@ -2,6 +2,15 @@ DESCRIPTION = "EET is the Enlightenment data storage library"
 DEPENDS = "zlib jpeg openssl"
 LICENSE = "MIT BSD"
 PV = "1.0.1+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit efl
+
+EXTRA_OECONF = "\
+  --enable-openssl \
+  --enable-cypher \
+  --enable-signature \
+  --disable-coverage \
+  --enable-old-eet-file-format \
+  --disable-assert \
+"
diff --git a/packages/efl1/evas-native_svn.bb b/packages/efl1/evas-native_svn.bb
index 3ca8df9e41..3f85757cf9 100644
--- a/packages/efl1/evas-native_svn.bb
+++ b/packages/efl1/evas-native_svn.bb
@@ -1,11 +1,13 @@
 require evas.inc
 inherit native
 DEPENDS = "freetype-native libpng-native jpeg-native eet-native"
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
+		--enable-evas-magic-debug \
+		\
 		--enable-fb				\
 		--disable-directfb			\
 		--disable-sdl				\
diff --git a/packages/efl1/evas_svn.bb b/packages/efl1/evas_svn.bb
index e7079615de..35192b7ed3 100644
--- a/packages/efl1/evas_svn.bb
+++ b/packages/efl1/evas_svn.bb
@@ -1,9 +1,11 @@
 require evas.inc
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
+        --enable-evas-magic-debug \
+        \
 		--enable-fb					\
 		--disable-directfb			\
 		--disable-sdl				\
@@ -59,4 +61,3 @@ EXTRA_OECONF = "\
 		--enable-convert-32-rgb-rot-90	\
 		--disable-convert-32-rgb-rot-180 \
 		--enable-convert-32-rgb-rot-270"
-
diff --git a/packages/glib-2.0/glib.inc b/packages/glib-2.0/glib.inc
index 2120e38c22..278b7cbc62 100644
--- a/packages/glib-2.0/glib.inc
+++ b/packages/glib-2.0/glib.inc
@@ -8,16 +8,19 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
-PACKAGES =+ " glib-2.0-utils "
+PACKAGES =+ "gobject-2.0 gmodule-2.0 gthread-2.0 gio-2.0 glib-2.0-utils "
 
-PR = "r2"
+PR = "r3"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
 FILES_${PN} = "${libdir}/lib*so.* ${libdir}/gio/modules/*.so"
 FILES_${PN}-dev += "${libdir}/glib-2.0 ${datadir}/glib-2.0 ${libdir}/gio/modules/*.la"
 FILES_${PN}-dbg += "${libdir}/gio/modules/.debug"
-
+FILES_gmodule-2.0 = "${libdir}/libgmodule-2.0.so.*"
+FILES_gobject-2.0 = "${libdir}/libgobject-2.0.so.*"
+FILES_gio-2.0 = "${libdir}/libgio-2.0.so.*"
+FILES_gthread-2.0 = "${libdir}/libgthread-2.0.so.*"
 
 EXTRA_OECONF = "--disable-debug "
 
diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
index eabe00b0e6..15075f022c 100644
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -60,6 +60,7 @@ TOOLS_INSTALL = "\
   powertop \
   s3c24xx-gpio \
   sysstat \
+  tcpdump \
 "
 
 # audio
@@ -106,9 +107,20 @@ PYTHON_INSTALL = "\
 ZHONE_INSTALL = "\
   gsm0710muxd \
   frameworkd \
+  fso-gpsd \
   zhone \
 "
 
+# additional apps
+APPS_INSTALL = "\
+  tichy \
+  gpe-gallery \
+  gpe-sketchbook \
+  gpe-filemanager \
+  vagalume \
+  starling \
+"
+
 IMAGE_INSTALL = "\
   ${BASE_INSTALL} \
   ${X_INSTALL} \
@@ -118,7 +130,7 @@ IMAGE_INSTALL = "\
   ${TOOLS_INSTALL} \
   ${PYTHON_INSTALL} \
   ${ZHONE_INSTALL} \
-  tichy \
+  ${APPS_INSTALL} \
 "
 
 inherit image
diff --git a/packages/lmbench/lmbench-2.5/.mtn2git_empty b/packages/lmbench/lmbench-2.5/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lmbench/lmbench-2.5/.mtn2git_empty
diff --git a/packages/lmbench/lmbench-2.5/build.patch b/packages/lmbench/lmbench-2.5/build.patch
new file mode 100644
index 0000000000..e6283aea60
--- /dev/null
+++ b/packages/lmbench/lmbench-2.5/build.patch
@@ -0,0 +1,11 @@
+--- lmbench-2.5/scripts/build.old	2008-09-18 17:03:59.000000000 +0100
++++ lmbench-2.5/scripts/build	2008-09-18 17:04:01.000000000 +0100
+@@ -34,7 +34,7 @@
+ 	
+ # check for IA64 HP-UX w/ HP's ANSI compiler; may need pointer swizzling
+ arch=`echo $OS | awk -F- '{print $1;}'`
+-if [ X$CC = "Xcc" -a X$arch = "Xia64" ]
++if [ "X$CC" = "Xcc" -a "X$arch" = "Xia64" ]
+ then
+ 	echo "#include <stdlib.h>" > ${BASE}$$.c
+ 	echo "main(int ac, char *av[])" >> ${BASE}$$.c
diff --git a/packages/lmbench/lmbench/.mtn2git_empty b/packages/lmbench/lmbench/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lmbench/lmbench/.mtn2git_empty
diff --git a/packages/lmbench/lmbench-2.0.4/lmbench-run b/packages/lmbench/lmbench/lmbench-run
index 3674f6d265..3674f6d265 100644
--- a/packages/lmbench/lmbench-2.0.4/lmbench-run
+++ b/packages/lmbench/lmbench/lmbench-run
diff --git a/packages/lmbench/lmbench_2.5.bb b/packages/lmbench/lmbench_2.5.bb
new file mode 100644
index 0000000000..a51508017c
--- /dev/null
+++ b/packages/lmbench/lmbench_2.5.bb
@@ -0,0 +1,44 @@
+SECTION = "console/utils"
+DESCRIPTION = "Tools for performance analysis."
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \
+	   file://build.patch;patch=1 \
+	   file://lmbench-run"
+S = "${WORKDIR}/lmbench-${PV}"
+
+EXTRA_OEMAKE = 'CC="${CC}" AR="${AR}" CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" LD="${LD}" OS="${TARGET_SYS}" \
+		TARGET="${TARGET_OS}" BASE="${prefix}"'
+
+python do_unpack () {
+	bb.build.exec_func('base_do_unpack', d)
+	bb.build.exec_func('byebk_do_unpack', d)
+}
+
+byebk_do_unpack () {
+	find ${S}/.. -name BitKeeper -o -name SCCS | xargs rm -rf
+}
+
+do_compile () {
+	. ${CONFIG_SITE}
+	if [ X"$ac_cv_uint" == X"yes" ]; then
+		CFLAGS="${CFLAGS} -DHAVE_uint"
+	fi
+	install -d ${S}/bin/${TARGET_SYS}
+	oe_runmake -C src
+	sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${PN},;' \
+	       -e 's,^BINDIR=.*$,BINDIR=${libdir}/${PN},;' ${WORKDIR}/lmbench-run
+}
+
+do_install () {
+        mkdir -p ${D}${libdir}/lmbench
+	oe_runmake 'BASE=${D}${prefix}' \
+		    -C src install
+	install -d ${D}${localstatedir}/lib/lmbench/config \
+		   ${D}${localstatedir}/run/lmbench \
+		   ${D}${bindir}
+	install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/
+	mkdir -p ${D}${mandir}
+	mv ${D}${prefix}/man/* ${D}${mandir}/
+}