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

7 files changed, 35 insertions, 39 deletions

diff --git a/packages/angstrom/angstrom-gpe-task-settings.bb b/packages/angstrom/angstrom-gpe-task-settings.bb
index adc4bb0756..0280859fdc 100644
--- a/packages/angstrom/angstrom-gpe-task-settings.bb
+++ b/packages/angstrom/angstrom-gpe-task-settings.bb
@@ -1,12 +1,13 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r33"
+PR = "r34"
 
 inherit task
 
 RDEPENDS_${PN} = "\
     matchbox-panel-manager \
     mboxkbd-layouts-gui \
-    gpe-su \
+    connman-gnome \
+	gpe-su \
     gpe-conf \
     gpe-package \
     gpe-shield \
diff --git a/packages/connman/connman-gnome_0.4.bb b/packages/connman/connman-gnome_0.4.bb
index f42cfdcfc2..ef981ddad9 100644
--- a/packages/connman/connman-gnome_0.4.bb
+++ b/packages/connman/connman-gnome_0.4.bb
@@ -3,9 +3,9 @@ HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php"
 SECTION = "libs/network"
 LICENSE = "GPL"
 DEPENDS = "gtk+ dbus"
-PR = "r5"
+PR = "r6"
 
-RRECOMMENDS_${PN} = "connman"
+RRECOMMENDS_${PN} = "connman connman-plugin-udhcp connman-plugin-wifi"
 
 SRC_URI = "http://repo.moblin.org/connman/releases/connman-gnome-${PV}.tar.gz \
            file://phrase-lenght.diff;patch=1 \
diff --git a/packages/connman/connman.inc b/packages/connman/connman.inc
index a97ca44c90..c79c22cabb 100644
--- a/packages/connman/connman.inc
+++ b/packages/connman/connman.inc
@@ -24,6 +24,10 @@ do_configure_append() {
 	ln -sf . include/connman
 }
 
+do_compile_append() {
+	sed -i -e s:deny:allow:g src/connman-dbus.conf
+}
+
 do_install_append() {
     install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
 }
diff --git a/packages/connman/connman_0.10.bb b/packages/connman/connman_0.10.bb
index d8f763a5cd..dfd631b9bf 100644
--- a/packages/connman/connman_0.10.bb
+++ b/packages/connman/connman_0.10.bb
@@ -1,5 +1,5 @@
 require connman.inc
-PR = "r5"
+PR = "r6"
 
 EXTRA_OECONF += "\
   --disable-gtk-doc \
diff --git a/packages/tasks/task-beagleboard-demo.bb b/packages/tasks/task-beagleboard-demo.bb
index 35c8d6582e..72edd0646d 100644
--- a/packages/tasks/task-beagleboard-demo.bb
+++ b/packages/tasks/task-beagleboard-demo.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task for Beagleboard-demo-image"
 
-PR = "r6"
+PR = "r7"
 
 inherit task 
 
@@ -37,6 +37,7 @@ RDEPENDS_${PN} = "\
 	angstrom-gnome-icon-theme-enable \
 	openssh-scp openssh-ssh \
 	picodlp-control \
+	connman-gnome \
 "
 
 # Install all kernel modules
diff --git a/packages/xorg-lib/pixman/pixman-0.13.2-neon1.patch b/packages/xorg-lib/pixman/pixman-0.13.2-neon1.patch
index 5c89721d8f..b3bb762415 100644
--- a/packages/xorg-lib/pixman/pixman-0.13.2-neon1.patch
+++ b/packages/xorg-lib/pixman/pixman-0.13.2-neon1.patch
@@ -110,10 +110,10 @@ index c4612ea..4c1ec6b 100644
  
 diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
 new file mode 100644
-index 0000000..f8a41a8
+index 0000000..10050e4
 --- /dev/null
 +++ b/pixman/pixman-arm-neon.c
