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

77 files changed, 501 insertions, 129 deletions

diff --git a/recipes/efl1/ecore.inc b/recipes/efl1/ecore.inc
index 1e639fc342..facd7a231a 100644
--- a/recipes/efl1/ecore.inc
+++ b/recipes/efl1/ecore.inc
@@ -27,6 +27,27 @@ PACKAGES =+ "\
     ${PN}-x \
     ${PN}-input \
     "
+# Some upgrade path tweaking
+AUTO_LIBNAME_PKGS = ""
+
+RREPLACES_${PN} = "libecore-ver-pre-svn-00-0 libecore-ver-pre-svn-01-0"
+REPLACES_${PN}-tests = "libecore-ver-pre-svn-01-tests"
+RREPLACES_${PN}-con = "libecore-ver-pre-svn-01-con libecore-con-ver-pre-svn-01-0"
+RREPLACES_${PN}-config = "libecore-config-ver-pre-svn-01-0"
+RREPLACES_${PN}-desktop = "libecore-desktop-ver-pre-svn-01-0"
+RREPLACES_${PN}-directfb = "libecore-directfb-ver-pre-svn-01-0"
+RREPLACES_${PN}-sdl = "libecore-sdl-ver-pre-svn-01-0"
+RREPLACES_${PN}-evas = "libecore-evas-ver-pre-svn-01-0"
+RREPLACES_${PN}-fb = "libecore-fb-ver-pre-svn-01-0"
+RREPLACES_${PN}-file = "libecore-file-ver-pre-svn-01-0"
+RREPLACES_${PN}-imf-evas = "libecore-imf-evas-ver-pre-svn-01-0"
+RREPLACES_${PN}-imf = "libecore-imf-ver-pre-svn-01-0"
+RREPLACES_${PN}-ipc = "libecore-ipc-ver-pre-svn-01-0"
+RREPLACES_${PN}-job = "libecore-job-ver-pre-svn-01-0"
+RREPLACES_${PN}-txt = "libecore-txt-ver-pre-svn-01-0"
+RREPLACES_${PN}-x = "libecore-x-ver-pre-svn-01-0"
+RREPLACES_${PN}-input = "libecore-input-ver-pre-svn-01-0"
+
 FILES_${PN} = "${libdir}/libecore*.so.*"
 FILES_${PN}-con = "${libdir}/libecore_con*.so.*"
 FILES_${PN}-config = "${libdir}/libecore_config*.so.*"
@@ -43,3 +64,6 @@ FILES_${PN}-job = "${libdir}/libecore_job*.so.*"
 FILES_${PN}-txt = "${libdir}/libecore_txt*.so.*"
 FILES_${PN}-x = "${libdir}/libecore_x*.so.*"
 FILES_${PN}-input = "${libdir}/libecore_input*.so.*"
+
+
+
diff --git a/recipes/efl1/edje_svn.bb b/recipes/efl1/edje_svn.bb
index 2509c859c7..7f94b08256 100644
--- a/recipes/efl1/edje_svn.bb
+++ b/recipes/efl1/edje_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
 DEPENDS = "eet evas ecore embryo edje-native"
 LICENSE = "MIT BSD"
 PV = "0.9.92.060+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 inherit efl
 
@@ -20,6 +20,11 @@ RRECOMMENDS_${PN}-utils = "\
 "
 
 DEBIAN_NOAUTONAME_${PN}-utils = "1"
+# Some upgrade path tweaking
+AUTO_LIBNAME_PKGS = ""
+
+RREPLACES_${PN} = "libedje-ver-pre-svn-00-0 libedje-ver-pre-svn-01-0"
+
 FILES_${PN}-utils = "\
   ${bindir}/edje_* \
   ${datadir}/edje/include/edje.inc \
diff --git a/recipes/efl1/embryo_svn.bb b/recipes/efl1/embryo_svn.bb
index aeceb5abe4..222d85a7cb 100644
--- a/recipes/efl1/embryo_svn.bb
+++ b/recipes/efl1/embryo_svn.bb
@@ -1,9 +1,14 @@
 DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
 LICENSE = "MIT BSD"
 PV = "0.9.9.060+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit efl
 
