merge of '1a0381ff4565808f58609382d1280e18d59ded7f'

     and '82db3fe8864d686473c6bbf5db186f5fcbc90c5f'

73 files changed, 78758 insertions, 1700 deletions

diff --git a/packages/dasher/dasher-gpe_0.0cvs20040828.bb b/packages/dasher/dasher-gpe_0.0-svn.bb
index 7e515feae7..297aa9ac4f 100644
--- a/packages/dasher/dasher-gpe_0.0cvs20040828.bb
+++ b/packages/dasher/dasher-gpe_0.0-svn.bb
@@ -1,12 +1,12 @@
-
 LICENSE="GPL"
+PV = "0.0+svnr${SRCREV}"
 PR = "r1"
 DEPENDS = "libxsettings-client libglade libxtst gconf gtk+"
 SECTION = "gpe"
-SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=dasher;date=20040828 \
+SRC_URI = "svn://svn.gnome.org/svn/dasher;module=trunk \
 	file://configure-lossage.patch;patch=1"
 
-S = "${WORKDIR}/dasher"
+S = "${WORKDIR}/trunk"
 FILES_${PN} += "${datadir}/dasher"
 
 inherit autotools
diff --git a/packages/dsplink/dsplink-1.51/prcs-fix-include.patch b/packages/dsplink/dsplink-1.51/prcs-fix-include.patch
index 6fa92cd50a..a71cea3904 100644
--- a/packages/dsplink/dsplink-1.51/prcs-fix-include.patch
+++ b/packages/dsplink/dsplink-1.51/prcs-fix-include.patch
@@ -27,23 +27,3 @@
  
  /*  ----------------------------------- DSP/BIOS Link               */
  #include <dsplink.h>
