merge of '35d00516005b1f33ef42cecb0350a20a51723706'

     and 'c167fd3cbb5184fbfe56dff8fbb57e988ce58f51'

31 files changed, 4178 insertions, 61 deletions

diff --git a/packages/classpath/classpath-initial_0.93.bb b/packages/classpath/classpath-initial_0.93.bb
index 9e303f6eba..7c1b91eb20 100644
--- a/packages/classpath/classpath-initial_0.93.bb
+++ b/packages/classpath/classpath-initial_0.93.bb
@@ -5,7 +5,7 @@ require classpath-native.inc
 
 DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclasspath for jikes-native."
 
-PR = "r0"
+PR = "r2"
 
 DEPENDS = "zip-native fastjar-native jikes-native"
 
@@ -25,4 +25,3 @@ EXTRA_OECONF = "\
   --with-native-libdir=${STAGING_LIBDIR}/classpath-initial \
   --includedir=${STAGING_INCDIR}/classpath-initial \
   "
-
diff --git a/packages/classpath/classpath-native.inc b/packages/classpath/classpath-native.inc
index bb5abaf178..3094dca924 100644
--- a/packages/classpath/classpath-native.inc
+++ b/packages/classpath/classpath-native.inc
@@ -6,13 +6,17 @@ S = "${WORKDIR}/classpath-${PV}"
 
 SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
 
-DEPENDS = "ecj-initial fastjar-native zip-native"
+DEPENDS = "ecj-initial fastjar-native zip-nativei gettext-native"
 
 inherit autotools native
 
+export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial"
+
+# Note: the --with-ecj options seems redundant but is
+# for compatibility with older classpath versions.
 EXTRA_OECONF = "\
-  --with-glibj \
   --with-ecj=${STAGING_BINDIR_NATIVE}/ecj-initial \
+  --with-glibj \
   --with-fastjar=fastjar \
   --enable-local-sockets \
   --disable-alsa \
@@ -25,6 +29,12 @@ EXTRA_OECONF = "\
   --includedir=${STAGING_INCDIR}/classpath \
   --with-vm=java \
   "
