xorg: Update to a buildable configuration

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index ed6bb3c6c7a2f301835b94bcc751e5fcc10dcecd..2dc7f34d477ecb7a1a91b847855a900cd735cfac 100644 (file)
--- 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 7f1347e9be239805907f3fbd68c325d125aeed82..2f2f4f931c9179fa45d4382d3452c2237fa7acef 100644 (file)
--- 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"