merge of '8fb06f47da36b8b2158bea8339a80be10a144e3c'

     and 'a064a0293b3a138710553a3fa279c7f690061da8'

19 files changed, 140 insertions, 30 deletions

diff --git a/conf/distro/include/angstrom-2007-for-openmoko-versions.inc b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc
index ef97eae09a..700af88653 100644
--- a/conf/distro/include/angstrom-2007-for-openmoko-versions.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc
@@ -1111,8 +1111,8 @@ PREFERRED_VERSION_libxres ?= "1.0.3"
 PREFERRED_VERSION_libxscrnsaver ?= "1.1.2"
 PREFERRED_VERSION_libxsettings ?= "0.11"
 PREFERRED_VERSION_libxsettings-client ?= "0.17"
-PREFERRED_VERSION_libxslt ?= "1.1.21"
-PREFERRED_VERSION_libxslt-native ?= "1.1.21"
+PREFERRED_VERSION_libxslt ?= "1.1.22"
+PREFERRED_VERSION_libxslt-native ?= "1.1.22"
 PREFERRED_VERSION_libxt ?= "1.0.5"
 PREFERRED_VERSION_libxtrap ?= "1.0.0"
 PREFERRED_VERSION_libxtst ?= "1.0.3"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 119be23ad2..2c9543abd9 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,5 +1,5 @@
 PREFERRED_VERSION_busybox = "1.9.1"
-PREFERRED_VERSION_dbus = "1.1.4"
+PREFERRED_VERSION_dbus = "1.1.20"
 PREFERRED_VERSION_glib-2.0 = "2.15.6"
 PREFERRED_VERSION_gst-pulse = "0.9.7"
 PREFERRED_VERSION_libtool = "1.5.10"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index a666b42a65..b5a04deab8 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -154,5 +154,5 @@ SRCREV_pn-webkit-gtk ?= "30762"
 SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
-SRCREV_pn-xoo ?= "1623"
+SRCREV_pn-xoo ?= "1971"
 
diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
index 2f882450c8..31dd704994 100755
--- a/contrib/angstrom/build-release.sh
+++ b/contrib/angstrom/build-release.sh
@@ -5,6 +5,22 @@ DO_UCLIBC=1
 do_build() {
 	echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
 
+        if [ $DO_UCLIBC = 1 ]
+        then
+                BUILD_MODE="uclibc"
+                echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+
+                if [ "$BUILD_CLEAN" != "" ]
+                then
+                        bitbake -c clean $BUILD_CLEAN
+                fi
+
+                for target in $BUILD_TARGETS
+                do
+                        bitbake $target && do_report_success
+                done
+        fi
+
 	BUILD_MODE="glibc"
 	if [ "$BUILD_CLEAN" != "" ]
 	then
@@ -15,22 +31,6 @@ do_build() {
 	do
 		bitbake $target && do_report_success
 	done
-
-	if [ $DO_UCLIBC = 1 ]
-	then
-		BUILD_MODE="uclibc"
-		echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
-		
-		if [ "$BUILD_CLEAN" != "" ]
-        	then
-                	bitbake -c clean $BUILD_CLEAN
-        	fi
-
-		for target in $BUILD_TARGETS
-		do
-			bitbake $target && do_report_success
-		done
-	fi
 }
 
 do_report_success() {
@@ -79,7 +79,7 @@ for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 h5000 pood
 do
 	BUILD_CLEAN="base-files"
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="base-image console-image minimal-gpe-image x11-image"
+	BUILD_TARGETS="initramfs-bootmenu-image base-image console-image minimal-gpe-image x11-image"
 	do_build
 done
 
diff --git a/packages/apmd/files/90-wifi-off b/packages/apmd/files/90-wifi-off
index c54936c4be..645484b8cd 100644
--- a/packages/apmd/files/90-wifi-off
+++ b/packages/apmd/files/90-wifi-off
@@ -3,7 +3,7 @@
 #
 # turn off wifi cards before suspend so they are fully reloaded upon resume
 
-wifislot = `pccardctl ls|egrep '(hostap|orinoco)'|cut -f 2 -d " "`
+wifislot = `pccardctl ls|egrep '(hostap|orinoco|libertas)'|cut -f 2 -d " "`
 if test $wifislot
 then
   for slot in $wifislot; do
diff --git a/packages/libsexy/files/.mtn2git_empty b/packages/libsexy/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libsexy/files/.mtn2git_empty
diff --git a/packages/libsexy/files/libsexy-pkgconfig-fixes.patch b/packages/libsexy/files/libsexy-pkgconfig-fixes.patch
new file mode 100644
index 0000000000..331b24bf1b
--- /dev/null
+++ b/packages/libsexy/files/libsexy-pkgconfig-fixes.patch
@@ -0,0 +1,15 @@
+Index: libsexy-0.1.11/libsexy.pc.in
+===================================================================
+--- libsexy-0.1.11.orig/libsexy.pc.in	2005-11-10 10:21:18.000000000 +0000
++++ libsexy-0.1.11/libsexy.pc.in	2008-03-05 14:36:39.000000000 +0000
+@@ -6,7 +6,8 @@
+ Name: libsexy
+ Description: Doing naughty things to good widgets
+ Version: @VERSION@
+-Libs: -L${libdir} -lsexy @PACKAGE_LIBS@
+-Cflags: -I${includedir} @PACKAGE_CFLAGS@
+ 
++Requires: pango glib-2.0 gtk+-2.0 libxml
++Libs: -L${libdir} -lsexy 
++Cflags: -I${includedir}
+ 
diff --git a/packages/libsexy/libsexy.inc b/packages/libsexy/libsexy.inc
index 522b7e0d63..27816c0800 100644
--- a/packages/libsexy/libsexy.inc
+++ b/packages/libsexy/libsexy.inc
@@ -5,7 +5,8 @@ SECTION = "x11/libs"
 
 DEPENDS = "gtk+ enchant libxml2"
 
-SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz"
+SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz \
+           file://libsexy-pkgconfig-fixes.patch;patch=1"
 
 inherit autotools pkgconfig
 
diff --git a/packages/libsexy/libsexy_0.1.11.bb b/packages/libsexy/libsexy_0.1.11.bb
index 042ea757e9..91784ffb49 100644
--- a/packages/libsexy/libsexy_0.1.11.bb
+++ b/packages/libsexy/libsexy_0.1.11.bb
@@ -1,2 +1,2 @@
 require libsexy.inc
-PR = "r0"
+PR = "r1"
diff --git a/packages/libxslt/libxslt_1.1.22.bb b/packages/libxslt/libxslt_1.1.22.bb
new file mode 100644
index 0000000000..53348becc9
--- /dev/null
+++ b/packages/libxslt/libxslt_1.1.22.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "GNOME XSLT library"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libxml2 (>=2.6.27)"
+LICENSE = "MIT"
+
+SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz"
+S = "${WORKDIR}/libxslt-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
+
+# Something is wrong inside configure.ac, so we need to resort to sed in this stage :(
+# Koen - 20080305
+do_compile_append() {
+	sed -i -e s:-L${STAGING_LIBDIR}::g  libexslt.pc
+	sed -i -e s:-L${STAGING_LIBDIR}::g  libxslt.pc
+} 
+
+do_stage () {
+	autotools_stage_all
+}
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/xslt-config"
+FILES_${PN}-utils += "${bindir}"
diff --git a/packages/mtd/mtd-utils_1.0.0+git.bb b/packages/mtd/mtd-utils_1.0.0+git.bb
index 42d92edd9a..b325bb03d3 100644
--- a/packages/mtd/mtd-utils_1.0.0+git.bb
+++ b/packages/mtd/mtd-utils_1.0.0+git.bb
@@ -36,12 +36,12 @@ mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
 
 do_install () {
 	install -d ${D}${bindir}
-	install -d ${D}${includedir}
+	install -d ${D}${includedir}/mtd
 	for binary in ${mtd_utils}; do
 		install -m 0755 $binary ${D}${bindir}
 	done
 	for f in ${S}/include/mtd/*.h; do
-		install -m 0644 $f ${D}${includedir}
+		install -m 0644 $f ${D}${includedir}/mtd
 	done
 }
 
diff --git a/packages/mtd/mtd-utils_1.1.0.bb b/packages/mtd/mtd-utils_1.1.0.bb
index 679fc7e79e..ed9a8b8441 100644
--- a/packages/mtd/mtd-utils_1.1.0.bb
+++ b/packages/mtd/mtd-utils_1.1.0.bb
@@ -33,12 +33,12 @@ mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
 
 do_install () {
 	install -d ${D}${bindir}
-	install -d ${D}${includedir}
+	install -d ${D}${includedir}/mtd
 	for binary in ${mtd_utils}; do
 		install -m 0755 $binary ${D}${bindir}
 	done
 	for f in ${S}/include/mtd/*.h; do
-		install -m 0644 $f ${D}${includedir}
+		install -m 0644 $f ${D}${includedir}/mtd
 	done
 }
 
diff --git a/packages/vte/files/.mtn2git_empty b/packages/vte/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/vte/files/.mtn2git_empty
diff --git a/packages/vte/files/vte-pkgconfig-fixes.patch b/packages/vte/files/vte-pkgconfig-fixes.patch
new file mode 100644
index 0000000000..2acc7348e7
--- /dev/null
+++ b/packages/vte/files/vte-pkgconfig-fixes.patch
@@ -0,0 +1,47 @@
+Index: vte-0.16.9/configure.in
+===================================================================
+--- vte-0.16.9.orig/configure.in	2007-09-17 23:07:18.000000000 +0100
++++ vte-0.16.9/configure.in	2008-03-05 15:59:04.000000000 +0000
+@@ -381,8 +381,6 @@
+ 
+ # Search for the required modules.
+ PKG_CHECK_MODULES(VTE,[$wantedmodules])
+-NEEDEDPACKAGES="$wantedmodules"
+-AC_SUBST(NEEDEDPACKAGES)
+ 
+ # Check for various optional functions within those modules
+ save_CFLAGS="$CFLAGS"
+@@ -403,10 +401,12 @@
+ 
+ # Require Freetype2. First see if there is suitable pkgconfig file...
+ PKG_CHECK_EXISTS(freetype2 >= 6.1.0,
+-		 [PKG_CHECK_MODULES(FT2, freetype2)], [
++		 [PKG_CHECK_MODULES(FT2, freetype2)
++                 wantedmodules="$wantedmodules freetype2 >= 6.1.0"], [
+ 	# We use our local copy of the macro because packages of
+ 	# freetype's development files don't always include the proper macro.
+-	VTE_CHECK_FT2(6.1.0,,
++	VTE_CHECK_FT2(6.1.0,[
++                      wantedmodules="$wantedmodules freetype2 >= 6.1.0" ],
+ 		      [AC_MSG_ERROR([You must have freetype 2.0.2 or later to build vte.])])])
+ 
+ # Temporarily pull in the Freetype cflags and libs for checking what's
+@@ -508,6 +508,8 @@
+ CFLAGS="$savecflags"
+ CPPFLAGS="$savecppflags"
+ 
++NEEDEDPACKAGES="$wantedmodules"
++AC_SUBST(NEEDEDPACKAGES)
+ 
+ wcs_funcs_includes="
+ #ifdef HAVE_STRING_H
+Index: vte-0.16.9/vte.pc.in
+===================================================================
+--- vte-0.16.9.orig/vte.pc.in	2007-02-26 21:05:19.000000000 +0000
++++ vte-0.16.9/vte.pc.in	2008-03-05 15:56:37.000000000 +0000
+@@ -11,4 +11,4 @@
+ Requires: @NEEDEDPACKAGES@
+ Libs: -L${libdir} -lvte @OTHERLIBS@
+ Libs.private: @FT2_LIBS@
+-Cflags: -I${includedir} @FT2_CFLAGS@ @OTHERCFLAGS@
++Cflags: -I${includedir} @OTHERCFLAGS@
diff --git a/packages/vte/vte.inc b/packages/vte/vte.inc
index e575a5a3fb..e9313cd861 100644
--- a/packages/vte/vte.inc
+++ b/packages/vte/vte.inc
@@ -5,6 +5,8 @@ RDEPENDS = "termcap"
 
 inherit gnome
 
+SRC_URI += "file://vte-pkgconfig-fixes.patch;patch=1"
+
 EXTRA_OECONF = "--disable-gtk-doc"
 
 do_stage() {
diff --git a/packages/vte/vte_0.16.9.bb b/packages/vte/vte_0.16.9.bb
index f408632430..5875fd317f 100644
--- a/packages/vte/vte_0.16.9.bb
+++ b/packages/vte/vte_0.16.9.bb
@@ -1,2 +1,2 @@
 require vte.inc
-PR = "r3"
+PR = "r4"
diff --git a/packages/xoo/xoo_svn.bb b/packages/xoo/xoo_svn.bb
index 231122194b..e9cd7ee9b7 100644
--- a/packages/xoo/xoo_svn.bb
+++ b/packages/xoo/xoo_svn.bb
@@ -3,7 +3,7 @@ It is intended for embedded developers that want to simulate a target device \
 (with an accurate display size, working hardware buttons, etc) on a desktop machine."
 HOMEPAGE = "http://projects.o-hand.com/xoo"
 LICENSE = "GPL"
-DEPENDS = "virtual/libx11 libxtst gtk+ libglade"
+DEPENDS = "virtual/libx11 libxtst gtk+ libglade expat"
 PV = "0.7+svnr${SRCREV}"
 PR = "r1"
 
diff --git a/packages/xserver-common/xserver-common_1.22.bb b/packages/xserver-common/xserver-common_1.22.bb
new file mode 100644
index 0000000000..a30a37c893
--- /dev/null
+++ b/packages/xserver-common/xserver-common_1.22.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r0"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh "
+
+do_install_append() {
+	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/site/arm-linux-uclibc b/site/arm-linux-uclibc
index 81d2c54aae..5120795f7a 100644
--- a/site/arm-linux-uclibc
+++ b/site/arm-linux-uclibc
@@ -4,6 +4,7 @@ ac_cv_func_setgrent_void=yes
 ac_cv_func_malloc_0_nonnull=yes
 ac_cv_func_malloc_works=yes
 ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
+ac_cv_func_posix_getgrgid_r=${ac_cv_func_getgrgid_r=yes}
 ac_cv_func_setvbuf_reversed=no
 ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
 ac_cv_sizeof_char=${ac_cv_sizeof_char=1}