From eacf14f20429604fa3fe8cc81d89f61a5ee5a482 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 14 Oct 2008 09:30:18 +0000 Subject: Various X package updates to deal with XInput.h being removed in the latest inputproto package. Updates libx11, libxext, libxext-sdk, libxi, xcb-proto and libxcb Note: There is a still a xcb build issue that needs investigating with these updated packages. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5489 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/include/poky-fixed-revisions.inc | 4 ++++ meta/conf/distro/include/preferred-xorg-versions.inc | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'meta/conf/distro/include') diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index eb9f60913..d1555b05f 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc @@ -159,6 +159,10 @@ SRCREV_pn-dri2proto ?= "abb1edc487543c26856afdbe6a7e2c088a1e82ee" SRCREV_pn-inputproto ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07" SRCREV_pn-inputproto-native ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07" SRCREV_pn-inputproto-sdk ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07" +SRCREV_pn-libxi ?= "e179b124aac13387c6f730197b8852c1f69eb9e3" +SRCREV_pn-libx11 ?= "d23aad31338e7d869d878d5aa1b6b91d20287005" +SRCREV_pn-libxext ?= "49563f5d76637e2ca28fe0b91ce3114271c0955d" +SRCREV_pn-libxcb ?= "625ed596cae6dd8175aeb6cb6f26784928042f22" # # Preferred Versions: diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 887cc31bb..aa1665986 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -34,7 +34,7 @@ PREFERRED_VERSION_liblbxutil ?= "1.0.1" PREFERRED_VERSION_liboldx ?= "1.0.1" PREFERRED_VERSION_libsm ?= "1.0.3" PREFERRED_VERSION_libwindowswm ?= "1.0.0" -PREFERRED_VERSION_libx11 ?= "1.1.5" +PREFERRED_VERSION_libx11 ?= "1.1.99.1+git${SRCREV}" PREFERRED_VERSION_libx11-diet ?= "1.1.5" PREFERRED_VERSION_libx11-native ?= "1.1.5" PREFERRED_VERSION_libx11-sdk ?= "1.1.5" @@ -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.4" -PREFERRED_VERSION_libxext-sdk ?= "1.0.4" +PREFERRED_VERSION_libxext ?= "1.0.99.1+git${SRCREV}" +PREFERRED_VERSION_libxext-sdk ?= "1.0.99.1+git${SRCREV}"" PREFERRED_VERSION_libxfixes ?= "4.0.3" PREFERRED_VERSION_libxfont ?= "1.3.3" PREFERRED_VERSION_libxfont-native ?= "1.3.2" PREFERRED_VERSION_libxfontcache ?= "1.0.4" PREFERRED_VERSION_libxft ?= "2.1.12" -PREFERRED_VERSION_libxi ?= "1.1.3" +PREFERRED_VERSION_libxi ?= "1.1.99.1+git${SRCREV}" PREFERRED_VERSION_libxinerama ?= "1.0.3" PREFERRED_VERSION_libxkbfile ?= "1.0.5" PREFERRED_VERSION_libxkbui ?= "1.0.2" @@ -138,8 +138,8 @@ PREFERRED_VERSION_xvinfo ?= "1.0.2" PREFERRED_VERSION_xwininfo ?= "1.0.3" PREFERRED_VERSION_mesa-dri ?= "7.2" PREFERRED_VERSION_libdrm ?= "2.3.1" -PREFERRED_VERSION_xcb-proto ?= "1.0" -PREFERRED_VERSION_libxcb ?= "1.0" +PREFERRED_VERSION_xcb-proto ?= "1.2" +PREFERRED_VERSION_libxcb ?= "1.1.90.1+git${SRCREV}" PREFERRED_VERSION_libpciaccess ?= "0.10.3" PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0" -- cgit v1.2.3