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

14 files changed, 76 insertions, 52 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 4bb80c147f..fb2e7f2aa1 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13054,9 +13054,9 @@ sha256=bd518b930f76c976bf693c247f0742d88808c776a2aeb51ab7830dedb0eb692d
 md5=308e5746a2d0804be1d638319ad7b9c0
 sha256=bd518b930f76c976bf693c247f0742d88808c776a2aeb51ab7830dedb0eb692d
 
-[http://downloads.sourceforge.net/libdbi/libdbi-0.8.2.tar.gz]
-md5=e5b5aa098ac35e7cb921edcf8b77a865
-sha256=8d3cc69f8afc0386afdaeaab2b3558b2a4fe9a54c440dac34e3b9206d376f407
+[http://downloads.sourceforge.net/libdbi/libdbi-0.8.3.tar.gz]
+md5=ca66db78d479cbfa727cf3245b5864ae
+sha256=72e41856bebb1da7b1fd1e6369358c294913f329c5e594e338b3983e6369a5e3
 
 [http://downloads.sourceforge.net/libdbi-drivers/libdbi-drivers-0.7.1.tar.gz]
 md5=f11020119ceb7a6dee3969cb0589d4bc
@@ -13066,6 +13066,10 @@ sha256=5ae76aff042249750437ab7e490ae7d9e19a10f0005cd9bb525106365998aca8
 md5=f11020119ceb7a6dee3969cb0589d4bc
 sha256=5ae76aff042249750437ab7e490ae7d9e19a10f0005cd9bb525106365998aca8
 
+[http://downloads.sourceforge.net/libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz]
+md5=4de79b323162a5a7652b65b608eca6cd
+sha256=4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72
+
 [http://nchipin.kos.to/libddmpeg/libddmpeg_1.5.orig.tar.gz]
 md5=89e59638d31384987d912741986398b6
 sha256=9422e73c55aa921fbbce06e5e01bba0b98bb7a0f1640c27cfd307c290dba792c
@@ -23534,6 +23538,10 @@ sha256=0da9424503faad972860682107157d7348872f00f932ec270c78f17ee495dc97
 md5=5396e8d279b5140e86113c80abc041ad
 sha256=2e6a535ba29d06337daf22ae12e17cbe10e70de95134ebd7b6e8a6838e3ca5a0
 
+[http://limpens.net/trac/at91-kit-trac/export/4/trunk/sources/tinylogin-1.4.tar.bz2]
+md5=44da0ff2b727455669890b24305e351d
+sha256=5e542e4b7825305a3678bf73136c392feb0d44b8bbf926e8eda5453eea7ddd6b
+
 [http://tinylogin.busybox.net/downloads/tinylogin-1.4.tar.bz2]
 md5=44da0ff2b727455669890b24305e351d
 sha256=5e542e4b7825305a3678bf73136c392feb0d44b8bbf926e8eda5453eea7ddd6b
@@ -24166,6 +24174,10 @@ sha256=4605f3f0001afd3af91ffb554dfd65c5cd313b6b9ada52ae8b2efdccf894cfa2
 md5=06966791546a7b40a2b0139fba552cb0
 sha256=f53533b44a9c17972aff6ac7047c6ac1e2e5e2930254eccdb1239678a6dd1793
 
+[http://downloads.sourceforge.net/project/infozip/UnZip%205.x%20and%20earlier/5.52/unzip552.tar.gz]
+md5=9d23919999d6eac9217d1f41472034a9
+sha256=145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9
+
 [http://ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz]
 md5=9d23919999d6eac9217d1f41472034a9
 sha256=145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9
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/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/qt4/qt4-embedded-gles_4.5.2.bb.disabled b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
index 31bfe0fee2..5aa07c2ebb 100644
--- a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
+++ b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
@@ -6,6 +6,8 @@ QT_CONFIG_FLAGS += "-D QT_QWS_CLIENTBLIT -depths 16,24,32 -opengl es1 -plugin-gf
 
 require qt4-embedded_${PV}.bb
 
+LICENSE = "LGPLv2.1 GPLv3"
+
 DEPENDS += "virtual/egl"
 SRC_URI += "file://sgx-hack.patch;patch=1"
 
diff --git a/recipes/qt4/qt4-embedded_4.5.2.bb b/recipes/qt4/qt4-embedded_4.5.2.bb
index dff754c68c..bbe119c89f 100644
--- a/recipes/qt4/qt4-embedded_4.5.2.bb
+++ b/recipes/qt4/qt4-embedded_4.5.2.bb
@@ -2,5 +2,5 @@ include qt4-embedded.inc
 
 PR = "${INC_PR}.1"
 
-LICENSE += "LGPL"
+LICENSE = "LGPLv2.1 GPLv3"
 SRC_URI += "file://0010-no-simpledecoration-example.patch;patch=1"
diff --git a/recipes/qt4/qt4-tools-native_4.5.2.bb b/recipes/qt4/qt4-tools-native_4.5.2.bb
index d1962bf98f..8eed0034db 100644
--- a/recipes/qt4/qt4-tools-native_4.5.2.bb
+++ b/recipes/qt4/qt4-tools-native_4.5.2.bb
@@ -1,4 +1,5 @@
 require qt4-tools-native.inc
+LICENSE = "LGPLv2.1 GPLv3"
 PR = "${INC_PR}.1"
 
 TOBUILD := "src/tools/bootstrap ${TOBUILD}"
diff --git a/recipes/qt4/qt4-tools-sdk_4.5.2.bb b/recipes/qt4/qt4-tools-sdk_4.5.2.bb
index db919fd6df..fafb7710c9 100644
--- a/recipes/qt4/qt4-tools-sdk_4.5.2.bb
+++ b/recipes/qt4/qt4-tools-sdk_4.5.2.bb
@@ -3,7 +3,7 @@ DEPENDS = "zlib-native dbus-native"
 SECTION = "libs"
 HOMEPAGE = "http://www.trolltech.com"
 PRIORITY = "optional"
-LICENSE = "GPL"
+LICENSE = "LGPLv2.1 GPLv3"
 
 inherit sdk
 
diff --git a/recipes/qt4/qt4-x11-free-gles_git.bb.disabled b/recipes/qt4/qt4-x11-free-gles_git.bb.disabled
index 2e2364414d..bb5f355e6a 100644
--- a/recipes/qt4/qt4-x11-free-gles_git.bb.disabled
+++ b/recipes/qt4/qt4-x11-free-gles_git.bb.disabled
@@ -5,7 +5,7 @@ FILESPATHPKG =. "qt4-x11-free-${PV}:qt4-x11-free:"
 QT_GLFLAGS = "-opengl es1 -openvg" 
 
 include qt4-x11-free.inc
-LICENSE += "LGPL"
+LICENSE = "LGPLv2.1 GPLv3"
 PR = "${INC_PR}.0+gitr${SRCREV}"
 
 DEPENDS += "virtual/egl"
diff --git a/recipes/qt4/qt4-x11-free_4.5.2.bb b/recipes/qt4/qt4-x11-free_4.5.2.bb
index 14d635c04f..27e45ed167 100644
--- a/recipes/qt4/qt4-x11-free_4.5.2.bb
+++ b/recipes/qt4/qt4-x11-free_4.5.2.bb
@@ -1,4 +1,4 @@
 include qt4-x11-free.inc
-LICENSE += "LGPL"
+LICENSE = "LGPLv2.1 GPLv3"
 PR = "${INC_PR}.2"
 
diff --git a/recipes/tinylogin/tinylogin_1.4.bb b/recipes/tinylogin/tinylogin_1.4.bb
index 54708b2d4b..23ee694b1c 100644
--- a/recipes/tinylogin/tinylogin_1.4.bb
+++ b/recipes/tinylogin/tinylogin_1.4.bb
@@ -7,7 +7,8 @@ SECTION = "base"
 LICENSE = "GPL"
 PR = "r6"
 
-SRC_URI = "http://tinylogin.busybox.net/downloads/tinylogin-${PV}.tar.bz2 \
+#SRC_URI = "http://tinylogin.busybox.net/downloads/tinylogin-${PV}.tar.bz2 \
+SRC_URI = "http://limpens.net/trac/at91-kit-trac/export/4/trunk/sources/tinylogin-${PV}.tar.bz2 \
 	file://cvs-20040608.patch;patch=1;pnum=1 \
 	file://add-system.patch;patch=1;pnum=1 \
 	file://adduser-empty_pwd.patch;patch=1 \
diff --git a/recipes/unzip/unzip_552.bb b/recipes/unzip/unzip_552.bb
index d8809196d8..16b63de2dd 100644
--- a/recipes/unzip/unzip_552.bb
+++ b/recipes/unzip/unzip_552.bb
@@ -2,8 +2,7 @@ DESCRIPTION = "A (de)compression library for the ZIP format"
 SECTION = "console/utils"
 LICENSE = "Info-ZIP"
 PR = "r1"
-
-SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/unzip${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/infozip/UnZip%205.x%20and%20earlier/5.52/unzip${PV}.tar.gz"
 S = "${WORKDIR}/unzip-5.52"
 
 export LD = "${CC} ${LDFLAGS}"