merge of '7168bc90d12251e04fc9d38ea7a8082b002fff93'

     and 'e97ced3dc091a93df4e70b2feabd08d3d70bafbc'

26 files changed, 1084 insertions, 37 deletions

diff --git a/packages/bitbake/bitbake_1.6.0.bb b/packages/bitbake/bitbake_1.6.2.bb
index 4289c49a04..f0fdfb9e76 100644
--- a/packages/bitbake/bitbake_1.6.0.bb
+++ b/packages/bitbake/bitbake_1.6.2.bb
@@ -1,6 +1,6 @@
 require bitbake.inc
 
-PR = "r1"
+PR = "r0"
 
 # We don't need a toolchain...
 INHIBIT_DEFAULT_DEPS = "1"
diff --git a/packages/directfb/++dfb_0.9.23.bb b/packages/directfb/++dfb_0.9.25.bb
index 0f965af118..f440e117ff 100644
--- a/packages/directfb/++dfb_0.9.23.bb
+++ b/packages/directfb/++dfb_0.9.25.bb
@@ -6,9 +6,14 @@ LICENSE = "LGPL"
 
 SRC_URI = "http://www.directfb.org/downloads/Extras/++DFB-${PV}.tar.gz"
 S = "${WORKDIR}/++DFB-${PV}"
+RV = "0.9-25"
 
 inherit autotools pkgconfig
 
+do_configure_append() {
+    find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+}
+
 do_stage() {
 	autotools_stage_all
 }
