summaryrefslogtreecommitdiff
path: root/meta/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf/distro')
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc109
-rw-r--r--meta/conf/distro/poky.conf11
2 files changed, 114 insertions, 6 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
new file mode 100644
index 000000000..1a28a3f3b
--- /dev/null
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -0,0 +1,109 @@
+PREFERRED_VERSION_applewmproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_bigreqsproto = "X11R7.0-1.0.2"
+PREFERRED_VERSION_bigreqsproto-native = "X11R7.0-1.0.2"
+PREFERRED_VERSION_compositeproto = "X11R7.1-0.3.1"
+PREFERRED_VERSION_damageproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_diet-x11 = "X11R7.1-1.0.1"
+PREFERRED_VERSION_dmxproto = "X11R7.0-2.2.2"
+PREFERRED_VERSION_evieext = "X11R7.0-1.0.2"
+PREFERRED_VERSION_fixesproto = "X11R7.1-4.0"
+PREFERRED_VERSION_fontcacheproto = "X11R7.0-0.1.2"
+PREFERRED_VERSION_fontcacheproto-native = "X11R7.0-0.1.2"
+PREFERRED_VERSION_fontsproto = "X11R7.0-2.0.2"
+PREFERRED_VERSION_fontsproto-native = "X11R7.0-2.0.2"
+PREFERRED_VERSION_gccmakedep = "X11R7.1-1.0.2"
+PREFERRED_VERSION_glproto = "X11R7.1-1.4.7"
+PREFERRED_VERSION_imake = "X11R7.1-1.0.2"
+PREFERRED_VERSION_inputproto = "X11R7.0-1.3.2"
+PREFERRED_VERSION_inputproto-native = "X11R7.0-1.3.2"
+PREFERRED_VERSION_kbproto = "X11R7.1-1.0.3"
+PREFERRED_VERSION_kbproto-native = "X11R7.0-1.0.2"
+PREFERRED_VERSION_libapplewm = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libdmx = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libfontenc = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libfontenc-native = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libfs = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libice = "X11R7.1-1.0.1"
+PREFERRED_VERSION_liblbxutil = "X11R7.1-1.0.1"
+PREFERRED_VERSION_liboldx = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libsm = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libwindowswm = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libx11 = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libx11-native = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxau = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxau-native = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxaw = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxcomposite = "X11R7.1-0.3"
+PREFERRED_VERSION_libxcursor = "X11R7.1-1.1.6"
+PREFERRED_VERSION_libxdamage = "X11R7.1-1.0.3"
+PREFERRED_VERSION_libxdmcp = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxdmcp-native = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxevie = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxext = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxfixes = "X11R7.1-4.0.1"
+PREFERRED_VERSION_libxfont = "X11R7.1-1.2.0"
+PREFERRED_VERSION_libxfont-native = "X11R7.1-1.1.0"
+PREFERRED_VERSION_libxfontcache = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxft = "X11R7.0-2.1.8.2"
+PREFERRED_VERSION_libxi = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxinerama = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxkbfile = "X11R7.1-1.0.3"
+PREFERRED_VERSION_libxkbui = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxmu = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxp = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxpm = "X11R7.1-3.5.5"
+PREFERRED_VERSION_libxprintapputil = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxprintutil = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxrandr = "X11R7.1-1.1.1"
+PREFERRED_VERSION_libxrender = "X11R7.1-0.9.1"
+PREFERRED_VERSION_libxres = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxscrnsaver = "X11R7.1-1.1.0"
+PREFERRED_VERSION_libxt = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxtrap = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxtst = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxv = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxvmc = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxxf86dga = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxxf86misc = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxxf86vm = "X11R7.1-1.0.1"
+PREFERRED_VERSION_lndir = "X11R7.0-1.0.1"
+PREFERRED_VERSION_makedepend = "X11R7.0-1.0.0"
+PREFERRED_VERSION_makedepend-native = "X11R7.0-1.0.0"
+PREFERRED_VERSION_printproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_randrproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_recordproto = "X11R7.0-1.13.2"
+PREFERRED_VERSION_renderproto = "X11R7.0-0.9.2"
+PREFERRED_VERSION_resourceproto = "X11R7.0-1.0.2"
+PREFERRED_VERSION_scrnsaverproto = "X11R7.1-1.1.0"
+PREFERRED_VERSION_trapproto = "X11R7.0-3.4.3"
+PREFERRED_VERSION_util-macros = "X11R7.1-1.0.2"
+PREFERRED_VERSION_util-macros-native = "X11R7.1-1.0.2"
+PREFERRED_VERSION_videoproto = "X11R7.0-2.2.2"
+PREFERRED_VERSION_windowswmproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_xauth = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xcmiscproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xcmiscproto-native = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xdpyinfo = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xextproto = "X11R7.0-7.0.2"
+PREFERRED_VERSION_xextproto-native = "X11R7.0-7.0.2"
+PREFERRED_VERSION_xf86bigfontproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xf86bigfontproto-native = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xf86dgaproto = "X11R7.0-2.0.2"
+PREFERRED_VERSION_xf86driproto = "X11R7.0-2.0.3"
+PREFERRED_VERSION_xf86miscproto = "X11R7.0-0.9.2"
+PREFERRED_VERSION_xf86rushproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xf86vidmodeproto = "X11R7.0-2.2.2"
+PREFERRED_VERSION_xhost = "X11R7.1-1.0.1"
+PREFERRED_VERSION_xineramaproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xmodmap = "X11R7.1-1.0.1"
+PREFERRED_VERSION_xorg-cf-files = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xproto = "X11R7.1-7.0.5"
+PREFERRED_VERSION_xproto-native = "X11R7.1-7.0.5"
+PREFERRED_VERSION_xproxymanagementprotocol = "X11R7.0-1.0.2"
+PREFERRED_VERSION_xrandr = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xrdb = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xserver-xorg = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xset = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xtrans = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xtrans-native = "X11R7.0-1.0.0"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index a08abf134..561effbe2 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -103,7 +103,7 @@ SRCDATE_libfakekey ?= "20051101"
SRCDATE_xmodmap ?= "20051101"
SRCDATE_libxrandr ?= "20051101"
SRCDATE_libxtst ?= "20051101"
-SRCDATE_xcalibrate ?= "20051101"
+SRCDATE_xcalibrate ?= "20060312"
SRCDATE_libxmu ?= "20051115"
SRCDATE_xdpyinfo ?= "20051115"
SRCDATE_xauth ?= "20060120"
@@ -127,7 +127,6 @@ PREFERRED_VERSION_matchbox-stroke ?= "0.0+svn${SRCDATE}"
PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svn${SRCDATE}"
PREFERRED_VERSION_matchbox-wm ?= "1.1"
PREFERRED_VERSION_libmatchbox ?= "1.9"
-PREFERRED_VERSION_xserver-kdrive = "0.0+cvs${SRCDATE}"
PREFERRED_VERSION_glib-2.0 ?= "2.10.3"
PREFERRED_VERSION_glib-2.0-native ?= "2.10.3"
@@ -140,7 +139,6 @@ PREFERRED_VERSION_pango ?= "1.10.1"
PREFERRED_VERSION_dbus ?= "0.60"
PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}"
-PREFERRED_VERSION_diet-x11 ?= "6.2.1"
PREFERRED_VERSION_dillo2 ?= "0.6.6"
PREFERRED_VERSION_evince ?= "0.3.2"
PREFERRED_VERSION_firefox ?= "1.0"
@@ -161,14 +159,15 @@ PREFERRED_VERSION_rxvt-unicode ?= "5.6"
PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
PREFERRED_VERSION_xdemineur ?= "2.1.1"
PREFERRED_VERSION_xextensions ?= "1.0.1"
-PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
+
+
PREFERRED_VERSION_xmonobut ?= "0.4"
PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_xproto ?= "6.6.2"
-PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
PREFERRED_VERSION_xst ?= "0.15"
PREFERRED_VERSION_oprofile ?= "0.9.1+cvs${SRCDATE}"
+require conf/distro/include/preferred-xorg-versions.inc
+
PCMCIA_MANAGER ?= "pcmciautils"
CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/"