Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

20 files changed, 392 insertions, 12 deletions

diff --git a/packages/gnome/gdm/cross-xdetection.diff b/packages/gnome/gdm/cross-xdetection.diff
new file mode 100644
index 0000000000..9cb6ac98dd
--- /dev/null
+++ b/packages/gnome/gdm/cross-xdetection.diff
@@ -0,0 +1,84 @@
+--- /tmp/configure.ac	2008-12-10 08:38:16.000000000 +0100
++++ gdm-2.24.1/configure.ac	2008-12-10 08:39:17.000000000 +0100
+@@ -1133,80 +1133,10 @@
+ dnl - Check for X Server location
+ dnl ---------------------------------------------------------------------------
+ 
+-# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often
+-# symlink to each other, and configure should use the more stable
+-# location (the real directory) if possible.
+-#
+-# On Solaris, the /usr/bin/Xserver script is used to decide whether to
+-# use Xsun or Xorg, so this is used on Solaris.
+-#
+-# When testing for /usr/X11R6, first check with "! -h" for /usr/X11R6
+-# and /usr/X11 since they often symlink to each other, and configure
+-# should use the more stable location (the real directory) if possible.
+-#
+-if test -x /usr/X11/bin/Xserver; then
+-   X_PATH="/usr/X11/bin"
+-   X_SERVER_PATH="/usr/X11/bin"
+-   X_SERVER="/usr/X11/bin/Xserver"
+-   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
+-   X_CONFIG_OPTIONS="-audit 0"
+-elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
+-   X_PATH="/usr/X11R6/bin"
+-   X_SERVER_PATH="/usr/X11R6/bin"
+-   X_SERVER="/usr/X11R6/bin/X"
+-   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
+-   X_CONFIG_OPTIONS="-audit 0"
+-elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
+-   X_PATH="/usr/X11/bin"
+-   X_SERVER_PATH="/usr/X11/bin"
+-   X_SERVER="/usr/X11/bin/X"
+-   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
+-   X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/X11R6/bin/X; then
+-   X_PATH="/usr/X11R6/bin"
+-   X_SERVER_PATH="/usr/X11R6/bin"
+-   X_SERVER="/usr/X11R6/bin/X"
+-   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
+-   X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/bin/Xorg; then
+    X_PATH="/usr/bin"
+    X_SERVER_PATH="/usr/bin"
+-   X_SERVER="/usr/bin/Xorg"
+-   X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/X11/bin/X; then
+-   X_PATH="/usr/X11/bin"
+-   X_SERVER_PATH="/usr/X11/bin"
+-   X_SERVER="/usr/X11/bin/X"
+-   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
+-   X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/openwin/bin/Xsun; then
+-   # Do not add /usr/openwin/bin here because on Solaris you need
+-   # /usr/openwin/bin in your PATH even if you are using the Xorg
+-   # Xserver.  We add this to the path below.
+-   X_PATH="/usr/openwin/bin"
+-   X_SERVER_PATH="/usr/openwin/bin"
+-   X_SERVER="/usr/openwin/bin/Xsun"
+-   X_CONFIG_OPTIONS="-audit 0 -nobanner"
+-elif test -x /opt/X11R6/bin/X; then
+-   X_PATH="/opt/X11R6/bin"
+-   X_SERVER_PATH="/opt/X11R6/bin"
+-   X_SERVER="/opt/X11R6/bin/X"
+-   GDM_USER_PATH="$GDM_USER_PATH:/opt/X11R6/bin"
+-   X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/bin/X; then
+-   X_PATH="/usr/bin"
+-   X_SERVER_PATH="/usr/bin"
+-   X_SERVER="/usr/bin/X"
+-   X_CONFIG_OPTIONS="-audit 0"
+-else
+-   # what to do, what to do, this is wrong, but this just sets the
+-   # defaults, perhaps this user is cross compiling or some such
+-   X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
+-   X_SERVER_PATH="/usr/X11R6/bin"
+-   X_SERVER="/usr/X11R6/bin/X"
+-   GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
++   X_SERVER="/etc/X11/Xserver"
+    X_CONFIG_OPTIONS="-audit 0"
+-fi
+ 
+ # Don't add bindir to GDM_USER_PATH if it is already in the PATH.
+ # If it is /bin or /usr/bin, for example.
diff --git a/packages/gnome/gdm_2.24.1.bb b/packages/gnome/gdm_2.24.1.bb
index cdca2f87ae..c04e9aabea 100644
--- a/packages/gnome/gdm_2.24.1.bb
+++ b/packages/gnome/gdm_2.24.1.bb
@@ -1,17 +1,22 @@
 DESCRIPTION = "Graphical login manager"
 LICENSE = "GPL"
 
