Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

94 files changed, 943 insertions, 153 deletions

diff --git a/recipes/efl1/illume-keyboard-arabic_git.bb b/recipes/efl1/illume-keyboard-arabic_git.bb
index 41ea9e1cd4..900c745fe5 100644
--- a/recipes/efl1/illume-keyboard-arabic_git.bb
+++ b/recipes/efl1/illume-keyboard-arabic_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Mohammad Fahmi / Tom Hacohen"
 DESCRIPTION = "Illume keyboard with arabic layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "arabic"
diff --git a/recipes/efl1/illume-keyboard-browse_git.bb b/recipes/efl1/illume-keyboard-browse_git.bb
index 268140c75a..4eda497c4c 100644
--- a/recipes/efl1/illume-keyboard-browse_git.bb
+++ b/recipes/efl1/illume-keyboard-browse_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Pander"
 DESCRIPTION = "Illume keyboard with a layout optimized for browsing"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "browse"
diff --git a/recipes/efl1/illume-keyboard-danish_git.bb b/recipes/efl1/illume-keyboard-danish_git.bb
index 21f8ff954a..5a042d9c6b 100644
--- a/recipes/efl1/illume-keyboard-danish_git.bb
+++ b/recipes/efl1/illume-keyboard-danish_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Esben Damgaard"
 DESCRIPTION = "Illume keyboard with danish layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "danish"
diff --git a/recipes/efl1/illume-keyboard-default-alt_git.bb b/recipes/efl1/illume-keyboard-default-alt_git.bb
index 34c3c299bb..f367f11f79 100644
--- a/recipes/efl1/illume-keyboard-default-alt_git.bb
+++ b/recipes/efl1/illume-keyboard-default-alt_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Pander"
 DESCRIPTION = "Illume keyboard with an alternative default layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "default-alt"
diff --git a/recipes/efl1/illume-keyboard-dutch_git.bb b/recipes/efl1/illume-keyboard-dutch_git.bb
index 2300ac7101..2eb137db85 100644
--- a/recipes/efl1/illume-keyboard-dutch_git.bb
+++ b/recipes/efl1/illume-keyboard-dutch_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Pander"
 DESCRIPTION = "Illume keyboard with dutch layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "dutch"
diff --git a/recipes/efl1/illume-keyboard-dvorak_git.bb b/recipes/efl1/illume-keyboard-dvorak_git.bb
index 795d78dcc7..dd6b96c31e 100644
--- a/recipes/efl1/illume-keyboard-dvorak_git.bb
+++ b/recipes/efl1/illume-keyboard-dvorak_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Gabor Adam TOTH"
 DESCRIPTION = "Illume keyboard with dvorak layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "dvorak"
diff --git a/recipes/efl1/illume-keyboard-french_git.bb b/recipes/efl1/illume-keyboard-french_git.bb
index 205a6ad991..8c8041a9b1 100644
--- a/recipes/efl1/illume-keyboard-french_git.bb
+++ b/recipes/efl1/illume-keyboard-french_git.bb
@@ -1,5 +1,6 @@
 DESCRIPTION = "Illume keyboard with french layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "french"
diff --git a/recipes/efl1/illume-keyboard-german_git.bb b/recipes/efl1/illume-keyboard-german_git.bb
index 0252932116..a1ad5481df 100644
--- a/recipes/efl1/illume-keyboard-german_git.bb
+++ b/recipes/efl1/illume-keyboard-german_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Florian Hackenberger"
 DESCRIPTION = "Illume keyboard with german layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "german"
diff --git a/recipes/efl1/illume-keyboard-hebrew_git.bb b/recipes/efl1/illume-keyboard-hebrew_git.bb
index 8d408b4a91..e7cda399f2 100644
--- a/recipes/efl1/illume-keyboard-hebrew_git.bb
+++ b/recipes/efl1/illume-keyboard-hebrew_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Tom Hacohen"
 DESCRIPTION = "Illume keyboard with hebrew layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "hebrew"
diff --git a/recipes/efl1/illume-keyboard-numeric-alt_git.bb b/recipes/efl1/illume-keyboard-numeric-alt_git.bb
index f2d2487386..92090d925d 100644
--- a/recipes/efl1/illume-keyboard-numeric-alt_git.bb
+++ b/recipes/efl1/illume-keyboard-numeric-alt_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Pander"
 DESCRIPTION = "Illume keyboard with an alternative numeric layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "numeric-alt"