+# hack to get config.rpath in, it comes from gettext
+do_configure_prepend () {
+
+        ${@['','cp ${STAGING_DATADIR}/automake-1.10/config.rpath ${S}'][bb.data.getVar('PREFERRED_VERSION_automake-native',d,1) == '1.10']}
+
+}
 
 do_stage() {
 	oe_runmake install
diff --git a/packages/ecj/ecj-bootstrap-native_3.3.2.bb b/packages/ecj/ecj-bootstrap-native_3.3.2.bb
new file mode 100644
index 0000000000..bd4347457c
--- /dev/null
+++ b/packages/ecj/ecj-bootstrap-native_3.3.2.bb
@@ -0,0 +1,38 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+#
+# Since the VM running the compiler has no effect on the produced bytecode this recipe
+# uses the jar created by ecj-initial and creates a start script that runs it with a different
+# VM.
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "EPL"
+
+DEPENDS = "ecj-initial virtual/java-native"
+
+PROVIDES = "virtual/javac-native"
+
+SRC_URI = "file://ecj.in"
+
+S = "${WORKDIR}"
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+inherit native
+
+do_compile() {
+  # Create the start script
+  echo "#!/bin/sh" > ecj-bootstrap
+  echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-bootstrap
+  echo "RUNTIME=java" >> ecj-bootstrap
+  cat ecj.in >> ecj-bootstrap
+}
+
+do_stage() {
+  install -d ${STAGING_BINDIR}
+  install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}
+  install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}/javac
+}
diff --git a/packages/ecj/ecj-bootstrap-native_3.4.bb b/packages/ecj/ecj-bootstrap-native_3.4.bb
new file mode 100644
index 0000000000..bd4347457c
--- /dev/null
+++ b/packages/ecj/ecj-bootstrap-native_3.4.bb
@@ -0,0 +1,38 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+#
+# Since the VM running the compiler has no effect on the produced bytecode this recipe
+# uses the jar created by ecj-initial and creates a start script that runs it with a different
+# VM.
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "EPL"
+
+DEPENDS = "ecj-initial virtual/java-native"
+
+PROVIDES = "virtual/javac-native"
+
+SRC_URI = "file://ecj.in"
+
+S = "${WORKDIR}"
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+inherit native
+
+do_compile() {
+  # Create the start script
+  echo "#!/bin/sh" > ecj-bootstrap
+  echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-bootstrap
+  echo "RUNTIME=java" >> ecj-bootstrap
+  cat ecj.in >> ecj-bootstrap
+}
+
+do_stage() {
+  install -d ${STAGING_BINDIR}
+  install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}
+  install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}/javac
+}
diff --git a/packages/ecj/ecj-initial_3.3.2.bb b/packages/ecj/ecj-initial_3.3.2.bb
new file mode 100644
index 0000000000..22cced959d
--- /dev/null
+++ b/packages/ecj/ecj-initial_3.3.2.bb
@@ -0,0 +1,84 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+
+# This variant runs on the initial (not Java5-compatible runtime).
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+LICENSE = "EPL"
+
+DEPENDS = "fastjar-native jikes-initial virtual/java-initial"
+
+SRC_URI = "\
+    http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3.2-200802211800/ecjsrc.zip \
+    file://ecj.in \
+    "
+
+S = "${WORKDIR}"
+
+inherit native
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+do_unpackpost() {
+  if [ ! -d source ]; then
+    mkdir source
+  fi
+
+  if [ ! -d build ]; then
+    mkdir build
+  fi
+
+  # Remove crap.
+  rm about.html build.xml
+  rm -rf META-INF
+
+  # Move source into separate subdir.
+  mv org source/
+
+  # Remove stuff unneeded for the bootstrap compiler.
+  rm -rf source/org/eclipse/jdt/internal/compiler/apt
+  rm -rf source/org/eclipse/jdt/internal/compiler/tool
+  rm -rf source/org/eclipse/jdt/internal/antadapter
+  rm source/org/eclipse/jdt/core/JDTCompilerAdapter.java
+
+  # Make a copy of the remaining source to get the embedded
+  # resources.
+  cp -r source/org build/
+
+  # Remove source code and other stuff.
+  find build -name '*.java' -exec rm -f {} \;
+  find build -name '*.html' -exec rm -f {} \;
+}
+
+addtask unpackpost after do_unpack before do_patch
+
+do_compile() {
+  find source -name '*.java' > sourcefiles
+  split -l 25 sourcefiles ecj-sources.
+
+  # Compiling in place is done because the sources contain
+  # property files which need to be available at runtime.
+  for list in `find . -name 'ecj-sources.*'`; do
+      echo "building files in $list ...";
+      echo jikes-initial -d build -source 1.4 -sourcepath source `cat $list`;
+      jikes-initial \
+				-d build -source 1.4 -sourcepath source `cat $list`;
+  done
+
+  fastjar -c -C build . -f ${JAR}
+
+  # Create the start script
+  echo "#!/bin/sh" > ecj-initial
+  echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial
+  echo "RUNTIME=java-initial" >> ecj-initial
+  cat ecj.in >> ecj-initial
+}
+
+do_stage() {
+  install -d ${STAGING_DATADIR}/java
+  install -m 755 ${S}/${JAR} ${STAGING_DATADIR}/java
+
+  install -d ${STAGING_BINDIR}
+  install -m 755 ${S}/ecj-initial ${STAGING_BINDIR}
+}
diff --git a/packages/ecj/ecj-initial_3.4.bb b/packages/ecj/ecj-initial_3.4.bb
new file mode 100644
index 0000000000..a0cacffebb
--- /dev/null
+++ b/packages/ecj/ecj-initial_3.4.bb
@@ -0,0 +1,84 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+
+# This variant runs on the initial (not Java5-compatible runtime).
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+LICENSE = "EPL"
+
+DEPENDS = "fastjar-native jikes-initial virtual/java-initial"
+
+SRC_URI = "\
+    http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/ecjsrc.zip \
+    file://ecj.in \
+    "
+
+S = "${WORKDIR}"
+
+inherit native
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+do_unpackpost() {
+  if [ ! -d source ]; then
+    mkdir source
+  fi
+
+  if [ ! -d build ]; then
+    mkdir build
+  fi
+
+  # Remove crap.
+  rm about.html build.xml
+  rm -rf META-INF
+
+  # Move source into separate subdir.
+  mv org source/
+
+  # Remove stuff unneeded for the bootstrap compiler.
+  rm -rf source/org/eclipse/jdt/internal/compiler/apt
+  rm -rf source/org/eclipse/jdt/internal/compiler/tool
+  rm -rf source/org/eclipse/jdt/internal/antadapter
+  rm source/org/eclipse/jdt/core/JDTCompilerAdapter.java
+
+  # Make a copy of the remaining source to get the embedded
+  # resources.
+  cp -r source/org build/
+
+  # Remove source code and other stuff.
+  find build -name '*.java' -exec rm -f {} \;
+  find build -name '*.html' -exec rm -f {} \;
+}
+
+addtask unpackpost after do_unpack before do_patch
+
+do_compile() {
+  find source -name '*.java' > sourcefiles
+  split -l 25 sourcefiles ecj-sources.
+
+  # Compiling in place is done because the sources contain
+  # property files which need to be available at runtime.
+  for list in `find . -name 'ecj-sources.*'`; do
+      echo "building files in $list ...";
+      echo jikes-initial -d build -source 1.4 -sourcepath source `cat $list`;
+      jikes-initial \
+				-d build -source 1.4 -sourcepath source `cat $list`;
+  done
+
+  fastjar -c -C build . -f ${JAR}
+
+  # Create the start script
+  echo "#!/bin/sh" > ecj-initial
+  echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial
+  echo "RUNTIME=java-initial" >> ecj-initial
+  cat ecj.in >> ecj-initial
+}
+
+do_stage() {
+  install -d ${STAGING_DATADIR}/java
+  install -m 755 ${S}/${JAR} ${STAGING_DATADIR}/java
+
+  install -d ${STAGING_BINDIR}
+  install -m 755 ${S}/ecj-initial ${STAGING_BINDIR}
+}
diff --git a/packages/efl1/ecore_cvs.bb b/packages/efl1/ecore_cvs.bb
index e2ded16111..f36cc737bf 100644
--- a/packages/efl1/ecore_cvs.bb
+++ b/packages/efl1/ecore_cvs.bb
@@ -1,32 +1,33 @@
 require ecore.inc
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF = "\
-        --x-includes=${STAGING_INCDIR}/X11 \
-        --x-libraries=${STAGING_LIBDIR} \
-        --enable-simple-x11 \
+  --x-includes=${STAGING_INCDIR}/X11 \
+  --x-libraries=${STAGING_LIBDIR} \
+  --enable-simple-x11 \
 \
-		--enable-ecore-txt \
-        --enable-ecore-config \
-		--disable-ecore-x-xcb \
-		--enable-ecore-x \
-		--enable-ecore-job \
-		--disable-ecore-directfb \
-		--disable-ecore-sdl \
-		--enable-ecore-fb \
-		--enable-ecore-evas \
-		--enable-ecore-evas-x11-16 \
-        --disable-ecore-evas-x11-gl \
-		--enable-ecore-evas-xrender \
-		--disable-ecore-evas-dfb \
-        --disable-ecore-evas-sdl \
-		--disable-openssl \
-		--enable-abstract-sockets \
-		--enable-ecore-con \
-		--enable-ecore-ipc \
-		--enable-ecore-file \
-		--enable-inotify \
-		--disable-poll \
-		--enable-curl \
-		--disable-ecore-desktop \
+  --enable-ecore-txt \
+  --enable-ecore-config \
+  --disable-ecore-x-xcb \
+  --enable-ecore-x \
+  --enable-ecore-job \
+  --disable-ecore-directfb \
+  --disable-ecore-sdl \
+  --enable-ecore-fb \
+  --enable-ecore-evas \
+  --enable-ecore-evas-x11-16 \
+  --enable-ecore-evas-16-x11 \
+  --disable-ecore-evas-x11-gl \
+  --enable-ecore-evas-xrender \
+  --disable-ecore-evas-dfb \
+  --disable-ecore-evas-sdl \
+  --disable-openssl \
+  --enable-abstract-sockets \
+  --enable-ecore-con \
+  --enable-ecore-ipc \
+  --enable-ecore-file \
+  --enable-inotify \
+  --disable-poll \
+  --enable-curl \
+  --disable-ecore-desktop \
 "
