merge of '98112dc48d05ba36117d1045ed0b25ac449d5c7f'

     and 'a6d3725bcd7849f3044d01c9bfa2c73dd96dfe89'

57 files changed, 2543 insertions, 159 deletions

diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf
index 4007f203ad..c88aa06697 100644
--- a/conf/distro/angstrom-2007.1-oabi.conf
+++ b/conf/distro/angstrom-2007.1-oabi.conf
@@ -3,6 +3,8 @@ require conf/distro/angstrom-2007.1.conf
 #this is a special version of angstrom for armv4 based machines that can't do EABI
 #see http://wiki.debian.org/ArmEabiPort for details on that
 
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate"
+
 #only glibc based builds are supported ATM
 TARGET_OS = "linux"
 
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index b1d67e0405..ab59d392b8 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -93,12 +93,13 @@ require conf/distro/include/preferred-gpe-versions-2.8.inc
 PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
 PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
 PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
+PREFERRED_PROVIDER_esound 		?= "pulseaudio"
 
 
 PREFERRED_VERSION_fontconfig = "2.4.1"
 PREFERRED_VERSION_freetype = "2.2.1"
 #fix screen corruption issues
-PREFERRED_VERSION_cairo = "1.3.10"
+PREFERRED_VERSION_cairo = "1.3.12"
 
 #work around a segfault in gcc for armv4t
 PREFERRED_VERSION_glib-2.0_ep93xx = "2.12.3"
@@ -225,7 +226,7 @@ EXTRA_STUFF ?= ""
 
 
 # Angstrom want to ship some extra stuff. This should be moved into task-base eventually
-DISTRO_EXTRA_RDEPENDS = "\
+DISTRO_EXTRA_RDEPENDS += "\
     update-modules module-init-tools modutils-initscripts \
     sysvinit initscripts sysvinit-pidof \
     ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \
diff --git a/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc b/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc
deleted file mode 100644
index 7898f7b349..0000000000
--- a/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-# Opie
-#use 1337 mt version of opie to have a webbrowser
-PALMTOP_USE_MULTITHREADED_QT = "yes"
-QTE_VERSION = "2.3.10"
-OPIE_VERSION = "1.2.2"
-require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
index 95be1624f0..d8d9264699 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/compulab-pxa270.conf
@@ -4,7 +4,7 @@
 #OLDEST_KERNEL = "2.6.16"
 TARGET_ARCH = "arm"
 PREFERRED_VERSION_compulab-pxa270 = "2.6.16"
-GUI_MACHINE_CLASS = "bigscreen"
+GUI_MACHINE_CLASS ?= "bigscreen"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
 PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
@@ -12,10 +12,10 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 require conf/machine/include/tune-xscale.conf
 
 # used by sysvinit_2
-SERIAL_CONSOLE = "38400 ttySA0"
+SERIAL_CONSOLE ?= "38400 ttySA0"
 
 # used by opie-collections.inc
-ROOT_FLASH_SIZE = "32"
+ROOT_FLASH_SIZE ?= "32"
 
 EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000"
 
diff --git a/packages/cairo/cairo_1.3.10.bb b/packages/cairo/cairo_1.3.12.bb
index 883884d15f..883884d15f 100644
--- a/packages/cairo/cairo_1.3.10.bb
+++ b/packages/cairo/cairo_1.3.12.bb
diff --git a/packages/cairo/cairo_git.bb b/packages/cairo/cairo_git.bb
index 55bdc019f0..26eaf78879 100644
--- a/packages/cairo/cairo_git.bb
+++ b/packages/cairo/cairo_git.bb
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
 
-PV = "1.3.11+git${SRCDATE}"
+PV = "1.3.13+git${SRCDATE}"
 
 SRC_URI = "git://git.cairographics.org/git/cairo;protocol=git \
 	  "
