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

63 files changed, 762 insertions, 199 deletions

diff --git a/recipes/barebox/barebox.inc b/recipes/barebox/barebox.inc
new file mode 100644
index 0000000000..b3def2a7b6
--- /dev/null
+++ b/recipes/barebox/barebox.inc
@@ -0,0 +1,49 @@
+DESCRIPTION = "Barebox - a bootloader that inherits the best of U-Boot and the Linux kernel"
+HOMEPAGE = "http://www.barebox.org/"
+SECTION = "bootloaders"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PROVIDES = "virtual/bootloader"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit kernel-arch
+
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+
+BAREBOX_MACHINE ?= "${MACHINE}_defconfig"
+BAREBOX_BINARY ?= "barebox.bin"
+BAREBOX_IMAGE ?= "barebox-${MACHINE}-${PV}-${PR}.bin"
+BAREBOX_SYMLINK ?= "barebox-${MACHINE}.bin"
+
+INSANE_SKIP_${PN} = True
+
+do_configure_prepend() {
+	   cp ${WORKDIR}/defconfig ${S}/.config
+	   oe_runmake oldconfig
+}
+
+do_compile () {
+	   unset LDFLAGS
+	   unset CFLAGS
+	   unset CPPFLAGS
+	   oe_runmake all
+}
+
+do_deploy () {
+	  install -d ${DEPLOY_DIR_IMAGE}
+	  install ${S}/${BAREBOX_BINARY} ${DEPLOY_DIR_IMAGE}/${BAREBOX_IMAGE}
+	  package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${BAREBOX_IMAGE}
+
+	  cd ${DEPLOY_DIR_IMAGE}
+	  rm -f ${BAREBOX_SYMLINK}
+	  ln -sf ${BAREBOX_IMAGE} ${BAREBOX_SYMLINK}
+	  package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${BAREBOX_SYMLINK}
+}
+do_deploy[dirs] = "${S}"
+addtask deploy before do_build after do_compile
+
+do_stage() {
+	   install -d ${STAGING_BINDIR_NATIVE}
+	   install -m 755 scripts/mkimage ${STAGING_BINDIR_NATIVE}/
+}
diff --git a/recipes/barebox/barebox_2009.12.bb b/recipes/barebox/barebox_2009.12.bb
new file mode 100644
index 0000000000..2977429180
--- /dev/null
+++ b/recipes/barebox/barebox_2009.12.bb
@@ -0,0 +1,15 @@
+require barebox.inc
+
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+BAREBOX_REVISION ?= "0"
+
+S = "${WORKDIR}/barebox-${PV}.${BAREBOX_REVISION}"
+
+SRC_URI = "http://barebox.org/download/barebox-${PV}.${BAREBOX_REVISION}.tar.bz2;name=barebox-${PV}.${BAREBOX_REVISION} \
+	   file://defconfig"
+
+SRC_URI[barebox-2009.12.0.md5sum] = "d1aefe17cfd72affec766617b42dfb78"
+SRC_URI[barebox-2009.12.0.sha256sum] = "0ccd59898289652f4bebd8282737a771729d84886195221c781df08f81a837ef"
diff --git a/recipes/barebox/barebox_git.bb b/recipes/barebox/barebox_git.bb
new file mode 100644
index 0000000000..8f9e3221d7
--- /dev/null
+++ b/recipes/barebox/barebox_git.bb
@@ -0,0 +1,10 @@
+require barebox.inc
+
+PR = "r0"
+
+FILESPATHPKG =. "barebox-git:"
+
+SRC_URI = "git://git.pengutronix.de/git/barebox.git;protocol=git \
+	   file://defconfig"
+
+S = "${WORKDIR}/git"
diff --git a/recipes/cairo/cairo-native_1.8.0.bb b/recipes/cairo/cairo-native_1.8.0.bb
index c575cdcce1..d58e16b61d 100644
--- a/recipes/cairo/cairo-native_1.8.0.bb
+++ b/recipes/cairo/cairo-native_1.8.0.bb
@@ -3,8 +3,7 @@ require cairo_1.8.0.bb
 
 inherit native
 
-DEPENDS += "glib-2.0-native libpng-native libpixman-native libx11-native fontconfig-native"
+DEPENDS += "glib-2.0-native libpng-native pixman-native libx11-native fontconfig-native"
 PROVIDES = "cairo-native"
 
