summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-17 18:22:26 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-17 18:22:26 +0000
commitb010c24c22bb53b07a82f76df6ebf01af7ac5cb3 (patch)
tree3b7585d47dfde015066fd46c986c617becfd5b7f /meta
parent05c1fabda8aee2a0d8a82e245f443967795a5fec (diff)
downloadopenembedded-core-b010c24c22bb53b07a82f76df6ebf01af7ac5cb3.tar.gz
openembedded-core-b010c24c22bb53b07a82f76df6ebf01af7ac5cb3.tar.bz2
openembedded-core-b010c24c22bb53b07a82f76df6ebf01af7ac5cb3.zip
poky-fixed-revisions.inc: Update xserver-xf86-dri and inputproto revisions
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc10
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb2
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 772525ce94..7a63133596 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -153,15 +153,15 @@ SRCREV_pn-uboot-openmoko_upstream ?= "1ce55151c85d068f70317a8d65c61058b891afb4"
SRCREV_pn-usbpath-native = "3172"
SRCREV_pn-usbpath = "3172"
SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
-SRCREV_pn-xserver-xf86-dri-lite ?= "d936a4235c9625bd41569cef3452dd086284e0d7"
-SRCREV_pn-xserver-xf86-dri2-lite ?= "d936a4235c9625bd41569cef3452dd086284e0d7"
+SRCREV_pn-xserver-xf86-dri-lite ?= "251d0d8090322b2c9dc0c8b7bef001f338d19433"
+SRCREV_pn-xserver-xf86-dri2-lite ?= "251d0d8090322b2c9dc0c8b7bef001f338d19433"
SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
SRCREV_pn-metacity-clutter ?= "22eb4d08e4fd8716658a1dca29ab128e2986ea30"
SRCREV_pn-dri2proto ?= "8cab3f0e6f551220bd11074779f4ccec1e948e00"
-SRCREV_pn-inputproto ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07"
-SRCREV_pn-inputproto-native ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07"
-SRCREV_pn-inputproto-sdk ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07"
+SRCREV_pn-inputproto ?= "7203036522ba9d4b224d282d6afc2d0b947711ee"
+SRCREV_pn-inputproto-native ?= "7203036522ba9d4b224d282d6afc2d0b947711ee"
+SRCREV_pn-inputproto-sdk ?= "7203036522ba9d4b224d282d6afc2d0b947711ee"
SRCREV_pn-libxi ?= "e179b124aac13387c6f730197b8852c1f69eb9e3"
SRCREV_pn-libx11 ?= "d23aad31338e7d869d878d5aa1b6b91d20287005"
SRCREV_pn-libx11-diet ?= "d23aad31338e7d869d878d5aa1b6b91d20287005"
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
index 1d5c218684..dabd8711b7 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -8,7 +8,7 @@ PROTO_DEPS += "xf86driproto"
DEFAULT_PREFERENCE = "-1"
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git \
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=server-1.6-branch \
file://xorg.conf \
file://libdri-xinerama-symbol.patch;patch=1 \
file://xserver-boottime.patch;patch=1"