Merge remote-tracking branch 'meta-oe-contrib/jansa/pull2'

17 files changed, 129 insertions, 19 deletions

diff --git a/meta-oe/recipes-connectivity/midori/midori_0.4.4.bb b/meta-oe/recipes-connectivity/midori/midori_0.4.5.bb
index a408d73695..4cdd82d980 100644
--- a/meta-oe/recipes-connectivity/midori/midori_0.4.4.bb
+++ b/meta-oe/recipes-connectivity/midori/midori_0.4.5.bb
@@ -4,12 +4,10 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 DEPENDS = "webkit-gtk libsoup-2.4 libsexy openssl vala-native python-native python-docutils-native librsvg-native"
 
-PR = "r1"
-
 SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \
           "
-SRC_URI[midori.md5sum] = "a6578ebfd237c0f22cce49113b95f70c"
-SRC_URI[midori.sha256sum] = "fadd43f76c1c9f6a16483e60a804e58fb6817c6a595b1acdd59bcbdd7b35bca2"
+SRC_URI[midori.md5sum] = "14288197a1e2251b7c0803e1448daa0e"
+SRC_URI[midori.sha256sum] = "7b57cf3ebb56eef586351f2ae9f71ec9683aedff0b79a071b70b811d9876ff84"
 
 inherit gtk-icon-cache pkgconfig
 
diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb
index 66df4edaff..30a7edd5c8 100644
--- a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb
+++ b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb
@@ -1,5 +1,5 @@
 require vala-dbus-binding-tool.inc
-SRCREV = "fd89af4941d6478575900128d09029fa5549e0db"
+SRCREV = "2c72ff9c981be947837c72d3aa38e1fbf074068f"
 PV = "0.3.2+gitr${SRCPV}"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/vala-dbus-binding-tool.git;protocol=git;branch=master"
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc47x.diff b/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc47x.diff
new file mode 100644
index 0000000000..11b7260045
--- /dev/null
+++ b/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc47x.diff
@@ -0,0 +1,48 @@
+../../../src/frontend/common/TemplateBuilder.hh:50:113: warning: 'linkerAssoc' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive]
+../../../src/frontend/common/TemplateBuilder.hh:50:113: note: declarations in dependent base 'custom_reader_Builder' are not found by unqualified lookup
+../../../src/frontend/common/TemplateBuilder.hh:50:113: note: use 'this->linkerAssoc' instead
+../../../src/frontend/common/TemplateBuilder.hh:54:111: error: redeclaration of 'SmartPtr<BoxMLDecorElement> elem'
+../../../src/frontend/common/TemplateBuilder.hh:50:49: error: 'SmartPtr<BoxMLDecorElement> elem' previously declared here
+../../../src/frontend/common/TemplateBuilder.hh:55:2: warning: 'linkerAdd' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive]
+../../../src/frontend/common/TemplateBuilder.hh:55:2: note: declarations in dependent base 'custom_reader_Builder' are not found by unqualified lookup
+../../../src/frontend/common/TemplateBuilder.hh:55:2: note: use 'this->linkerAdd' instead
+
+--- gtkmathview-0.8.0.orig/src/frontend/common/TemplateBuilder.hh       2007-08-17 12:02:34.000000000 +0200
++++ gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh    2012-04-30 11:45:07.000000000 +0200
+@@ -47,12 +47,13 @@
+   SmartPtr<typename ElementBuilder::type>
+   getElement(const typename Model::Element& el) const
+   {
+-    if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(linkerAssoc(el)))
++    SmartPtr<typename ElementBuilder::type> elem = NULL;
++    if (elem = smart_cast<typename ElementBuilder::type>(this->linkerAssoc(el)))
+       return elem;
+     else
+       {
+-       SmartPtr<typename ElementBuilder::type> elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
+-       linkerAdd(el, elem);
++       elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
++       this->linkerAdd(el, elem);
+        return elem;
+       }
+   }
+--- gtkmathview-0.8.0.orig/mathmlsvg/main.cc    2012-04-30 11:35:19.000000000 +0200
++++ gtkmathview-0.8.0/mathmlsvg/main.cc 2012-04-30 11:51:19.000000000 +0200
+@@ -20,6 +20,7 @@
+ 
+ #include <cassert>
+ #include <fstream>
++#include <unistd.h>
+ #include <string.h>
+ #include <popt.h>
+ 
+--- gtkmathview-0.8.0.orig/mathmlps/main.cc     2012-04-30 11:35:19.000000000 +0200
++++ gtkmathview-0.8.0/mathmlps/main.cc  2012-04-30 11:50:57.000000000 +0200
+@@ -20,6 +20,7 @@
+ 
+ #include <cassert>
+ #include <fstream>
++#include <unistd.h>
+ #include <string.h>
+ #include <popt.h>
+ 
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb
index c8e611a483..67cb32584d 100644
--- a/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb
+++ b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb
@@ -4,10 +4,11 @@ DEPENDS = "t1lib gtk+ popt libxslt libxml2"
 LICENSE = "LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz \
            file://mathview-gcc43x.diff \
+           file://mathview-gcc47x.diff \
           "
 SRC_URI[md5sum] = "b53564e553728d4b69f7d366dfeb5299"
 SRC_URI[sha256sum] = "1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43"