-PR = "r0"
-
+PR = "r1"
diff --git a/recipes/dri/libdrm_2.4.17.bb b/recipes/dri/libdrm_2.4.17.bb
new file mode 100644
index 0000000000..fd1ab3a5e4
--- /dev/null
+++ b/recipes/dri/libdrm_2.4.17.bb
@@ -0,0 +1,18 @@
+SECTION = "x11/base"
+DEPENDS = "libpthread-stubs"
+LICENSE = "MIT"
+SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
+PROVIDES = "drm"
+PR = "r2"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '', '--disable-intel',d)}"
+
+do_stage() {
+	autotools_stage_all
+}
+
+PACKAGES =+ "${@base_contains('MACHINE_FEATURES', 'x86', '${PN}-intel', '',d)}"
+
+FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*"
diff --git a/recipes/eggdbus/eggdbus_0.6.bb b/recipes/eggdbus/eggdbus_0.6.bb
new file mode 100644
index 0000000000..1d8717929b
--- /dev/null
+++ b/recipes/eggdbus/eggdbus_0.6.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "gobject dbus binding"
+HOMEPAGE = "http://cgit.freedesktop.org/~david/eggdbus"
+LICENSE = "GPLv2"
+
+DEPENDS = "dbus glib-2.0"
+
+BASE_SRC_URI = "http://cgit.freedesktop.org/~david/${BPN}/snapshot/${BPN}-${PV}.tar.bz2 \
+          file://gtk-doc.patch;patch=1 \
+          "
+
+SRC_URI = "${BASE_SRC_URI} \
+           file://marshal.patch;patch=1 \
+          "
+
+SRC_URI_virtclass-native = "${BASE_SRC_URI}"
+
+inherit autotools
+
+EXTRA_OECONF = " --disable-man-pages --disable-gtk-doc-html "
+
+BBCLASSEXTEND = "native"
+
diff --git a/recipes/eggdbus/files/gtk-doc.patch b/recipes/eggdbus/files/gtk-doc.patch
new file mode 100644
index 0000000000..0999a85153
--- /dev/null
+++ b/recipes/eggdbus/files/gtk-doc.patch
@@ -0,0 +1,32 @@
+Index: eggdbus-0.6/docs/eggdbus/Makefile.am
+===================================================================
+--- eggdbus-0.6.orig/docs/eggdbus/Makefile.am
++++ eggdbus-0.6/docs/eggdbus/Makefile.am
+@@ -87,11 +87,7 @@ HTML_IMAGES = 				\
+ # Extra options to supply to gtkdoc-fixref
+ FIXXREF_OPTIONS=
+ 
+-if ENABLE_GTK_DOC
+-include $(top_srcdir)/gtk-doc.make
+-else
+ CLEANFILES =
+-endif
+ 
+ CLEANFILES +=   *~				\
+ 		eggdbus-scan.*			\
+Index: eggdbus-0.6/docs/tests/Makefile.am
+===================================================================
+--- eggdbus-0.6.orig/docs/tests/Makefile.am
++++ eggdbus-0.6/docs/tests/Makefile.am
+@@ -65,11 +65,7 @@ HTML_IMAGES = 				\
+ # Extra options to supply to gtkdoc-fixref
+ FIXXREF_OPTIONS=
+ 
+-if ENABLE_GTK_DOC
+-include $(top_srcdir)/gtk-doc.make
+-else
+ CLEANFILES =
+-endif
+ 
+ CLEANFILES +=   *~				\
+ 		tests-scan.*			\
diff --git a/recipes/eggdbus/files/marshal.patch b/recipes/eggdbus/files/marshal.patch
new file mode 100644
index 0000000000..2b2cb4985b
--- /dev/null
+++ b/recipes/eggdbus/files/marshal.patch
@@ -0,0 +1,26 @@
+Index: eggdbus-0.6/src/eggdbus/Makefile.am
+===================================================================
+--- eggdbus-0.6.orig/src/eggdbus/Makefile.am
++++ eggdbus-0.6/src/eggdbus/Makefile.am
+@@ -130,7 +130,7 @@ BUILT_SOURCES =								\
+ 	$(NULL)
+ 
+ eggdbus-built-sources.stamp : eggdbus-binding-tool Makefile.am org.freedesktop.DBus.xml org.freedesktop.DBus.Peer.xml org.freedesktop.DBus.Properties.xml org.freedesktop.DBus.Introspectable.xml eggdbus-glib-genmarshal
+-	EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool							\
++	EGG_DBUS_GENMARSHAL=eggdbus-glib-genmarshal eggdbus-binding-tool							\
+ 		--namespace EggDBus									\
+ 		--dbus-namespace org.freedesktop.DBus							\
+ 		--interfaces-only									\
+Index: eggdbus-0.6/src/tests/Makefile.am
+===================================================================
+--- eggdbus-0.6.orig/src/tests/Makefile.am
++++ eggdbus-0.6/src/tests/Makefile.am
+@@ -25,7 +25,7 @@ BUILT_SOURCES = 							\
+ 	$(NULL)
+ 
+ test-built-sources.stamp : Makefile.am $(top_builddir)/src/eggdbus/eggdbus-binding-tool com.example.Frob.xml com.example.Tweak.xml com.example.Twiddle.xml
+-	EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool									\
++	EGG_DBUS_GENMARSHAL=eggdbus-glib-genmarshal eggdbus-binding-tool									\
+ 	  --namespace       "Test"										\
+ 	  --dbus-namespace  "com.example"									\
+ 	  --include-header  testtypes.h										\
diff --git a/recipes/gdb/gdb.inc b/recipes/gdb/gdb.inc
index 77a9ca6a3e..a63fb6159b 100644
--- a/recipes/gdb/gdb.inc
+++ b/recipes/gdb/gdb.inc
@@ -10,6 +10,10 @@ FILES_gdbserver = "${bindir}/gdbserver"
 RRECOMMENDS_gdb_append_linux = " glibc-thread-db "
 RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
 