---- /tmp/hal_intgen.c	2008-06-29 23:42:05.000000000 +0200
-+++ dsplink_1_51_00_08/dsplink/gpp/src/ldrv/HAL/OMAP/3530/hal_intgen.c	2008-06-29 23:42:18.000000000 +0200
-@@ -17,6 +17,7 @@
- 
- 
- /*  ----------------------------------- OS headers                  */
-+#include <linux/autoconf.h> 
- #include <asm/io.h>
- 
- /*  ----------------------------------- DSP/BIOS Link               */
---- /tmp/hal_prcm.c	2008-06-29 23:42:05.000000000 +0200
-+++ dsplink_1_51_00_08/dsplink/gpp/src/ldrv/HAL/OMAP/3530/hal_prcm.c	2008-06-29 23:43:10.000000000 +0200
-@@ -18,6 +18,7 @@
- 
- 
- /*  ----------------------------------- OS headers                  */
-+#include <linux/autoconf.h> 
- #include <asm/io.h>
- 
- /*  ----------------------------------- DSP/BIOS Link               */
diff --git a/packages/dsplink/dsplink.inc b/packages/dsplink/dsplink.inc
index 877697eb99..2fa4aae8e0 100644
--- a/packages/dsplink/dsplink.inc
+++ b/packages/dsplink/dsplink.inc
@@ -66,6 +66,10 @@ do_compile () {
 do_install () {
 	install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp
 	cp ${S}/gpp/BUILD/EXPORT/RELEASE/dsplinkk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/
+
+	install -d ${D}/${bindir}
+	install ${S}/gpp/BUILD/EXPORT/RELEASE/mpcsxfergpp ${D}/${bindir}
+	install ${S}/gpp/BUILD/EXPORT/RELEASE/ringiogpp   ${D}/${bindir}
 }
 
 pkg_postinst_${PN}-module () {
@@ -82,6 +86,7 @@ pkg_postrm_${PN}-module () {
 
 PACKAGES =+ "${PN}-module"
 FILES_${PN}-module  = "${sysconfdir} /lib/modules"
+FILES_${PN} = "${bindir}/mpcsxfergpp ${bindir}/ringiogpp"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}" 
 
diff --git a/packages/dsplink/dsplink_1.50.bb b/packages/dsplink/dsplink_1.50.bb
index b9664e7e5b..c1b6f15694 100644
--- a/packages/dsplink/dsplink_1.50.bb
+++ b/packages/dsplink/dsplink_1.50.bb
@@ -1,6 +1,6 @@
 require dsplink.inc
 
-PR = "r3"
+PR = "r4"
 PE = "1"
 PV = "1.50"
 
diff --git a/packages/dsplink/dsplink_1.51.00.08.bb b/packages/dsplink/dsplink_1.51.00.08.bb
index d79b5e655c..02c04aa054 100644
--- a/packages/dsplink/dsplink_1.51.00.08.bb
+++ b/packages/dsplink/dsplink_1.51.00.08.bb
@@ -1,6 +1,6 @@
 require dsplink.inc
 
-PR = "r0"
+PR = "r1"
 PE = "1"
 PV = "1.51"
 
diff --git a/packages/dsplink/files/davinci_mvlpro5.0.mk b/packages/dsplink/files/davinci_mvlpro5.0.mk
index 66365f607b..2379bc359e 100644
--- a/packages/dsplink/files/davinci_mvlpro5.0.mk
+++ b/packages/dsplink/files/davinci_mvlpro5.0.mk
@@ -99,7 +99,7 @@ CC_SW_DEB       := -g
 #   ----------------------------------------------------------------------------
 #   Standard flags for the compiler
 #   ----------------------------------------------------------------------------
-STD_KRNL_FLAGS  := -c -iwithprefix include -Iinclude -Wall  -Wstrict-prototypes\
+STD_KRNL_FLAGS  := -include linux/autoconf.h -c -iwithprefix include -Iinclude -Wall  -Wstrict-prototypes\
                    -Wno-trigraphs -fno-strict-aliasing -fno-common             \
                    -fno-omit-frame-pointer -mapcs -mno-sched-prolog            \
                    -mlittle-endian -D__LINUX_ARM_ARCH__=5 -march=armv5t        \
diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb
index 87161526e0..b3a4201bcf 100644
--- a/packages/e17/e-wm_cvs.bb
+++ b/packages/e17/e-wm_cvs.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "The Enlightenment Window Mananger Version 17"
-DEPENDS = "eet evas ecore edje efreet"
+DEPENDS = "eet evas ecore edje efreet edbus"
 LICENSE = "MIT BSD"
 PV = "0.16.999.042+cvs${SRCDATE}"
-PR = "r8"
+PR = "r9"
 
 inherit e update-alternatives
 
diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb
index e59ba0be1a..8574d9f29e 100644
--- a/packages/efl1/edbus_cvs.bb
+++ b/packages/efl1/edbus_cvs.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
-DEPENDS = "dbus ecore efreet ewl"
+DEPENDS = "dbus ecore"
 LICENSE = "MIT BSD"
 PV = "0.5.0.043+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 inherit efl
 
diff --git a/packages/freesmartphone/frameworkd/frameworkd.conf b/packages/freesmartphone/frameworkd/frameworkd.conf
index 8b13789179..36b4f5fc8e 100644
--- a/packages/freesmartphone/frameworkd/frameworkd.conf
+++ b/packages/freesmartphone/frameworkd/frameworkd.conf
@@ -1 +1,20 @@
+[odeviced]
 
+[kernel26]
+# set 1 to disable the module
+disable = 0
+
+[idlenotifier]
+# set 1 to disable the module
+disable = 0
+# add inut nodes to ignore for idle activity
+ignoreinput = 2,3,4
+
+[powercontrol-neo]
+disable = 0
+
+[ogsmd]
+modemtype = ti_calypso
+
+[opreferencesd]
+rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb
index ea3a4cb652..a6d25f79ec 100644
--- a/packages/freesmartphone/frameworkd_git.bb
+++ b/packages/freesmartphone/frameworkd_git.bb
@@ -1,11 +1,11 @@
-DESCRIPTION = "The freesmartphon.org Framework Daemon"
+DESCRIPTION = "The freesmartphone.org Framework Daemon"
 HOMEPAGE = "http://www.freesmartphone.org"
-AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de> et. al."
 SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.8.0+gitr${SRCREV}"
-PR = "r2"
+PR = "r6"
 
 inherit distutils update-rc.d
 
@@ -27,12 +27,14 @@ do_install_append() {
 
 RDEPENDS_${PN} += "\
   python-dbus \
+  python-datetime \
   python-pygobject \
   python-pyrtc \
   python-pyserial \
+  python-pyyaml \
   python-shell \
   python-syslog \
 "
 
-FILES_${PN} += "${sysconfdir}"
+FILES_${PN} += "${sysconfdir} ${datadir}"
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/framework/subsystems/*/.debug"
diff --git a/packages/freesmartphone/zhone_git.bb b/packages/freesmartphone/zhone_git.bb
index c9411a58c3..a766eb1ab5 100644
--- a/packages/freesmartphone/zhone_git.bb
+++ b/packages/freesmartphone/zhone_git.bb
@@ -1,16 +1,16 @@
 DESCRIPTION = "Zhone: Zen Phone"
 LICENSE = "GPL"
 SECTION = "x11"
-DEPENDS = "edje-native"
+DEPENDS = "edje-native python-pyrex-native python-cython-native"
 RDEPENDS = "task-python-efl python-textutils python-dbus"
 PV = "0.0.0+gitr${SRCREV}"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \
            file://80zhone"
 S = "${WORKDIR}/git"
 
-inherit autotools
+inherit distutils
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/X11/Xsession.d/
@@ -18,6 +18,3 @@ do_install_append() {
 }
 
 FILES_${PN} += "${datadir} ${sysconfdir}"
-
-PACKAGE_ARCH = "all"
-
diff --git a/packages/gcc/gcc-4.2.2.inc b/packages/gcc/gcc-4.2.2.inc
index 5691fb647a..0f4de3cdc7 100644
--- a/packages/gcc/gcc-4.2.2.inc
+++ b/packages/gcc/gcc-4.2.2.inc
@@ -43,7 +43,9 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 
 SRC_URI_append_avr32 = " \
         file://gcc-4.2.2.atmel.1.0.8.patch.bz2;patch=1 \
-        file://901-avr32-no-cond-exec-before-reload-by-default.patch;patch=1 \
+	file://901-avr32-fix-no-cond-exec-before-reload.patch;patch=1 \
+	file://902-avr32-fix-sync-insn-instructions.patch;patch=1 \
+	file://903-avr32-fix-removal-of-redundant-cast-operations.patch;patch=1 \
 "
 
 
diff --git a/packages/gcc/gcc-4.2.2/901-avr32-fix-no-cond-exec-before-reload.patch b/packages/gcc/gcc-4.2.2/901-avr32-fix-no-cond-exec-before-reload.patch
new file mode 100644
index 0000000000..5d84dd82a8
--- /dev/null
+++ b/packages/gcc/gcc-4.2.2/901-avr32-fix-no-cond-exec-before-reload.patch
@@ -0,0 +1,48 @@
+Index: trunk/gcc/config/avr32/avr32.c
+===================================================================
+--- trunk/gcc/config/avr32/avr32.c	(revision 42108)
++++ trunk/gcc/config/avr32/avr32.c	(revision 42335)
+@@ -3737,7 +3737,34 @@
+   return 0;
+ }
+ 
++/* Return TRUE if X contains a MEM expression.  */
++int
++mem_mentioned_p (rtx x)
++{
++  const char *fmt;
++  int i;
+ 
++  if (MEM_P (x))
++    return 1;
++
++  fmt = GET_RTX_FORMAT (GET_CODE (x));
++  for (i = GET_RTX_LENGTH (GET_CODE (x)) - 1; i >= 0; i--)
++    {
++      if (fmt[i] == 'E')
++	{
++	  int j;
++
++	  for (j = XVECLEN (x, i) - 1; j >= 0; j--)
++	    if (mem_mentioned_p (XVECEXP (x, i, j)))
++	      return 1;
++	}
++      else if (fmt[i] == 'e' && mem_mentioned_p (XEXP (x, i)))
++	return 1;
++    }
++
++  return 0;
++}
++
+ int
+ avr32_legitimate_pic_operand_p (rtx x)
+ {
+@@ -7547,7 +7574,7 @@
+                    /* We cannot move memory loads outside of the if-then-else
+                       since the memory access should not be perfomed if the
+                       condition is not met. */
+-                   && !MEM_P (SET_SRC (op)) )
++                   && !mem_mentioned_p (SET_SRC (op)) )
+                 {
+                   rtx scratch_reg = gen_reg_rtx (mode);
+                   rtx op_pattern = copy_rtx (op);
diff --git a/packages/gcc/gcc-4.2.2/902-avr32-fix-sync-insn-instructions.patch b/packages/gcc/gcc-4.2.2/902-avr32-fix-sync-insn-instructions.patch
new file mode 100644
index 0000000000..aab1490c98
--- /dev/null
+++ b/packages/gcc/gcc-4.2.2/902-avr32-fix-sync-insn-instructions.patch
@@ -0,0 +1,174 @@
+Index: a/gcc/config/avr32/predicates.md
+===================================================================
+--- a/gcc/config/avr32/predicates.md	(revision 42108)
++++ b/gcc/config/avr32/predicates.md	(working copy)
+@@ -333,6 +333,11 @@
+                          && ((GET_CODE(XEXP(op,0)) == CONST_INT)
+                              || (GET_CODE(XEXP(op,1)) == CONST_INT))")) ))
+ 
++;; An offset k16 memory operand
++(define_predicate "avr32_ks16_memory_operand"
++  (and (match_code "mem")
++       (match_test "avr32_ks16_address_operand (XEXP (op, 0), GET_MODE (XEXP (op, 0)))")))
++
+ ;; An immediate k11 address operand
+ (define_predicate "avr32_ks11_address_operand"
+   (and (match_operand 0 "address_operand")
+Index: a/gcc/config/avr32/sync.md
+===================================================================
+--- a/gcc/config/avr32/sync.md	(revision 41409)
++++ b/gcc/config/avr32/sync.md	(working copy)
+@@ -32,9 +32,14 @@
+ (define_code_attr  atomic_insn [(plus "add") (minus "sub") (and "and") (ior "ior") (xor "xor")])
+ 
+ (define_insn "sync_loadsi"
+-  [(set (match_operand:SI 0 "register_operand" "=r")
++  ; NB! Put an early clobber on the destination operand to
++  ; avoid gcc using the same register in the source and
++  ; destination. This is done in order to avoid gcc to
++  ; clobber the source operand since these instructions
++  ; are actually inside a "loop".
++  [(set (match_operand:SI 0 "register_operand" "=&r")
+ 	(unspec_volatile:SI
+-         [(match_operand:SI 1 "memory_operand" "RKs16")
++         [(match_operand:SI 1 "avr32_ks16_memory_operand" "RKs16")
+           (label_ref (match_operand 2 "" ""))]
+          VUNSPEC_SYNC_SET_LOCK_AND_LOAD) )]
+   ""
+@@ -46,7 +51,7 @@
+   )
+   
+ (define_insn "sync_store_if_lock"
+-  [(set (match_operand:SI 0 "memory_operand" "=RKs16")
++  [(set (match_operand:SI 0 "avr32_ks16_memory_operand" "=RKs16")
+         (unspec_volatile:SI
+          [(match_operand:SI 1 "register_operand" "r")
+           (label_ref (match_operand 2 "" ""))]
+@@ -62,7 +67,7 @@
+ (define_expand "sync_<atomic_insn>si"
+   [(set (match_dup 2)
+ 	(unspec_volatile:SI
+-         [(match_operand:SI 0 "memory_operand" "")
++         [(match_operand:SI 0 "avr32_ks16_memory_operand" "")
+           (match_dup 3)]
+          VUNSPEC_SYNC_SET_LOCK_AND_LOAD))
+    (set (match_dup 2) 
+@@ -72,11 +77,33 @@
+         (unspec_volatile:SI
+          [(match_dup 2)
+           (match_dup 3)]
+-         VUNSPEC_SYNC_STORE_IF_LOCK) )]
++         VUNSPEC_SYNC_STORE_IF_LOCK) )
++   (use (match_dup 1))
++   (use (match_dup 4))]
+   ""
+   {
++   rtx *mem_expr = &operands[0];
++   rtx ptr_reg;
++   if ( !avr32_ks16_memory_operand (*mem_expr, GET_MODE (*mem_expr)) )
++    {
++      ptr_reg = force_reg (Pmode, XEXP (*mem_expr, 0));
++      XEXP (*mem_expr, 0) = ptr_reg;
++    }
++   else
++    {
++      rtx address = XEXP (*mem_expr, 0);
++      if ( REG_P (address) )
++         ptr_reg = address;
++      else if ( REG_P (XEXP (address, 0)) )
++         ptr_reg = XEXP (address, 0);
++      else
++         ptr_reg = XEXP (address, 1);
++    }
++
+    operands[2] = gen_reg_rtx (SImode);
+    operands[3] = gen_rtx_LABEL_REF(Pmode, gen_label_rtx ());
++   operands[4] = ptr_reg;
++
+   }
+   )
+ 
+@@ -85,7 +112,7 @@
+ (define_expand "sync_old_<atomic_insn>si"
+   [(set (match_operand:SI 0 "register_operand" "")
+ 	(unspec_volatile:SI
+-         [(match_operand:SI 1