@@ -16,3 +21,4 @@ do_stage() {
 do_install() {
         oe_runmake 'DESTDIR=${D}' install
 }
+FILES_++dfb_append = " ${libdir}/*.so*"
diff --git a/packages/directfb/directfb-examples_0.9.23.bb b/packages/directfb/directfb-examples_0.9.25.bb
index 423e888fd8..28de29c4a6 100644
--- a/packages/directfb/directfb-examples_0.9.23.bb
+++ b/packages/directfb/directfb-examples_0.9.25.bb
@@ -8,3 +8,8 @@ S = "${WORKDIR}/DirectFB-examples-${PV}"
 
 inherit autotools
 
+do_configure_append() {
+#    find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:'
+    find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+}
+
diff --git a/packages/directfb/directfb_0.9.25.1.bb b/packages/directfb/directfb_0.9.99+1.0.0rc2.bb
index 09fddd4c7c..0298f2a247 100644
--- a/packages/directfb/directfb_0.9.25.1.bb
+++ b/packages/directfb/directfb_0.9.99+1.0.0rc2.bb
@@ -6,13 +6,18 @@ Linux framebuffer device."
 SECTION = "libs"
 LICENSE = "LGPL"
 HOMEPAGE = "http://directfb.org"
-DEPENDS = "jpeg libpng freetype zlib"
+DEPENDS = "jpeg libpng freetype zlib tslib"
 PR = "r1"
-RV = "0.9.25"
+RV = "1.0-0"
 
-SRC_URI = "http://directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \
-           file://fix-pkgconfig-specs.patch;patch=1"
-S = "${WORKDIR}/DirectFB-${PV}"
+SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.0.0-rc2.tar.gz \
+           file://fix-pkgconfig-specs.patch;patch=1 \
+	   file://mkdfiff.patch;patch=1 \
+	   file://tslib_support.patch;patch=1"
+
+S = "${WORKDIR}/DirectFB-1.0.0-rc2"
+
+LDFLAGS_append =" -lts -lm"
 
 inherit autotools pkgconfig
 
diff --git a/packages/directfb/files/mkdfiff.patch b/packages/directfb/files/mkdfiff.patch
new file mode 100644
index 0000000000..cb56fd3602
--- /dev/null
+++ b/packages/directfb/files/mkdfiff.patch
@@ -0,0 +1,11 @@
+--- DirectFB-1.0.0-rc1~org/tools/mkdfiff.c	2006-10-12 13:45:50.000000000 -0400
++++ DirectFB-1.0.0-rc1/tools/mkdfiff.c	2006-10-12 13:57:38.000000000 -0400
+@@ -15,6 +15,8 @@
+ 
+ #include <dfiff.h>
+ 
++#include <unistd.h>
++
+ static DirectFBPixelFormatNames( format_names );
+ 
+ static const char            *filename;
diff --git a/packages/directfb/files/tslib_support.patch b/packages/directfb/files/tslib_support.patch
new file mode 100644
index 0000000000..f444cb9574
--- /dev/null
+++ b/packages/directfb/files/tslib_support.patch
@@ -0,0 +1,818 @@
+diff -u'rNF^function' DirectFB-1.0.0-rc1~org/configure.in DirectFB-1.0.0-rc1/configure.in
+--- DirectFB-1.0.0-rc1~org/configure.in	2006-09-30 17:08:56.000000000 -0400
++++ DirectFB-1.0.0-rc1/configure.in	2006-10-16 08:15:32.000000000 -0400
+@@ -998,6 +998,7 @@
+ checkfor_serialmouse=no
+ checkfor_sonypijogdial=no
+ checkfor_ucb1x00=no
++checkfor_tslib=no
+ checkfor_wm97xx=no
+ 
+ AC_MSG_CHECKING(which inputdrivers should be built)
+@@ -1027,6 +1028,7 @@
+   checkfor_serialmouse=yes
+   checkfor_sonypijogdial=yes
+   checkfor_ucb1x00="$have_arm"
++  checkfor_tslib=yes
+   checkfor_wm97xx=yes
+   AC_MSG_RESULT(all)
+ else 
+@@ -1083,6 +1085,9 @@
+           ucb1x00)
+                   checkfor_ucb1x00=yes
+                   ;;
++	  tslib)
++                  checkfor_tslib=yes
++                  ;;
+           wm97xx)
+                   checkfor_wm97xx=yes
+                   ;;
+@@ -1196,6 +1201,12 @@
+   enable_ucb1x00_ts=yes
+ fi
+ 
++enable_tslib=no
++if test "$checkfor_tslib" = "yes"; then
++  dnl Test for TSLIB Touchscreen support
++  enable_tslib=yes
++fi
++
+ enable_wm97xx_ts=no
+ if test "$checkfor_wm97xx" = "yes"; then
+   dnl Test for WM97xx Touchscreen support
+@@ -1266,6 +1277,7 @@
+ AM_CONDITIONAL(WM97XX_TS, test "$enable_wm97xx_ts" = "yes")
+ 
+ AM_CONDITIONAL(UCB1X00_TS, test "$enable_ucb1x00_ts" = "yes")
++AM_CONDITIONAL(TSLIB, test "$enable_tslib" = "yes")
+ 
+ AM_CONDITIONAL(BUILD_TESTS, test "$with_tests" = "yes")
+ AM_CONDITIONAL(BUILD_TOOLS, test "$with_tools" = "yes")
+@@ -1426,6 +1438,7 @@
+ inputdrivers/serialmouse/Makefile
+ inputdrivers/sonypi/Makefile
+ inputdrivers/ucb1x00_ts/Makefile
++inputdrivers/tslib/Makefile
+ inputdrivers/wm97xx_ts/Makefile
+ 
+ interfaces/Makefile
+@@ -1536,6 +1549,7 @@
+   Serial Mouse              $enable_serial_mouse
+   SonyPI Jogdial            $enable_sonypi_jogdial
+   ucb1x00 Touchscreen       $enable_ucb1x00_ts
++  tslib Touchscreen	    $enable_tslib
+   WM97xx Touchscreen        $enable_wm97xx_ts]);
+ fi
+ 
+diff -u'rNF^function' DirectFB-1.0.0-rc1~org/inputdrivers/Makefile.am DirectFB-1.0.0-rc1/inputdrivers/Makefile.am
+--- DirectFB-1.0.0-rc1~org/inputdrivers/Makefile.am	2006-09-30 17:06:58.000000000 -0400
++++ DirectFB-1.0.0-rc1/inputdrivers/Makefile.am	2006-10-16 08:06:27.000000000 -0400
+@@ -44,6 +44,10 @@
+ UCB1X00_TS_DIR = ucb1x00_ts
+ endif
+ 
++if TSLIB
++TSLIB_DIR = tslib
++endif
++
+ if SONYPI
+ SONYPI_DIR = sonypi
+ endif
+@@ -80,6 +84,7 @@
+ 	$(SERIALMOUSE_INPUT_DIR) \
+ 	$(H3600_TS_DIR)		\
+ 	$(UCB1X00_TS_DIR)	\
++	$(TSLIB_DIR)		\
+ 	$(MUTOUCH_TS_DIR)	\
+ 	$(PENMOUNT_TS_DIR)	\
+ 	$(SONYPI_DIR)		\
+diff -u'rNF^function' DirectFB-1.0.0-rc1~org/inputdrivers/tslib/Makefile.am DirectFB-1.0.0-rc1/inputdrivers/tslib/Makefile.am
+--- DirectFB-1.0.0-rc1~org/inputdrivers/tslib/Makefile.am	1969-12-31 19:00:00.000000000 -0500
++++ DirectFB-1.0.0-rc1/inputdrivers/tslib/Makefile.am	2006-10-13 07:44:02.000000000 -0400
+@@ -0,0 +1,31 @@
++## Makefile.am for DirectFB/inputdrivers/tslib
++
++INCLUDES = \
++	-I$(top_srcdir)/include	\
++	-I$(top_builddir)/lib	\
++	-I$(top_srcdir)/lib	\
++	-I$(top_srcdir)/src
++
++input_LTLIBRARIES = libdirectfb_tslib.la
++
++if BUILD_STATIC
++input_DATA = $(input_LTLIBRARIES:.la=.o)
++endif
++
++inputdir = $(MODULEDIR)/inputdrivers
++
++libdirectfb_tslib_la_SOURCES =	\
++	tslib.c
++
++libdirectfb_tslib_la_LDFLAGS = \
++	-export-dynamic		\
++	-avoid-version		\
++	$(DFB_LDFLAGS)
++
++libdirectfb_tslib_la_LIBADD = \
++	$(top_builddir)/lib/direct/libdirect.la \
++	$(top_builddir)/src/libdirectfb.la
++
++
++include $(top_srcdir)/rules/libobject.make
++	
+diff -u'rNF^function' DirectFB-1.0.0-rc1~org/inputdrivers/tslib/Makefile.in DirectFB-1.0.0-rc1/inputdrivers/tslib/Makefile.in
+--- DirectFB-1.0.0-rc1~org/inputdrivers/tslib/Makefile.in	1969-12-31 19:00:00.000000000 -0500
++++ DirectFB-1.0.0-rc1/inputdrivers/tslib/Makefile.in	2006-10-13 07:44:02.000000000 -0400
+@@ -0,0 +1,429 @@
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++
++
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++
++DESTDIR =
++
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++
++top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++transform = @program_transform_name@
++
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++AR = @AR@
++AS = @AS@
++ASFLAGS = @ASFLAGS@
++CC = @CC@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++DATADIR = @DATADIR@
++DFB_CFLAGS_OMIT_FRAME_POINTER = @DFB_CFLAGS_OMIT_FRAME_POINTER@
++DFB_INTERNAL_CFLAGS = @DFB_INTERNAL_CFLAGS@
++DFB_LDFLAGS = @DFB_LDFLAGS@
++DIRECTFB_BINARY_AGE = @DIRECTFB_BINARY_AGE@
++DIRECTFB_CSOURCE = @DIRECTFB_CSOURCE@
++DIRECTFB_INTERFACE_AGE = @DIRECTFB_INTERFACE_AGE@
++DIRECTFB_MAJOR_VERSION = @DIRECTFB_MAJOR_VERSION@
++DIRECTFB_MICRO_VERSION = @DIRECTFB_MICRO_VERSION@
++DIRECTFB_MINOR_VERSION = @DIRECTFB_MINOR_VERSION@
++DIRECTFB_VERSION = @DIRECTFB_VERSION@
++DIRECT_BUILD_DEBUG = @DIRECT_BUILD_DEBUG@
++DIRECT_BUILD_DEBUGS = @DIRECT_BUILD_DEBUGS@
++DIRECT_BUILD_GETTID = @DIRECT_BUILD_GETTID@
++DIRECT_BUILD_NETWORK = @DIRECT_BUILD_NETWORK@
++DIRECT_BUILD_TEXT = @DIRECT_BUILD_TEXT@
++DIRECT_BUILD_TRACE = @DIRECT_BUILD_TRACE@
++DLLTOOL = @DLLTOOL@
++DYNLIB = @DYNLIB@
++ECHO = @ECHO@
++EGREP = @EGREP@
++EXEEXT = @EXEEXT@
++F77 = @F77@
++FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
++FREETYPE_CONFIG = @FREETYPE_CONFIG@
++FREETYPE_LIBS = @FREETYPE_LIBS@
++FREETYPE_PROVIDER = @FREETYPE_PROVIDER@
++FUSION_BUILD_MULTI = @FUSION_BUILD_MULTI@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
++GIF_PROVIDER = @GIF_PROVIDER@
++HAVE_LIB = @HAVE_LIB@
++HAVE_LINUX = @HAVE_LINUX@
++INCLUDEDIR = @INCLUDEDIR@
++INTERNALINCLUDEDIR = @INTERNALINCLUDEDIR@
++JPEG_PROVIDER = @JPEG_PROVIDER@
++LIB = @LIB@
++LIBJPEG = @LIBJPEG@
++LIBPNG = @LIBPNG@
++LIBTOOL = @LIBTOOL@
++LN_S = @LN_S@
++LTLIB = @LTLIB@
++LT_AGE = @LT_AGE@
++LT_CURRENT = @LT_CURRENT@
++LT_RELEASE = @LT_RELEASE@
++LT_REVISION = @LT_REVISION@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++MAN2HTML = @MAN2HTML@
++MODULEDIR = @MODULEDIR@
++MODULEDIRNAME = @MODULEDIRNAME@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++OSX_LIBS = @OSX_LIBS@
++PACKAGE = @PACKAGE@
++PERL = @PERL@
++PNG_PROVIDER = @PNG_PROVIDER@
++RANLIB = @RANLIB@
++RC = @RC@
++RUNTIME_SYSROOT = @RUNTIME_SYSROOT@
++SDL_CFLAGS = @SDL_CFLAGS@
++SDL_CONFIG = @SDL_CONFIG@
++SDL_LIBS = @SDL_LIBS@
++SOPATH = @SOPATH@
++STRIP = @STRIP@
++SYSFS_LIBS = @SYSFS_LIBS@
++THREADFLAGS = @THREADFLAGS@
++THREADLIB = @THREADLIB@
++VERSION = @VERSION@
++VNC_CFLAGS = @VNC_CFLAGS@
++VNC_CONFIG = @VNC_CONFIG@
++VNC_LIBS = @VNC_LIBS@
++X11_CFLAGS = @X11_CFLAGS@
++X11_LIBS = @X11_LIBS@
++ZLIB_LIBS = @ZLIB_LIBS@
++
++INCLUDES =  	-I$(top_srcdir)/include		-I$(top_builddir)/lib		-I$(top_srcdir)/lib		-I$(top_srcdir)/src
++
++
++input_LTLIBRARIES = libdirectfb_tslib.la
++
++@BUILD_STATIC_TRUE@input_DATA = $(input_LTLIBRARIES:.la=.o)
++
++inputdir = $(MODULEDIR)/inputdrivers
++
++libdirectfb_tslib_la_SOURCES =  	tslib.c
++
++
++libdirectfb_tslib_la_LDFLAGS =  	-export-dynamic			-avoid-version			$(DFB_LDFLAGS)
++
++
++libdirectfb_tslib_la_LIBADD =  	$(top_builddir)/lib/direct/libdirect.la 	$(top_builddir)/src/libdirectfb.la
++
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = ../../config.h
++CONFIG_CLEAN_FILES = 
++LTLIBRARIES =  $(input_LTLIBRARIES)
++
++
++DEFS = @DEFS@ -I. -I$(srcdir) -I../..
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++libdirectfb_tslib_la_DEPENDENCIES =  \
++$(top_builddir)/lib/direct/libdirect.la \
++$(top_builddir)/src/libdirectfb.la
++libdirectfb_tslib_la_OBJECTS =  tslib.lo
++CFLAGS = @CFLAGS@
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++DATA =  $(input_DATA)
++
++DIST_COMMON =  Makefile.am Makefile.in
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = tar
++GZIP_ENV = --best
++SOURCES = $(libdirectfb_tslib_la_SOURCES)
++OBJECTS = $(libdirectfb_tslib_la_OBJECTS)
++
++all: all-redirect
++.SUFFIXES:
++.SUFFIXES: .S .c .lo .o .obj .s
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/rules/libobject.make
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps inputdrivers/tslib/Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) \
++	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++
++mostlyclean-inputLTLIBRARIES:
++
++clean-inputLTLIBRARIES:
++	-test -z "$(input_LTLIBRARIES)" || rm -f $(input_LTLIBRARIES)
++
++distclean-inputLTLIBRARIES:
++
++maintainer-clean-inputLTLIBRARIES:
++
++install-inputLTLIBRARIES: $(input_LTLIBRARIES)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(inputdir)
++	@list='$(input_LTLIBRARIES)'; for p in $$list; do \
++	  if test -f $$p; then \
++	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(inputdir)/$$p"; \
++	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(inputdir)/$$p; \
++	  else :; fi; \
++	done
++
++uninstall-inputLTLIBRARIES:
++	@$(NORMAL_UNINSTALL)
++	list='$(input_LTLIBRARIES)'; for p in $$list; do \
++	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(inputdir)/$$p; \
++	done
++
++.c.o:
++	$(COMPILE) -c $<
++
++# FIXME: We should only use cygpath when building on Windows,
++# and only if it is available.
++.c.obj:
++	$(COMPILE) -c `cygpath -w $<`
++
++.s.o:
++	$(COMPILE) -c $<
++
++.S.o:
++	$(COMPILE) -c $<
++
++mostlyclean-compile:
++	-rm -f *.o core *.core
++	-rm -f *.$(OBJEXT)
++
++clean-compile:
++
++distclean-compile:
++	-rm -f *.tab.c
++
++maintainer-clean-compile:
++
++.c.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++.s.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++.S.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++
++maintainer-clean-libtool:
++
++libdirectfb_tslib.la: $(libdirectfb_tslib_la_OBJECTS) $(libdirectfb_tslib_la_DEPENDENCIES)
++	$(LINK) -rpath $(inputdir) $(libdirectfb_tslib_la_LDFLAGS) $(libdirectfb_tslib_la_OBJECTS) $(libdirectfb_tslib_la_LIBADD) $(LIBS)
++
++install-inputDATA: $(input_DATA)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(inputdir)
++	@list='$(input_DATA)'; for p in $$list; do \
++	  if test -f $(srcdir)/$$p; then \
++	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(inputdir)/$$p"; \
++	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(inputdir)/$$p; \
++	  else if test -f $$p; then \
++	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(inputdir)/$$p"; \
++	    $(INSTALL_DATA) $$p $(DESTDIR)$(inputdir)/$$p; \
++	  fi; fi; \
++	done
++
++uninstall-inputDATA:
++	@$(NORMAL_UNINSTALL)
++	list='$(input_DATA)'; for p in $$list; do \
++	  rm -f $(DESTDIR)$(inputdir)/$$p; \
++	done
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	here=`pwd` && cd $(srcdir) \
++	  && mkid -f$$here/ID $$unique $(LISP)
++
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
++	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
++
++mostlyclean-tags:
++
++clean-tags:
++
++distclean-tags:
++	-rm -f TAGS ID
++
++maintainer-clean-tags:
++
++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
++
++subdir = inputdrivers/tslib
++
++distdir: $(DISTFILES)
++	@for file in $(DISTFILES); do \
++	  d=$(srcdir); \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$d/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
++	done
++
++info-am:
++info: info-am
++dvi-am:
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
++install-exec-am:
++install-exec: install-exec-am
++
++install-data-am: install-inputLTLIBRARIES install-inputDATA
++install-data: install-data-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-am
++uninstall-am: uninstall-inputLTLIBRARIES uninstall-inputDATA
++uninstall: uninstall-am
++all-am: Makefile $(LTLIBRARIES) $(DATA)
++all-redirect: all-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
++installdirs:
++	$(mkinstalldirs)  $(DESTDIR)$(inputdir) $(DESTDIR)$(inputdir)
++
++
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++
++maintainer-clean-generic:
++mostlyclean-am:  mostlyclean-inputLTLIBRARIES mostlyclean-compile \
++		mostlyclean-libtool mostlyclean-tags \
++		mostlyclean-generic
++
++mostlyclean: mostlyclean-am
++
++clean-am:  clean-inputLTLIBRARIES clean-compile clean-libtool clean-tags \
++		clean-generic mostlyclean-am
++
++clean: clean-am
++
++distclean-am:  distclean-inputLTLIBRARIES distclean-compile \
++		distclean-libtool distclean-tags distclean-generic \
++		clean-am
++	-rm -f libtool
++
++distclean: distclean-am
++
++maintainer-clean-am:  maintainer-clean-inputLTLIBRARIES \
++		maintainer-clean-compile maintainer-clean-libtool \
++		maintainer-clean-tags maintainer-clean-generic \
++		distclean-am
++	@echo "This command is intended for maintainers to use;"
++	@echo "it deletes files that may require special tools to rebuild."
++
++maintainer-clean: maintainer-clean-am
++
++.PHONY: mostlyclean-inputLTLIBRARIES distclean-inputLTLIBRARIES \
++clean-inputLTLIBRARIES maintainer-clean-inputLTLIBRARIES \
++uninstall-inputLTLIBRARIES install-inputLTLIBRARIES mostlyclean-compile \
++distclean-compile clean-compile maintainer-clean-compile \
++mostlyclean-libtool distclean-libtool clean-libtool \
++maintainer-clean-libtool uninstall-inputDATA install-inputDATA tags \
++mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
++distdir info-am info dvi-am dvi check check-am installcheck-am \
++installcheck install-exec-am install-exec install-data-am install-data \
++install-am install uninstall-am uninstall all-redirect all-am all \
++installdirs mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++
++
++%.o: .libs/%.a %.la
++	rm -f $<.tmp/*.o
++	if test -d $<.tmp; then rmdir $<.tmp; fi
++	mkdir $<.tmp
++	(cd $<.tmp && $(AR) x ../../$<)
++	$(LD) -o $@ -r $<.tmp/*.o
++	rm -f $<.tmp/*.o && rmdir $<.tmp
++
++.PHONY: $(LTLIBRARIES:%.la=.libs/%.a)
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+diff -u'rNF^function' DirectFB-1.0.0-rc1~org/inputdrivers/tslib/tslib.c DirectFB-1.0.0-rc1/inputdrivers/tslib/tslib.c
+--- DirectFB-1.0.0-rc1~org/inputdrivers/tslib/tslib.c	1969-12-31 19:00:00.000000000 -0500
++++ DirectFB-1.0.0-rc1/inputdrivers/tslib/tslib.c	2006-10-30 15:30:35.000000000 -0500
+@@ -0,0 +1,258 @@
++/*
++   (c) Copyright 2000-2002  convergence integrated media GmbH.
++   (c) Copyright 2002-2004  convergence GmbH.
++
++   All rights reserved.
++
++   Written by Shane Volpe <shanevolpe@gmail.com
++
++   Based on usb1x00_ts writen by:
++              Denis Oliver Kropp <dok@directfb.org>,
++              Andreas Hundt <andi@fischlustig.de>,
++              Sven Neumann <neo@directfb.org> and
++              Ville Syrj��<syrjala@sci.fi>.
++
++   This library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2 of the License, or (at your option) any later version.
++
++   This library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with this library; if not, write to the
++   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.
++*/
++
++#include <config.h>
++
++#include <stdlib.h>
++#include <stdio.h>
++
++#include <tslib.h>
++
++#include <directfb.h>
++
++#include <core/coredefs.h>
++#include <core/coretypes.h>
++
++#include <core/input.h>
++
++#include <direct/mem.h>
++#include <direct/messages.h>
++#include <direct/thread.h>
++
++#include <core/input_driver.h>
++
++
++const char* ts_dev = "/dev/ts0";
++#define TS_BLOCK	0
++
++DFB_INPUT_DRIVER( tslib )
++
++typedef struct {
++     CoreInputDevice   *device;
++     DirectThread  *thread;
++     struct tsdev *ts;
++} tslibData;
++
++
++static void *
++tslibEventThread( DirectThread *thread, void *driver_data )
++{
++     tslibData *data = (tslibData*) driver_data;
++
++     struct ts_sample ts_event;
++
++     int readlen;
++
++     unsigned short old_x = -1;
++     unsigned short old_y = -1;
++     unsigned short old_pressure = 0;
++
++     while ((readlen = ts_read(data->ts, &ts_event, 1)) >= 0)
++     {
++          DFBInputEvent evt;
++
++          direct_thread_testcancel( thread );
++
++          if (readlen < 1)
++               continue;
++	
++          if (ts_event.pressure) {
++
++ 
++              if (ts_event.x != old_x) {
++
++                    evt.type    = DIET_AXISMOTION;
++                    evt.flags   = DIEF_AXISABS;
++                    evt.axis    = DIAI_X;
++                    evt.axisabs = ts_event.x;
++
++                    dfb_input_dispatch( data->device, &evt );
++
++                    old_x = ts_event.x;
++               }
++
++               if (ts_event.y != old_y) {
++                    evt.type    = DIET_AXISMOTION;
++                    evt.flags   = DIEF_AXISABS;
++                    evt.axis    = DIAI_Y;
++                    evt.axisabs = ts_event.y;
++
++                    dfb_input_dispatch( data->device, &evt );
++
++                    old_y = ts_event.y;
++               }
++          }
++
++          if (!ts_event.pressure != !old_pressure) {
++              evt.type   = (ts_event.pressure ?
++                             DIET_BUTTONPRESS : DIET_BUTTONRELEASE);
++               evt.flags  = DIEF_NONE;
++               evt.button = DIBI_LEFT;
++
++               dfb_input_dispatch( data->device, &evt );
++
++               old_pressure = ts_event.pressure;
++          }
++     }
++
++     if (readlen <= 0)
++          D_ERROR ("tslib Touchscreen thread died\n");
++
++     return NULL;
++}
++
++
++/* exported symbols */
++
++static int 
++driver_get_available()
++{
++	struct tsdev *tschk;
++
++//	printf("tslib available check occured! \n");
++
++     tschk = ts_open(ts_dev, TS_BLOCK);
++     if (!tschk) {
++          D_ERROR( "DirectFB/tslib: Error opening `%s'!\n", ts_dev);
++          return 0;
++     }
++
++     if (ts_config(tschk)) {
++          D_ERROR( "DirectFB/tslib: Error configuring `%s'!\n", ts_dev);
++     ts_close( tschk );
++          return 0;
++     }
++
++     ts_close( tschk );
++     D_INFO( "DirectFB/tslib: Found `%s'\n", ts_dev);
++
++     return 1;
++}
++
++static void 
++driver_get_info( InputDriverInfo *info ) 
++{
++     /* fill driver info structure */
++//	printf("tslib getinfo occured! \n");
++
++     snprintf( info->name,
++               DFB_INPUT_DRIVER_INFO_NAME_LENGTH, "tslib Touchscreen Driver" );
++
++     snprintf( info->vendor,
++               DFB_INPUT_DRIVER_INFO_VENDOR_LENGTH,
++               "tslib" );
++
++     info->version.major = 0;
++     info->version.minor = 1;
++}
++
++static DFBResult
++driver_open_device( CoreInputDevice      *device,
++                    unsigned int      number,
++                    InputDeviceInfo  *info,
++                    void            **driver_data )
++{
++     tslibData *data;
++	 struct tsdev *ts;
++
++     /* open device */
++//	printf("tslib open occured! \n");
++
++	ts = ts_open(ts_dev, TS_BLOCK);
++     if (!ts) {
++          D_ERROR( "DirectFB/tslib: Error opening `%s'!\n", ts_dev);
++          return DFB_INIT;
++     }
++
++     if (ts_config(ts)) {
++          D_ERROR( "DirectFB/tslib: Error configuring `%s'!\n", ts_dev);
++          ts_close( ts );
++          return DFB_INIT;
++     }
++
++     /* fill device info structure */
++     snprintf( info->desc.name,
++               DFB_INPUT_DEVICE_DESC_NAME_LENGTH, "tslib Touchscreen" );
++
++     snprintf( info->desc.vendor,
++               DFB_INPUT_DEVICE_DESC_VENDOR_LENGTH, "Unknown" );
++
++     info->prefered_id     = DIDID_MOUSE;
++
++     info->desc.type       = DIDTF_MOUSE;
++     info->desc.caps       = DICAPS_AXES | DICAPS_BUTTONS;
++     info->desc.max_axis   = DIAI_Y;
++     info->desc.max_button = DIBI_LEFT;
++
++     /* allocate and fill private data */
++     data = D_CALLOC( 1, sizeof(tslibData) );
++
++     data->ts   = ts;
++     data->device = device;
++
++     /* start input thread */
++     data->thread = direct_thread_create( DTT_INPUT, tslibEventThread, data, "tslib Input" );
++
++     /* set private data pointer */
++     *driver_data = data;
++		D_INFO("tslib open return \n");
++
++     return DFB_OK;
++}
++
++/*
++ * Fetch one entry from the device's keymap if supported.
++ */
++static DFBResult 
++driver_get_keymap_entry( CoreInputDevice               *device,
++                         void                      *driver_data,
++                         DFBInputDeviceKeymapEntry *entry )
++{
++     return DFB_UNSUPPORTED;
++}
++
++static void 
++driver_close_device( void *driver_data )
++{
++     tslibData *data = (tslibData*) driver_data;
++//	printf("tslib close occured! \n");
++
++     /* stop input thread */
++     direct_thread_cancel( data->thread );
++     direct_thread_join( data->thread );
++     direct_thread_destroy( data->thread );
++
++     /* close device */
++     if (ts_close(data->ts))
++          D_ERROR( "DirectFB/tslib: Error closing `%s'!\n", ts_dev);
++
++     /* free private data */
++     D_FREE( data );
++}
diff --git a/packages/glibc/glibc-2.4/powerpc-sqrt-hack.diff b/packages/glibc/glibc-2.4/powerpc-sqrt-hack.diff
new file mode 100644
index 0000000000..1046efb2a1
--- /dev/null
+++ b/packages/glibc/glibc-2.4/powerpc-sqrt-hack.diff
@@ -0,0 +1,25 @@
+diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c
+--- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c	2006-04-14 07:44:30.000000000 +0200
++++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c	2006-12-08 12:53:32.202227000 +0100
+@@ -25,6 +25,9 @@
+ #include <sysdep.h>
+ #include <ldsodefs.h>
+ 
++#define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0)
++
++
+ static const double almost_half = 0.5000000000000001;	/* 0.5 + 2^-53 */
+ static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
+ static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
+diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c
+--- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c	2006-04-14 07:44:30.000000000 +0200
++++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c	2006-12-08 12:53:36.992227000 +0100
+@@ -25,6 +25,8 @@
+ #include <sysdep.h>
+ #include <ldsodefs.h>
+ 
++#define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0)
++
+ static const float almost_half = 0.50000006;	/* 0.5 + 2^-24 */
+ static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
+ static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index 07be0fa181..815038f0a6 100644
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -72,6 +72,8 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
 SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
 SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
 