diff --git a/packages/eglibc/eglibc.inc b/packages/eglibc/eglibc.inc
index 5d531a7915..0309a7f1b2 100644
--- a/packages/eglibc/eglibc.inc
+++ b/packages/eglibc/eglibc.inc
@@ -11,7 +11,10 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
 #RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
 PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES += "virtual/libintl virtual/libiconv"
-
+# We need this RRECOMMENDS because libc dlopens libgcc
+# and shlib mechanism can not detect it because its not
+# listed in the NEEDED field.
+RRECOMMENDS += "libgcc"
 inherit autotools
 
 LEAD_SONAME = "libc.so"
diff --git a/packages/eglibc/eglibc_svn.bb b/packages/eglibc/eglibc_svn.bb
index 1be10c13ad..3e8a5a0c99 100644
--- a/packages/eglibc/eglibc_svn.bb
+++ b/packages/eglibc/eglibc_svn.bb
@@ -3,7 +3,7 @@ require eglibc.inc
 # DEFAULT_PREFERENCE = "-1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
 PV = "2.8+svnr${SRCREV}"
-PR = "r7"
+PR = "r8"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
            file://etc/ld.so.conf \
diff --git a/packages/gcc/gcc-cross-kernel.inc b/packages/gcc/gcc-cross-kernel.inc
index 7bca7d2bf5..a567c60119 100644
--- a/packages/gcc/gcc-cross-kernel.inc
+++ b/packages/gcc/gcc-cross-kernel.inc
@@ -11,6 +11,6 @@ do_install () {
 
 do_stage () {
 	cd gcc
-	oe_runmake install-common install-headers install-libgcc
+	oe_runmake installdirs install-common install-headers install-libgcc
 	install -m 0755 xgcc ${CROSS_DIR}/bin/${TARGET_PREFIX}gcc-${PV}
 }
diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
index 7ba86f901c..8c9d56adbc 100644
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -40,6 +40,7 @@ X_INSTALL = "\
 # useful command line tools
 TOOLS_INSTALL = "\
 #  bash \
+  dosfstools \
   htop \
   iptables \
   lsof \
diff --git a/packages/lirc/lirc-modules_0.8.3+cvs20080713.bb b/packages/lirc/lirc-modules_0.8.3+cvs20080713.bb
index 094c6fd380..7dfba0d789 100644
--- a/packages/lirc/lirc-modules_0.8.3+cvs20080713.bb
+++ b/packages/lirc/lirc-modules_0.8.3+cvs20080713.bb
@@ -16,7 +16,7 @@ inherit autotools module
 
 require lirc-config.inc
 
-MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e V=1' -C drivers"
+MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make V=1' -C drivers"
 
 fakeroot do_install() {
 	oe_runmake -C drivers DESTDIR="${D}" moduledir="/lib/modules/${KERNEL_VERSION}/lirc" install
diff --git a/packages/mesa/files/mklib-cross.patch b/packages/mesa/files/mklib-cross.patch
new file mode 100644
index 0000000000..fbe86e3c4d
--- /dev/null
+++ b/packages/mesa/files/mklib-cross.patch
@@ -0,0 +1,14 @@
+--- s/bin/mklib~	2008-02-19 15:30:18.000000000 +0000
++++ s/bin/mklib	2008-07-27 11:15:25.000000000 +0100
+@@ -204,9 +204,9 @@
+ 	if [ "x$LINK" = "x" ] ; then
+ 	    # -linker was not specified so set default link command now
+             if [ $CPLUSPLUS = 1 ] ; then
+-                LINK=g++
++                LINK=$CXX
+             else
+-                LINK=gcc
++                LINK=$CC
+             fi
+ 	fi
+ 
diff --git a/packages/mesa/mesa-dri_6.5.2.bb b/packages/mesa/mesa-dri_6.5.2.bb
index fffbfee780..29d169b1a8 100644
--- a/packages/mesa/mesa-dri_6.5.2.bb
+++ b/packages/mesa/mesa-dri_6.5.2.bb
@@ -1,5 +1,7 @@
 include mesa-common.inc
 
+SRC_URI += " file://mklib-cross.patch;patch=1"
+
 FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
 PACKAGES_DYNAMIC = "mesa-dri-driver-*"
diff --git a/packages/mesa/mesa-dri_7.0.3.bb b/packages/mesa/mesa-dri_7.0.3.bb
new file mode 100644
index 0000000000..87b3dcf9e1
--- /dev/null
+++ b/packages/mesa/mesa-dri_7.0.3.bb
@@ -0,0 +1,42 @@
+include mesa-common.inc
+
+# suppress mklib-rpath-link patch from mesa-common
+SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 file://mklib-cross.patch;patch=1"
+
+FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
+
+PACKAGES_DYNAMIC = "mesa-dri-driver-*"
+
+PR = "r0"
+
+DEPENDS += "libdrm"
+# DRI is useless without the kernel drivers
+RRECOMMENDS += " kernel-module-drm kernel-module-radeon "
+
+do_configure() {
+	cd configs
+
+	ln -sf linux-dri current
+	sed -e "s%CC *= *.*%CC = ${CC}%" -i current
+	sed -e "s%CXX *= *.*%CXX = ${CXX}%" -i current
+	sed -e "s%LD *= *.*%LD = ${LD}%" -i current
+	sed -e "s%OPT_FLAGS *= *.*%OPT_FLAGS = ${TARGET_CFLAGS}%" -i current
+	sed -e "s%X11_INCLUDES *= *.*%X11_INCLUDES = -I${STAGING_INCDIR}/X11%" -i current
+	sed -e "s%EXTRA_LIB_PATH *= *.*%EXTRA_LIB_PATH = ${LDFLAGS}%" -i current
+	sed -i s:\$\(CC\):gcc:g  ../src/mesa/x86/Makefile
+	echo "SRC_DIRS = mesa" >> current
+	echo "DRI_DRIVER_INSTALL_DIR = ${D}${libdir}/dri" >> current
+}
+
+do_install() {
+	oe_runmake -C src/mesa/drivers/dri install
+}
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug"
+
+python populate_packages_prepend () {
+        import re, os.path
+
+        do_split_packages(d, root=bb.data.expand('${libdir}/dri', d), file_regex='(.*)_dri\.so', output_pattern='mesa-dri-driver-%s', description='%s DRI driver')
+}
+
diff --git a/packages/openchrome/openchrome.inc b/packages/openchrome/openchrome.inc
new file mode 100644
index 0000000000..e88f3223ae
--- /dev/null
+++ b/packages/openchrome/openchrome.inc
@@ -0,0 +1,16 @@
+PACKAGES = "libviaXvMC libviaXvMCPro libviaXvMC-dev libviaXvMCPro-dev libviaXvMC-dbg libviaXvMCPro-dbg ${PN}-doc"
+
+FILES_libviaXvMC = "${libdir}/libviaXvMC.so.*"
+FILES_libviaXvMCPro = "${libdir}/libviaXvMCPro.so.*"
+FILES_libviaXvMC-dev = "${libdir}/libviaXvMC.so ${libdir}/libviaXvMC.la"
+FILES_libviaXvMCPro-dev = "${libdir}/libviaXvMCPro.so ${libdir}/libviaXvMCPro.la"
+FILES_libviaXvMC-dbg += "${libdir}/.debug/libviaXvMC.so.*"
+FILES_libviaXvMCPro-dbg += "${libdir}/.debug/libviaXvMCPro.so.*"
+
+DEPENDS = "xserver-xorg libxvmc"
+
+inherit autotools xorg-module
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/openchrome/openchrome_svn.bb b/packages/openchrome/openchrome_svn.bb
index c1e9829a35..c1d8052eea 100644
--- a/packages/openchrome/openchrome_svn.bb
+++ b/packages/openchrome/openchrome_svn.bb
@@ -1,21 +1,5 @@
-SRC_URI = "svn://svn.openchrome.org/svn;module=trunk;proto=http \
-	file://configure.patch;patch=1"
+SRC_URI = "svn://svn.openchrome.org/svn;module=trunk;proto=http"
 S = "${WORKDIR}/trunk"
-
-PACKAGES = "libviaXvMC libviaXvMCPro libviaXvMC-dev libviaXvMCPro-dev libviaXvMC-dbg libviaXvMCPro-dbg ${PN}-doc"
 PACKAGES_DYNAMIC = "xorg-driver-via"
 
-FILES_libviaXvMC = "${libdir}/libviaXvMC.so.*"
-FILES_libviaXvMCPro = "${libdir}/libviaXvMCPro.so.*"
-FILES_libviaXvMC-dev = "${libdir}/libviaXvMC.so ${libdir}/libviaXvMC.la"
-FILES_libviaXvMCPro-dev = "${libdir}/libviaXvMCPro.so ${libdir}/libviaXvMCPro.la"
-FILES_libviaXvMC-dbg += "${libdir}/.debug/libviaXvMC.so.*"
-FILES_libviaXvMCPro-dbg += "${libdir}/.debug/libviaXvMCPro.so.*"
-
-DEPENDS = "xserver-xorg libxvmc"
-
-inherit autotools xorg-module
-
-do_stage() {
-	autotools_stage_all
-}
+include openchrome.inc
diff --git a/packages/openchrome/xf86-video-openchrome_0.2.902.bb b/packages/openchrome/xf86-video-openchrome_0.2.902.bb
new file mode 100644
index 0000000000..5792f72184
--- /dev/null
+++ b/packages/openchrome/xf86-video-openchrome_0.2.902.bb
@@ -0,0 +1,4 @@
+SRC_URI = "http://www.openchrome.org/releases/xf86-video-openchrome-${PV}.tar.gz file://configure.patch;patch=1 file://configure-dri.patch;patch=1"
+PACKAGES_DYNAMIC = "xorg-driver-openchrome"
+
+include openchrome.inc
diff --git a/packages/openmoko-projects/illume/.mtn2git_empty b/packages/openmoko-projects/illume/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko-projects/illume/.mtn2git_empty
diff --git a/packages/openmoko-projects/illume/configure-keyboard.patch b/packages/openmoko-projects/illume/configure-keyboard.patch
new file mode 100644
index 0000000000..589fe53f38
--- /dev/null
+++ b/packages/openmoko-projects/illume/configure-keyboard.patch
@@ -0,0 +1,39 @@
+Index: configure.in
+===================================================================
+--- configure.in	(Revision 170)
++++ configure.in	(Arbeitskopie)
+@@ -95,6 +95,21 @@
+ AC_SUBST(e_libs)
+ AC_SUBST(e_modules)
+ 
++want_illume_virtual_keyboard=no
++AC_ARG_ENABLE(illume-keyboard,
++    AC_HELP_STRING(
++        [--enable-illume-keyboard],
++        [Enable the illume virtual keyboard.]
++    ),
++    [want_illume_virtual_keyboard=$enableval]
++    )
++AC_MSG_CHECKING(whether the illume virtual keyboard is to be built in)
++AC_MSG_RESULT($want_illume_virtual_keyboard)
++
++if test "x$want_illume_virtual_keyboard" = "xyes"; then
++    AC_DEFINE(BUILD_ILLUME_VIRTUAL_KEYBOARD, 1, [Build the virtual keyboard in])
++fi
++
+ AC_OUTPUT([
+ Makefile
+ src/Makefile
+Index: src/e_mod_win.c
+===================================================================
+--- src/e_mod_win.c	(Revision 170)
++++ src/e_mod_win.c	(Arbeitskopie)
+@@ -102,7 +102,7 @@
+ 		    e_module_dir_get(m),
+ 		    e_module_dir_get(m));
+    // FIXME: run kbd app or use internal
+-#if 0
++#ifdef BUILD_ILLUME_VIRTUAL_KEYBOARD
+    //enable for now to test internal kbd
+    vkbd_int = e_kbd_int_new(e_module_dir_get(m),
+ 			    e_module_dir_get(m),
diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb
index af101f1a01..52150a00dc 100644
--- a/packages/openmoko-projects/illume_svn.bb
+++ b/packages/openmoko-projects/illume_svn.bb
@@ -4,9 +4,12 @@ AUTHOR = "Rasterman"
 LICENSE = "MIT/BSD"
 DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
 PV = "0.0+svnr${SRCREV}"
-PR = "r8"
+PR = "r10"
 
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=http"
+SRC_URI = "\
+  svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=http \
+  file://configure-keyboard.patch;patch=1;pnum=0 \
+"
 S = "${WORKDIR}/${PN}"
 
 inherit autotools pkgconfig
@@ -16,6 +19,8 @@ EXTRA_OECONF = "\
   --x-libraries=${STAGING_LIBDIR} \
   --enable-simple-x11 \
   --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+\
+  --enable-illume-keyboard \
 "
 
 RRECOMMENDS_${PN} = "\
diff --git a/packages/snes9x/64bit.patch b/packages/snes9x/64bit.patch
new file mode 100644
index 0000000000..a8388de0a2
--- /dev/null
+++ b/packages/snes9x/64bit.patch
@@ -0,0 +1,110 @@
+--- s/offsets.cpp~	2004-07-11 22:50:59.000000000 +0100
++++ s/offsets.cpp	2008-07-27 10:28:40.000000000 +0100
+@@ -100,30 +100,30 @@
+ #endif
+ 
+ #define OFFSET(N,F) \
+-fprintf (S9xSTREAM, "#define " #N " CPU + %d\n", (int) &((struct SCPUState *) 0)->F);
++fprintf (S9xSTREAM, "#define " #N " CPU + %d\n",  &((struct SCPUState *) 0)->F);
+ #define OFFSET2(N,F) \
+-fprintf (S9xSTREAM, "#define " #N " Registers + %d\n", (int) &((struct SRegisters *) 0)->F);
++fprintf (S9xSTREAM, "#define " #N " Registers + %d\n",  &((struct SRegisters *) 0)->F);
+ #define OFFSET3(F) \
+-fprintf (S9xSTREAM, "#define " #F " Memory + %d\n", (int) &((class CMemory *) 0)->F);
++fprintf (S9xSTREAM, "#define " #F " Memory + %d\n",  &((class CMemory *) 0)->F);
+ #define OFFSET4(N,F) \
+-fprintf (S9xSTREAM, "#define " #N " APU + %d\n", (int) &((struct SAPU *) 0)->F);
++fprintf (S9xSTREAM, "#define " #N " APU + %d\n",  &((struct SAPU *) 0)->F);
+ #define OFFSET5(N,F) \
+-fprintf (S9xSTREAM, "#define " #N " IAPU + %d\n", (int) &((struct SIAPU *) 0)->F);
++fprintf (S9xSTREAM, "#define " #N " IAPU + %d\n",  &((struct SIAPU *) 0)->F);
+ #define OFFSET6(N,F) \
+-fprintf (S9xSTREAM, "#define " #N " ICPU + %d\n", (int) &((struct SICPU *) 0)->F);
++fprintf (S9xSTREAM, "#define " #N " ICPU + %d\n",  &((struct SICPU *) 0)->F);
+ #define OFFSET7(N,F) \
+-fprintf (S9xSTREAM, "#define " #N " Settings + %d\n", (int) &((struct SSettings *) 0)->F);
++fprintf (S9xSTREAM, "#define " #N " Settings + %d\n",  &((struct SSettings *) 0)->F);
+ #define OFFSET8(N, F) \
+-fprintf (S9xSTREAM, "#define " #N " APURegisters + %d\n", (int) &((struct SAPURegisters *) 0)->F);
++fprintf (S9xSTREAM, "#define " #N " APURegisters + %d\n",  &((struct SAPURegisters *) 0)->F);
+ 
+ #define OFFSET9(N, F) \
+-fprintf (S9xSTREAM, "#define " #N " PPU + %d\n", (int) &((struct SPPU *) 0)->F);
++fprintf (S9xSTREAM, "#define " #N " PPU + %d\n",  &((struct SPPU *) 0)->F);
+ #define OFFSET10(N, F) \
+-fprintf (S9xSTREAM, "#define " #N " IPPU + %d\n", (int) &((struct InternalPPU *) 0)->F);
++fprintf (S9xSTREAM, "#define " #N " IPPU + %d\n",  &((struct InternalPPU *) 0)->F);
+ #define OFFSET11(N, F) \
+-fprintf (S9xSTREAM, "#define " #N " SA1 + %d\n", (int) &((struct SSA1 *) 0)->F);
++fprintf (S9xSTREAM, "#define " #N " SA1 + %d\n",  &((struct SSA1 *) 0)->F);
+ #define OFFSET12(N, F) \
+-fprintf (S9xSTREAM, "#define " #N " SA1Registers + %d\n", (int) &((struct SSA1Registers *) 0)->F);
++fprintf (S9xSTREAM, "#define " #N " SA1Registers + %d\n",  &((struct SSA1Registers *) 0)->F);
+ 
+ int main (int /*argc*/, char ** /*argv*/)
+ {
+--- s/getset.h~	2004-07-11 22:50:58.000000000 +0100
++++ s/getset.h	2008-07-27 10:30:38.000000000 +0100
+@@ -120,7 +120,7 @@
+ 		return (*(GetAddress + (Address & 0xffff)));
+     }
+ 	
+-    switch ((int) GetAddress)
++    switch ((long)GetAddress)
+     {
+     case CMemory::MAP_PPU:
+ 		return (S9xGetPPU (Address & 0xffff));
+@@ -225,7 +225,7 @@
+ #endif	
+     }
+ 
+-    switch ((int) GetAddress)
++    switch ((long) GetAddress)
+     {
+     case CMemory::MAP_PPU:
+ 		return (S9xGetPPU (Address & 0xffff) |
+@@ -349,7 +349,7 @@
+ 		return;
+     }
+ 	
+-    switch ((int) SetAddress)
++    switch ((long) SetAddress)
+     {
+     case CMemory::MAP_PPU:
+ 		S9xSetPPU (Byte, Address & 0xffff);
+@@ -482,7 +482,7 @@
+ 		return;
+     }
+ 	
+-    switch ((int) SetAddress)
++    switch ((long) SetAddress)
+     {
+     case CMemory::MAP_PPU:
+ 		S9xSetPPU ((uint8) Word, Address & 0xffff);
+@@ -603,7 +603,7 @@
+ 	{