+RRECOMMENDS_gdb_append_linux-uclibc = " uclibc-thread-db "
+RRECOMMENDS_gdb_append_linux-uclibceabi = " uclibc-thread-db "
+RRECOMMENDS_gdb_append_linux-spe = " uclibc-thread-db "
+
 inherit gettext
 
 SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \
@@ -43,5 +47,3 @@ do_install () {
 	install -d ${D}${bindir}
 	install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir}
 }
-
-
diff --git a/recipes/gdb/gdbserver.inc b/recipes/gdb/gdbserver.inc
index b98058fe5d..f477c3aa9c 100644
--- a/recipes/gdb/gdbserver.inc
+++ b/recipes/gdb/gdbserver.inc
@@ -1,6 +1,6 @@
 require gdb-common.inc
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 DEFAULT_PREFERENCE_avr32 = "-99"
 
@@ -9,6 +9,10 @@ FILES_gdbserver = "${bindir}/gdbserver"
 RRECOMMENDS_gdb_append_linux = " glibc-thread-db "
 RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
 
+RRECOMMENDS_gdb_append_linux-uclibc = " uclibc-thread-db "
+RRECOMMENDS_gdb_append_linux-uclibceabi = " uclibc-thread-db "
+RRECOMMENDS_gdb_append_linux-spe = " uclibc-thread-db "
+
 inherit gettext
 
 FILESPATHPKG =. "gdb-${PV}:"
diff --git a/recipes/gnome/at-spi_1.28.0.bb b/recipes/gnome/at-spi_1.28.0.bb
index 3639407eb6..79b48b3f1b 100644
--- a/recipes/gnome/at-spi_1.28.0.bb
+++ b/recipes/gnome/at-spi_1.28.0.bb
@@ -6,8 +6,16 @@ LICENSE = "LGPL"
 DEPENDS = "gtk+ atk libbonobo orbit2 orbit2-native"
 RDEPENDS_${PN} = "libgail-gnome gtk-module-gail"
 
+PR = "r1"
+
 inherit gnome
 
+do_configure_prepend () {
+	sed -i "s|ORBIT_IDL=.*|ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2|" ${S}/configure.in
+	sed -i "s|BONOBO_ACTIVATION_IDL_DIR=.*|BONOBO_ACTIVATION_IDL_DIR=${STAGING_DATADIR}/idl/bonobo-activation-2.0|" ${S}/configure.in
+	sed -i "s|LIBBONOBO_IDL_DIR=.*|LIBBONOBO_IDL_DIR=${STAGING_DATADIR}/idl//bonobo-2.0|" ${S}/configure.in
+}
+
 do_stage () {
 	autotools_stage_all
 }
