summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-07-02 17:09:17 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-07-02 17:09:17 +0100
commita909986a2641ef19de9d36d2d517deb198962996 (patch)
tree63c8926160a8e474f4db2c9a65204e03a27c36aa /meta
parentb3fd2238f82870b3cc670a69a75a87df12948df1 (diff)
downloadpoky-a909986a2641ef19de9d36d2d517deb198962996.tar.gz
xorg: Update to a buildable configuration
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc10
-rw-r--r--meta/packages/xorg-proto/inputproto_git.bb2
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index ed6bb3c6c7..2dc7f34d47 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"
18PREFERRED_VERSION_gccmakedep ?= "1.0.2" 18PREFERRED_VERSION_gccmakedep ?= "1.0.2"
19PREFERRED_VERSION_glproto ?= "1.4.9" 19PREFERRED_VERSION_glproto ?= "1.4.9"
20PREFERRED_VERSION_imake ?= "1.0.2" 20PREFERRED_VERSION_imake ?= "1.0.2"
21PREFERRED_VERSION_inputproto ?= "1.9.99.12" 21#PREFERRED_VERSION_inputproto ?= "1.9.99.12"
22PREFERRED_VERSION_inputproto-native ?= "1.9.99.12" 22#PREFERRED_VERSION_inputproto-native ?= "1.9.99.12"
23PREFERRED_VERSION_inputproto-sdk ?= "1.9.99.12" 23#PREFERRED_VERSION_inputproto-sdk ?= "1.9.99.12"
24PREFERRED_VERSION_kbproto ?= "1.0.3" 24PREFERRED_VERSION_kbproto ?= "1.0.3"
25PREFERRED_VERSION_kbproto-native ?= "1.0.3" 25PREFERRED_VERSION_kbproto-native ?= "1.0.3"
26PREFERRED_VERSION_kbproto-sdk ?= "1.0.3" 26PREFERRED_VERSION_kbproto-sdk ?= "1.0.3"
@@ -50,14 +50,14 @@ PREFERRED_VERSION_libxdmcp ?= "1.0.2"
50PREFERRED_VERSION_libxdmcp-native ?= "1.0.2" 50PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
51PREFERRED_VERSION_libxdmcp-sdk ?= "1.0.2" 51PREFERRED_VERSION_libxdmcp-sdk ?= "1.0.2"
52PREFERRED_VERSION_libxevie ?= "1.0.2" 52PREFERRED_VERSION_libxevie ?= "1.0.2"
53PREFERRED_VERSION_libxext ?= "1.0.5" 53#PREFERRED_VERSION_libxext ?= "1.0.5"
54PREFERRED_VERSION_libxext-sdk ?= "1.0.5" 54PREFERRED_VERSION_libxext-sdk ?= "1.0.5"
55PREFERRED_VERSION_libxfixes ?= "4.0.3" 55PREFERRED_VERSION_libxfixes ?= "4.0.3"
56PREFERRED_VERSION_libxfont ?= "1.3.4" 56PREFERRED_VERSION_libxfont ?= "1.3.4"
57PREFERRED_VERSION_libxfont-native ?= "1.3.4" 57PREFERRED_VERSION_libxfont-native ?= "1.3.4"
58PREFERRED_VERSION_libxfontcache ?= "1.0.4" 58PREFERRED_VERSION_libxfontcache ?= "1.0.4"
59PREFERRED_VERSION_libxft ?= "2.1.13" 59PREFERRED_VERSION_libxft ?= "2.1.13"
60PREFERRED_VERSION_libxi ?= "1.2.1" 60#PREFERRED_VERSION_libxi ?= "1.2.1"
61PREFERRED_VERSION_libxinerama ?= "1.0.3" 61PREFERRED_VERSION_libxinerama ?= "1.0.3"
62PREFERRED_VERSION_libxkbfile ?= "1.0.5" 62PREFERRED_VERSION_libxkbfile ?= "1.0.5"
63PREFERRED_VERSION_libxkbui ?= "1.0.2" 63PREFERRED_VERSION_libxkbui ?= "1.0.2"
diff --git a/meta/packages/xorg-proto/inputproto_git.bb b/meta/packages/xorg-proto/inputproto_git.bb
index 7f1347e9be..2f2f4f931c 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
2 2
3PR = "r1" 3PR = "r1"
4PE = "1" 4PE = "1"
5PV = "1.9.99.5+git${SRCPV}" 5PV = "1.9.99.12+git${SRCPV}"
6 6
7SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/inputproto;protocol=git" 7SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/inputproto;protocol=git"
8S = "${WORKDIR}/git" 8S = "${WORKDIR}/git"