+SRC_URI_append_powerpc = " file://powerpc-sqrt-hack.diff;patch=1"
+
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
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 122d5bc1b1..cb5ea6c5c6 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 = "r3"
+PR = "r4"
 
 #apply a patch to set the fontsize for bigdpi (200+) devices to 5
 SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1"
@@ -20,7 +20,11 @@ SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1"
 SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1"
 SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1"
 
-SRC_URI_append_angstrom = " file://angstrom-change-theme.diff;patch=1" 
+
+do_configure_append_angstrom() {
+	sed -i s:Default:Clearlooks:g X11/xsettings.default
+	sed -i s:Industrial:Clearlooks:g X11/xsettings.default
+}	
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
diff --git a/packages/libcap/libcap_1.10.bb b/packages/libcap/libcap_1.10.bb
index 886248c5ad..49332c050d 100644
--- a/packages/libcap/libcap_1.10.bb
+++ b/packages/libcap/libcap_1.10.bb
@@ -2,18 +2,16 @@ DESCRIPTION = "Libcap is a library for getting and setting POSIX.1e (formerly PO
 PRIORITY = "optional"
 SECTION = "libs"
 LICENSE = "GPL"
+DEPENDS = "bison-native flex-native"
 
-SRC_URI = "http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/libcap-${PV}.tar.bz2 \
+CFLAGS_append = " -I${S}/libcap/include"
+
+SRC_URI = "http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/${PN}-${PV}.tar.bz2 \
 	   file://makenames.patch;patch=1 \
 	   file://make.patch;patch=1 "
 
