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

11 files changed, 189 insertions, 10 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/libgmime/files/configure-cross.patch b/recipes/libgmime/files/configure-cross.patch
new file mode 100644
index 0000000000..3b63d0b2e9
--- /dev/null
+++ b/recipes/libgmime/files/configure-cross.patch
@@ -0,0 +1,42 @@
+Index: gmime-2.2.23/configure.in
+===================================================================
+--- gmime-2.2.23.orig/configure.in	2008-09-14 15:28:35.000000000 +0000
++++ gmime-2.2.23/configure.in	2009-06-30 20:36:00.000000000 +0000
+@@ -169,14 +169,21 @@
+ LIBS_save="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+ 
+-AC_MSG_CHECKING(preferred charset formats for system iconv)
+-AC_TRY_RUN([
+-#define CONFIGURE_IN
+-#include "iconv-detect.c"
+-],[
+-	AC_MSG_RESULT(found)
++AC_CACHE_CHECK([preferred charset formats for system iconv], [ac_cv_have_iconv_detect_h], [
++	AC_RUN_IFELSE([AC_LANG_SOURCE([
++		#define CONFIGURE_IN
++		#include "iconv-detect.c"
++		])],
++	[ac_cv_have_iconv_detect_h=yes], [ac_cv_have_iconv_detect_h=no],
++	[
++		AC_MSG_RESULT([cannot run test program while cross compiling])
++		AC_MSG_ERROR([Please set ac_cv_have_iconv_detect_h to yes iconv-detect.h file.])
++	])
++])
++if test "x$ac_cv_have_iconv_detect_h" = xyes; then
++	AC_MSG_RESULT([found])
+ 	AC_DEFINE(HAVE_ICONV_DETECT_H, 1, [Define to 1 to use auto-detected iconv-friendly charset names.])
+-],[
++else
+ 	AC_MSG_RESULT([not found
+ 	*** The iconv-detect program was unable to determine the
+ 	*** preferred charset formats recognized by your system
+@@ -186,7 +193,7 @@
+ 	*** 
+ 	*** Default charset formats will be used.
+ 	])
+-])
++fi
+ 
+ CFLAGS="$CFLAGS_save"
+ LIBS="$LIBS_save"
diff --git a/recipes/libgmime/files/iconv-detect.h b/recipes/libgmime/files/iconv-detect.h
new file mode 100644
index 0000000000..714cb5aa9d
--- /dev/null
+++ b/recipes/libgmime/files/iconv-detect.h
@@ -0,0 +1,5 @@
+/* This is an auto-generated header, DO NOT EDIT! */
+
+#define ICONV_ISO_INT_FORMAT "iso-%u-%u"
+#define ICONV_ISO_STR_FORMAT "iso-%u-%s"
+#define ICONV_10646 "iso-10646"
diff --git a/recipes/libgmime/libgmime-2.4_2.4.7.bb b/recipes/libgmime/libgmime-2.4_2.4.7.bb
new file mode 100644
index 0000000000..43b1c9c0a3
--- /dev/null
+++ b/recipes/libgmime/libgmime-2.4_2.4.7.bb
@@ -0,0 +1,15 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Runtime libraries for parsing and creating MIME mail"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "glib-2.0 zlib"
+SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gmime/2.4/gmime-${PV}.tar.bz2 \
+           file://configure-cross.patch;patch=1 \
+           file://iconv-detect.h"
+EXTRA_OECONF += "--disable-mono"
+S = "${WORKDIR}/gmime-${PV}"
+
+inherit autotools_stage lib_package
+
+export ac_cv_have_iconv_detect_h=yes
+do_configure_append = "cp ${WORKDIR}/iconv-detect.h ${S}"
diff --git a/recipes/libgmime/libgmime_2.2.23.bb b/recipes/libgmime/libgmime_2.2.23.bb
new file mode 100644
index 0000000000..2f2d320dac
--- /dev/null
+++ b/recipes/libgmime/libgmime_2.2.23.bb
@@ -0,0 +1,20 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Runtime libraries for parsing and creating MIME mail"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "glib-2.0 zlib"
+SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gmime/2.2/gmime-${PV}.tar.bz2 \
+           file://configure-cross.patch;patch=1 \
+           file://iconv-detect.h"
+EXTRA_OECONF += "--disable-mono"
+S = "${WORKDIR}/gmime-${PV}"
+
+inherit autotools_stage lib_package binconfig
+
+export ac_cv_have_iconv_detect_h=yes
+do_configure_append = "cp ${WORKDIR}/iconv-detect.h ${S}"
+
+# we do not need GNOME 1 gnome-config support
+do_install_append () {
+	rm -f ${D}${libdir}/gmimeConf.sh
+}
diff --git a/recipes/linux/linux-davinci_2.6.30.bb b/recipes/linux/linux-davinci_2.6.30.bb
new file mode 100644
index 0000000000..63c87e820b
--- /dev/null
+++ b/recipes/linux/linux-davinci_2.6.30.bb
@@ -0,0 +1,34 @@
+require linux.inc
+
+DESCRIPTION = "Linux kernel for Davinci processors"
+KERNEL_IMAGETYPE = "uImage"
+
+COMPATIBLE_MACHINE = "(dm6446-evm|dm6467-evm|dm355-evm|davinci-sffsdr|dm355-leopard)"
+
+DEFAULT_PREFERENCE = "1"
+
+SRCREV = "5212151f26e688416faac9f6f33ddd958f7de96c"
+
+# The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc
+PV = "2.6.30-${PR}+gitr${SRCREV}"
+
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git;protocol=git \
+           file://defconfig"
+
+# Need checking
+SRC_URI_append_davinci-sffsdr = " \
+           file://0001-USB-musb-cppi-bugfixes.patch;patch=1 \
+           file://0002-ARM-Mark-unsupported-syscalls-as-IGNORE.patch;patch=1 \
+           file://0003-Add-macros-for-enabling-a-UART.patch;patch=1 \
+           file://0004-Davinci-Enable-MAC-address-to-be-specified-on-kerne.patch;patch=1 \
+           file://0005-Add-DAS-Mini-DAS-and-AFE-USB-machine-types.patch;patch=1 \
+           file://0006-ALSA-ASoC-DaVinci-Fix-SFFSDR-compilation-error.patch;patch=1 \
+           file://0007-ALSA-ASoC-Davinci-Fix-SFFSDR-FPGA-module-codec-FS.patch;patch=1 \
+           file://0008-ALSA-ASoC-Davinci-Fix-incorrect-machine-type-for.patch;patch=1 \
+           file://0009-sound-ASoC-Fix-DaVinci-module-unload-error.patch;patch=1 \
+           file://0010-Add-generic-FPGA-bitstream-loader-driver.patch;patch=1 \
+           file://0011-Add-lyrvpss-example-driver-for-the-SFFSDR-board.patch;patch=1 \
+           file://0012-Update-SFFSDR-to-support-FPGA-and-lyrvpss-drivers.patch;patch=1 \
+          "
+
+S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb
index 7af90fa440..a39ba10d7a 100644
--- a/recipes/linux/linux-davinci_git.bb
+++ b/recipes/linux/linux-davinci_git.bb
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE = "(dm6446-evm|dm6467-evm|dm355-evm|davinci-sffsdr|dm355-leop
 
 DEFAULT_PREFERENCE = "1"
 