-DEPENDS = "libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl"
+DEPENDS = "grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl"
 
-PR = "r1"
+PR = "r3"
 
 inherit gnome update-rc.d
 
-SRC_URI += "file://%gconf-tree.xml \
+SRC_URI += "file://cross-xdetection.diff;patch=1 \
+            file://%gconf-tree.xml \
             file://gdm.conf \
             file://gdm \
            "
 
+EXTRA_OECONF = " --enable-authentication-scheme=shadow \
+                 --with-console-kit \
+                 --disable-scrollkeeper "
+
 do_install_prepend() {
 	mkdir -p ${D}/var/lib/gdm/.gconf.mandatory
 	cp ${WORKDIR}/%gconf-tree.xml ${D}/var/lib/gdm/.gconf.mandatory/ 
diff --git a/packages/gnome/gnome-power-manager_2.24.2.bb b/packages/gnome/gnome-power-manager_2.24.2.bb
new file mode 100644
index 0000000000..904cd39364
--- /dev/null
+++ b/packages/gnome/gnome-power-manager_2.24.2.bb
@@ -0,0 +1,36 @@
+LICENSE = "GPLv2"
+DEPENDS = "libnotify libgnomeui gnome-panel gnome-doc-utils libwnck gtk+ gnome-keyring libglade hal dbus-glib " 
+
+inherit gnome
+
+EXTRA_OECONF = " --disable-scrollkeeper \
+                 --disable-keyring \
+                 --x-includes=${STAGING_INCDIR} \
+                 --x-libraries=${STAGING_LIBDIR} \
+                 --with-dpms-ext=${STAGING_INCDIR}/.. \
+                 --enable-compile-warnings=no \
+                 ac_cv_header_X11_extensions_dpms_h=yes \
+               "
+
+do_configure_append() {
+        rm config.log
+        # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror
+        for i in $(find ${S} -name "Makefile") ; do
+            sed -i -e s:-Werror::g $i
+        done
+}
+
+PACKAGES =+ "${PN}-applets"
+
+FILES_${PN}-applets = "${bindir}/*applet* \
+                       ${libdir}/bonobo/servers \
+		       ${datadir}/gnome-2.0/ui"
+
+FILES_${PN} += "${datadir}/icons \
+                ${datadir}/dbus-1 \
+		${datadir}/gnome/autostart \
+		"
+
+FILE_{PN}-doc += "${datadir}/omf \
+                  ${datadir}/gnome/help "
+
diff --git a/packages/hal/consolekit_0.3.0.bb b/packages/hal/consolekit_0.3.0.bb
new file mode 100644
index 0000000000..9e100b60ca
--- /dev/null
+++ b/packages/hal/consolekit_0.3.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "ConsoleKit is a framework for defining and tracking users, login sessions, and seats."
+LICENSE = "GPLv2"
+DEPENDS = "libpam dbus"
+
+inherit gnome
+
+SRC_URI = "http://people.freedesktop.org/~mccann/dist/ConsoleKit-${PV}.tar.bz2"
+S = "${WORKDIR}/ConsoleKit-${PV}"
+
+do_stage () {
+	autotools_stage_all
+}
+
+FILES_${PN} += "${libdir}/ConsoleKit ${datadir}/dbus-1"
+
+
+
+
diff --git a/packages/images/x11-image.bb b/packages/images/x11-image.bb
index 90d8fa3ffa..093e0c5b6d 100644
--- a/packages/images/x11-image.bb
+++ b/packages/images/x11-image.bb
@@ -1,8 +1,6 @@
 #Angstrom X11 image
 
-ANGSTROM_EXTRA_INSTALL += " \
-                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
-			  " 
+ANGSTROM_EXTRA_INSTALL ?= ""
 XSERVER ?= "xserver-kdrive-fbdev"
 
 export IMAGE_BASENAME = "x11-image"
diff --git a/packages/images/xorg-image.bb b/packages/images/xorg-image.bb
new file mode 100644
index 0000000000..be37f6028b
--- /dev/null
+++ b/packages/images/xorg-image.bb
@@ -0,0 +1,8 @@
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-tslib \
+           xf86-video-fbdev "
+
+require x11-image.bb
+
+export IMAGE_BASENAME = "xorg-image"
diff --git a/packages/mozilla/firefox-3.0.1+3.1b2/arm/mozconfig b/packages/mozilla/firefox-3.0.1+3.1b2/arm/mozconfig
new file mode 100644
index 0000000000..094a0ff642
--- /dev/null
+++ b/packages/mozilla/firefox-3.0.1+3.1b2/arm/mozconfig
@@ -0,0 +1,67 @@
+. $topsrcdir/browser/config/mozconfig
+
+# use GTK+-2 widget set with XFT font rendering
+#ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-xft
+ac_add_options --disable-freetype2
+
+# enable minimal profile support
+ac_add_options --disable-profilesharing
+ac_add_options --disable-profilelocking
+ac_add_options --enable-single-profile
+
+ac_add_options --with-system-zlib
+ac_add_options --with-system-jpeg
+#ac_add_options --with-system-png
+
+ac_add_options --disable-accessibility
+ac_add_options --disable-composer
+#ac_add_options --enable-plaintext-editor-only
+ac_add_options --disable-mailnews
+ac_add_options --disable-ldap
+#ac_add_options --disable-postscript
+ac_add_options --disable-mathml
+ac_add_options --disable-jsd
+ac_add_options --disable-installer
+ac_add_options --disable-xprint
+ac_add_options --disable-necko-disk-cache
+
+# 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-gtktest
+ac_add_options --disable-tests
+ac_add_options --disable-printing
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-gnomeui
+ac_add_options --enable-debugger-info-modules
+
+# 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,ftp,about,viewsource
+
+# build minimal set of image decoders
+ac_add_options --enable-image-decoders=png,gif,jpeg
+
+#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
+ac_add_options --enable-optimize=-O2
+ac_add_options --with-arm-kuser
+
+# Use cairo from system
+ac_add_options --enable-system-cairo
+
+# Disable jemalloc
+ac_add_options --disable-jemalloc
+
+# enable libxul
+ac_add_options --enable-libxul
diff --git a/packages/mozilla/firefox-3.0.1+3.1b2/jsautocfg-dontoverwrite.patch b/packages/mozilla/firefox-3.0.1+3.1b2/jsautocfg-dontoverwrite.patch
new file mode 100644
index 0000000000..39978cfd11
--- /dev/null
+++ b/packages/mozilla/firefox-3.0.1+3.1b2/jsautocfg-dontoverwrite.patch
@@ -0,0 +1,23 @@
+--- mozilla/js/src/Makefile.in.orig	2006-12-12 11:46:02.000000000 +0000
++++ mozilla/js/src/Makefile.in	2006-12-12 11:46:27.000000000 +0000
+@@ -319,20 +319,8 @@
+ 
+ jsopcode.h jsopcode.c: jsopcode.tbl
+ 
+-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
+ jsautocfg.h:
+ 	touch $@
+-else
+-ifeq ($(OS_ARCH),WINCE)
+-jsautocfg.h:
+-	touch $@
+-else
+-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
+-	@rm -f $@ jsautocfg.tmp
+-	./jscpucfg > jsautocfg.tmp
+-	mv jsautocfg.tmp $@
+-endif
+-endif
+ 
+ # jscpucfg is a strange target
+ # Needs to be built with the host compiler but needs to include
diff --git a/packages/mozilla/firefox-3.0.1+3.1b2/mozconfig b/packages/mozilla/firefox-3.0.1+3.1b2/mozconfig
new file mode 100644
index 0000000000..f7ab5dd3a3
--- /dev/null
+++ b/packages/mozilla/firefox-3.0.1+3.1b2/mozconfig
@@ -0,0 +1,66 @@
+. $topsrcdir/browser/config/mozconfig
+
+# use GTK+-2 widget set with XFT font rendering
+#ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-xft
+ac_add_options --disable-freetype2
+
+# enable minimal profile support
+ac_add_options --disable-profilesharing
+ac_add_options --disable-profilelocking
+ac_add_options --enable-single-profile
+
+ac_add_options --with-system-zlib
+ac_add_options --with-system-jpeg
+#ac_add_options --with-system-png
+
+ac_add_options --disable-accessibility
+ac_add_options --disable-composer
+#ac_add_options --enable-plaintext-editor-only
+ac_add_options --disable-mailnews
+ac_add_options --disable-ldap
+#ac_add_options --disable-postscript
+ac_add_options --disable-mathml
+ac_add_options --disable-jsd
+ac_add_options --disable-installer
+ac_add_options --disable-xprint
+ac_add_options --disable-necko-disk-cache
+
+# 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-gtktest
+ac_add_options --disable-tests
+ac_add_options --disable-printing
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-gnomeui
+ac_add_options --enable-debugger-info-modules
+
+# 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,ftp,about,viewsource
+
+# build minimal set of image decoders
+#ac_add_options --enable-image-decoders=png,gif,jpeg
+
+#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
+ac_add_options --enable-optimize=-O2
+
+# Use cairo from system
+ac_add_options --enable-system-cairo
+
+# Disable jemalloc
+ac_add_options --disable-jemalloc
+
+# enable libxul
+ac_add_options --enable-libxul
diff --git a/packages/mozilla/firefox_3.1b2.bb b/packages/mozilla/firefox_3.1b2.bb
new file mode 100644
index 0000000000..2d661ea5f9
--- /dev/null
+++ b/packages/mozilla/firefox_3.1b2.bb
@@ -0,0 +1,46 @@
+DEPENDS += "cairo"
+
+PV = "3.0.1+3.1b2"
+MOZPV = "3.1b2"
+PR = "r1"
+
+SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build2/source/firefox-${MOZPV}-source.tar.bz2 \
+	file://jsautocfg.h \
+	file://jsautocfg-dontoverwrite.patch;patch=1 \
+"
+
+S = "${WORKDIR}/mozilla-central"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit mozilla
+require firefox.inc
+
+export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+
+do_configure_prepend() {
+	sed -i -e s:'head -1':'head -n1':g client.mk
+	oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure
+}
+
+do_compile_prepend() {
+	cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
+        sed -i -e "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" \
+               -e  s:'$(OS_TEST)':${TARGET_ARCH}:g \
+                   ${S}/security/coreconf/Linux.mk
+}
+
+do_stage() {
+        install -d ${STAGING_INCDIR}/firefox-${MOZPV}
+        cd dist/sdk/include
+		rm -rf obsolete
+        headers=`find . -name "*.h"`
+        for f in $headers
+        do
+                install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${MOZPV}/
+        done
+        # removes 2 lines that call absent headers
+        sed -e '178,179d' ${STAGING_INCDIR}/firefox-${MOZPV}/nsIServiceManager.h
+}
+
diff --git a/packages/opencv/artoolkit_2.72.1.bb b/packages/opencv/artoolkit_2.72.1.bb
index a72975553a..2dfbc429bc 100644
--- a/packages/opencv/artoolkit_2.72.1.bb
+++ b/packages/opencv/artoolkit_2.72.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "ARToolKit is a software library that allows for the creation of augmented reality applications. "
 LICENSE = "GPL/ARToolkit"
 
-DEPENDS = "gstreamer virtual/libx11 freeglut mesa"
+DEPENDS = "libxi gstreamer virtual/libx11 freeglut mesa"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/artoolkit/ARToolKit-${PV}.tgz \
            file://configure.diff;patch=1 \
diff --git a/packages/pcmciautils/pcmciautils.inc b/packages/pcmciautils/pcmciautils.inc
index 1df39549dc..f9ef159a5c 100644
--- a/packages/pcmciautils/pcmciautils.inc
+++ b/packages/pcmciautils/pcmciautils.inc
@@ -4,6 +4,7 @@ RDEPENDS = "udev module-init-tools"
 HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
 SECTION = "kernel/userland"
 PRIORITY = "optional"
+LICENSE = "GPLv2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
 
diff --git a/packages/qt4/qt-embedded_4.4.3.bb b/packages/qt4/qt-embedded_4.4.3.bb
index 0bc82e77af..d246cd0ce7 100644
--- a/packages/qt4/qt-embedded_4.4.3.bb
+++ b/packages/qt4/qt-embedded_4.4.3.bb
@@ -3,7 +3,7 @@ require qtopia-core.inc
 PROVIDES += "qtopia-core"
 RPROVIDES_${PN} = "qtopia-core"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
            file://qconfig-oe.h \
diff --git a/packages/qt4/qt4-x11-free_4.4.3.bb b/packages/qt4/qt4-x11-free_4.4.3.bb
index 3bef76f138..af46f4734a 100644
--- a/packages/qt4/qt4-x11-free_4.4.3.bb
+++ b/packages/qt4/qt4-x11-free_4.4.3.bb
@@ -1,5 +1,5 @@
 require qt4-x11-free.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI += " \
            file://0002-fix-resinit-declaration.patch;patch=1 \
diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc
index b291925982..d87b8d8be4 100644
--- a/packages/qt4/qt_packaging.inc
+++ b/packages/qt4/qt_packaging.inc
@@ -180,6 +180,7 @@ python populate_packages_prepend() {
 	qtopia_split('imageformats','imageformat', '^libq(.*)\.so$')
 	qtopia_split('inputmethods','inputmethod', '^libq(.*)\.so$')
 	qtopia_split('sqldrivers',  'sqldriver',   '^libq(.*)\.so$')
+	qtopia_split('script',      'script',      '^libqtscript(.*)\.so$')
 	qtopia_split('styles',      'style',       '^libq(.*)\.so$')
 }
 
diff --git a/packages/shasum/shasum-native.bb b/packages/shasum/shasum-native.bb
index a28d5ac967..fab6244f71 100644
--- a/packages/shasum/shasum-native.bb
+++ b/packages/shasum/shasum-native.bb
@@ -8,5 +8,5 @@ PATCHTOOL = "patch"
 do_fetch[depends] = ""
 do_stage() {
     install -d ${STAGING_BINDIR}
-    install ${S}/oe_sha256sum ${STAGING_BINDIR}
+    install -m 0755 ${S}/oe_sha256sum ${STAGING_BINDIR}
 }
diff --git a/packages/vala/vala-native_0.5.1.bb b/packages/vala/vala-native_0.5.2.bb
index 13ed6ad275..13ed6ad275 100644
--- a/packages/vala/vala-native_0.5.1.bb
+++ b/packages/vala/vala-native_0.5.2.bb
diff --git a/packages/vala/vala_0.5.1.bb b/packages/vala/vala_0.5.2.bb
index a70f00e49b..a70f00e49b 100644
--- a/packages/vala/vala_0.5.1.bb
+++ b/packages/vala/vala_0.5.2.bb
diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index ddf8089587..1cf1dbd072 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -38,9 +38,10 @@ PACKAGES =+ "xserver-security-policy"
 FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy"
 RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-fonts rgb xserver-xorg-conf"
 
-PACKAGES =+ "${PN}-fbdev ${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xephyr"
+PACKAGES =+ "${PN}-sdl ${PN}-fbdev ${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xephyr"
 
 FILES_${PN}-fbdev = "${bindir}/Xfbdev"
+FILES_${PN}-sdl = "${bindir}/Xsdl"
 FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
 FILES_${PN}-xvfb = "${bindir}/Xvfb"
 FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
@@ -53,6 +54,32 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
 		    ${libdir}/xorg/modules/*/*/.debug \
 		    "
 
+# Split out some modules and extensions from the main package
+# These aren't needed for basic operations and only take up space:
+#  32.0k   libdri.so
+#  336.0k  libglx.so
+#  1360k   libint10.so
+#  180.0k  libwfb.so
+#  320.0k  libxaa.so
+#  124.0k  libxf1bpp.so
+#  84.0k   libxf4bpp.so
+
+PACKAGES =+ "${PN}-extension-dri ${PN}-extension-glx ${PN}-module-libint10 ${PN}-module-libwfb ${PN}-module-libmfb ${PN}-module-libcfb ${PN}-module-xaa ${PN}-module-libxf1bpp ${PN}-module-libxf4bpp"
+
+FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
+FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
+FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.*"
+FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.*"
+FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.*"
+FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.*"
+FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.*"
+FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.*"
+FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.*"
+
+PACKAGES =+ "${PN}-multimedia-modules"
+
+FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
+
 do_stage() {
 	autotools_stage_all
 }
diff --git a/packages/xorg-xserver/xserver-xorg_1.5.3.bb b/packages/xorg-xserver/xserver-xorg_1.5.3.bb
index 378f5a1e20..1402c8e653 100644
--- a/packages/xorg-xserver/xserver-xorg_1.5.3.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.5.3.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl"
 PE = "2"
-PR = "r1"
+PR = "r3"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://sysroot_fix.patch;patch=1"