diff options
Diffstat (limited to 'meta/conf/distro')
| -rw-r--r-- | meta/conf/distro/include/poky-fixed-revisions.inc | 6 | ||||
| -rw-r--r-- | meta/conf/distro/include/preferred-xorg-versions.inc | 23 | ||||
| -rw-r--r-- | meta/conf/distro/poky.conf | 1 |
3 files changed, 18 insertions, 12 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index d7e0a5a45..eb9f60913 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc @@ -154,7 +154,11 @@ SRCREV_pn-usbpath = "3172" SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f" SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d" SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" -SRCREV_pn-metacity-clutter ?= "389ce295417bdd99bf583026f7f1dedae29650da" +SRCREV_pn-metacity-clutter ?= "b52f1df75af8216b13539431283fd1cfaa33cf51" +SRCREV_pn-dri2proto ?= "abb1edc487543c26856afdbe6a7e2c088a1e82ee" +SRCREV_pn-inputproto ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07" +SRCREV_pn-inputproto-native ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07" +SRCREV_pn-inputproto-sdk ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07" # # Preferred Versions: diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 29fa81568..887cc31bb 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.4.4" -PREFERRED_VERSION_inputproto-native ?= "1.4.4" -PREFERRED_VERSION_inputproto-sdk ?= "1.4.3" +PREFERRED_VERSION_inputproto ?= "1.9.99.5+git${SRCREV}" +PREFERRED_VERSION_inputproto-native ?= "1.9.99.5+git${SRCREV}" +PREFERRED_VERSION_inputproto-sdk ?= "1.9.99.5+git${SRCREV}" PREFERRED_VERSION_kbproto ?= "1.0.3" PREFERRED_VERSION_kbproto-native ?= "1.0.3" PREFERRED_VERSION_kbproto-sdk ?= "1.0.3" @@ -88,8 +88,8 @@ PREFERRED_VERSION_printproto ?= "1.0.4" PREFERRED_VERSION_randrproto ?= "1.2.1" PREFERRED_VERSION_randrproto-sdk ?= "1.2.1" PREFERRED_VERSION_recordproto ?= "1.13.2" -PREFERRED_VERSION_renderproto ?= "0.9.2" -PREFERRED_VERSION_renderproto-sdk ?= "0.9.2" +PREFERRED_VERSION_renderproto ?= "0.9.3" +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" @@ -104,14 +104,15 @@ PREFERRED_VERSION_xcmiscproto-native ?= "1.1.2" PREFERRED_VERSION_xcmiscproto-sdk ?= "1.1.2" PREFERRED_VERSION_xdpyinfo ?= "1.0.2" PREFERRED_VERSION_xev ?= "1.0.3" -PREFERRED_VERSION_xextproto ?= "7.0.2" -PREFERRED_VERSION_xextproto-native ?= "7.0.2" -PREFERRED_VERSION_xextproto-sdk ?= "7.0.2" +PREFERRED_VERSION_xextproto ?= "7.0.3" +PREFERRED_VERSION_xextproto-native ?= "7.0.3" +PREFERRED_VERSION_xextproto-sdk ?= "7.0.3" PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2" PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2" PREFERRED_VERSION_xf86bigfontproto-sdk ?= "1.1.2" PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" PREFERRED_VERSION_xf86driproto ?= "2.0.3" +PREFERRED_VERSION_dri2proto ?= "1.99.1+git${SRCREV}" PREFERRED_VERSION_xf86miscproto ?= "0.9.2" PREFERRED_VERSION_xf86rushproto ?= "1.1.2" PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2" @@ -121,9 +122,9 @@ PREFERRED_VERSION_xineramaproto ?= "1.1.2" PREFERRED_VERSION_xmodmap ?= "1.0.3" PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" PREFERRED_VERSION_xprop ?= "1.0.4" -PREFERRED_VERSION_xproto ?= "7.0.12" -PREFERRED_VERSION_xproto-native ?= "7.0.12" -PREFERRED_VERSION_xproto-sdk ?= "7.0.12" +PREFERRED_VERSION_xproto ?= "7.0.13" +PREFERRED_VERSION_xproto-native ?= "7.0.13" +PREFERRED_VERSION_xproto-sdk ?= "7.0.13" PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.2" PREFERRED_VERSION_xrandr ?= "1.2.3" PREFERRED_VERSION_xrdb ?= "1.0.5" diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index efa6845df..09d86f1d2 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -79,6 +79,7 @@ PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib" PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet" +PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" |