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

9 files changed, 69 insertions, 45 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index b07d8d011c..4ebc95f21c 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -275,6 +275,7 @@ SRCREV_pn-edje-player ?= "${EFL_SRCREV}"
 SRCREV_pn-edje-viewer ?= "${EFL_SRCREV}"
 SRCREV_pn-elementary-alarm ?= "${EFL_SRCREV}"
 SRCREV_pn-elementary-sms ?= "${EFL_SRCREV}"
+SRCREV_pn-elmdentica ?= "${EFL_SRCREV}"
 SRCREV_pn-emphasis ?= "${EFL_SRCREV}"
 SRCREV_pn-ephoto ?= "${EFL_SRCREV}"
 SRCREV_pn-eve ?= "${EFL_SRCREV}"
@@ -301,4 +302,5 @@ SRCREV_pn-illume-keyboard-default ?= "${EFL_SRCREV}"
 SRCREV_pn-exalt ?= "${EFL_SRCREV}"
 SRCREV_pn-exalt-client ?= "${EFL_SRCREV}"
 
+
 require conf/distro/include/sane-srcrevs-fso.inc
diff --git a/recipes/e17/elmdentica_svn.bb b/recipes/e17/elmdentica_svn.bb
index d5d441b629..c0cf56a7e1 100644
--- a/recipes/e17/elmdentica_svn.bb
+++ b/recipes/e17/elmdentica_svn.bb
@@ -4,13 +4,7 @@ LICENSE = "GPLv3+"
 SECTION = "e/apps"
 HOMEPAGE = "http://elmdentica.googlecode.com"
 AUTHOR = "seabra"
