summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-08-04 07:32:25 +0000
committerKoen Kooi <koen@openembedded.org>2006-08-04 07:32:25 +0000
commit7e46fede90e31209865fd58e04e72107a2787166 (patch)
tree06083382c470340b6687f91614b6cce791897617
parent784208cccd9f1758ce8e1b8d2b2e8102c0151f6f (diff)
angstrom 2006.9: use xorg 7.1 versions
-rw-r--r--conf/distro/angstrom-2006.9.conf11
1 files changed, 9 insertions, 2 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index ce52336a16..020e3f98a3 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -30,6 +30,7 @@ FEED_URIS += " \
#SRCDATE = "20060630"
#SRCDATE_handhelds-pxa-2.6 = "20060622"
SRCDATE_gconf-dbus = "20060719"
+SRCDATE_gnome-vfs-dbus = "20060803"
CVS_TARBALL_STASH = "\
http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
@@ -47,7 +48,13 @@ require conf/distro/include/preferred-gpe-versions-2.8.inc
PREFERRED_VERSION_fontconfig = "2.3.95"
PREFERRED_VERSION_freetype = "2.2.1"
-PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
+
+#Small machines prefer kdrive, but we might ship full Xorg in other images
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
+PREFERRED_PROVIDER_xserver ?= "xserver-drive"
+
+require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+
#zap extra stuff taking place in $MACHINE.conf
GPE_EXTRA_INSTALL = ""
@@ -78,7 +85,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive
# Others:
PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
PREFERRED_PROVIDER_gconf ?= gconf-dbus
-PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus
+PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs
PREFERRED_PROVIDER_tslib ?= tslib
#EABI stuff