diff --git a/recipes/gnome/libgdata_0.5.1.bb b/recipes/gnome/libgdata_0.5.1.bb
new file mode 100644
index 0000000000..7c510d0b5f
--- /dev/null
+++ b/recipes/gnome/libgdata_0.5.1.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "libgdata is a GLib-based library for accessing online service APIs"
+LICENSE = "LGPL"
+DEPENDS = "libxml2 glib-2.0 libsoup-2.4"
+
+inherit gnome lib_package autotools_stage
+
+SRC_URI += " \
+           file://gtk-doc.make \
+"
+
+do_configure_prepend() {
+    cp ${WORKDIR}/gtk-doc.make ${S}/
+    sed -i -e s:docs::g ${S}/Makefile.am
+    echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make
+}
+
+
+
diff --git a/recipes/gsoap/gsoap-native/use-just-built-binary-2.7.13.patch b/recipes/gsoap/gsoap-native/use-just-built-binary-2.7.13.patch
deleted file mode 100644
index 25a8ef0db1..0000000000
--- a/recipes/gsoap/gsoap-native/use-just-built-binary-2.7.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN gsoap-2.7.orig/gsoap/wsdl/Makefile.am gsoap-2.7.orig/gsoap/wsdl/Makefile.am
---- gsoap-2.7.orig/gsoap/wsdl/Makefile.am	2009-03-21 22:24:42.000000000 +0100
-+++ gsoap-2.7.orig/gsoap/wsdl/Makefile.am	2009-04-07 11:30:50.000000000 +0200
-@@ -17,7 +17,7 @@ BUILT_SOURCES=$(SOAP_CPP_SRC)
- # WSDL2H_EXTRA_LIBS=-lssl -lcrypto -lz # defined in configure.in
- 
- $(SOAP_CPP_SRC) : $(SOAPHEADER)
--	$(SOAP) $(SOAP_FLAGS) $(SOAPHEADER)
-+	../src/soapcpp2 $(SOAP_FLAGS) $(SOAPHEADER)
- 
- #LIBS=
- 
diff --git a/recipes/gsoap/gsoap-native/use-just-built-binary.patch b/recipes/gsoap/gsoap-native/use-just-built-binary.patch
deleted file mode 100644
index f7e4811f9e..0000000000
--- a/recipes/gsoap/gsoap-native/use-just-built-binary.patch
+++ /dev/null
@@ -1,19 +0,0 @@
----
- soapcpp2/wsdl/Makefile.am |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- gsoap-2.7.orig/soapcpp2/wsdl/Makefile.am
-+++ gsoap-2.7/soapcpp2/wsdl/Makefile.am
-@@ -13,11 +13,11 @@ SOAP_CPP_SRC=wsdlC.cpp
- SOAPHEADER=wsdl.h
- SOAP_FLAGS=-SC -pwsdl
- BUILT_SOURCES=$(SOAP_CPP_SRC)
- 
- $(SOAP_CPP_SRC) : $(SOAPHEADER)
--	$(SOAP) $(SOAP_FLAGS) $(SOAPHEADER)
-+	../src/soapcpp2 $(SOAP_FLAGS) $(SOAPHEADER)
- 
- #LIBS=
- 
- bin_PROGRAMS=wsdl2h
- 
diff --git a/recipes/gsoap/gsoap-native_2.7.13.bb b/recipes/gsoap/gsoap-native_2.7.13.bb
index 3ed78d0227..f0370beb2b 100644
--- a/recipes/gsoap/gsoap-native_2.7.13.bb
+++ b/recipes/gsoap/gsoap-native_2.7.13.bb
@@ -2,7 +2,7 @@ require gsoap_${PV}.inc
 
 DEPENDS = ""
 
-SRC_URI += "file://use-just-built-binary-2.7.13.patch;patch=1"
+EXTRA_OEMAKE = ""
 
 inherit native
 