diff --git a/meta-oe/recipes-graphics/xorg-lib/libxcomposite_0.4.3.bbappend b/meta-oe/recipes-graphics/xorg-lib/libxcomposite_0.4.3.bbappend
deleted file mode 100644
index d6f5869959..0000000000
--- a/meta-oe/recipes-graphics/xorg-lib/libxcomposite_0.4.3.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND += "native"
diff --git a/meta-oe/recipes-graphics/xorg-lib/libxcursor_1.1.13.bbappend b/meta-oe/recipes-graphics/xorg-lib/libxcursor_1.1.13.bbappend
deleted file mode 100644
index d6f5869959..0000000000
--- a/meta-oe/recipes-graphics/xorg-lib/libxcursor_1.1.13.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND += "native"
diff --git a/meta-oe/recipes-graphics/xorg-lib/libxdamage_1.1.3.bbappend b/meta-oe/recipes-graphics/xorg-lib/libxdamage_1.1.3.bbappend
deleted file mode 100644
index d6f5869959..0000000000
--- a/meta-oe/recipes-graphics/xorg-lib/libxdamage_1.1.3.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND += "native"
diff --git a/meta-oe/recipes-graphics/xorg-lib/libxfixes_5.0.bbappend b/meta-oe/recipes-graphics/xorg-lib/libxfixes_5.0.bbappend
deleted file mode 100644
index d6f5869959..0000000000
--- a/meta-oe/recipes-graphics/xorg-lib/libxfixes_5.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND += "native"
diff --git a/meta-oe/recipes-graphics/xorg-lib/libxrandr_1.3.2.bbappend b/meta-oe/recipes-graphics/xorg-lib/libxrandr_1.3.2.bbappend
deleted file mode 100644
index d6f5869959..0000000000
--- a/meta-oe/recipes-graphics/xorg-lib/libxrandr_1.3.2.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND += "native"
diff --git a/meta-oe/recipes-graphics/xorg-proto/compositeproto_0.4.2.bbappend b/meta-oe/recipes-graphics/xorg-proto/compositeproto_0.4.2.bbappend
deleted file mode 100644
index d6f5869959..0000000000
--- a/meta-oe/recipes-graphics/xorg-proto/compositeproto_0.4.2.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND += "native"
diff --git a/meta-oe/recipes-graphics/xorg-proto/damageproto_1.2.1.bbappend b/meta-oe/recipes-graphics/xorg-proto/damageproto_1.2.1.bbappend
deleted file mode 100644
index d6f5869959..0000000000
--- a/meta-oe/recipes-graphics/xorg-proto/damageproto_1.2.1.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND += "native"
diff --git a/meta-oe/recipes-graphics/xorg-proto/fixesproto_5.0.bbappend b/meta-oe/recipes-graphics/xorg-proto/fixesproto_5.0.bbappend
deleted file mode 100644
index d6f5869959..0000000000
--- a/meta-oe/recipes-graphics/xorg-proto/fixesproto_5.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND += "native"
diff --git a/meta-oe/recipes-graphics/xorg-proto/randrproto_1.3.2.bbappend b/meta-oe/recipes-graphics/xorg-proto/randrproto_1.3.2.bbappend
deleted file mode 100644
index d6f5869959..0000000000
--- a/meta-oe/recipes-graphics/xorg-proto/randrproto_1.3.2.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND += "native"
diff --git a/meta-oe/recipes-multimedia/libav/libav-0.7.4/h264_qpel_mmx.patch b/meta-oe/recipes-multimedia/libav/libav-0.7.4/h264_qpel_mmx.patch
new file mode 100644
index 0000000000..5656c47f48
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libav/libav-0.7.4/h264_qpel_mmx.patch
@@ -0,0 +1,57 @@
+Backport http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=5f654897e325349dacf2546674e0510bb72ecb50;hp=250cebeb3b348c3da71f9972eb500d6005dc01f1
+
+Fixes these errors on x86
+
+libavcodec/x86/h264_qpel_mmx.c: Assembler messages:
+libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp'
+libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp'
+libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp'
+libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp'
+libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp'
+libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp'
+libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp'
+make[5]: *** [libavcodec/x86/dsputil_mmx.o] Error 1
+
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-status: Backport
+Index: b/libavcodec/x86/h264_qpel_mmx.c
+===================================================================
+--- a/libavcodec/x86/h264_qpel_mmx.c    2012-03-30 11:39:41.324522051 -0700
++++ b/libavcodec/x86/h264_qpel_mmx.c    2012-03-30 11:54:08.152564075 -0700
+@@ -398,7 +398,7 @@
+             "2:                         \n\t"\
+             \
+             : "+a"(src), "+c"(dst)\
+-            : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
++            : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
+             : "memory"\
+         );\
+         src += 4-(h+5)*srcStride;\
+@@ -446,7 +446,7 @@
+             QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
+             "2:                     \n\t"\
+             : "+a"(src)\
+-            : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\
++            : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\
+             : "memory"\
+             );\
+         tmp += 4;\
+@@ -823,7 +823,7 @@
+         "2:                          \n\t"\
+         \
+         : "+a"(src), "+c"(dst)\
+-        : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
++        : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
+         : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
+                        "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
+           "memory"\
+@@ -878,7 +878,7 @@
+             QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
+             "2:                         \n\t"
+             : "+a"(src)
+-            : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)
++            : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)
+             : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
+                            "%xmm4", "%xmm5", "%xmm6", "%xmm7",)
+               "memory"
diff --git a/meta-oe/recipes-multimedia/libav/libav_0.7.4.bb b/meta-oe/recipes-multimedia/libav/libav_0.7.4.bb
index c4c01db376..bf077c6b46 100644
--- a/meta-oe/recipes-multimedia/libav/libav_0.7.4.bb
+++ b/meta-oe/recipes-multimedia/libav/libav_0.7.4.bb
@@ -10,9 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 SRCREV = "d4653e882fee5a2876c3878bc23d26799e3380ad"
 
 PV = "0.7.4"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
-SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.7"
+SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.7 \
+  file://h264_qpel_mmx.patch \
+"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/glib-2.32.patch b/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/glib-2.32.patch
new file mode 100644
index 0000000000..0579455277
--- /dev/null
+++ b/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/glib-2.32.patch
@@ -0,0 +1,11 @@
+diff -uNr tangogps-0.99.4.orig/src/map_management.c tangogps-0.99.4/src/map_management.c
+--- tangogps-0.99.4.orig/src/map_management.c   2010-06-25 11:40:05.000000000 +0200
++++ tangogps-0.99.4/src/map_management.c        2012-04-30 07:43:58.551301271 +0200
+@@ -2,7 +2,6 @@
+ 
+ #include <glib.h>
+ #include <gtk/gtk.h>
+-#include <glib/gstring.h>
+ #include <glib/gprintf.h>
+ #include <gconf/gconf.h>
+ #include <math.h>
diff --git a/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb b/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
index 3a1ea3df2d..5a4231ab1f 100644
--- a/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
+++ b/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
@@ -5,10 +5,12 @@ SECTION = "x11/applications"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 DEPENDS = "curl gtk+ gconf sqlite3 libexif libsoup-2.4 bluez4"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.tangogps.org/downloads/${P}.tar.gz \
-           file://remove.unused.header.patch"
+           file://remove.unused.header.patch \
+           file://glib-2.32.patch \
+"
 SRC_URI[md5sum] = "0f07ede94a21eb84f5e017fa88a1fc3d"
 SRC_URI[sha256sum] = "660fdf89ef3c379f2fc0c2a9d0c9d3bfa5345835786b72bf9f513ba9ec2c812a"