-@@ -0,0 +1,1397 @@
+@@ -0,0 +1,1387 @@
 +/*
 + * Copyright © 2009 Mozilla Corporation
 + *
@@ -319,12 +319,10 @@ index 0000000..f8a41a8
 +                        "b 9f\n\t"
 +// LOOP
 +                        "2:\n\t"
-+                        "vld1.8  {d0}, [%[src]]\n\t"
-+                        "vld1.8  {d4}, [%[dst]]\n\t"
++                        "vld1.8  {d0}, [%[src]]!\n\t"
++                        "vld1.8  {d4}, [%[dst]]!\n\t"
 +                        "vst1.8  {d20}, [%[keep_dst]]\n\t"
-+                        "mov     %[keep_dst], %[dst]\n\t"
-+                        "add %[src], %[src], #8\n\t"
-+                        "add %[dst], %[dst], #8\n\t"
++                        "sub     %[keep_dst], %[dst], #8\n\t"
 +                        "subs %[w], %[w], #8\n\t"
 +                        "9:\n\t"
 +                        "vqadd.u8 d20, d0, d4\n\t"
@@ -468,12 +466,10 @@ index 0000000..f8a41a8
 +                        "b 9f\n\t"
 +// LOOP
 +                        "2:\n\t"
-+                        "vld4.8  {d0-d3}, [%[src]]\n\t"
-+                        "vld4.8  {d4-d7}, [%[dst]]\n\t"
++                        "vld4.8  {d0-d3}, [%[src]]!\n\t"
++                        "vld4.8  {d4-d7}, [%[dst]]!\n\t"
 +                        "vst4.8  {d20-d23}, [%[keep_dst]]\n\t"
-+                        "mov     %[keep_dst], %[dst]\n\t"
-+                        "add %[src], %[src], #8*4\n\t"
-+                        "add %[dst], %[dst], #8*4\n\t"
++                        "sub     %[keep_dst], %[dst], #8*4\n\t"
 +                        "subs %[w], %[w], #8\n\t"
 +                        "9:\n\t"
 +                        "vmvn.8  d31, d3\n\t"
@@ -746,12 +742,10 @@ index 0000000..f8a41a8
 +                        "b 9f\n\t"
 +// LOOP
 +                        "2:\n\t"
-+                        "vld4.8       {d0-d3}, [%[src]]\n\t"
-+                        "vld4.8       {d4-d7}, [%[dst]]\n\t"
++                        "vld4.8       {d0-d3}, [%[src]]!\n\t"
++                        "vld4.8       {d4-d7}, [%[dst]]!\n\t"
 +                        "vst4.8       {d20-d23}, [%[keep_dst]]\n\t"
-+                        "mov  %[keep_dst], %[dst]\n\t"
-+                        "add  %[src], %[src], #8*4\n\t"
-+                        "add  %[dst], %[dst], #8*4\n\t"
++                        "sub  %[keep_dst], %[dst], #8*4\n\t"
 +                        "subs  %[w], %[w], #8\n\t"
 +
 +                        "9:\n\t"
@@ -957,12 +951,10 @@ index 0000000..f8a41a8
 +// LOOP
 +                        "2:\n\t"
 +
-+                        "vld1.16      {q12}, [%[dst]]\n\t"
-+                        "vld1.8       {d31}, [%[mask]]\n\t"
++                        "vld1.16      {q12}, [%[dst]]!\n\t"
++                        "vld1.8       {d31}, [%[mask]]!\n\t"
 +                        "vst1.16      {q10}, [%[keep_dst]]\n\t"
-+                        "mov  %[keep_dst], %[dst]\n\t"
-+                        "add  %[mask], %[mask], #8\n\t"
-+                        "add  %[dst], %[dst], #8*2\n\t"
++                        "sub  %[keep_dst], %[dst], #8*2\n\t"
 +                        "subs  %[w], %[w], #8\n\t"
 +                        "9:\n\t"
 +// expand 0565 q12 to 8888 {d4-d7}
@@ -1294,12 +1286,10 @@ index 0000000..f8a41a8
 +                        "b 9f\n\t"
 +// LOOP
 +                        "2:\n\t" 
-+                        "vld4.8       {d4-d7}, [%[dst]]\n\t"
-+                        "vld1.8       {d31}, [%[mask]]\n\t"
++                        "vld4.8       {d4-d7}, [%[dst]]!\n\t"
++                        "vld1.8       {d31}, [%[mask]]!\n\t"
 +                        "vst4.8       {d20-d23}, [%[keep_dst]]\n\t"
-+                        "mov  %[keep_dst], %[dst]\n\t"
-+                        "add  %[mask], %[mask], #8\n\t"
-+                        "add  %[dst], %[dst], #8*4\n\t"
++                        "sub  %[keep_dst], %[dst], #8*4\n\t"
 +                        "subs  %[w], %[w], #8\n\t"
 +                        "9:\n\t"
 +
@@ -1371,7 +1361,7 @@ index 0000000..f8a41a8
 +                dval = vld1_u8((void*)dst);
 +
 +                temp = neon2mul(sval2,alpha);
-+                res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(sval2), alpha_selector)));
++                res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(temp), alpha_selector)));
 +
 +                vst1_u8((void*)dst,res);
 +
@@ -1387,7 +1377,7 @@ index 0000000..f8a41a8
 +                dval = vreinterpret_u8_u32(vld1_dup_u32((void*)dst));
 +
 +                temp = neon2mul(sval2,alpha);
-+                res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(sval2), alpha_selector)));
++                res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(temp), alpha_selector)));
 +
 +                vst1_lane_u32((void*)dst,vreinterpret_u32_u8(res),0);
 +            }
@@ -1513,12 +1503,12 @@ index 0000000..f8a41a8
 +
 diff --git a/pixman/pixman-arm-neon.h b/pixman/pixman-arm-neon.h
 new file mode 100644
-index 0000000..a473841
+index 0000000..bab4dee
 --- /dev/null
 +++ b/pixman/pixman-arm-neon.h
 @@ -0,0 +1,137 @@
 +/*
-+ * Copyright © 2008 Mozilla Corporation
++ * Copyright © 2009 Mozilla Corporation
 + *
 + * Permission to use, copy, modify, distribute, and sell this software and its
 + * documentation for any purpose is hereby granted without fee, provided that
@@ -1539,7 +1529,7 @@ index 0000000..a473841
 + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 + * SOFTWARE.
 + *
-+ * Author:  Jeff Muizelaar (jeff@infidigm.net)
++ * Author:  Ian Rickards (ian.rickards@arm.com)
 + *
 + */
 +
diff --git a/packages/xorg-lib/pixman_0.13.2.bb b/packages/xorg-lib/pixman_0.13.2.bb
index 5b304de104..4b489f89a6 100644
--- a/packages/xorg-lib/pixman_0.13.2.bb
+++ b/packages/xorg-lib/pixman_0.13.2.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 DESCRIPTION = "Low-level pixel manipulation library."
 LICENSE = "X11"
 
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"