diff --git a/recipes/gsoap/gsoap-native_2.7.7.bb b/recipes/gsoap/gsoap-native_2.7.7.bb
index 206208d329..0b8a4b8a5c 100644
--- a/recipes/gsoap/gsoap-native_2.7.7.bb
+++ b/recipes/gsoap/gsoap-native_2.7.7.bb
@@ -3,7 +3,7 @@ require gsoap_${PV}.bb
 DEPENDS = ""
 PR = "r1"
 
-SRC_URI += "file://use-just-built-binary.patch;patch=1"
+EXTRA_OEMAKE = ""
 
 inherit native
 
diff --git a/recipes/konqueror/konqueror-embedded_20030705.bb b/recipes/konqueror/konqueror-embedded_20030705.bb
index 979c1ce305..fba9d31ac3 100644
--- a/recipes/konqueror/konqueror-embedded_20030705.bb
+++ b/recipes/konqueror/konqueror-embedded_20030705.bb
@@ -31,7 +31,6 @@ FILES_${PN} = "${palmtopdir}"
 export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake"
 export MOC = "${STAGING_BINDIR_NATIVE}/moc"
 export UIC = "${STAGING_BINDIR_NATIVE}/uic"
-export exec_prefix = "${STAGING_LIBDIR}/.."
 
 EXTRA_OECONF = '--prefix=${palmtopdir} --exec-prefix=${palmtopdir}                              \
                 --enable-static --disable-shared --disable-debug                                \
diff --git a/recipes/konqueror/konqueror-embedded_20060404.bb b/recipes/konqueror/konqueror-embedded_20060404.bb
index a84f47d471..9f6ed35aeb 100644
--- a/recipes/konqueror/konqueror-embedded_20060404.bb
+++ b/recipes/konqueror/konqueror-embedded_20060404.bb
@@ -21,7 +21,7 @@ S = "${WORKDIR}/kdenox"
 export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake"
 export MOC = "${STAGING_BINDIR_NATIVE}/moc"
 export UIC = "${STAGING_BINDIR_NATIVE}/uic"
-export exec_prefix = "${palmtopdir}"
+#export exec_prefix = "${palmtopdir}"
 export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS"
 export PCRE_CONFIG = "invalid"
 # uncomment this for a static build
diff --git a/recipes/libcap/libcap_1.10.bb b/recipes/libcap/libcap_1.10.bb
index 172acaca6e..241529e865 100644
--- a/recipes/libcap/libcap_1.10.bb
+++ b/recipes/libcap/libcap_1.10.bb
@@ -3,9 +3,9 @@ PRIORITY = "optional"
 SECTION = "libs"
 LICENSE = "GPL"
 DEPENDS = "bison-native flex-native"
-PR = "r1"
+PR = "r2"
 
-CFLAGS_append = " -I${S}/libcap/include"
+CFLAGS_append = " -I${S}/libcap/include -fPIC"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/kernel-2.4/${PN}-${PV}.tar.bz2 \
 	   file://makenames.patch;patch=1 \
diff --git a/recipes/mokomaze/mokomaze_0.5.5.bb b/recipes/mokomaze/mokomaze_0.5.5.bb
index 6fbe415d2e..f15ca0ff53 100644
--- a/recipes/mokomaze/mokomaze_0.5.5.bb
+++ b/recipes/mokomaze/mokomaze_0.5.5.bb
@@ -8,7 +8,7 @@ RDEPENDS="ttf-liberation-mono libpng"
 
 RDEPENDS_shr += "fsoraw"
 
-PR="r1"
+PR="r2"
 PV="0.5.5+git8"
 
 
diff --git a/recipes/mozilla/firefox_3.5.2.bb b/recipes/mozilla/firefox_3.5.2.bb
index f126f13763..3d940d7af5 100644
--- a/recipes/mozilla/firefox_3.5.2.bb
+++ b/recipes/mozilla/firefox_3.5.2.bb
@@ -1,5 +1,5 @@
-DEPENDS += "cairo"
-PR = "r2"
+DEPENDS += "cairo sqlite3"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
diff --git a/recipes/mozilla/firefox_3.5.4.bb b/recipes/mozilla/firefox_3.5.4.bb
index 37be0fb858..8ba6ba15db 100644
--- a/recipes/mozilla/firefox_3.5.4.bb
+++ b/recipes/mozilla/firefox_3.5.4.bb
@@ -1,6 +1,6 @@
-DEPENDS += "cairo"
+DEPENDS += "cairo sqlite3"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.sourc