-SRCREV = "215"
-PV = "0.7.0+svnr${SRCPV}"
-PR = "r1"
- 
- 
-SRC_URI = "svn://elmdentica.googlecode.com/svn;module=trunk;proto=http"
- 
-S = "${WORKDIR}/trunk"
- 
-inherit autotools pkgconfig
+
+inherit e
+
+PV = "0.9.0+svnr${SRCPV}"
diff --git a/recipes/gstreamer/gst-plugins-base/ivorbis-thumb.patch b/recipes/gstreamer/gst-plugins-base/ivorbis-thumb.patch
new file mode 100644
index 0000000000..83b13e279b
--- /dev/null
+++ b/recipes/gstreamer/gst-plugins-base/ivorbis-thumb.patch
@@ -0,0 +1,12 @@
+diff -uNr base/ext/vorbis.orig//gstvorbisdeclib.c base/ext/vorbis/gstvorbisdeclib.c
+--- base/ext/vorbis.orig//gstvorbisdeclib.c	2010-02-15 13:03:13.000000000 +0100
++++ base/ext/vorbis/gstvorbisdeclib.c	2010-03-18 18:48:10.000000000 +0100
+@@ -56,7 +56,7 @@
+ #else
+ 
+ /* Taken from Tremor, misc.h */
+-#ifdef _ARM_ASSEM_
++#if defined(_ARM_ASSEM_) && !defined(__thumb__)
+ static inline ogg_int32_t
+ CLIP_TO_15 (ogg_int32_t x)
+ {
diff --git a/recipes/gstreamer/gst-plugins-base_0.10.28.bb b/recipes/gstreamer/gst-plugins-base_0.10.28.bb
index 621a8918fe..058f6a6c0f 100644
--- a/recipes/gstreamer/gst-plugins-base_0.10.28.bb
+++ b/recipes/gstreamer/gst-plugins-base_0.10.28.bb
@@ -2,12 +2,13 @@ require gst-plugins.inc
 
 SRC_URI += " \
             file://gst-plugins-base_rowstride.patch;patch=1 \
+            file://ivorbis-thumb.patch;patch=1 \
 "
 
 SRC_URI[archive.md5sum] = "0107cf985ac90544bae70288220f5bab"
 SRC_URI[archive.sha256sum] = "132b6fd7749fcbfa9ad88c854aada44b6870c4175bda21cdb01a52b59a98e14f"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 PROVIDES += "gst-plugins"
 
diff --git a/recipes/librsvg/librsvg-native_2.26.0.bb b/recipes/librsvg/librsvg-native_2.26.0.bb
index 0a0a274469..5ec1b285f1 100644
--- a/recipes/librsvg/librsvg-native_2.26.0.bb
+++ b/recipes/librsvg/librsvg-native_2.26.0.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Library for rendering SVG files"
 SECTION = "x11/utils"
 DEPENDS = "cairo-native pango-native gdk-pixbuf-csource-native"
 LICENSE = "LGPL"
+PR = "r1"
 
 inherit native autotools_stage
 
diff --git a/recipes/libunwind/libunwind.inc b/recipes/libunwind/libunwind.inc
new file mode 100644
index 0000000000..4cd41b7d9e
--- /dev/null
+++ b/recipes/libunwind/libunwind.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program"
+DEPENDS = ""
+HOMEPAGE = "http://www.nongnu.org/libunwind"
+LICENSE = "MIT"
+INC_PR = "r0"
+
+SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/${PN}-${PV}.tar.gz;name=archive"
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+inherit autotools
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/libunwind/libunwind_0.99.bb b/recipes/libunwind/libunwind_0.99.bb
new file mode 100644
index 0000000000..b7d0612007
--- /dev/null
+++ b/recipes/libunwind/libunwind_0.99.bb
@@ -0,0 +1,5 @@
+require libunwind.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3e9ca08118e22165a7f07d01d61a2d0d"
+SRC_URI[archive.sha256sum] = "56083aae17eab3ccb7a36b95f0430f5a5f258755bf193bb5ca4fd4b918356164"
diff --git a/recipes/lighttpd/lighttpd.inc b/recipes/lighttpd/lighttpd.inc
index 20e85a8dad..e9f8640d66 100644
--- a/recipes/lighttpd/lighttpd.inc
+++ b/recipes/lighttpd/lighttpd.inc
@@ -3,32 +3,32 @@ SECTION = "net"
 LICENSE = "BSD"
 DEPENDS = "libpcre"
 RDEPENDS_${PN} += " \
-                    lighttpd-module-access \
-                    lighttpd-module-accesslog \
-                    lighttpd-module-indexfile \
-                    lighttpd-module-dirlisting \
-                    lighttpd-module-staticfile \
-                  "
+               lighttpd-module-access \
+               lighttpd-module-accesslog \
+               lighttpd-module-indexfile \
+               lighttpd-module-dirlisting \
+               lighttpd-module-staticfile \
+"
 
-INC_PR = "r7"
+INC_PR = "r8"
 
 SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.gz;name=src \
-	   file://index.html \
-	   file://lighttpd.conf \
-	   file://lighttpd \
-          "
-
-EXTRA_OECONF=" \
-              --without-bzip2 \
-              --without-ldap \
-              --without-lua \
-              --without-memcache \
-              --with-pcre \
-              --without-webdav-props \
-              --without-webdav-locks \
-              --without-openssl \
-              --disable-static \
-             "
+        file://index.html \
+        file://lighttpd.conf \
+        file://lighttpd \
+"
+
+EXTRA_OECONF = " \
+             --without-bzip2 \
+             --without-ldap \
+             --without-lua \
+             --without-memcache \
+             --with-pcre \
+             --without-webdav-props \
+             --without-webdav-locks \
+             --without-openssl \
+             --disable-static \
+"
 
 inherit autotools pkgconfig update-rc.d gettext
 
@@ -36,14 +36,10 @@ INITSCRIPT_NAME = "lighttpd"
 INITSCRIPT_PARAMS = "defaults 70"
 
 do_install_append() {
-	install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var
-	install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
-	install -m 0644 ${WORKDIR}/index.html ${D}/www/pages/
-}
-
-do_stage() {
-	autotools_stage_all
+    install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var
+    install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
+    install -m 0644 ${WORKDIR}/index.html ${D}/www/pages/
 }
 
 FILES_${PN} += "${sysconfdir} /www"
diff --git a/recipes/vala-dbus-binding-tool/vala-dbus-binding-tool.inc b/recipes/vala-dbus-binding-tool/vala-dbus-binding-tool.inc
index 96c2836b25..b28079cb5d 100644
--- a/recipes/vala-dbus-binding-tool/vala-dbus-binding-tool.inc
+++ b/recipes/vala-dbus-binding-tool/vala-dbus-binding-tool.inc
@@ -1,11 +1,11 @@
 DESCRIPTION = "Vala DBus Binding Tool"
 SECTION = "devel"
 DEPENDS = "vala libgee libxml2 intltool-native"
-HOMEPAGE = "http://www.freesmartphone.org/index.php/Implementations/vala-dbus-binding-tool"
+HOMEPAGE = "http://wiki.freesmartphone.org/index.php/Implementations/vala-dbus-binding-tool"
 LICENSE = "GPLv2"
-INC_PR = "r2"
+INC_PR = "r3"
 
-SRC_URI = "http://www.freesmartphone.org/sources/vala-dbus-binding-tool-${PV}.tar.bz2;name=archive"
+SRC_URI = "http://downloads.freesmartphone.org/sources/vala-dbus-binding-tool-${PV}.tar.bz2;name=archive"
 
 inherit autotools_stage