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

Conflicts:

	MAINTAINERS

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

66 files changed, 57597 insertions, 2810 deletions

diff --git a/recipes/alsa/alsa-utils_1.0.19.bb b/recipes/alsa/alsa-utils_1.0.19.bb
index 9ff129f233..3e9bd86b7e 100644
--- a/recipes/alsa/alsa-utils_1.0.19.bb
+++ b/recipes/alsa/alsa-utils_1.0.19.bb
@@ -3,10 +3,10 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
-	   file://alsa-utils-remove-xmlto.patch;patch=1 \
+	   file://alsa-utils-remove-xmlto-1.0.19plus.patch;patch=1 \
 	  "
 	
 
diff --git a/recipes/alsa/alsa-utils_1.0.20.bb b/recipes/alsa/alsa-utils_1.0.20.bb
new file mode 100644
index 0000000000..7eeb46ca7d
--- /dev/null
+++ b/recipes/alsa/alsa-utils_1.0.20.bb
@@ -0,0 +1,66 @@
+DESCRIPTION = "ALSA Utilities"
+HOMEPAGE = "http://www.alsa-project.org"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib ncurses"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
+	   file://alsa-utils-remove-xmlto-1.0.19plus.patch;patch=1 \
+	  "
+	
+
+inherit autotools
+
+# This are all packages that we need to make. Also, the now empty alsa-utils
+# ipk depend on them.
+
+
+do_configure_append() {
+	for i in $(find ${S} -name Makefile) ; do
+		sed -i -e s:/usr/include/ncurses:${STAGING_INCDIR}/ncurses:g $i
+		sed -i -e 's:-L/usr/lib -lncurses:-L${STAGING_LIBDIR} -lncurses:g' $i
+	done
+}
+
+PACKAGES += "\
+             alsa-utils-alsamixer \
+             alsa-utils-midi \
+             alsa-utils-aplay \
+             alsa-utils-amixer \
+             alsa-utils-aconnect \
+             alsa-utils-iecset \
+             alsa-utils-speakertest \
+             alsa-utils-aseqnet \
+             alsa-utils-aseqdump \
+             alsa-utils-alsaconf \
+             alsa-utils-alsactl "
+
+# We omit alsaconf, because
+# a) this is a bash script
+# b) it creates config files not suitable for OE-based distros
+
+FILES_${PN} = ""
+FILES_alsa-utils-aplay       = "${bindir}/aplay ${bindir}/arecord"
+FILES_alsa-utils-amixer      = "${bindir}/amixer"
+FILES_alsa-utils-alsamixer   = "${bindir}/alsamixer"
+FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/"
+FILES_alsa-utils-midi        = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
+FILES_alsa-utils-aconnect    = "${bindir}/aconnect"
+FILES_alsa-utils-aseqnet     = "${bindir}/aseqnet"
+FILES_alsa-utils-iecset      = "${bindir}/iecset"
+FILES_alsa-utils-alsactl     = "${sbindir}/alsactl"
+FILES_alsa-utils-aseqdump    = "${bindir}/aseqdump"
+FILES_alsa-utils-alsaconf    = "${sbindir}/alsaconf"
+
+DESCRIPTION_alsa-utils-aplay        = "play (and record) sound files via ALSA"
+DESCRIPTION_alsa-utils-amixer       = "command-line based control for ALSA mixer and settings"
+DESCRIPTION_alsa-utils-alsamixer    = "ncurses based control for ALSA mixer and settings"
+DESCRIPTION_alsa-utils-speakertest  = "ALSA surround speaker test utility"
+DESCRIPTION_alsa-utils-midi         = "miscalleanous MIDI utilities for ALSA"
+DESCRIPTION_alsa-utils-aconnect     = "ALSA sequencer connection manager"
+DESCRIPTION_alsa-utils-aseqnet      = "network client/server on ALSA sequencer"
+DESCRIPTION_alsa-utils-alsactl      = "saves/restores ALSA-settings in /etc/asound.state"
+DESCRIPTION_alsa-utils-alsaconf     = "a bash script that creates ALSA configuration files"
+
+ALLOW_EMPTY_alsa-utils = "1"
diff --git a/recipes/alsa/alsa-utils-1.0.19/alsa-utils-remove-xmlto.patch b/recipes/alsa/files/alsa-utils-remove-xmlto-1.0.19plus.patch
index 53ff95a886..53ff95a886 100644
--- a/recipes/alsa/alsa-utils-1.0.19/alsa-utils-remove-xmlto.patch
+++ b/recipes/alsa/files/alsa-utils-remove-xmlto-1.0.19plus.patch
diff --git a/recipes/balsa/balsa-2.4.0/balsa-no-spell.patch b/recipes/balsa/balsa-2.4.0/balsa-no-spell.patch
new file mode 100644
index 0000000000..52780040a9
--- /dev/null
+++ b/recipes/balsa/balsa-2.4.0/balsa-no-spell.patch
@@ -0,0 +1,53 @@
+WARNING! This patch is buggy!
+It fixes compilation without gtkspell and breaks compilation with gtkspell.
+Index: balsa-2.4.0/src/Makefile.am
+===================================================================
+--- balsa-2.4.0.orig/src/Makefile.am
++++ balsa-2.4.0/src/Makefile.am
+@@ -87,13 +87,13 @@ balsa_print_source = print-gtk.c	\
+ 	balsa-print-object-text.h
+ 
+ if BUILD_WITH_GTKSPELL
+-balsa_gtkspell_extra =
+-balsa_gtkspell_extra_dist =	\
++balsa_gtkspell_extra_dist =
++balsa_gtkspell_extra =		\
+ 		spell-check.c		\
+ 		spell-check.h
+ else
+-balsa_gtkspell_extra_dist =
+-balsa_gtkspell_extra =		\
++balsa_gtkspell_extra =
++balsa_gtkspell_extra_dist =	\
+ 		spell-check.c		\
+ 		spell-check.h
+ endif
+Index: balsa-2.4.0/src/sendmsg-window.c
+===================================================================
+--- balsa-2.4.0.orig/src/sendmsg-window.c
++++ balsa-2.4.0/src/sendmsg-window.c
+@@ -366,7 +366,7 @@ static const GtkActionEntry entries[] =
+      NULL, G_CALLBACK(insert_signature_cb)},
+     {"QuoteMessages", NULL, N_("_Quote Message(s)"), NULL,
+      NULL, G_CALLBACK(quote_messages_cb)},
+-#if !HAVE_GTKSPELL
++#if HAVE_GTKSPELL
+     {"CheckSpelling", GTK_STOCK_SPELL_CHECK, N_("C_heck Spelling"), NULL,
+      N_("Check the spelling of the message"),
+      G_CALLBACK(spell_check_cb)},
+@@ -6559,7 +6559,6 @@ spell_check_menu_cb(GtkToggleAction * ac
+         sw_spell_detach(bsmsg);
+ }
+ 
+-#else                           /* HAVE_GTKSPELL */
+ /* spell_check_cb
+  * 
+  * Start the spell check
+@@ -6605,6 +6604,7 @@ spell_check_cb(GtkAction * action, Balsa
+     balsa_spell_check_start(sc, GTK_WINDOW(bsmsg->window));
+ }
+ 
++#else                           /* HAVE_GTKSPELL */
+ static void
+ sw_spell_check_response(BalsaSpellCheck * spell_check, gint response, 
+                         BalsaSendmsg * bsmsg)
diff --git a/recipes/balsa/balsa-2.4.0/balsa-touch.patch b/recipes/balsa/balsa-2.4.0/balsa-touch.patch
new file mode 100644
index 0000000000..16b0a68eeb
--- /dev/null
+++ b/recipes/balsa/balsa-2.4.0/balsa-touch.patch
@@ -0,0 +1,11 @@
+--- balsa-2.4.0/src/main-window.c
++++ balsa-2.4.0/src/main-window.c
+@@ -375,7 +375,7 @@
+      G_CALLBACK(mailbox_conf_add_mbox_cb)},
+     {"NewMaildir", GTK_STOCK_ADD, N_("New \"Maildir\" mailbox..."), NULL,
+      N_("Add a new Maildir style mailbox"),
+-     G_CALLBACK(bw_mailbox_conf_add_maildir_cb)},
++     G_CALLBACK(mailbox_conf_add_maildir_cb)},
+     {"NewMH", GTK_STOCK_ADD, N_("New \"MH\" mailbox..."), NULL,
+      N_("Add a new MH style mailbox"), G_CALLBACK(mailbox_conf_add_mh_cb)},
+ #endif /* ENABLE_TOUCH_UI */
diff --git a/recipes/balsa/balsa_2.4.0.bb b/recipes/balsa/balsa_2.4.0.bb
new file mode 100644
index 0000000000..9fc3736a66
--- /dev/null
+++ b/recipes/balsa/balsa_2.4.0.bb
@@ -0,0 +1,80 @@
+DESCRIPTION = "Robust and configurable e-mail client for GNOME"
+HOMEPAGE = "http://pawsa.fedorapeople.org/balsa/"
+SECTION = "x11/network"
+LICENSE = "GPL"
+SRC_URI = "http://pawsa.fedorapeople.org/balsa/${P}.tar.bz2 \
+           file://balsa-touch.patch;patch=1 \
+           file://balsa-no-spell.patch;patch=1"
+
+DEPENDS = "glib-2.0 libgmime-2.4 gtk+ intltool-native libesmtp libxml-parser-perl-native"
+# FIXME: It is possible to build several variants of balsa: lite (SSL, gqlite/GPE, maybe HTML),
+# standard (GNOME, spell checking, HTML), full (Kerberos, LDAP, PGP, Rubrica, X-Face)
+
+# Options for regular expressions are: NONE (POSIX) glib-2.0 (GRegex) libpcre (PCRE)
+DEPENDS += ""
+
+# Options for remote activation are: libbonobo libunique
+DEPENDS += "libunique"
+
+# Options for HTML view are: gtkhtml-2.0 gtkhtml-3.0 webkit-gtk NONE
+DEPENDS += "webkit-gtk"
+
+# Optional dependencies (missing in OE): Spell checking
+#DEPENDS += "gtkspell"
+
+# Optional dependencies: SSL support:
+DEPENDS += "openssl"
+
+# Optional dependencies: GPE addressbook:
+DEPENDS += "sqlite"
+
+# Optional dependencies: GNOME:
+DEPENDS += "gconf libgnome libgnomeui"
+#DEPENDS += "gnome-keyring"
+
+# Optional dependencies: PGP support:
+#DEPENDS += "gpgme"
+
+# Optional dependencies: view source:
+#DEPENDS += "gtksourceview2"
+
+# Optional dependencies: LDAP:
+#DEPENDS += "openldap"
+
+# Options for optional Kerberos 5: heimdal (not in OE) krb5
+#DEPENDS += "krb5"
+
+# Optional dependencies: Rubrica addressbook:
+#DEPENDS += "libxml2"
+
+# Optional dependencies (not yet in OE): X-Face support:
+#DEPENDS += "compface"
+
+# FIXME: doc build requires docbook4 and gnome-doc-utils
+
+inherit autotools
+
+EXTRA_OECONF="--with-ssl \
+	      --without-gnome \
+	      --enable-touch-ui \
+	      --disable-scrollkeeper \
+	      --enable-smime \
+	      --with-sqlite \
+	      --with-ssl \
+	      --with-webkit \
+	      --with-unique \
+#	      --without-gtkspell \
+"
+# Not enabled:
+#	      --with-gtkspell \
+#	      --with-gpgme \
+#	      --with-gtksourceview \
+#	      --with-rubrica \
+#	      --with-gss \
+#	      --with-ldap \
+#	      --with-compface \
+
+do_configure_prepend() {
+	# aclocal seems to insist on looking in here.  Make sure it exists.
+	mkdir -p ${S}/m4
+}
diff --git a/recipes/classpath/classpath.inc b/recipes/classpath/classpath.inc
index da3273bc97..bf630bf569 100644
--- a/recipes/classpath/classpath.inc
+++ b/recipes/classpath/classpath.inc
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "Classpath"
 PBN = "classpath"
 