-# HACK alert: When compiling for VFP embryo emits bugs -- maybe gcc bug
-#FULL_OPTIMIZATION_arm =+ "-O0"
+# Some upgrade path tweaking
+AUTO_LIBNAME_PKGS = ""
+
+RREPLACES_${PN} = "libembryo-ver-pre-svn-00-0 libembryo-ver-pre-svn-01-0"
+
+RREPLACES_${PN}-tests = "libembryo-ver-pre-svn-00-tests libembryo-ver-pre-svn-01-tests"
+
diff --git a/recipes/efl1/emotion_svn.bb b/recipes/efl1/emotion_svn.bb
index 455bc82b18..0f31e667cc 100644
--- a/recipes/efl1/emotion_svn.bb
+++ b/recipes/efl1/emotion_svn.bb
@@ -3,11 +3,11 @@ LICENSE = "MIT BSD"
 # we no longer build the libxine backend, since the gstreamer backend seems more promising
 DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base"
 PV = "0.1.0.042+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit efl
 
-EXTRA_OECONF = "--disable-xine --enable-gstreamer"
+EXTRA_OECONF = "--disable-xine --enable-gstreamer --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 PACKAGES =+ "emotion-backend-gstreamer"
 FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so"
diff --git a/recipes/gdb/gdb-6.8/gdb-6.8-fix-compile-karmic.patch b/recipes/gdb/gdb-6.8/gdb-6.8-fix-compile-karmic.patch
new file mode 100644
index 0000000000..1080b162aa
--- /dev/null
+++ b/recipes/gdb/gdb-6.8/gdb-6.8-fix-compile-karmic.patch
@@ -0,0 +1,22 @@
+fix this on karmic
+
+cc1: warnings being treated as errors
+/home/ich/build/arm/armv5t/tmp/work/i686-armv5te-sdk-oe-linux-gnueabi/gdb-cross-sdk-6.8-r2/gdb-6.8/gdb/eval.c: In function 'evaluate_subexp_standard':
+/home/ich/build/arm/armv5t/tmp/work/i686-armv5te-sdk-oe-linux-gnueabi/gdb-cross-sdk-6.8-r2/gdb-6.8/gdb/eval.c:1705: error: 'subscript_array' may be used uninitialized in this function
+/home/ich/build/arm/armv5t/tmp/work/i686-armv5te-sdk-oe-linux-gnueabi/gdb-cross-sdk-6.8-r2/gdb-6.8/gdb/eval.c:1644: note: 'subscript_array' was declared here
+
+
+
+Index: gdb-6.8/gdb/eval.c
+===================================================================
+--- gdb-6.8.orig/gdb/eval.c	2009-08-02 03:25:20.000000000 +0200
++++ gdb-6.8/gdb/eval.c	2009-08-02 03:53:39.000000000 +0200
+@@ -1656,6 +1656,8 @@
+ 	if (nargs != ndimensions)
+ 	  error (_("Wrong number of subscripts"));
+ 
++        memset(&subscript_array, 0, sizeof(subscript_array));
++
+ 	/* Now that we know we have a legal array subscript expression 
+ 	   let us actually find out where this element exists in the array. */
+ 
diff --git a/recipes/gdb/gdb-cross-sdk_6.8.bb b/recipes/gdb/gdb-cross-sdk_6.8.bb
index 6aed03d639..66e1454779 100644
--- a/recipes/gdb/gdb-cross-sdk_6.8.bb
+++ b/recipes/gdb/gdb-cross-sdk_6.8.bb
@@ -1,6 +1,7 @@
 require gdb-cross.inc
 
-SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0"
+SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \
+            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
 
 DEPENDS = "ncurses-sdk"
 
diff --git a/recipes/gdb/gdb_6.8.bb b/recipes/gdb/gdb_6.8.bb
index afa4286c2e..ff14c0f31f 100644
--- a/recipes/gdb/gdb_6.8.bb
+++ b/recipes/gdb/gdb_6.8.bb
@@ -1,6 +1,7 @@
 require gdb.inc
 LICENSE = "GPLv3"
 
-SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0"
+SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \
+            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
 
 PR = "r3"