diff --git a/recipes/efl1/illume-keyboard-russian-terminal_git.bb b/recipes/efl1/illume-keyboard-russian-terminal_git.bb
index f0a4508d98..7b126bbf09 100644
--- a/recipes/efl1/illume-keyboard-russian-terminal_git.bb
+++ b/recipes/efl1/illume-keyboard-russian-terminal_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "lucky"
 DESCRIPTION = "Illume keyboard with russian layout for the Terminal"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "russian-terminal"
diff --git a/recipes/efl1/illume-keyboard-russian_git.bb b/recipes/efl1/illume-keyboard-russian_git.bb
index 517956bb2b..c067871848 100644
--- a/recipes/efl1/illume-keyboard-russian_git.bb
+++ b/recipes/efl1/illume-keyboard-russian_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "lucky"
 DESCRIPTION = "Illume keyboard with russian layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "russian"
diff --git a/recipes/fbreader/fbreader_0.10.7.bb b/recipes/fbreader/fbreader_0.10.7.bb
index 0dfea08479..986f21fbca 100644
--- a/recipes/fbreader/fbreader_0.10.7.bb
+++ b/recipes/fbreader/fbreader_0.10.7.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.fbreader.org"
 SECTION = "x11/utils"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
-DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak"
+DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi"
 
 SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz file://help.patch;patch=1"
 	   
diff --git a/recipes/freespace/libfreespace_0.4.bb b/recipes/freespace/libfreespace_0.4.bb
new file mode 100644
index 0000000000..bf9e70fbf7
--- /dev/null
+++ b/recipes/freespace/libfreespace_0.4.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "The open-source libfreespace library provides an easy-to-use interface to Hillcrest Labs Freespace®-based devices such as in-air remote controls. "
+LICENSE = "LGPLv2"
+DEPENDS = "libusb1"
+
+SRC_URI = "http://launchpad.net/libfreespace/${PV}/${PV}/+download/libfreespace-${PV}.tar.gz"
+
+inherit autotools
+
+
diff --git a/recipes/gtk-webcore/midori_0.2.1.bb b/recipes/gtk-webcore/midori_0.2.1.bb
new file mode 100644
index 0000000000..7439a85e3e
--- /dev/null
+++ b/recipes/gtk-webcore/midori_0.2.1.bb
@@ -0,0 +1,31 @@
+require midori.inc
+
+DEPENDS += "python-native python-docutils-native"
+
+SRC_URI = "http://archive.xfce.org/src/apps/midori/0.2/midori-${PV}.tar.bz2 \
+           file://waf"
+
+do_configure() {
+	cp -f ${WORKDIR}/waf ${S}/
+	sed -i -e 's:, shell=False::g' wscript 
+	./configure \
+            --prefix=${prefix} \
+            --bindir=${bindir} \
+            --sbindir=${sbindir} \
+            --libexecdir=${libexecdir} \
+            --datadir=${datadir} \
+            --sysconfdir=${sysconfdir} \
+            --sharedstatedir=${sharedstatedir} \
+            --localstatedir=${localstatedir} \
+            --libdir=${libdir} \
+            --includedir=${includedir} \
+            --infodir=${infodir} \
+            --mandir=${mandir} \
+            ${EXTRA_OECONF} 
+ 
+	sed -i /LINK_CC/d ./_build_/c4che/default.cache.py 
+	echo "LINK_CC = '${CXX}'" >>  ./_build_/c4che/default.cache.py
+}
+
+
+
diff --git a/recipes/libacpi/files/makefile-fix.patch b/recipes/libacpi/files/makefile-fix.patch
new file mode 100644
index 0000000000..9193929767
--- /dev/null
+++ b/recipes/libacpi/files/makefile-fix.patch
@@ -0,0 +1,45 @@
+---
+ Makefile  |    6 +++---
+ config.mk |    3 ++-
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+Index: libacpi-0.2/Makefile
+===================================================================
+--- libacpi-0.2.orig/Makefile	2007-07-29 14:09:34.000000000 +0200
++++ libacpi-0.2/Makefile	2008-09-26 10:34:53.000000000 +0200
+@@ -25,16 +25,16 @@ ${OBJ}: config.mk libacpi.h
+ 
+ libacpi.a: ${OBJ}
+ 	@echo AR $@
+-	@${AR} $@ ${OBJ}
++	${AR} ${ARFLAGS} $@ ${OBJ}
+ 	@${RANLIB} $@
+ 
+ libacpi.so: ${OBJ}
+ 	@echo LD $@