-SRCREV = "03022e38318bef016836dae71c70b9ea975723e7"
+SRCREV = "5bbb6571043c7e3a1d73b874334037a64d10612f"
 
 # The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc
-PV = "2.6.29+2.6.30-rc7-${PR}+gitr${SRCREV}"
+PV = "2.6.30-${PR}+gitr${SRCREV}"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git;protocol=git;branch=staging/vpfe \
            file://defconfig"
diff --git a/recipes/zaurusd/files/avoid-rotated-server.patch b/recipes/zaurusd/files/avoid-rotated-server.patch
index 0ee601222e..8d724017dc 100644
--- a/recipes/zaurusd/files/avoid-rotated-server.patch
+++ b/recipes/zaurusd/files/avoid-rotated-server.patch
@@ -16,12 +16,9 @@ Index: zaurusd/config/mach-config/mach-borzoi-vars.in
 ===================================================================
 --- zaurusd.orig/config/mach-config/mach-borzoi-vars.in	2009-03-07 11:04:43.000000000 +0000
 +++ zaurusd/config/mach-config/mach-borzoi-vars.in	2009-06-22 20:51:00.000000000 +0000
-@@ -5,6 +5,9 @@
- SWITCH_EVENT_DEVICE=/dev/input/event0
- 
+@@ -7,4 +7,7 @@
  TSKEYS_CONF=@appconfdir@/tskeys/zaurus-cxx00.conf
--TSKEYS_DEVICE=/dev/input/event1
-+TSKEYS_DEVICE=/dev/input/touchscreen0
+ TSKEYS_DEVICE=/dev/input/event1
  
 -ALSA_MIXER_INIT=@appconfdir@/alsa/cxx00-default.state
 \ No newline at end of file
diff --git a/recipes/zaurusd/files/use-ts-symlink-instead-of-hardcoding.diff b/recipes/zaurusd/files/use-ts-symlink-instead-of-hardcoding.diff
index 55118f6aaa..9c418ec5f9 100644
--- a/recipes/zaurusd/files/use-ts-symlink-instead-of-hardcoding.diff
+++ b/recipes/zaurusd/files/use-ts-symlink-instead-of-hardcoding.diff
@@ -15,7 +15,7 @@
  SWITCH_EVENT_DEVICE=/dev/input/event0
  
  TSKEYS_CONF=@appconfdir@/tskeys/zaurus-cxx00.conf
--TSKEYS_DEVICE=/dev/input/touchscreen0
+-TSKEYS_DEVICE=/dev/input/event1
 +TSKEYS_DEVICE=/dev/input/touchscreen0
  
  ALSA_MIXER_INIT=@appconfdir@/alsa/cxx00-default.state