-S = "${WORKDIR}/libcap-${PV}"
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/sys
-	install -m 0644 libcap/include/sys/capability.h ${STAGING_INCDIR}/sys/
-	oe_libinstall -s -C libcap libcap ${STAGING_LIBDIR}
-}
+FILES_${PN} = "${libdir}"
+FILES_${PN}-dev = "${includedir}"
 
 do_install() {
 	install -d ${D}${includedir}/sys
@@ -22,5 +20,8 @@ do_install() {
 	oe_libinstall -s -C libcap libcap ${D}${libdir}
 }
 
-FILES_${PN} = "${libdir}"
-FILES_${PN}-dev = "${includedir}"
\ No newline at end of file
+do_stage() {
+	install -d ${STAGING_INCDIR}/sys
+	install -m 0644 libcap/include/sys/capability.h ${STAGING_INCDIR}/sys/
+	oe_libinstall -s -C libcap libcap ${STAGING_LIBDIR}
+}
diff --git a/packages/libeventdb/libeventdb_cvs.bb b/packages/libeventdb/libeventdb_svn.bb
index 3ea70bac01..4f00f4aac8 100644
--- a/packages/libeventdb/libeventdb_cvs.bb
+++ b/packages/libeventdb/libeventdb_svn.bb
@@ -1,18 +1,21 @@
-LICENSE     = "LGPL"
 DESCRIPTION = "Database access library for GPE calendar"
+LICENSE     = "LGPL"
 SECTION  = "gpe/libs"
 PRIORITY = "optional"
+
 DEPENDS  = "libgpewidget libgpepimc sqlite"
-PV = "0.30+cvs${SRCDATE}"
+
+PV = "0.30+svn${SRCDATE}"
 PR = "r0"
+
 DEFAULT_PREFERENCE = "-1"
 
 inherit pkgconfig gpe autotools
 
-SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}"
+SRC_URI = "${GPE_SVN}"
 
 S = "${WORKDIR}/${PN}"
 
 do_stage () {
-autotools_stage_all
+    autotools_stage_all
 }
