poky-fixed-revisions/preferred-xorg-versions.inc: Update PREFERRED_VERSIONS to reflect changed package versions in recent updates

2 files changed, 24 insertions, 24 deletions

diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index a056c9678e..e835e66e46 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -195,9 +195,9 @@ PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
 
 PREFERRED_VERSION_glib-2.0 ?= "2.18.1"
 PREFERRED_VERSION_glib-2.0-native ?= "2.18.1"
-PREFERRED_VERSION_atk ?= "1.20.0"
-PREFERRED_VERSION_cairo ?= "1.6.4"
-PREFERRED_VERSION_pango ?= "1.18.3"
+PREFERRED_VERSION_atk ?= "1.24.0"
+PREFERRED_VERSION_cairo ?= "1.8.2"
+PREFERRED_VERSION_pango ?= "1.22.2"
 PREFERRED_VERSION_gtk+ ?= "2.12.7"
 
 PREFERRED_VERSION_dbus ?= "1.1.20"
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 2bec394f4c..e3e2cad384 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -28,21 +28,21 @@ PREFERRED_VERSION_libapplewm ?= "1.0.0"
 PREFERRED_VERSION_libdmx ?= "1.0.2"
 PREFERRED_VERSION_libfontenc ?= "1.0.4"
 PREFERRED_VERSION_libfontenc-native ?= "1.0.4"
-PREFERRED_VERSION_libfs ?= "1.0.0"
+PREFERRED_VERSION_libfs ?= "1.0.1"
 PREFERRED_VERSION_libice ?= "1.0.4"
 PREFERRED_VERSION_liblbxutil ?= "1.0.1"
 PREFERRED_VERSION_liboldx ?= "1.0.1"
-PREFERRED_VERSION_libsm ?= "1.0.3"
+PREFERRED_VERSION_libsm ?= "1.1.0"
 PREFERRED_VERSION_libwindowswm ?= "1.0.0"
 PREFERRED_VERSION_libx11 ?= "1.1.99.1+gitr${SRCREV}"
 PREFERRED_VERSION_libx11-diet ?= "1.1.99.1+gitr${SRCREV}"
-PREFERRED_VERSION_libx11-native ?= "1.1.99.1+gitr${SRCREV}"
+PREFERRED_VERSION_libx11-native ?= "1.1.5"
 PREFERRED_VERSION_libx11-sdk ?= "1.1.99.1+gitr${SRCREV}"
 PREFERRED_VERSION_libx11-trim ?= "1.1.99.1+gitr${SRCREV}"
 PREFERRED_VERSION_libxau ?= "1.0.4"
-PREFERRED_VERSION_libxau-native ?= "1.0.3"
-PREFERRED_VERSION_libxau-sdk ?= "1.0.3"
-PREFERRED_VERSION_libxaw ?= "1.0.4"
+PREFERRED_VERSION_libxau-native ?= "1.0.4"
+PREFERRED_VERSION_libxau-sdk ?= "1.0.4"
+PREFERRED_VERSION_libxaw ?= "1.0.5"
 PREFERRED_VERSION_libxcomposite ?= "0.4.0"
 PREFERRED_VERSION_libxcursor ?= "1.1.9"
 PREFERRED_VERSION_libxdamage ?= "1.1.1"
@@ -51,12 +51,12 @@ 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.99.1+gitr${SRCREV}"
-PREFERRED_VERSION_libxext-sdk ?= "1.0.99.1+gitr${SRCREV}""
+PREFERRED_VERSION_libxext-sdk ?= "1.0.99.1+gitr${SRCREV}"
 PREFERRED_VERSION_libxfixes ?= "4.0.3"
-PREFERRED_VERSION_libxfont ?= "1.3.3"
-PREFERRED_VERSION_libxfont-native ?= "1.3.2"
+PREFERRED_VERSION_libxfont ?= "1.3.4"
+PREFERRED_VERSION_libxfont-native ?= "1.3.4"
 PREFERRED_VERSION_libxfontcache ?= "1.0.4"
-PREFERRED_VERSION_libxft ?= "2.1.12"
+PREFERRED_VERSION_libxft ?= "2.1.13"
 PREFERRED_VERSION_libxi ?= "1.9.99.5+gitr${SRCREV}"
 PREFERRED_VERSION_libxinerama ?= "1.0.3"
 PREFERRED_VERSION_libxkbfile ?= "1.0.5"
