Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded

into giantshoulder.com:/home/tom/dev/openslug/openembedded

2005/03/17 05:41:17-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/17 14:49:07+01:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2005/03/17 14:48:44+01:00 dyndns.org!reenoo
xserver-kdrive: add epson patch courtesy of Matthew Allum. fix packaging.

2005/03/17 14:19:17+01:00 utwente.nl!koen
vlc-gpe_0.8.1.bb:
  re-enable gtnutls after fixing tls

2005/03/17 14:12:02+01:00 utwente.nl!koen
gnutls_1.0.23.bb:
  and bump PR

2005/03/17 14:09:36+01:00 utwente.nl!koen
gnutls_1.0.23.bb:
  inherit binconfig  to have -config stuff installed to staging

2005/03/17 14:00:22+01:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/03/17 14:00:06+01:00 utwente.nl!koen
vlc-gpe_0.8.1.bb:
  disable gnutls as long as gnutls doesn't install *-config into staging

2005/03/17 04:41:26-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/17 13:04:19+01:00 mn-solutions.de!schurig
The new libspeex 1.1.7 knows about fixed-point, ARMv4 and ARMv5e

2005/03/17 12:45:12+01:00 utwente.nl!koen
familiar-0.8.2.conf:
  FIXME added

2005/03/17 03:41:20-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/17 12:35:48+01:00 utwente.nl!koen
vlc-gpe_0.8.1.bb:
  fix stupid typo

2005/03/17 12:31:40+01:00 utwente.nl!koen
vlc-gpe_0.8.1.bb:
  add missing DEPENDS

2005/03/17 11:56:50+01:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/03/17 11:56:35+01:00 utwente.nl!koen
mplayer_1.0pre3try2.bb:
  add tslib to mplayer DEPEND as it wants to link against it

2005/03/17 02:41:22-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/17 11:30:03+01:00 local!hrw
network-suspend-scripts: get usbnet working after suspend/resume also on 2.4 zaurus - patch by Jose Bernardo Silva

2005/03/17 11:18:07+01:00 local!hrw
downgrade kdepimpi to 2.0.6 - upstream author removed all newer versions

2005/03/17 01:41:23-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/17 10:11:43+01:00 mn-solutions.de!schurig
MNCI "Ramses":
fix download path for a kernel patch
provide custom qmake.conf file

2005/03/17 10:00:42+01:00 utwente.nl!koen
preferred-gpe-versions.inc:
  remove cairo CVSDATE

2005/03/17 09:58:03+01:00 utwente.nl!koen
familiar-0.8.2.conf:
  adjust gcc version and pre-tweak opie-version

2005/03/17 19:26:37+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded

2005/03/17 09:50:43+01:00 utwente.nl!koen
  update familiar-0.8.2.conf

2005/03/16 22:25:52-10:00 (none)!dyoung
Added some spca5xx USB Camera support, added SECTION to identify pwc as a module

2005/03/17 11:26:24+10:30 (none)!rwhitby
Changed base-files/nslu2 to base-files/openslug, and fixed a couple of errors in the fstab.

2005/03/16 12:41:24-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/16 20:35:36+00:00 reciva.com!pb
apply patch from Paul Eggleton to change h3600/h3900 fstab entries from /mnt to /media

2005/03/16 21:28:34+01:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/data/build/oe/openembedded

2005/03/16 21:28:16+01:00 utwente.nl!koen
minimo: freshen mozconfig, courtesy Doug Turner

2005/03/16 15:07:14-05:00 accelent.com!cbrake
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gus.accelent.com:/home/cbrake/workspace/oe/openembedded

2005/03/16 15:06:33-05:00 accelent.com!cbrake
add machine and date to uboot output -- consistent with how kernel
images are done.

2005/03/16 15:05:34-05:00 accelent.com!cbrake
add kernel patch to fix CPU and Timer LEDs on Vibren PXA255 IDP

2005/03/16 09:41:33-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/16 17:46:53+01:00 utwente.nl!koen
handheld-common.conf:
  Re-enable openswan in handhelds-common.conf. ~lart ral for touching this without discussing it first.

2005/03/16 16:53:47+01:00 utwente.nl!koen
preferred-gpe-versions.inc:
  updates to preferred-gpe-versions