-DEPENDS = "virtual/javac-native fastjar-native zip-native"
+DEPENDS = "virtual/javac-native fastjar-native zip-native gmp"
 RPROVIDES = ""
 
 RDEPENDS_${PN} = "${PBN}-common (>= ${PV})"
diff --git a/recipes/classpath/classpath_0.98.bb b/recipes/classpath/classpath_0.98.bb
index 292c49ff1a..13f7a72b44 100644
--- a/recipes/classpath/classpath_0.98.bb
+++ b/recipes/classpath/classpath_0.98.bb
@@ -4,9 +4,10 @@ SRC_URI += "\
   file://SimpleName.diff;patch=1;pnum=0 \
   file://ecj_java_dir.patch;patch=1 \
   file://autotools.patch;patch=1 \
+  file://fix-gmp.patch;patch=1 \
   "
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS += "gtk+ gconf libxtst"
 
diff --git a/recipes/classpath/files/fix-gmp.patch b/recipes/classpath/files/fix-gmp.patch
new file mode 100644
index 0000000000..3f0dfbe084
--- /dev/null
+++ b/recipes/classpath/files/fix-gmp.patch
@@ -0,0 +1,19 @@
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- classpath-0.98.orig/configure.ac
++++ classpath-0.98/configure.ac
+@@ -766,11 +766,11 @@ if test "x${COMPILE_JNI}" = xyes; then
+   dnl __gmpz_mul_si for earlier versions (>= 3.1).
+   dnl IMPORTANT: if you decide to look for __gmpz_combit, don't forget to
+   dnl change the name of the corresponding ac_ variable on lines 860...
+   if test "x${COMPILE_GMP}" = xyes; then
+     AC_CHECK_LIB(gmp, __gmpz_mul_si,
+-      [GMP_CFLAGS=-I/usr/include
++      [GMP_CFLAGS=
+        GMP_LIBS=-lgmp ],
+       [GMP_CFLAGS=
+        GMP_LIBS= ])
+     AC_SUBST(GMP_CFLAGS)
+     AC_SUBST(GMP_LIBS)
diff --git a/recipes/cwiid/cwiid_svn.bb b/recipes/cwiid/cwiid_svn.bb
new file mode 100644
index 0000000000..8d134f3f36
--- /dev/null
+++ b/recipes/cwiid/cwiid_svn.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "wiimote library + tools"
+LICENSE = "GPLv2"
+HOMEPAGE = "http://abstrakraft.org/cwiid/"
+
+SRCREV = "192"
+PV = "0.6.00+svnr${SRCREV}"
+
+inherit autotools
+inherit distutils-base
+
+export BUILD_SYS
+export HOST_SYS
+
+PARALLEL_MAKE = ""
+
+SRC_URI = "svn://abstrakraft.org/cwiid/svn/;module=trunk;proto=http"
+S = "${WORKDIR}/trunk"
+
+EXTRA_OECONF = "--disable-ldconfig"
+
+FILES_${PN} += "\
+	${sysconfdir}/cwiid/ \
+"
+
+FILES_${PN}-dbg += "\
+	${libdir}/cwiid/plugins/.debug \
+"
+
+do_configure_append() {
+	find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+ 	find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
+}
+
+
diff --git a/recipes/gdb/gdbserver_6.6.bb b/recipes/gdb/gdbserver_6.6.bb
new file mode 100644
index 0000000000..bad9ae7158
--- /dev/null
+++ b/recipes/gdb/gdbserver_6.6.bb
@@ -0,0 +1,5 @@
+require gdbserver.inc
+
+LICENSE = "GPLv2"
+
+PR = "${INC_PR}.0"
diff --git a/recipes/gnome/epiphany_2.21.92.bb b/recipes/gnome/epiphany_2.21.92.bb
index c13d8ea050..2cdc4ba027 100644
--- a/recipes/gnome/epiphany_2.21.92.bb
+++ b/recipes/gnome/epiphany_2.21.92.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "GNOME default webbrowser"
 DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
-RDEPENDS = "gnome-vfs-plugin-http"
-PR ="r1"
+RDEPENDS = "gnome-vfs-plugin-http iso-codes"
+PR ="r2"
 
 inherit gnome
 
diff --git a/recipes/gnome/epiphany_2.22.1.bb b/recipes/gnome/epiphany_2.22.1.bb
index 0324cb7a65..531544d515 100644
--- a/recipes/gnome/epiphany_2.22.1.bb
+++ b/recipes/gnome/epiphany_2.22.1.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "GNOME default webbrowser"
 DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
-RDEPENDS = "gnome-vfs-plugin-http"
+RDEPENDS = "gnome-vfs-plugin-http iso-codes"
 
-PR = "r1"
+PR = "r2"
 
 inherit gnome
 
diff --git a/recipes/gnome/epiphany_2.24.0.bb b/recipes/gnome/epiphany_2.24.0.bb
index d2d45475b7..9ae253df4c 100644
--- a/recipes/gnome/epiphany_2.24.0.bb
+++ b/recipes/gnome/epiphany_2.24.0.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "GNOME default webbrowser"
 DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
-RDEPENDS = "gnome-vfs-plugin-http"
+RDEPENDS = "gnome-vfs-plugin-http iso-codes"
+PR = "r1"
 
 inherit gnome
 
diff --git a/recipes/gnome/epiphany_2.24.2.bb b/recipes/gnome/epiphany_2.24.2.bb
index a5ad6bef22..54bd3e389a 100644
--- a/recipes/gnome/epiphany_2.24.2.bb
+++ b/recipes/gnome/epiphany_2.24.2.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "GNOME default webbrowser"
 DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
-RDEPENDS = "gnome-vfs-plugin-http"
+RDEPENDS = "gnome-vfs-plugin-http iso-codes"
 
 inherit gnome
 
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}"
 