diff --git a/recipes/libdbi/libdbi-drivers.inc b/recipes/libdbi/libdbi-drivers.inc
new file mode 100644
index 0000000000..b5875eb893
--- /dev/null
+++ b/recipes/libdbi/libdbi-drivers.inc
@@ -0,0 +1,47 @@
+# libdbi-drivers OE build file
+# Copyright (C) 2005, Koninklijke Philips Electronics NV.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION = "Database Drivers for libdbi"
+HOMEPAGE = "http://libdbi-drivers.sourceforge.net/"
+LICENSE = "LGPL"
+SECTION = "libs"
+
+PROVIDES = "libdbd-sqlite"
+DEPENDS = "libdbi sqlite sqlite3 mysql postgresql"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libdbi-drivers/libdbi-drivers-${PV}.tar.gz"
+
+inherit autotools
+
+PACKAGES += "libdbd-sqlite3 libdbd-sqlite libdbd-pgsql libdbd-mysql"
+
+EXTRA_OECONF = "--with-dbi-incdir=${STAGING_INCDIR} \
+                --with-sqlite \
+                --with-sqlite3 \
+                --with-pgsql \
+                --with-mysql \
+                --with-sqlite-libdir=${STAGING_LIBDIR} \
+                --with-sqlite-incdir=${STAGING_INCDIR} \
+                --with-sqlite3-incdir=${STAGING_INCDIR} \
+                --with-sqlite3-libdir=${STAGING_LIBDIR} \
+                --with-mysql-incdir=${STAGING_INCDIR} \
+                --with-mysql-libdir=${STAGING_LIBDIR} \
+                --with-pgsql-incdir=${STAGING_INCDIR} \
+                --with-pgsql-libdir=${STAGING_LIBDIR}"
+
+FILES_${PN}-dbg += " ${libdir}/dbd/.debug/*.so"
+FILES_${PN}-dev += " ${libdir}/dbd/*.la ${libdir}/dbd/*.a"
+
+DESCRIPTION_libdbd-sqlite = "SQLite database driver for libdbi"
+FILES_libdbd-sqlite = "${libdir}/dbd/libdbdsqlite.so"
+
+DESCRIPTION_libdbd-sqlite3 =  "SQLite3 database driver for libdbi"
+FILES_libdbd-sqlite3 = "${libdir}/dbd/libdbdsqlite3.so"
+
+DESCRIPTION_libdbd-mysql = "MySQL4 database driver for libdbi"
+FILES_libdbd-mysql = "${libdir}/dbd/libdbdmysql.so"
+
+DESCRIPTION_libdbd-psql = "Postgres SQL database driver for libdbi"
+FILES_libdbd-pgsql = "${libdir}/dbd/libdbdpgsql.so"
+
diff --git a/recipes/libdbi/libdbi-drivers_0.7.1.bb b/recipes/libdbi/libdbi-drivers_0.7.1.bb
deleted file mode 100644
index eea45ca4bb..0000000000
--- a/recipes/libdbi/libdbi-drivers_0.7.1.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-# libdbi-drivers OE build file
-# Copyright (C) 2005, Koninklijke Philips Electronics NV.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-DESCRIPTION = "Database Drivers for libdbi"
-HOMEPAGE = "http://libdbi-drivers.sourceforge.net/"
-LICENSE = "GPLv2"
-SECTION = "libs"
-
-PROVIDES = "libdbd-sqlite"
-DEPENDS = "libdbi sqlite"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libdbi-drivers/libdbi-drivers-${PV}.tar.gz"
-
-inherit autotools
-
-PACKAGES = "${PN}-dbg libdbd-sqlite ${PN}"
-
-EXTRA_OECONF = "--with-dbi-incdir=${STAGING_INCDIR} \
-                --with-sqlite \
-                --with-sqlite-libdir=${STAGING_LIBDIR} \
-                --with-sqlite-incdir=${STAGING_INCDIR}"
-
-FILES_libdbd-sqlite = "/usr/lib/dbd/libsqlite.so \
-                       /usr/lib/dbd/libsqlite.la \
-                       /usr/lib/dbd/libsqlite.a"
-
-DESCRIPTION_libdbd-sqlite = "SQLite database driver for libdbi"
-
-do_configure_old () {
-  ./configure \
-		    --build=${BUILD_SYS} \
-		    --host=${HOST_SYS} \
-		    --target=${TARGET_SYS} \
-		    --prefix=${prefix} \
-		    --with-sqlite \
-		    --with-sqlite-libdir=${STAGING_LIBDIR} \
-		    --with-sqlite-incdir=${STAGING_INCDIR}
-}
-
diff --git a/recipes/libdbi/libdbi-drivers_0.8.3-1.bb b/recipes/libdbi/libdbi-drivers_0.8.3-1.bb
new file mode 100644
index 0000000000..efbc61f5c0
--- /dev/null
+++ b/recipes/libdbi/libdbi-drivers_0.8.3-1.bb
@@ -0,0 +1,2 @@
+require ${PN}.inc
+LICENSE = "LGPL"
diff --git a/recipes/libdbi/libdbi_0.8.2.bb b/recipes/libdbi/libdbi_0.8.3.bb
index bd54419686..bd54419686 100644
--- a/recipes/libdbi/libdbi_0.8.2.bb
+++ b/recipes/libdbi/libdbi_0.8.3.bb
diff --git a/recipes/libmrss/libmrss.inc b/recipes/libmrss/libmrss.inc
new file mode 100644
index 0000000000..de4b705502
--- /dev/null
+++ b/recipes/libmrss/libmrss.inc
@@ -0,0 +1,15 @@
+DESCRIPTION = "mRSS is a C library for parsing, writing and creating RSS (0.91, 0.92, 1.0, 2.0) files or streams"
+LICENSE = "LGPL"
+HOMEPAGE = "http://www.autistici.org/bakunin/libmrss/"
+
+DEPENDS = "libnxml curl"
+INC_PR = "r1"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://www.autistici.org/bakunin/libmrss/libmrss-${PV}.tar.gz \
+          "
+
+do_stage() {
+    autotools_stage_all
+}
diff --git a/recipes/libmrss/libmrss_0.17.2.bb b/recipes/libmrss/libmrss_0.17.2.bb
index f536468479..38fb2997b0 100644
--- a/recipes/libmrss/libmrss_0.17.2.bb
+++ b/recipes/libmrss/libmrss_0.17.2.bb
@@ -1,15 +1,6 @@
-DESCRIPTION = "mRSS is a C library for parsing, writing and creating RSS (0.91, 0.92, 1.0, 2.0) files or streams"
-LICENSE = "LGPL"
-HOMEPAGE = "http://www2.autistici.org/bakunin/codes.php"
+require libmrss.inc
 