2005/03/15 10:52:36-05:00 accelent.com!cbrake
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gus.accelent.com:/home/cbrake/workspace/oe/openembedded

2005/03/14 04:17:44-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/14 06:40:22-05:00 rr.com!cbrake
Merge bk://openembedded@openembedded.bkbits.net/openembedded
into notebook.neo.rr.com:/home/workspace/oe/openembedded

2005/03/14 06:39:00-05:00 rr.com!cbrake
Add support for Intel Mainstone (PXA270).
Only bootstrap image over NFS tested at this time.

2005/03/14 03:17:36-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/13 20:17:42-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/13 19:17:33-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/13 17:17:48-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/13 11:17:34-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/13 10:17:26-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/13 09:17:29-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/13 07:17:34-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/13 06:17:29-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/13 03:18:26-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/12 22:17:50-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/12 21:17:55-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/12 19:17:29-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/12 18:17:27-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/12 17:17:29-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/12 16:17:35-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/12 15:17:36-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/12 14:17:34-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/12 13:17:38-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/12 04:17:39-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/12 03:17:28-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/11 19:17:41-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/11 18:17:39-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/11 13:18:04-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/11 12:17:32-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/11 11:17:31-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/11 05:17:26-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/11 04:17:42-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/11 03:17:22-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/11 00:17:31-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/10 23:17:24-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/10 20:17:21-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/10 19:17:45-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/10 17:17:32-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/10 16:17:43-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/10 09:17:26-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/10 08:17:29-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/10 06:17:25-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/10 05:17:39-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/10 04:17:42-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/10 03:17:31-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/10 02:17:52-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/09 17:17:29-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/09 15:17:32-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/09 14:17:29-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/09 11:17:54-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/09 10:17:35-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/09 10:32:13-05:00 accelent.com!cbrake
Merge bk://openembedded@openembedded.bkbits.net/openembedded
into gus.accelent.com:/home/cbrake/workspace/oe/openembedded

2005/03/09 10:29:33-05:00 accelent.com!cbrake
add armv5te to IPKG_ARCH -- needed for xscale processors

2005/03/09 07:17:30-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/09 06:17:32-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/09 05:17:28-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/09 04:17:39-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/09 03:17:27-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/09 01:17:36-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/09 00:17:37-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/08 16:17:46-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/08 15:17:30-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/08 13:17:26-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/08 12:17:24-08:00 bkbits.net!openembedded.adm
Merge bkbits.net://repos/o/oe-devel/openembedded
into bkbits.net:/repos/o/openembedded/openembedded

2005/03/08 15:16:04-05:00 accelent.com!cbrake
initial support for Vibren PXA255 platform

BKrev: 42398ad5x7A1ERIzWm2ude58u4RZWg

31 files changed, 328 insertions, 28 deletions

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 8867e3b416..dc9417686f 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -10,6 +10,8 @@ anon@tim.rpsys.net
 br1@null.(none)
 buildroot@mithis.com
 byrontodd@christy-todds-computer.local
+cbrake@gus.accelent.com
+cbrake@notebook.neo.rr.com
 chris@chrislaptop.(none)
 chriz@i74-copy.(none)
 cwiiis@chris.(none)
@@ -54,6 +56,7 @@ kergoth@nexus.(none)
 kergoth@odin.(none)
 kergoth@odin.sc.ti.com
 kergoth@zelda.tuxnami.org
+koen@bitbake.utwente.nl
 koen@lieve.(none)
 lpotter@polarbear.trolltech.com.au
 lpotter@spiritship.(none)
diff --git a/conf/distro/familiar-0.8.2.conf b/conf/distro/familiar-0.8.2.conf
index 736cefcf2d..8e4e70ce1c 100644
--- a/conf/distro/familiar-0.8.2.conf
+++ b/conf/distro/familiar-0.8.2.conf
@@ -7,18 +7,21 @@ DISTRO_VERSION = "v0.8.2-snapshot-${DATE}"
 DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
 
