From a909986a2641ef19de9d36d2d517deb198962996 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 2 Jul 2009 17:09:17 +0100 Subject: xorg: Update to a buildable configuration --- meta/conf/distro/include/preferred-xorg-versions.inc | 10 +++++----- meta/packages/xorg-proto/inputproto_git.bb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta') diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index ed6bb3c6c..2dc7f34d4 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -18,9 +18,9 @@ PREFERRED_VERSION_fontsproto-native ?= "2.0.2" PREFERRED_VERSION_gccmakedep ?= "1.0.2" PREFERRED_VERSION_glproto ?= "1.4.9" PREFERRED_VERSION_imake ?= "1.0.2" -PREFERRED_VERSION_inputproto ?= "1.9.99.12" -PREFERRED_VERSION_inputproto-native ?= "1.9.99.12" -PREFERRED_VERSION_inputproto-sdk ?= "1.9.99.12" +#PREFERRED_VERSION_inputproto ?= "1.9.99.12" +#PREFERRED_VERSION_inputproto-native ?= "1.9.99.12" +#PREFERRED_VERSION_inputproto-sdk ?= "1.9.99.12" PREFERRED_VERSION_kbproto ?= "1.0.3" PREFERRED_VERSION_kbproto-native ?= "1.0.3" PREFERRED_VERSION_kbproto-sdk ?= "1.0.3" @@ -50,14 +50,14 @@ PREFERRED_VERSION_libxdmcp ?= "1.0.2" PREFERRED_VERSION_libxdmcp-native ?= "1.0.2" PREFERRED_VERSION_libxdmcp-sdk ?= "1.0.2" PREFERRED_VERSION_libxevie ?= "1.0.2" -PREFERRED_VERSION_libxext ?= "1.0.5" +#PREFERRED_VERSION_libxext ?= "1.0.5" PREFERRED_VERSION_libxext-sdk ?= "1.0.5" PREFERRED_VERSION_libxfixes ?= "4.0.3" PREFERRED_VERSION_libxfont ?= "1.3.4" PREFERRED_VERSION_libxfont-native ?= "1.3.4" PREFERRED_VERSION_libxfontcache ?= "1.0.4" PREFERRED_VERSION_libxft ?= "2.1.13" -PREFERRED_VERSION_libxi ?= "1.2.1" +#PREFERRED_VERSION_libxi ?= "1.2.1" PREFERRED_VERSION_libxinerama ?= "1.0.3" PREFERRED_VERSION_libxkbfile ?= "1.0.5" PREFERRED_VERSION_libxkbui ?= "1.0.2" diff --git a/meta/packages/xorg-proto/inputproto_git.bb b/meta/packages/xorg-proto/inputproto_git.bb index 7f1347e9b..2f2f4f931 100644 --- a/meta/packages/xorg-proto/inputproto_git.bb +++ b/meta/packages/xorg-proto/inputproto_git.bb @@ -2,7 +2,7 @@ require xorg-proto-common.inc PR = "r1" PE = "1" -PV = "1.9.99.5+git${SRCPV}" +PV = "1.9.99.12+git${SRCPV}" SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/inputproto;protocol=git" S = "${WORKDIR}/git" -- cgit v1.2.3