diff --git a/recipes/gnome/epiphany_2.27.1.bb b/recipes/gnome/epiphany_2.27.1.bb
index 0c3327d679..200a7bccd1 100644
--- a/recipes/gnome/epiphany_2.27.1.bb
+++ b/recipes/gnome/epiphany_2.27.1.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "GNOME default webbrowser"
 DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
-RDEPENDS = "gnome-vfs-plugin-http"
+RDEPENDS = "gnome-vfs-plugin-http iso-codes"
+PR = "r1"
 
 inherit gnome
 
diff --git a/recipes/gnome/epiphany_svn.bb b/recipes/gnome/epiphany_svn.bb
index 97fd82b653..0c9f974f82 100644
--- a/recipes/gnome/epiphany_svn.bb
+++ b/recipes/gnome/epiphany_svn.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "GNOME default webbrowser"
 DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
-RDEPENDS = "gnome-vfs-plugin-http"
+RDEPENDS = "gnome-vfs-plugin-http iso-codes"
 
 PV = "2.20.1+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 inherit gnome
 
diff --git a/recipes/icon-slicer/icon-slicer-native_0.3.bb b/recipes/icon-slicer/icon-slicer-native_0.3.bb
index e23bcacdff..f7be0de306 100644
--- a/recipes/icon-slicer/icon-slicer-native_0.3.bb
+++ b/recipes/icon-slicer/icon-slicer-native_0.3.bb
@@ -4,7 +4,7 @@ SRC_URI = "http://freedesktop.org/software/icon-slicer/releases/icon-slicer-${PV
 
 inherit autotools native
 
-DEPENDS = "gtk+-native popt-native"
+DEPENDS = "gdk-pixbuf-csource-native popt-native"
 
 S = "${WORKDIR}/icon-slicer-${PV}"
 
diff --git a/recipes/images/sugar-image.bb b/recipes/images/sugar-image.bb
index 247927543b..e4513f6fe5 100644
--- a/recipes/images/sugar-image.bb
+++ b/recipes/images/sugar-image.bb
@@ -1,5 +1,6 @@
 XSERVER ?= "xserver-kdrive-fbdev"
 SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
+ANGSTROM_EXTRA_INSTALL += ""
 <