+#BIG FAT FIXME BEFORE RELEASE WARNING:
+# fixme: feed uri's
 FEED_URIS += " \
-        base##http://familiar.handhelds.org/releases/v0.8.1/feed/base"
+        base##http://familiar.handhelds.org/releases/v0.8.1/feed/base \
+	updates#http://familiar.handhelds.org/releases/v0.8.1/feed/updates"
 
-#CVSDATE = 20050222
+CVSDATE = 20050315
 
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
 
 PREFERRED_VERSION_binutils-cross = "2.15.91.0.2"
-PREFERRED_VERSION_gcc-cross = "3.4.2"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.2"
+PREFERRED_VERSION_gcc-cross = "3.4.3"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.3
 PREFERRED_VERSION_libtool-native = "1.5.6"
 PREFERRED_VERSION_libtool-cross= "1.5.6"
 
@@ -29,7 +32,7 @@ PREFERRED_VERSION_libtool-cross= "1.5.6"
 PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
 PREFERRED_VERSION_qte = "2.3.10"
 
-#OPIE_VERSION = "1.1.9"
+#OPIE_VERSION = "1.2.0"
 include conf/distro/preferred-opie-versions.inc
 
 #
diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index feae12faf7..2e47340a6e 100644
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/preferred-gpe-versions.inc
@@ -3,7 +3,6 @@
 #
 
 #work around some breakages
-CVSDATE_cairo=20050204
 CVSDATE_xserver-kdrive=20050207
 
 #specify versions, as the header says :)
@@ -14,8 +13,8 @@ PREFERRED_VERSION_matchbox-desktop = "0.9.1"
 PREFERRED_VERSION_matchbox-wm = "0.9.3"
 PREFERRED_VERSION_matchbox-panel = "0.9.1"
 PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
-PREFERRED_VERSION_gtk+ = "2.6.2"
-#PREFERRED_VERSION_libgpewidget = "0.97"
+PREFERRED_VERSION_gtk+ = "2.6.3"
+PREFERRED_VERSION_libgpewidget = "0.97"
 PREFERRED_VERSION_libgpepimc = "0.4"
 PREFERRED_VERSION_libgpevtype = "0.11"
 PREFERRED_VERSION_libschedule = "0.14"
@@ -23,13 +22,13 @@ PREFERRED_VERSION_gpe-icons = "0.24"
 PREFERRED_VERSION_libgsm = "1.0.10"
 #PREFERRED_VERSION_diet-x11 = "6.2.1"
 PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1"
-PREFERRED_VERSION_rxvt-unicode = "4.8"
+PREFERRED_VERSION_rxvt-unicode = "5.3"
 PREFERRED_VERSION_gtk2-theme-angelistic = "0.3"
 PREFERRED_VERSION_xst = "0.14"
 PREFERRED_VERSION_xprop = "0.0cvs${CVSDATE}" 
 PREFERRED_VERSION_xhost = "0.0cvs20040413"
 PREFERRED_VERSION_xrdb = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_gpe-login = "0.75"
+PREFERRED_VERSION_gpe-login = "0.76"
 PREFERRED_VERSION_gpe-session-scripts = "0.62"
 PREFERRED_VERSION_gpe-soundserver = "0.4-1"
 PREFERRED_VERSION_gpe-todo = "0.50"
diff --git a/conf/machine/handheld-common.conf b/conf/machine/handheld-common.conf
index 48ef6aa937..a872062ce9 100644
--- a/conf/machine/handheld-common.conf
+++ b/conf/machine/handheld-common.conf
@@ -17,8 +17,8 @@ input uinput \
 "
 
 # Configuration bits for "generic handheld"
-BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils wpa-supplicant-nossl lrzsz ppp-dialin scap network-suspend-scripts"
+BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap network-suspend-scripts"
 BOOTSTRAP_EXTRA_RDEPENDS +=  "pcmcia-cs apm apmd network-suspend-scripts"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils wpa-supplicant-nossl lrzsz ppp-dialin scap ${@linux_module_packages('${HANDHELD_MODULES}')}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap ${@linux_module_packages('${HANDHELD_MODULES}')}"
 
 INHERIT += "linux_modules"
