diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-09-29 19:50:30 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-09-29 19:50:30 +0000 |
| commit | c1f119575c8e0fabdd254dede3c888373a442a9f (patch) | |
| tree | d3107f3dac6039ad5118c30d84a1b53ab2910753 /meta | |
| parent | 05107cfb6911b8bf7559d5e4da54f770d7790830 (diff) | |
| download | poky-c1f119575c8e0fabdd254dede3c888373a442a9f.tar.gz | |
poky.conf/preferred-xorg-versions.inc: Catch up with libx11 changes
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5324 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/distro/include/preferred-xorg-versions.inc | 8 | ||||
| -rw-r--r-- | meta/conf/distro/poky.conf | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 143b4e5585..081a56eba2 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc | |||
| @@ -8,7 +8,6 @@ PREFERRED_VERSION_bigreqsproto-native = "1.0.2" | |||
| 8 | PREFERRED_VERSION_bigreqsproto-sdk = "1.0.2" | 8 | PREFERRED_VERSION_bigreqsproto-sdk = "1.0.2" |
| 9 | PREFERRED_VERSION_compositeproto = "0.4" | 9 | PREFERRED_VERSION_compositeproto = "0.4" |
| 10 | PREFERRED_VERSION_damageproto = "1.1.0" | 10 | PREFERRED_VERSION_damageproto = "1.1.0" |
| 11 | PREFERRED_VERSION_diet-x11 = "1.1.4" | ||
| 12 | PREFERRED_VERSION_dmxproto = "2.2.2" | 11 | PREFERRED_VERSION_dmxproto = "2.2.2" |
| 13 | PREFERRED_VERSION_evieext = "1.0.2" | 12 | PREFERRED_VERSION_evieext = "1.0.2" |
| 14 | PREFERRED_VERSION_fixesproto = "4.0" | 13 | PREFERRED_VERSION_fixesproto = "4.0" |
| @@ -35,10 +34,11 @@ PREFERRED_VERSION_liblbxutil = "1.0.1" | |||
| 35 | PREFERRED_VERSION_liboldx = "1.0.1" | 34 | PREFERRED_VERSION_liboldx = "1.0.1" |
| 36 | PREFERRED_VERSION_libsm = "1.0.3" | 35 | PREFERRED_VERSION_libsm = "1.0.3" |
| 37 | PREFERRED_VERSION_libwindowswm = "1.0.0" | 36 | PREFERRED_VERSION_libwindowswm = "1.0.0" |
| 38 | PREFERRED_VERSION_libx11 = "1.1.4" | 37 | PREFERRED_VERSION_libx11 = "1.1.5" |
| 38 | PREFERRED_VERSION_libx11-diet = "1.1.5" | ||
| 39 | PREFERRED_VERSION_libx11-native = "1.1.5" | ||
| 40 | PREFERRED_VERSION_libx11-sdk = "1.1.5" | ||
| 39 | PREFERRED_VERSION_libx11-trim = "1.1.5" | 41 | PREFERRED_VERSION_libx11-trim = "1.1.5" |
| 40 | PREFERRED_VERSION_libx11-native = "1.1.4" | ||
| 41 | PREFERRED_VERSION_libx11-sdk = "1.1.4" | ||
| 42 | PREFERRED_VERSION_libxau = "1.0.4" | 42 | PREFERRED_VERSION_libxau = "1.0.4" |
| 43 | PREFERRED_VERSION_libxau-native = "1.0.3" | 43 | PREFERRED_VERSION_libxau-native = "1.0.3" |
| 44 | PREFERRED_VERSION_libxau-sdk = "1.0.3" | 44 | PREFERRED_VERSION_libxau-sdk = "1.0.3" |
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 4b6863f5e8..c101ce9423 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf | |||
| @@ -69,7 +69,7 @@ PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" | |||
| 69 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib" | 69 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib" |
| 70 | PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" | 70 | PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" |
| 71 | PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" | 71 | PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" |
| 72 | PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" | 72 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet" |
| 73 | 73 | ||
| 74 | VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" | 74 | VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" |
| 75 | 75 | ||