@@ -66,8 +66,8 @@ PREFERRED_VERSION_libxp ?= "1.0.0"
 PREFERRED_VERSION_libxpm ?= "3.5.7"
 PREFERRED_VERSION_libxprintapputil ?= "1.0.1"
 PREFERRED_VERSION_libxprintutil ?= "1.0.1"
-PREFERRED_VERSION_libxrandr ?= "1.2.2"
-PREFERRED_VERSION_libxrandr-sdk ?= "1.2.2"
+PREFERRED_VERSION_libxrandr ?= "1.2.3"
+PREFERRED_VERSION_libxrandr-sdk ?= "1.2.3"
 PREFERRED_VERSION_libxrender ?= "0.9.4"
 PREFERRED_VERSION_libxrender-sdk ?= "0.9.4"
 PREFERRED_VERSION_libxres ?= "1.0.3"
@@ -79,11 +79,11 @@ PREFERRED_VERSION_libxv ?= "1.0.4"
 PREFERRED_VERSION_libxvmc ?= "1.0.4"
 PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
 PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
-PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
+PREFERRED_VERSION_libxxf86vm ?= "1.0.2"
 PREFERRED_VERSION_lndir ?= "1.0.1"
 PREFERRED_VERSION_makedepend ?= "1.0.1"
 PREFERRED_VERSION_makedepend-native ?= "1.0.1"
-PREFERRED_VERSION_pixman ?= "0.10.0"
+PREFERRED_VERSION_pixman ?= "0.13.2"
 PREFERRED_VERSION_printproto ?= "1.0.4"
 PREFERRED_VERSION_randrproto ?= "1.2.1"
 PREFERRED_VERSION_randrproto-sdk ?= "1.2.1"
@@ -93,8 +93,8 @@ PREFERRED_VERSION_renderproto-sdk ?= "0.9.3"
 PREFERRED_VERSION_resourceproto ?= "1.0.2"
 PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
 PREFERRED_VERSION_trapproto ?= "3.4.3"
-PREFERRED_VERSION_util-macros ?= "1.1.6"
-PREFERRED_VERSION_util-macros-native ?= "1.1.6"
+PREFERRED_VERSION_util-macros ?= "1.2.1"
+PREFERRED_VERSION_util-macros-native ?= "1.2.1"
 PREFERRED_VERSION_videoproto ?= "2.2.2"
 PREFERRED_VERSION_windowswmproto ?= "1.0.3"
 PREFERRED_VERSION_x11perf ?= "1.5"
@@ -117,7 +117,7 @@ PREFERRED_VERSION_xf86miscproto ?= "0.9.2"
 PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
 PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2"
 PREFERRED_VERSION_xhost ?= "1.0.2"
-PREFERRED_VERSION_xinit ?= "1.0.8"
+PREFERRED_VERSION_xinit ?= "1.1.1"
 PREFERRED_VERSION_xineramaproto ?= "1.1.2"
 PREFERRED_VERSION_xmodmap ?= "1.0.3"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
@@ -132,16 +132,16 @@ PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0"
 PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.5.99.1+git${SRCREV}"
 PREFERRED_VERSION_xset ?= "1.0.4"
 PREFERRED_VERSION_xtrans ?= "1.2.2"
-PREFERRED_VERSION_xtrans-native ?= "1.0.4"
-PREFERRED_VERSION_xtrans-sdk ?= "1.0.4"
+PREFERRED_VERSION_xtrans-native ?= "1.2.2"
+PREFERRED_VERSION_xtrans-sdk ?= "1.2.2"
 PREFERRED_VERSION_xvinfo ?= "1.0.2"
-PREFERRED_VERSION_xwininfo ?= "1.0.3"
+PREFERRED_VERSION_xwininfo ?= "1.0.4"
 PREFERRED_VERSION_mesa-dri ?= "7.3.0+git${SRCREV}"
 PREFERRED_VERSION_libdrm ?= "2.4.0+git${SRCREV}"
 PREFERRED_VERSION_xcb-proto ?= "1.2+gitr${SRCREV}"
 PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr${SRCREV}"
 PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr${SRCREV}"
-PREFERRED_VERSION_libpciaccess ?= "0.10.3"
+PREFERRED_VERSION_libpciaccess ?= "0.10.5"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4"
 PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git${SRCREV}"
 PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git${SRCREV}"