diff --git a/packages/kdepimpi/kdepimpi_2.0.15.bb b/conf/machine/mainstone.conf
index e69de29bb2..e69de29bb2 100644
--- a/packages/kdepimpi/kdepimpi_2.0.15.bb
+++ b/conf/machine/mainstone.conf
diff --git a/packages/kdepimpi/pwmpi_2.0.15.bb b/conf/machine/vibren-pxa255idp.conf
index e69de29bb2..e69de29bb2 100644
--- a/packages/kdepimpi/pwmpi_2.0.15.bb
+++ b/conf/machine/vibren-pxa255idp.conf
diff --git a/packages/base-files/base-files/h3600/fstab b/packages/base-files/base-files/h3600/fstab
index e69de29bb2..4228c15c00 100644
--- a/packages/base-files/base-files/h3600/fstab
+++ b/packages/base-files/base-files/h3600/fstab
@@ -0,0 +1,6 @@
+/dev/mtdblock4	/ 	jffs2	defaults	1  1 
+proc            /proc   proc    defaults        0  0
+/dev/hda1	/media/cf	auto	defaults,noauto,noatime,user,exec,suid	0  0
+/dev/mmc/part1	/media/card	auto	defaults,noauto,noatime,user,exec,suid	0  0
+tmpfs		/var	tmpfs	defaults	0  0
+tmpfs		/media/ram	tmpfs	defaults	0  0
diff --git a/packages/base-files/base-files/h3900/fstab b/packages/base-files/base-files/h3900/fstab
index a47b05e86b..32f08a13e5 100644
--- a/packages/base-files/base-files/h3900/fstab
+++ b/packages/base-files/base-files/h3900/fstab
@@ -1,6 +1,6 @@
 /dev/mtdblock/1	/ 	jffs2	defaults	1  1 
 proc            /proc   proc    defaults        0  0
-/dev/hda1	/mnt/cf	auto	defaults,noauto,noatime,user,exec,suid	0  0
-/dev/mmcda1	/mnt/card	auto	defaults,noauto,noatime,user,exec,suid	0  0
+/dev/hda1	/media/cf	auto	defaults,noauto,noatime,user,exec,suid	0  0
+/dev/mmc/part1	/media/card	auto	defaults,noauto,noatime,user,exec,suid	0  0
 tmpfs		/var	tmpfs	defaults	0  0
-tmpfs		/mnt/ram	tmpfs	defaults	0  0
+tmpfs		/media/ram	tmpfs	defaults	0  0
diff --git a/packages/base-files/base-files/nslu2/fstab b/packages/base-files/base-files/nslu2/fstab
deleted file mode 100644
index 941dfa3805..0000000000
--- a/packages/base-files/base-files/nslu2/fstab
+++ /dev/null
@@ -1,5 +0,0 @@
-rootfs		/		auto	defaults	1  1
-proc            /proc		proc    defaults        0  0
-tmpfs		/var		tmpfs	defaults	0  0
-tmpfs		/mnt/ram	tmpfs	defaults	0  0
-usbdevfs	/proc/bus/usb	usbdevfs noauto		0  0
diff --git a/packages/base-files/base-files/openslug/fstab b/packages/base-files/base-files/openslug/fstab
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/base-files/base-files/openslug/fstab
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index e3374b4903..abb88d3013 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r27"
+PR = "r28"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/packages/gnutls/gnutls_1.0.23.bb b/packages/gnutls/gnutls_1.0.23.bb
index 764a363dfa..2c177a5728 100644
--- a/packages/gnutls/gnutls_1.0.23.bb
+++ b/packages/gnutls/gnutls_1.0.23.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "GNU Transport Layer Security Library"
 DEPENDS = "zlib libgcrypt"
-PR = "r3"
+PR = "r4"
 
 LICENSE = "LGPL"
 
@@ -8,6 +8,7 @@ SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.gz \
 	file://gnutls-openssl.patch;patch=1"
 
 inherit autotools
+inherit binconfig
 
 PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin"
 FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
