From 7e46fede90e31209865fd58e04e72107a2787166 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 4 Aug 2006 07:32:25 +0000 Subject: angstrom 2006.9: use xorg 7.1 versions --- conf/distro/angstrom-2006.9.conf | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'conf') 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 -- cgit v1.2.3