diff --git a/packages/lighttpd/.mtn2git_empty b/packages/lighttpd/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lighttpd/.mtn2git_empty
diff --git a/packages/lighttpd/1.4.13/.mtn2git_empty b/packages/lighttpd/1.4.13/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lighttpd/1.4.13/.mtn2git_empty
diff --git a/packages/lighttpd/1.4.13/configure.in.patch b/packages/lighttpd/1.4.13/configure.in.patch
new file mode 100644
index 0000000000..f4db64d4fe
--- /dev/null
+++ b/packages/lighttpd/1.4.13/configure.in.patch
@@ -0,0 +1,28 @@
+Index: lighttpd-1.4.13-r0/lighttpd-1.4.13/configure.in
+===================================================================
+--- lighttpd-1.4.13-r0.orig/lighttpd-1.4.13/configure.in	2006-10-09 18:19:34.000000000 +0200
++++ lighttpd-1.4.13-r0/lighttpd-1.4.13/configure.in	2006-12-07 22:31:52.000000000 +0100
+@@ -250,23 +250,9 @@
+     [WITH_PCRE=$withval],[WITH_PCRE=yes])
+ AC_MSG_RESULT([$WITH_PCRE])
+ 
+-if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then
+-  AC_PATH_PROG(PCRECONFIG, pcre-config)
+ 
+-  if test x"$PCRECONFIG" != x; then
+-    PCRE_LIB=`$PCRECONFIG --libs`
+-    CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`"
+-    OLDLIBS="$LIBS"
+-    LIBS="$LIBS $PCRE_LIB"
+-    AC_CHECK_LIB(pcre, pcre_compile, [
+-      AC_CHECK_HEADERS([pcre.h], [
+         AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
+         AC_DEFINE([HAVE_PCRE_H], [1])
+-      ])
+-    ])
+-    LIBS="$OLDLIBS"
+-  fi
+-fi
+ 
+ AC_SUBST(PCRE_LIB)
+ 
diff --git a/packages/lighttpd/1.4.13/src-server.c.patch b/packages/lighttpd/1.4.13/src-server.c.patch
new file mode 100644
index 0000000000..6ca0c9ea40
--- /dev/null
+++ b/packages/lighttpd/1.4.13/src-server.c.patch
@@ -0,0 +1,22 @@
+--- lighttpd/src/server.c.orig	2006-03-04 09:12:17.000000000 -0800
++++ lighttpd/src/server.c	2006-07-11 09:16:28.000000000 -0700
+@@ -1174,8 +1174,8 @@
+ 		if (srv->sockets_disabled) {
+ 			/* our server sockets are disabled, why ? */
+ 
+-			if ((srv->cur_fds + srv->want_fds < srv->max_fds * 0.8) && /* we have enough unused fds */
+-			    (srv->conns->used < srv->max_conns * 0.9) &&
++			if ((srv->cur_fds + srv->want_fds < srv->max_fds * 8 / 10) && /* we have enough unused fds */
++			    (srv->conns->used < srv->max_conns * 9 / 10) &&
+ 			    (0 == graceful_shutdown)) {
+ 				for (i = 0; i < srv->srv_sockets.used; i++) {
+ 					server_socket *srv_socket = srv->srv_sockets.ptr[i];
+@@ -1187,7 +1187,7 @@
+ 				srv->sockets_disabled = 0;
+ 			}
+ 		} else {
+-			if ((srv->cur_fds + srv->want_fds > srv->max_fds * 0.9) || /* out of fds */
++			if ((srv->cur_fds + srv->want_fds > srv->max_fds * 9 / 10) || /* out of fds */
+ 			    (srv->conns->used > srv->max_conns) || /* out of connections */
+ 			    (graceful_shutdown)) { /* graceful_shutdown */ 
+ 
diff --git a/packages/lighttpd/lighttpd_1.4.13.bb b/packages/lighttpd/lighttpd_1.4.13.bb
new file mode 100644
index 0000000000..53aa9ff37f
--- /dev/null
+++ b/packages/lighttpd/lighttpd_1.4.13.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Web server"
+SECTION = "net"
+#DEPENDS = "libpcre openssl"
+LICENSE = "BSD"
+PR = "r0"
+
+SRC_URI = "http://www.lighttpd.net/download/lighttpd-1.4.13.tar.gz \
+file://${PV}/configure.in.patch;patch=1;pnum=2 file://${PV}/src-server.c.patch;patch=1;pnum=1"
+
+EXTRA_OECONF="--without-bzip2 \
+		--without-ldap \
+		--without-lua \
+		--without-memcache \
+		--without-mysql \
+		--without-pcre \
+		--without-openssl \
+		--without-webdav-locks \
+		--without-webdav-props \
+		--disable-nls \
+		--disable-static"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
+
+FILES_${PN} += "${libdir}/mod_*.so"
diff --git a/packages/linux/linux-dht-walnut_2.6.12.6.bb b/packages/linux/linux-dht-walnut_2.6.12.6.bb
index 15a6946331..decb5d2e5e 100644
--- a/packages/linux/linux-dht-walnut_2.6.12.6.bb
+++ b/packages/linux/linux-dht-walnut_2.6.12.6.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for DHT-Walnut (ppc)  machine"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 DEPENDS = "u-boot"
 
 KERNEL_CCSUFFIX = "-3.4.4"
@@ -55,7 +55,7 @@ do_install_append () {
         install -d  ${DEPLOY_DIR}/images
         install -m 0755 arch/ppc/boot/images/zImage.elf ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.elf
         install -m 0755 vmlinux ${DEPLOY_DIR}/images/
-        powerpc-linux-uclibc-objcopy -O binary -R .note -R .comment -S ${DEPLOY_DIR}/images/vmlinux ${DEPLOY_DIR}/images/linux.bin
+        powerpc-${TARGET_OS}-objcopy -O binary -R .note -R .comment -S ${DEPLOY_DIR}/images/vmlinux ${DEPLOY_DIR}/images/linux.bin
         gzip -f -9 ${DEPLOY_DIR}/images/linux.bin
         mkimage -A ppc -O linux -T kernel -C gzip -a 0 -e 0 -n "owmnr"+${PV}+"-ppc" -d ${DEPLOY_DIR}/images/linux.bin.gz ${DEPLOY_DIR}/images/uImage-${PV}-${MACHINE}-${DATETIME}.bin
         rm ${DEPLOY_DIR}/images/vmlinux
diff --git a/packages/mozilla/minimo/bug-322806.diff b/packages/mozilla/minimo/bug-322806.diff
new file mode 100644
index 0000000000..e001e3fc67
--- /dev/null
+++ b/packages/mozilla/minimo/bug-322806.diff
@@ -0,0 +1,13 @@
+See https://bugzilla.mozilla.org/show_bug.cgi?id=322806 and http://bugs.openembedded.org/show_bug.cgi?id=1600
+
+--- /tmp/xptcinvoke_arm.cpp	2006-12-10 20:02:57.000000000 +0100
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp	2006-12-10 20:03:54.592227000 +0100
+@@ -212,7 +212,7 @@
+     "add	sp, sp, r4	\n\t"	/* restore stack pointer		*/
+     "mov	%0, r0		\n\t"	/* the result...			*/
+     : "=r" (result)
+-    : "r" (&my_params)
++    : "r" (&my_params), "m" (my_params)
+     : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp"
+     );
+     
diff --git a/packages/mozilla/minimo_0.016+cvs.bb b/packages/mozilla/minimo_0.016+cvs.bb
index b7c7792879..dcd22b3dd9 100644
--- a/packages/mozilla/minimo_0.016+cvs.bb
+++ b/packages/mozilla/minimo_0.016+cvs.bb
@@ -11,11 +11,12 @@ BRTAG = "MOZILLA_1_8_BRANCH"
 MOZDATE = "20060720"
 
 PV = "0.016+cvs${MOZDATE}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \
 	   file://minimo.patch;patch=1 \
-           file://mozconfig file://minimo \
+           file://bug-322806.diff;patch=1 \
+	   file://mozconfig file://minimo \
            file://minimo.desktop file://minimo.png"
 
 inherit autotools 
diff --git a/packages/mplayer/files/Makefile-codec-cfg.patch b/packages/mplayer/files/Makefile-codec-cfg.patch
index 8eec79f291..f1fe636df2 100644
--- a/packages/mplayer/files/Makefile-codec-cfg.patch
+++ b/packages/mplayer/files/Makefile-codec-cfg.patch
@@ -1,11 +1,13 @@
---- trunk/Makefile.orig	2006-07-24 09:55:12.000000000 +0100
-+++ trunk/Makefile	2006-07-24 09:56:18.000000000 +0100
-@@ -410,7 +410,7 @@
- endif
+Index: trunk/Makefile
+===================================================================
+--- trunk.orig/Makefile
++++ trunk/Makefile
+@@ -239,7 +239,7 @@ mencoder$(EXESUF): $(MENCODER_DEPS)
+ 	$(CC) -o $@ $^ $(LDFLAGS_MENCODER)
  
- codec-cfg: codec-cfg.c codec-cfg.h help_mp.h
+ codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
 -	$(HOST_CC) -I. -DCODECS2HTML codec-cfg.c -o $@
-+	$(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. -DCODECS2HTML codec-cfg.c -o $@
++	$(BUILD_CC) -I. -DCODECS2HTML codec-cfg.c -o $@
  
- codecs.conf.h: codec-cfg etc/codecs.conf
- 	./codec-cfg ./etc/codecs.conf > $@
+ codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
+ 	./codec-cfg$(EXESUF) ./etc/codecs.conf > $@
diff --git a/packages/mplayer/files/makefile-nostrip-svn.patch b/packages/mplayer/files/makefile-nostrip-svn.patch
new file mode 100644
index 0000000000..0c3180c728
--- /dev/null
+++ b/packages/mplayer/files/makefile-nostrip-svn.patch
@@ -0,0 +1,26 @@
+Index: trunk/Makefile
+===================================================================
+--- trunk.orig/Makefile
++++ trunk/Makefile
+@@ -253,10 +253,10 @@ install: $(ALL_PRG)
+ ifeq ($(VIDIX),yes)
+ 	$(MAKE) -C libdha install
+ 	mkdir -p $(LIBDIR)/mplayer/vidix
+-	-install -m 755 $(INSTALLSTRIP) -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix
++	-install -m 755 -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix
+ endif
+ 	$(INSTALL) -d $(BINDIR)
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) \
++	$(INSTALL) -m 755 mplayer$(EXESUF) \
+ 		$(BINDIR)/mplayer$(EXESUF)
+ ifeq ($(GUI),yes)
+ 	-ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
+@@ -271,7 +271,7 @@ endif
+ 		fi ; \
+ 	done
+ ifeq ($(MENCODER),yes)
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) \
++	$(INSTALL) -m 755 mencoder$(EXESUF) \
+ 		$(BINDIR)/mencoder$(EXESUF)
+ 	for i in $(MAN_LANG); do \
+ 		if test "$$i" = en ; then \
diff --git a/packages/mplayer/files/makefile-nostrip.patch b/packages/mplayer/files/makefile-nostrip.patch
new file mode 100644
index 0000000000..22e5c5ad61
--- /dev/null
+++ b/packages/mplayer/files/makefile-nostrip.patch
@@ -0,0 +1,22 @@
+Index: MPlayer-1.0rc1/Makefile
+===================================================================
+--- MPlayer-1.0rc1.orig/Makefile
++++ MPlayer-1.0rc1/Makefile
+@@ -416,7 +416,7 @@ ifeq ($(VIDIX),yes)
+ 	$(MAKE) -C vidix install
+ endif
+ 	$(INSTALL) -d $(BINDIR)
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)
++	$(INSTALL) -m 755 $(PRG) $(BINDIR)/$(PRG)
+ ifeq ($(GUI),yes)
+ 	-ln -sf $(PRG) $(BINDIR)/gmplayer
+ endif
+@@ -430,7 +430,7 @@ endif
+ 		fi ; \
+ 	done
+ ifeq ($(MENCODER),yes)
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
++	$(INSTALL) -m 755 $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
+ 	for i in $(MAN_LANG); do \
+ 		if test "$$i" = en ; then \
+ 			cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \
diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb
index f91a06d424..41b50bd656 100644
--- a/packages/mplayer/mplayer_0.0+1.0rc1.bb
+++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb
@@ -15,6 +15,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 \
            file://w100-video_out.patch;patch=1 \
            file://w100-mplayer.patch;patch=1 \
            file://pld-onlyarm5.patch;patch=1 \
+           file://makefile-nostrip.patch;patch=1 \
            ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;patch=1 \
            file://imageon-video_out.patch;patch=1"
 
diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb
index dd78992d23..5dca7401c9 100644
--- a/packages/mplayer/mplayer_svn.bb
+++ b/packages/mplayer/mplayer_svn.bb
@@ -12,8 +12,9 @@ SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \
            file://Makefile-codec-cfg.patch;patch=1 \
            file://w100-configure-svn.patch;patch=1 \
            file://w100-video_out.patch;patch=1 \
-	       file://w100-mplayer.patch;patch= \
-           file://pld-onlyarm5.patch;patch=1"
+           file://w100-mplayer.patch;patch= \
+           file://pld-onlyarm5.patch;patch=1 \
+           file://makefile-nostrip-svn.patch;patch=1"
 
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
diff --git a/packages/uboot/u-boot-1.1.4/u-boot-make381-fix.patch b/packages/uboot/u-boot-1.1.4/u-boot-make381-fix.patch
new file mode 100644
index 0000000000..89555ac027
--- /dev/null
+++ b/packages/uboot/u-boot-1.1.4/u-boot-make381-fix.patch
@@ -0,0 +1,15 @@
+--- /examples/orig-Makefile	2005-12-16 18:39:27.000000000 +0200
++++ /examples/Makefile	2006-12-02 14:58:59.000000000 +0200
+@@ -123,10 +123,10 @@
+ 	$(LD) -g $(EX_LDFLAGS) -Ttext $(LOAD_ADDR) \
+ 		-o $@ -e $(<:.o=) $< $(LIB) \
+ 		-L$(gcclibdir) -lgcc
+-%.srec:	%
++%.srec:	%.o
+ 	$(OBJCOPY) -O srec $< $@ 2>/dev/null
+ 
+-%.bin:	%
++%.bin:	%.o
+ 	$(OBJCOPY) -O binary $< $@ 2>/dev/null
+ 
+ #########################################################################
diff --git a/packages/uboot/u-boot_1.1.4.bb b/packages/uboot/u-boot_1.1.4.bb
index f5751db204..2b29674e7a 100644
--- a/packages/uboot/u-boot_1.1.4.bb
+++ b/packages/uboot/u-boot_1.1.4.bb
@@ -6,7 +6,9 @@ LICENSE = "GPL"
 
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+          file://u-boot-make381-fix.patch;patch=1"
+
 SRC_URI_append_gumstix = "\
 						  file://u-boot-autoscript.patch;patch=1 \
 						  file://u-boot-base.patch;patch=1 \
@@ -24,6 +26,10 @@ SRC_URI_append_gumstix = "\
 SRC_URI_append_amsdelta = "\
 	http://the.earth.li/pub/e3/u-boot-amsdelta-20060519.diff;patch=1"
 
+SRC_URI_append_dht-walnut= "\ 
+        file://u-boot-dht-walnut-df2.patch;patch=1"
+
+
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
 EXTRA_OEMAKE_gumstix = "CROSS_COMPILE=${TARGET_PREFIX} GUMSTIX_400MHZ=${GUMSTIX_400MHZ}"
 TARGET_LDFLAGS = ""
@@ -31,6 +37,8 @@ TARGET_LDFLAGS = ""
 UBOOT_MACHINE ?= "${MACHINE}_config"
 UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin"
 
+UBOOT_MACHINE_dht-walnut = "walnut_config"
+
 def gumstix_mhz(d):
 	import bb
         m = bb.data.getVar('GUMSTIX_400MHZ', d, 1)