summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-04-09 21:26:45 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-18 05:49:41 +0100
commit009f88f05b8f561ed6fae583e40b367d02fc30c0 (patch)
tree2ba41eae79180cc24613d55fc3059a283147a5af
parentc00288e0d48d927a97216bfa760fe34c871b7981 (diff)
downloadpoky-009f88f05b8f561ed6fae583e40b367d02fc30c0.tar.gz
xf86-input-mouse: upgrade from 1.6 to 1.7
(From OE-Core rev: 0e9318cac2f587921bc8ca2b9c4300d83aafa14b) Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb (renamed from meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.6.0.bb)4
3 files changed, 5 insertions, 3 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 109491f498..23eaace4b0 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -142,7 +142,7 @@ PREFERRED_VERSION_libxcb ?= "1.7"
142PREFERRED_VERSION_libxcb-nativesdk ?= "1.7" 142PREFERRED_VERSION_libxcb-nativesdk ?= "1.7"
143PREFERRED_VERSION_libpciaccess ?= "0.12.1" 143PREFERRED_VERSION_libpciaccess ?= "0.12.1"
144PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" 144PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
145PREFERRED_VERSION_xf86-input-mouse ?= "1.6.0" 145PREFERRED_VERSION_xf86-input-mouse ?= "1.7.0"
146PREFERRED_VERSION_xf86-input-keyboard ?= "1.6.0" 146PREFERRED_VERSION_xf86-input-keyboard ?= "1.6.0"
147PREFERRED_VERSION_xf86-input-synaptics ?= "1.4.0" 147PREFERRED_VERSION_xf86-input-synaptics ?= "1.4.0"
148PREFERRED_VERSION_xf86-video-intel ?= "2.14.0" 148PREFERRED_VERSION_xf86-video-intel ?= "2.14.0"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch b/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch
index 665b320df1..6930864ede 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch
@@ -2,6 +2,8 @@ Unbreak the linux mouse driver by using config.h
2 2
3RP - 4/11/07 3RP - 4/11/07
4 4
5Upstream-Status: Pending
6
5Index: git/src/lnx_mouse.c 7Index: git/src/lnx_mouse.c
6=================================================================== 8===================================================================
7--- git.orig/src/lnx_mouse.c 2008-11-04 23:46:05.000000000 +0000 9--- git.orig/src/lnx_mouse.c 2008-11-04 23:46:05.000000000 +0000
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.6.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb
index 61d73e191b..fbc2c6691b 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.6.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb
@@ -10,5 +10,5 @@ driver."
10 10
11LIC_FILES_CHKSUM = "file://COPYING;md5=237eb1d1a602d29ef2af62d8fba60f19" 11LIC_FILES_CHKSUM = "file://COPYING;md5=237eb1d1a602d29ef2af62d8fba60f19"
12 12
13SRC_URI[md5sum] = "cef849b1a2743d2e84de98422f372974" 13SRC_URI[md5sum] = "7f31472689c15b6de62eff04d0fb57d7"
14SRC_URI[sha256sum] = "c7ae245e5168276346145f196d1d1faed618f41d5174a2031c71fab6e1a2fbdb" 14SRC_URI[sha256sum] = "4e989542b5e9e0c5f9087288b18e70de1064dd27c83a4bc6dce58f3ea9d74994"