diff --git a/packages/kdepimpi/kdepimpi_2.0.6.bb b/packages/kdepimpi/kdepimpi_2.0.6.bb
new file mode 100644
index 0000000000..10f4f51568
--- /dev/null
+++ b/packages/kdepimpi/kdepimpi_2.0.6.bb
@@ -0,0 +1,4 @@
+PR = "r1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz "
+
+include kdepimpi-base.inc
diff --git a/packages/kdepimpi/pwmpi_2.0.6.bb b/packages/kdepimpi/pwmpi_2.0.6.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kdepimpi/pwmpi_2.0.6.bb
diff --git a/packages/linux/mainstone-kernel/mainstone_defconfig b/packages/linux/mainstone-kernel/mainstone_defconfig
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/mainstone-kernel/mainstone_defconfig
diff --git a/packages/linux/mainstone-kernel_2.6.11.bb b/packages/linux/mainstone-kernel_2.6.11.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/mainstone-kernel_2.6.11.bb
diff --git a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
index 0588ff40ba..eaa8d64392 100644
--- a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
+++ b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
@@ -8,7 +8,7 @@ PXAV = "1"
 PR = "r3"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
-	   ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-${KV}-rmk${RMKV}.gz;patch=1 \
+	   http://lorien.handhelds.org/ftp.arm.linux.org.uk/kernel/v2.4/patch-${KV}-rmk${RMKV}.bz2;patch=1 \
 	   file://diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;patch=1 \
 	   file://mnci-combined.patch;patch=1"
 
diff --git a/packages/linux/vibren-pxa255idp-kernel/vibren-pxa255idp_defconfig b/packages/linux/vibren-pxa255idp-kernel/vibren-pxa255idp_defconfig
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/vibren-pxa255idp-kernel/vibren-pxa255idp_defconfig
diff --git a/packages/linux/vibren-pxa255idp-kernel_2.6.11.bb b/packages/linux/vibren-pxa255idp-kernel_2.6.11.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/vibren-pxa255idp-kernel_2.6.11.bb
diff --git a/packages/mozilla/minimo/mozconfig b/packages/mozilla/minimo/mozconfig
index e69de29bb2..5a84bcf87e 100644
--- a/packages/mozilla/minimo/mozconfig
+++ b/packages/mozilla/minimo/mozconfig
@@ -0,0 +1,76 @@
+# build minimo
+MINIMO=1
+mk_add_options MINIMO=1
+
+# enable building the browser
+ac_add_options --enable-application=browser
+
+# use GTK+-2 widget set with XFT font rendering
+
+MOZ_ENABLE_COREXFONTS=0
+mk_add_options MOZ_ENABLE_COREXFONTS=0
+ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-xft
+ac_add_options --disable-freetype2
+
+# disable XUL support to reduce codesize
+ac_add_options --disable-xul
+
+# enable minimal profile support
+ac_add_options --disable-profilesharing
+ac_add_options --disable-profilelocking
+ac_add_options --enable-single-profile
+
+# disable features and skip various build steps
+ac_add_options --disable-extensions
+ac_add_options --disable-accessibility
+ac_add_options --disable-composer
+ac_add_options --disable-extensions
+ac_add_options --disable-installer
+ac_add_options --disable-jsd
+ac_add_options --disable-jsloader
+ac_add_options --disable-ldap
+ac_add_options --disable-mailnews
+ac_add_options --disable-mathml
+ac_add_options --disable-necko-disk-cache
+ac_add_options --disable-postscript
+ac_add_options --disable-view-source
+ac_add_options --disable-xpfe-components
+ac_add_options --disable-xpinstall
+ac_add_options --disable-xprint
+ac_add_options --enable-native-uconv
+ac_add_options --enable-plaintext-editor-only
+ac_add_options --disable-v1-string-abi
+ac_add_options --disable-plugins
+
+# configure necko to allocate smaller network buffers
+ac_add_options --enable-necko-small-buffers
+
+# disable debug logging and tests
+ac_add_options --disable-dtd-debug
+ac_add_options --disable-logging
+ac_add_options --disable-tests
+
+# build crypto module (PSM + NSS)
+ac_add_options --enable-crypto
+
+# build minimal set of protocol handlers
+ac_add_options --enable-necko-protocols=http,file,res,jar
+
+# build minimal set of image decoders
+ac_add_options --enable-image-decoders=png,gif,jpeg
+
+# code generation options (optimize for size)
+ac_add_options --enable-optimize=-Os
+ac_add_options --enable-strip
+ac_add_options --disable-debug
+ac_add_options --enable-reorder
+ac_add_options --enable-elf-dynstr-gc
+
+# enable static build
+ac_add_options --disable-shared
+ac_add_options --enable-static
+
+# remove link dependency on libstdc++.so
+LIBS=-lsupc++
+
diff --git a/packages/mplayer/mplayer_1.0pre3try2.bb b/packages/mplayer/mplayer_1.0pre3try2.bb
index bcb1c26aeb..3d1da03f3f 100644
--- a/packages/mplayer/mplayer_1.0pre3try2.bb
+++ b/packages/mplayer/mplayer_1.0pre3try2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Open Source multimedia player."
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.mplayerhq.hu/"
-DEPENDS = "virtual/libsdl libmad tremor-20021126 libogg libvorbis zlib libpng jpeg"
+DEPENDS = "virtual/libsdl tslib libmad tremor-20021126 libogg libvorbis zlib libpng jpeg"
 PR = "r6"
 LICENSE = "GPL"
 SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
