merge of d95a77faa4899185141ccf69126722bbf2116c19

     and e063b9788ae00fbebf2d7ae07cf7f7fc2feb45e9

5 files changed, 32 insertions, 13 deletions

diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index 27c0437cf5..dbe68f24a4 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -53,10 +53,13 @@ PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
 TARGET_OS = "linux"
 TARGET_FPU_arm = "soft"
 TARGET_FPU_armeb = "soft"
+
 PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/libc = "glibc"
 PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
 PREFERRED_VERSION_glibc ?= "2.5"
 PREFERRED_VERSION_glibc-intermediate ?= "2.5"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 27e34856fd..53e187abf0 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -34,6 +34,8 @@ SRCDATE_matchbox-panel-manager ?= "20060612"
 SRCDATE_matchbox-stroke ?= "20060612"
 SRCDATE_matchbox-themes-extra ?= "20060612"
 SRCDATE_matchbox-wm ?= "20060612"
+SRCDATE_libmatchbox ?= "20060612"
+SRCDATE_libfakekey ?= "20051101"
 SRCDATE_psplash ?= "20061207"
 SRCDATE_web ?= "20060613"
 SRCDATE_zaurusd ?= "20060628"
diff --git a/packages/js/js_1.5.bb b/packages/js/js_1.5.bb
index 5f8323769f..cb353d968c 100644
--- a/packages/js/js_1.5.bb
+++ b/packages/js/js_1.5.bb
@@ -1,15 +1,12 @@
-LICENSE = "GPL"
 DESCRIPTION = "A JavaScript engine"
-SECTION = "libs"
+LICENSE = "GPL"
+SECTION = "libs/network"
 DEPENDS = "readline"
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/js-1.5.tar.gz \
-	   file://jsautocfg.h"
 
+SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/older-packages/js-1.5.tar.gz \
+           file://jsautocfg.h"
 S = "${WORKDIR}/js/src"
 
-FILES_${PN} = "${libdir}/lib*.so"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*.a"
-
 EXTRA_OEMAKE = "'CC=${CC}' 'LD=${LD}' 'XCFLAGS=${CFLAGS}' 'XLDFLAGS=-L${STAGING_LIBDIR} -soname=libjs'"
 
 do_compile_prepend() {
@@ -33,3 +30,6 @@ do_stage() {
 	install -m 0644 ${S}/*.h ${STAGING_INCDIR}/js/
 	oe_libinstall -so -C Linux_All_DBG.OBJ libjs ${STAGING_LIBDIR}
 }
+
+FILES_${PN} = "${libdir}/lib*.so"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*.a"
diff --git a/packages/vorbis-tools/vorbis-tools-1.0.1/remove-deprecated-curl-option.patch b/packages/vorbis-tools/vorbis-tools-1.0.1/remove-deprecated-curl-option.patch
new file mode 100644
index 0000000000..6261ac175c
--- /dev/null
+++ b/packages/vorbis-tools/vorbis-tools-1.0.1/remove-deprecated-curl-option.patch
@@ -0,0 +1,13 @@
+Index: vorbis-tools-1.0.1/ogg123/http_transport.c
+===================================================================
+--- vorbis-tools-1.0.1.orig/ogg123/http_transport.c
++++ vorbis-tools-1.0.1/ogg123/http_transport.c
+@@ -113,7 +113,7 @@ void set_curl_opts (http_private_t *priv
+   if (inputOpts.ProxyTunnel)
+     curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel);
+   */
+-  curl_easy_setopt(handle, CURLOPT_MUTE, 1);
++  /* curl_easy_setopt(handle, CURLOPT_MUTE, 1); */
+   curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error);
+   curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
+   curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private);
diff --git a/packages/vorbis-tools/vorbis-tools_1.0.1.bb b/packages/vorbis-tools/vorbis-tools_1.0.1.bb
index 7b8a75dd3b..9991156dcd 100644
--- a/packages/vorbis-tools/vorbis-tools_1.0.1.bb
+++ b/packages/vorbis-tools/vorbis-tools_1.0.1.bb
@@ -1,13 +1,14 @@
-LICENSE = "GPL"
-DEPENDS = "libogg libvorbis libao curl"
-DESCRIPTION = " vorbis-tools contains oggenc (an encoder), ogg123 (a playback tool), \
+DESCRIPTION = "vorbis-tools contains oggenc (an encoder), ogg123 (a playback tool), \
 ogginfo (displays ogg information), vcut (ogg file splitter), and \
 vorbiscomment (ogg comment editor)."
-
+LICENSE = "GPL"
+DEPENDS = "libogg libvorbis libao curl"
 SECTION = "console/multimedia"
+PR = "r1"
 
 SRC_URI = "http://www.vorbis.com/files/${PV}/unix/vorbis-tools-${PV}.tar.gz \
-	   file://m4.patch;patch=1"
+           file://m4.patch;patch=1 \
+           file://remove-deprecated-curl-option.patch;patch=1"
 
 inherit autotools