From 0e9318cac2f587921bc8ca2b9c4300d83aafa14b Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Sat, 9 Apr 2011 21:26:45 +0800 Subject: xf86-input-mouse: upgrade from 1.6 to 1.7 Signed-off-by: Yu Ke --- meta/conf/distro/include/preferred-xorg-versions.inc | 2 +- .../xorg-driver/xf86-input-mouse/unbreak.patch | 2 ++ .../recipes-graphics/xorg-driver/xf86-input-mouse_1.6.0.bb | 14 -------------- .../recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 15 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.6.0.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb 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" PREFERRED_VERSION_libxcb-nativesdk ?= "1.7" PREFERRED_VERSION_libpciaccess ?= "0.12.1" PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" -PREFERRED_VERSION_xf86-input-mouse ?= "1.6.0" +PREFERRED_VERSION_xf86-input-mouse ?= "1.7.0" PREFERRED_VERSION_xf86-input-keyboard ?= "1.6.0" PREFERRED_VERSION_xf86-input-synaptics ?= "1.4.0" PREFERRED_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 RP - 4/11/07 +Upstream-Status: Pending + Index: git/src/lnx_mouse.c =================================================================== --- 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.6.0.bb deleted file mode 100644 index 61d73e191b..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.6.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -require xf86-input-common.inc - -SUMMARY = "X.Org X server -- mouse input driver" - -DESCRIPTION = "mouse is an Xorg input driver for mice. The driver \ -supports most available mouse types and interfaces. The mouse driver \ -functions as a pointer input device, and may be used as the X server's \ -core pointer. Multiple mice are supported by multiple instances of this \ -driver." - -LIC_FILES_CHKSUM = "file://COPYING;md5=237eb1d1a602d29ef2af62d8fba60f19" - -SRC_URI[md5sum] = "cef849b1a2743d2e84de98422f372974" -SRC_URI[sha256sum] = "c7ae245e5168276346145f196d1d1faed618f41d5174a2031c71fab6e1a2fbdb" diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb new file mode 100644 index 0000000000..fbc2c6691b --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb @@ -0,0 +1,14 @@ +require xf86-input-common.inc + +SUMMARY = "X.Org X server -- mouse input driver" + +DESCRIPTION = "mouse is an Xorg input driver for mice. The driver \ +supports most available mouse types and interfaces. The mouse driver \ +functions as a pointer input device, and may be used as the X server's \ +core pointer. Multiple mice are supported by multiple instances of this \ +driver." + +LIC_FILES_CHKSUM = "file://COPYING;md5=237eb1d1a602d29ef2af62d8fba60f19" + +SRC_URI[md5sum] = "7f31472689c15b6de62eff04d0fb57d7" +SRC_URI[sha256sum] = "4e989542b5e9e0c5f9087288b18e70de1064dd27c83a4bc6dce58f3ea9d74994" -- cgit 1.2.3-korg