diff --git a/packages/network-suspend-scripts/files/usbnet b/packages/network-suspend-scripts/files/usbnet
index e69de29bb2..71d7256120 100644
--- a/packages/network-suspend-scripts/files/usbnet
+++ b/packages/network-suspend-scripts/files/usbnet
@@ -0,0 +1,14 @@
+#!/bin/sh
+# Unloads/loads usb-eth so it always works
+
+. /etc/default/usbd
+
+if [ "$1" = suspend ]; then
+	rmmod usb-eth
+	rmmod sa1100usb_core
+elif [ "$1" = resume ] && [ "$2" != standby ]; then
+	modprobe usb-eth
+	modprobe -r $usbdmodule
+	modprobe $usbdmodule
+fi
+
diff --git a/packages/network-suspend-scripts/network-suspend-scripts.bb b/packages/network-suspend-scripts/network-suspend-scripts.bb
index 2d61788110..a50ffa39c4 100644
--- a/packages/network-suspend-scripts/network-suspend-scripts.bb
+++ b/packages/network-suspend-scripts/network-suspend-scripts.bb
@@ -3,6 +3,7 @@ SRC_URI = "file://ifupdown \
 	   file://usbnet"
 FILES = "${sysconfdir}/apm"
 PV = "1.1"
+PR = "r1"
 
 do_install() {
 	install -d ${D}${sysconfdir}/apm/scripts.d
diff --git a/packages/pwc/pwc_10.0.6a.bb b/packages/pwc/pwc_10.0.6a.bb
index e69de29bb2..f6af027f56 100644
--- a/packages/pwc/pwc_10.0.6a.bb
+++ b/packages/pwc/pwc_10.0.6a.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Philips USB Webcam driver for Linux that supports VGA resolution"
+PRIORITY = "optional"
+SECTION = "kernel/modules"
+MAINTAINER = "dyoung <dyoung8888@yahoo.com>"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.saillard.org/linux/pwc/files/pwc-${PV}.tar.bz2 \
+	   file://Makefile"
+
+S = "${WORKDIR}/pwc-${PV}"
+
+inherit module
+
+do_compile_prepend() {
+	cp -f ${WORKDIR}/Makefile ${S}/
+}
+
+do_compile () {
+        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+        oe_runmake 'KDIR=${STAGING_KERNEL_DIR}' \
+                   'CC=${KERNEL_CC}' \
+                   'LD=${KERNEL_LD}' 
+}
+
+do_install() {   
+        install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+}
+
diff --git a/packages/qmake/files/ramses/linux-oe-qmake.conf b/packages/qmake/files/ramses/linux-oe-qmake.conf
new file mode 100644
index 0000000000..ad0311256f
--- /dev/null
+++ b/packages/qmake/files/ramses/linux-oe-qmake.conf
@@ -0,0 +1,81 @@
+#
+# qmake configuration for linux-oe-g++ / OpenEmbedded Build System / http://openembedded.org
+#
+
+MAKEFILE_GENERATOR	= UNIX
+TEMPLATE		= app
+CONFIG			+= qt warn_on release ramses
+
+QMAKE_CC		= $(OE_QMAKE_CC)
+QMAKE_LEX		= flex
+QMAKE_LEXFLAGS		=
+QMAKE_YACC		= yacc
+QMAKE_YACCFLAGS		= -d
+QMAKE_CFLAGS		= -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA)
+QMAKE_CFLAGS_WARN_ON	= -Wall -W
+QMAKE_CFLAGS_WARN_OFF	=
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
+QMAKE_CFLAGS_DEBUG	= -g
+QMAKE_CFLAGS_SHLIB	= -fPIC
+QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_THREAD	= -D_REENTRANT
+
+QMAKE_CXX		= $(OE_QMAKE_CXX)
+QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA)
+QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+
+QMAKE_INCDIR		=
+QMAKE_LIBDIR		=
+QMAKE_INCDIR_X11	= 
+QMAKE_LIBDIR_X11	= 
+QMAKE_INCDIR_QT		= $(OE_QMAKE_INCDIR_QT)
+QMAKE_LIBDIR_QT		= $(OE_QMAKE_LIBDIR_QT)
+QMAKE_INCDIR_OPENGL	=
+QMAKE_LIBDIR_OPENGL	=
+
+QMAKE_LINK		= $(OE_QMAKE_LINK)
+QMAKE_LINK_SHLIB	= $(OE_QMAKE_LINK)
+QMAKE_LFLAGS		= $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA)
+QMAKE_LFLAGS_RELEASE	=
+QMAKE_LFLAGS_DEBUG	=
+QMAKE_LFLAGS_SHLIB      = -shared
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME     = -Wl,-soname,
+QMAKE_LFLAGS_THREAD     =
+QMAKE_RPATH             = -Wl,-rpath-link,
+
+QMAKE_LIBS		= $(LIBS_EXTRA)
+QMAKE_LIBS_DYNLOAD      = -ldl
+QMAKE_LIBS_X11		= $(OE_QMAKE_LIBS_X11)
+QMAKE_LIBS_X11SM	= 
+QMAKE_LIBS_QT		= -l$(OE_QMAKE_LIBS_QT)
+QMAKE_LIBS_QT_THREAD    = -l$(OE_QMAKE_LIBS_QT)-mt
+QMAKE_LIBS_QT_OPENGL	= -lqgl
+QMAKE_LIBS_THREAD       = -lpthread
+
+QMAKE_MOC		= $(OE_QMAKE_MOC)
+QMAKE_UIC		= $(OE_QMAKE_UIC)
+
+QMAKE_AR		= $(OE_QMAKE_AR) cqs
+QMAKE_RANLIB		=
+
+QMAKE_TAR		= tar -cf
+QMAKE_GZIP		= gzip -9f
+
+QMAKE_COPY		= cp -f
+QMAKE_COPY_FILE         = $(COPY)
+QMAKE_COPY_DIR          = $(COPY) -r
+QMAKE_MOVE		= mv -f
+QMAKE_DEL_FILE		= rm -f
+QMAKE_DEL_DIR		= rmdir
+QMAKE_STRIP             = $(OE_QMAKE_STRIP)
+QMAKE_STRIPFLAGS_LIB	+= --strip-unneeded
+QMAKE_CHK_DIR_EXISTS	= test -d
+QMAKE_MKDIR		= mkdir -p
+
diff --git a/packages/spca5xx/spca5xx_20050301.bb b/packages/spca5xx/spca5xx_20050301.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/spca5xx/spca5xx_20050301.bb
diff --git a/packages/speex/speex_1.1.7.bb b/packages/speex/speex_1.1.7.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/speex/speex_1.1.7.bb
diff --git a/packages/uboot/uboot_cvs.bb b/packages/uboot/uboot_cvs.bb
index 67a05a9b25..d8a489714d 100644
--- a/packages/uboot/uboot_cvs.bb
+++ b/packages/uboot/uboot_cvs.bb
@@ -4,7 +4,7 @@ MAINTAINER = "Cliff Brake <cliff.brake@gmail.com>"
 PRIORITY = "optional"
 LICENSE = "GPL"
 PV = "0.0cvs${CVSDATE}"