diff --git a/packages/clutter/.mtn2git_empty b/packages/clutter/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/clutter/.mtn2git_empty
diff --git a/packages/clutter/clutter-fpu.inc b/packages/clutter/clutter-fpu.inc
new file mode 100644
index 0000000000..21a16feac2
--- /dev/null
+++ b/packages/clutter/clutter-fpu.inc
@@ -0,0 +1,6 @@
+
+def get_clutter_fpu_setting(bb, d):
+	if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+		return "--without-fpu"
+	return ""
+
diff --git a/packages/clutter/clutter.inc b/packages/clutter/clutter.inc
new file mode 100644
index 0000000000..b89070f3ea
--- /dev/null
+++ b/packages/clutter/clutter.inc
@@ -0,0 +1,26 @@
+DESCRIPTION = "Clutter graphics library"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPL"
+
+DEPENDS = "virtual/libx11 mesa gstreamer gtk-doc cairo pango gtk+"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-gtk-doc "
+
+#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
+require clutter-fpu.inc
+
+EXTRA_OECONF += "${@get_clutter_fpu_setting(bb, d)}"
+
+#Fix up some weirdness in the docs
+do_configure_prepend() {
+	touch ${S}/gtk-doc.make
+        sed -i s:doc/reference/Makefile::g ${S}/configure.ac
+        sed -i s:doc::g ${S}/Makefile.am
+}
+
+do_stage () {
+        autotools_stage_all
+}
+
diff --git a/packages/clutter/clutter_svn.bb b/packages/clutter/clutter_svn.bb
new file mode 100644
index 0000000000..9939221d8d
--- /dev/null
+++ b/packages/clutter/clutter_svn.bb
@@ -0,0 +1,9 @@
+require clutter.inc
+
+PV = "0.2.0+svn${SRCDATE}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http"
+
+S = "${WORKDIR}/clutter"
+
+
diff --git a/packages/freetype/freetype-2.3.0/.mtn2git_empty b/packages/freetype/freetype-2.3.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/freetype/freetype-2.3.0/.mtn2git_empty
diff --git a/packages/freetype/freetype-2.3.0/configure.patch b/packages/freetype/freetype-2.3.0/configure.patch
new file mode 100644
index 0000000000..7c2035d7e8
--- /dev/null
+++ b/packages/freetype/freetype-2.3.0/configure.patch
@@ -0,0 +1,43 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+Index: freetype-2.3.0/builds/unix/configure.ac
+===================================================================
+--- freetype-2.3.0.orig/builds/unix/configure.ac	2007-01-17 12:51:51.000000000 +0100
++++ freetype-2.3.0/builds/unix/configure.ac	2007-01-19 00:10:00.000000000 +0100
+@@ -159,7 +159,7 @@
+ 
+ # don't quote AS_HELP_STRING!
+ AC_ARG_WITH([zlib],
+-  AS_HELP_STRING([--without-zlib],
++  AC_HELP_STRING([--without-zlib],
+                  [use internal zlib instead of system-wide]))
+ if test x$with_zlib != xno && test -z "$LIBZ"; then
+   AC_CHECK_LIB([z], [gzsetparams], [AC_CHECK_HEADER([zlib.h], [LIBZ='-lz'])])
+@@ -175,7 +175,7 @@
+ 
+ # don't quote AS_HELP_STRING!
+ AC_ARG_WITH([old-mac-fonts],
+-  AS_HELP_STRING([--with-old-mac-fonts],
++  AC_HELP_STRING([--with-old-mac-fonts],
+                  [allow Mac resource-based fonts to be used]))
+ if test x$with_old_mac_fonts = xyes; then
+   orig_LDFLAGS="${LDFLAGS}"
+Index: freetype-2.3.0/builds/unix/unix-cc.in
+===================================================================
+--- freetype-2.3.0.orig/builds/unix/unix-cc.in	2006-10-15 10:57:22.000000000 +0200
++++ freetype-2.3.0/builds/unix/unix-cc.in	2007-01-19 00:10:53.000000000 +0100
+@@ -14,8 +14,10 @@
+ 
+ CC           := @CC@
+ COMPILER_SEP := $(SEP)
++SHELL        := @SHELL@
++top_builddir := $(BUILD_DIR)
+ 
+-LIBTOOL ?= $(BUILD_DIR)/libtool
++LIBTOOL := @LIBTOOL@
+ 
+ 
+ # The object file extension (for standard and static libraries).  This can be
diff --git a/packages/freetype/freetype-2.3.0/no-hardcode.patch b/packages/freetype/freetype-2.3.0/no-hardcode.patch
new file mode 100644
index 0000000000..65289758d5
--- /dev/null
+++ b/packages/freetype/freetype-2.3.0/no-hardcode.patch
@@ -0,0 +1,11 @@
+--- freetype-2.2.1/builds/unix/freetype-config.in.orig	2006-07-10 10:51:47.000000000 +0100
++++ freetype-2.2.1/builds/unix/freetype-config.in	2006-07-10 10:52:27.000000000 +0100
+@@ -16,7 +16,7 @@
+ libdir=@libdir@
+ enable_shared=@enable_shared@
+ wl=@wl@
+-hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@'
++hardcode_libdir_flag_spec=''
+ 
+ usage()
+ {
diff --git a/packages/freetype/freetype_2.3.0.bb b/packages/freetype/freetype_2.3.0.bb
new file mode 100644
index 0000000000..3c574486c1
--- /dev/null
+++ b/packages/freetype/freetype_2.3.0.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "Freetype font rendering library"
+SECTION = "libs"
+LICENSE = "freetype"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
+	   file://configure.patch;patch=1 \
+           file://no-hardcode.patch;patch=1"
+S = "${WORKDIR}/freetype-${PV}"
+
+inherit autotools pkgconfig binconfig
+
+DEFAULT_PREFERENCE = "-1"
+
+LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
+EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
+EXTRA_OECONF = "--without-zlib"
+
+do_configure() {
+	cd builds/unix
+	gnu-configize
+	aclocal -I .
+	autoconf
+	cd ${S}
+	oe_runconf
+}
+
+do_compile_prepend() {
+	${BUILD_CC} -o objs/apinames src/tools/apinames.c
+}
+
+do_stage() {
+	autotools_stage_includes
+	oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
+}
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}"
diff --git a/packages/g15daemon/g15daemon_1.2.6a.bb b/packages/g15daemon/g15daemon_1.2.6a.bb
index 872d61d848..0522b27a28 100644
--- a/packages/g15daemon/g15daemon_1.2.6a.bb
+++ b/packages/g15daemon/g15daemon_1.2.6a.bb
@@ -10,10 +10,16 @@ SECTION = "console/utils"
 PRIORITY = "optional"
 DEPENDS = "libdaemon libg15"
 RDEPENDS = "libg15"
+RRECOMMENDS = "kernel-module-uinput"
+PR="r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/g15daemon/g15daemon-${PV}.tar.bz2"
 
 inherit autotools
 
-EXTRA_OECONF = "--disable-build-docs"
+EXTRA_OECONF = "--with-gnu-ld"
+
+do_stage () {
+	autotools_stage_all
+}
 
diff --git a/packages/gpe-session-scripts/files/angstrom/.mtn2git_empty b/packages/gpe-session-scripts/files/angstrom/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-session-scripts/files/angstrom/.mtn2git_empty
diff --git a/packages/gpe-session-scripts/files/angstrom/matchbox-session b/packages/gpe-session-scripts/files/angstrom/matchbox-session
new file mode 100644
index 0000000000..ad2d9b6a78
--- /dev/null
+++ b/packages/gpe-session-scripts/files/angstrom/matchbox-session
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1`
+
+  matchbox-desktop &
+
+matchbox-panel --no-flip  --orientation south &
+exec matchbox-window-manager $@
+
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
index 2cf63737bd..85c6a2575a 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
@@ -11,7 +11,7 @@ DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question
 SRC_URI += "file://matchbox-session \
 	file://disable-composite.xsettings"
 
-PR = "r4"
+PR = "r5"
 
 #apply a patch to set the fontsize for bigdpi (200+) devices to 5
 SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1"
diff --git a/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb b/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb
index 8bd4260184..e239f21e04 100644
--- a/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb
+++ b/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 SECTION = "gpe"
 inherit gpe
 
-DEPENDS = "virtual/libx11 esound-gpe"
-RDEPENDS_${PN} = "esd"
+DEPENDS = "virtual/libx11 esound"
 
 SRC_URI += "file://makefile-breakage.patch;patch=1"
diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc
index a7f0d6d7e6..f0531dc570 100644
--- a/packages/gstreamer/gst-plugins.inc
+++ b/packages/gstreamer/gst-plugins.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Plugins for GStreamer"
 SECTION = "multimedia"
 PRIORITY = "optional"
-DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag esound-gpe"
+DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag esound"
 PR = "r1"
 
 PACKAGES_DYNAMIC = "gst-plugin-*"
diff --git a/packages/hal/files/99_hal b/packages/hal/files/99_hal
new file mode 100644
index 0000000000..f3d477231e
--- /dev/null
+++ b/packages/hal/files/99_hal
@@ -0,0 +1 @@
+d root root 0700 /var/run/hald none
diff --git a/packages/hal/hal_0.5.8.1.bb b/packages/hal/hal_0.5.8.1.bb
index 4b2196f875..f608c4018c 100644
--- a/packages/hal/hal_0.5.8.1.bb
+++ b/packages/hal/hal_0.5.8.1.bb
@@ -3,14 +3,15 @@ HOMEPAGE = "http://freedesktop.org/Software/hal"
 SECTION = "unknown"
 LICENSE = "GPL LGPL AFL"
 
-DEPENDS = "dbus-glib  expat libusb"
+DEPENDS = "dbus-glib udev intltool  expat libusb"
 RDEPENDS += "udev"
 #RDEPENDS_hal-device-manager = "python hal python-pygnome"
 RRECOMMENDS = "udev-utils"
 
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz"
+SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \
+        file://99_hal"
 
 S = "${WORKDIR}/hal-${PV}"
 
@@ -24,6 +25,11 @@ EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
                 --disable-policy-kit \
                 "
 
+do_install_append() {
+	install -d ${D}/etc/default/volatiles
+	install -m 0644 ${WORKDIR}/99_hal ${D}/etc/default/volatiles
+}
+
 do_stage() {
         autotools_stage_all
         install -d ${STAGING_LIBDIR}
@@ -31,6 +37,30 @@ do_stage() {
         install -m 755 libhal-storage/.libs/libhal-storage.so.1.0.0 ${STAGING_LIBDIR}/libhal-storage.so
 }
 
+# At the time the postinst runs, dbus might not be setup so only restart if running
+pkg_postinst_hal () {
+	# can't do this offline
+	if [ "x$D" != "x" ]; then
+		exit 1
+	fi
+
+	/etc/init.d/populate-volatile.sh update
+
+	grep haldaemon /etc/group || addgroup haldaemon
+	grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL
+
+	DBUSPID=`pidof dbus-daemon`
+
+	if [ "x$DBUSPID" != "x" ]; then
+		/etc/init.d/dbus-1 force-reload
+	fi
+}
+
+pkg_postrm_hal () {
+	deluser haldaemon || true
+	delgroup haldaemon || true
+}
+
 #PACKAGES += "hal-device-manager"
 
 #FILES_hal-device-manager = " \
diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh
index 44db23707e..cb0a940c7d 100755
--- a/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/checkroot.sh
@@ -141,6 +141,7 @@ else
     test `uname -m` = s390 && spinner="" # This should go away
     test "$VERBOSE" != no && echo "Checking root filesystem..."
     fsck $spinner $force $fix /
+    RTC=$?
     #
     # If there was a failure, drop into single-user mode.
     #
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 838c479cb1..0648ceea19 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -5,7 +5,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r83"
+PR = "r85"
 
 SRC_URI = "file://halt \
            file://ramdisk \
diff --git a/packages/lcdproc/lcdproc_0.5.1.bb b/packages/lcdproc/lcdproc_0.5.1.bb
index e769e0053f..aa1b26e544 100644
--- a/packages/lcdproc/lcdproc_0.5.1.bb
+++ b/packages/lcdproc/lcdproc_0.5.1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://lcdproc.org"
 LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "utils"
-PR="r1"
+PR="r2"
 
 DEPENDS = "libusb ncurses libg15 g15daemon libg15render"
 RRECOMMENDS_lcdproc = "lcdd"
@@ -13,7 +13,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lcdproc/${P}.tar.gz"
 
 inherit autotools update-rc.d
 
-PACKAGES =+ "lcdd lcdd-driver-cfontz lcdd-driver-bayrad lcdd-driver-hd44780nousb \
+PACKAGES =+ "lcdd lcdvc lcdd-driver-cfontz lcdd-driver-bayrad lcdd-driver-hd44780nousb \
 		lcdd-driver-hd44780 lcdd-driver-mtxorb lcdd-driver-serialvfd \
 		lcdd-driver-curses lcdd-driver-text \
 		lcdd-driver-sed lcdd-driver-cwlnx lcdd-driver-glk lcdd-driver-icp-a106 \
@@ -24,6 +24,7 @@ PACKAGES =+ "lcdd lcdd-driver-cfontz lcdd-driver-bayrad lcdd-driver-hd44780nousb
 
 CONFFILES_lcdd = "${sysconfdir}/LCDd.conf"
 CONFFILES_lcdproc = "${sysconfdir}/lcdproc.conf"
+CONFFILES_lcdvc = "${sysconfdir}/lcdvc.conf"
 
 FILES_lcdd = "${CONFFILES_lcdd} \
 	${sbindir}/LCDd \
@@ -33,6 +34,9 @@ FILES_lcdproc = "${CONFFILES_lcdproc} \
 	${bindir}/lcdproc \
 	${sysconfdir}/init.d/lcdproc"
 
+FILES_lcdvc = "${CONFFILES_lcdvc} \
+	${sbindir}/lcdvc"
+
 # Driver packages
 
 FILES_lcdd-driver-cfontz 	= "${libdir}/lcdproc/CFontz*.so"
@@ -91,6 +95,7 @@ do_install () {
 	# binaries
 	install -D -m 0755 server/LCDd ${D}${sbindir}/LCDd
 	install -D -m 0755 clients/lcdproc/lcdproc ${D}${bindir}/lcdproc
+	install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc
 
 	# init scripts
 	install -d ${D}${sysconfdir}/init.d
@@ -104,6 +109,7 @@ do_install () {
 
 	# configuration files
 	install -D -m 0644 LCDd.conf ${D}${sysconfdir}/LCDd.conf
+	install -D -m 0644 clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf
 	# don't start lcdproc by default
 	# will be fixed in next upstream release
 	cat scripts/lcdproc.conf | sed -e 's/C X//' > ${D}${sysconfdir}/lcdproc.conf
diff --git a/packages/libg15/libg15_1.2.1.bb b/packages/libg15/libg15_1.2.1.bb
index 746e5f2e98..930cfe8640 100644
--- a/