-DEPENDS = "libnxml curl"
-PR      = "r1"
+PR = "${INC_PR}.2"
 
-inherit autotools pkgconfig
+SRC_URI += "file://better-parse-url-r0.patch;patch=1"
 
-SRC_URI = "http://www2.autistici.org/bakunin/libmrss/libmrss-${PV}.tar.gz \
-           file://better-parse-url-r0.patch;patch=1                       "
-
-do_stage() {
-    autotools_stage_all
-}
diff --git a/recipes/libmrss/libmrss_0.19.2.bb b/recipes/libmrss/libmrss_0.19.2.bb
new file mode 100644
index 0000000000..ce978432b6
--- /dev/null
+++ b/recipes/libmrss/libmrss_0.19.2.bb
@@ -0,0 +1,7 @@
+require libmrss.inc
+
+# this version misses the patch applied to 0.17.2 - needs patch rebase
+DEFAULT_PREFERENCE = "-1"
+
+PR = "${INC_PR}.1"
+
diff --git a/recipes/libnxml/libnxml.inc b/recipes/libnxml/libnxml.inc
new file mode 100644
index 0000000000..7a777dab1a
--- /dev/null
+++ b/recipes/libnxml/libnxml.inc
@@ -0,0 +1,15 @@
+HOMEPAGE = "http://www2.autistici.org/bakunin/codes.php"
+DESCRIPTION = "nXML is a C library for parsing, writing and creating XML 1.0 and 1.1 files or streams. It supports utf-8, utf-16be and utf-16le, ucs-4 (1234, 4321, 2143, 2312)"
+LICENSE = "LGPL"
+
+DEPENDS = "curl"
+
+INC_PR = "r0"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://www.autistici.org/bakunin/libnxml/libnxml-${PV}.tar.gz"
+
+do_stage() {
+    autotools_stage_all
+}
diff --git a/recipes/libnxml/libnxml_0.16.bb b/recipes/libnxml/libnxml_0.16.bb
index 6f836d226d..b233795023 100644
--- a/recipes/libnxml/libnxml_0.16.bb
+++ b/recipes/libnxml/libnxml_0.16.bb
@@ -1,14 +1,4 @@
-HOMEPAGE = "http://www2.autistici.org/bakunin/codes.php"
-DESCRIPTION = "nXML is a C library for parsing, writing and creating XML 1.0 and 1.1 files or streams. It supports utf-8, utf-16be and utf-16le, ucs-4 (1234, 4321, 2143, 2312)"
-LICENSE = "LGPL"
+require libnxml.inc
 
-DEPENDS = "curl"
+PR