-PR = "r1"
+PR = "r2"
 
 PROVIDES = "virtual/bootloader"
 
@@ -26,7 +26,7 @@ do_compile () {
 
 do_deploy () {
 	install -d ${DEPLOY_DIR_IMAGE}
-	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/u-boot.bin
+	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}-${DATETIME}.bin
 }
 do_deploy[dirs] = "${S}"
 addtask deploy before do_build after do_compile
diff --git a/packages/vlc/vlc-gpe_0.8.1.bb b/packages/vlc/vlc-gpe_0.8.1.bb
index e69de29bb2..910f4b19dd 100644
--- a/packages/vlc/vlc-gpe_0.8.1.bb
+++ b/packages/vlc/vlc-gpe_0.8.1.bb
@@ -0,0 +1,86 @@
+DESCRIPTION = "Video player and streamer - GPE edition"
+HOMEPAGE = "http://www.videolan.org"
+LICENSE = "GPL"
+PRIORITY = "optional"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "gpe"
+PR = "r3"
+
+DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
+
+SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.gz \
+file://fix-pda.patch;patch=1"
+S = "${WORKDIR}/vlc-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-plugins \
+	--disable-httpd \
+	--disable-vlm \
+	--enable-gnutls \
+	--disable-libcdio \
+	--disable-libcddb \
+	--disable-glx \
+	--disable-libcdda \
+	--disable-joystick \
+	--disable-libcddax \
+	--disable-gtk \
+	--disable-opengl \
+	--disable-gtk2 \
+	--disable-gnome \
+	--disable-gnome2 \
+	--disable-qt \
+	--disable-kde \
+	--disable-qte \
+	--disable-xosd \
+	--enable-tremor \
+	--disable-skins \
+	--disable-skins2 \
+	--disable-v4l \
+	--enable-sout \
+	--enable-dummy \
+	--enable-fb \
+	--enable-oss \
+	--disable-alsa \
+	--enable-x11 \
+	--disable-xvideo \
+	--disable-dvd \
+	--disable-dvdplay \
+	--disable-dvdread \
+	--disable-dvdnav \
+	--disable-libcdio \
+	--disable-libcddb \
+	--disable-vcdx \
+	--disable-vcd \
+	--disable-macosx \
+	--disable-goom \
+	--disable-speex \
+	--disable-visual \
+	--enable-freetype \
+	--disable-fribidi \
+	--enable-a52 \
+	--enable-faad \
+	--enable-flac \
+	--enable-libmpeg2 \
+	--enable-dvbpsi \
+	--disable-mkv \
+	--enable-mad \
+	--enable-id3tag \
+	--enable-ffmpeg \
+	--disable-slp \
+	--enable-pda \
+	--with-ffmpeg-faac"
+
+do_install() {
+	autotools_do_install
+
+	install -d ${D}/${datadir}/applications
+	install -m 644 ipkg/vlc.gpe ${D}/${datadir}/applications/vlc-gpe.desktop
+}
+
+FILES_${PN} = "${bindir}/vlc \
+	${datadir}/applications \
+	${datadir}/vlc/pda-* \
+	${datadir}/vlc/vlc*png \
+	${datadir}/vlc/vlc*xpm \
+	${datadir}/vlc/http"
diff --git a/packages/xserver/xserver-kdrive/epson.patch b/packages/xserver/xserver-kdrive/epson.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xserver/xserver-kdrive/epson.patch
diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xserver/xserver-kdrive_cvs.bb
index c1639f2a51..fa9125ed74 100644
--- a/packages/xserver/xserver-kdrive_cvs.bb
+++ b/packages/xserver/xserver-kdrive_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0cvs${CVSDATE}"
 LICENSE = "MIT"
 DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
 PROVIDES = "virtual/xserver"
-PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr server-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
+PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
 SECTION = "x11/base"
 DESCRIPTION = "X server from freedesktop.org"
 DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices"
@@ -16,7 +16,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep
 DESCRIPTION_xserver-kdrive-fake = "Fake X server"
 DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
 
-PR = "r8"
+PR = "r9"
 
 FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
 FILES_xserver-kdrive-ati = "${bindir}/Xati"
@@ -31,6 +31,7 @@ FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver \
 	file://kmode.patch;patch=1 \
+	file://epson.patch;patch=1 \
 	file://fbdev-not-fix.patch;patch=1"
 
 SRC_URI_append_ramses = " file://onlyfb.patch;patch=1"