diff options
author | Yu Ke <ke.yu@intel.com> | 2011-01-14 14:47:07 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-01-18 07:38:02 -0800 |
commit | 89ca5472843daa3f8aeacd285ff64bc4fc403d67 (patch) | |
tree | 976c282de594b50d6a5a59e55b90b6724110296d /meta | |
parent | b75c4db7bb8cd09cf860cf733517bf0661204ec9 (diff) | |
download | poky-89ca5472843daa3f8aeacd285ff64bc4fc403d67.tar.gz |
xf86-input-synaptics: upgrade to 1.3.0
- update license checksum due to commit "COPYING: add three missing authors listed in synaptics.c". the license type is unchanged.
- Pass correct "sdkdir" value for cross compiling
Signed-off-by: Yu Ke <ke.yu@intel.com>
Diffstat (limited to 'meta')
3 files changed, 17 insertions, 11 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 32d5d807e5..2a982ba506 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc | |||
@@ -145,7 +145,7 @@ PREFERRED_VERSION_libpciaccess ?= "0.12.0" | |||
145 | PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" | 145 | PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" |
146 | PREFERRED_VERSION_xf86-input-mouse ?= "1.6.0" | 146 | PREFERRED_VERSION_xf86-input-mouse ?= "1.6.0" |
147 | PREFERRED_VERSION_xf86-input-keyboard ?= "1.5.0" | 147 | PREFERRED_VERSION_xf86-input-keyboard ?= "1.5.0" |
148 | PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1" | 148 | PREFERRED_VERSION_xf86-input-synaptics ?= "1.3.0" |
149 | PREFERRED_VERSION_xf86-video-intel ?= "2.13.0" | 149 | PREFERRED_VERSION_xf86-video-intel ?= "2.13.0" |
150 | 150 | ||
151 | 151 | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb deleted file mode 100644 index 84adb85ef9..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | require xf86-input-common.inc | ||
2 | |||
3 | DESCRIPTION = "X.Org X server -- keyboard input driver" | ||
4 | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=08955125302e95a16628a4bec64ade5f" | ||
6 | |||
7 | DEPENDS += "libxi" | ||
8 | |||
9 | SRC_URI[md5sum] = "29a6f9da5123149e4abc8ff83880ed5c" | ||
10 | SRC_URI[sha256sum] = "a63b48c5c8eb09416b941dea591a948e111d1b2e14d4620f25377cf47cf877e6" | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.3.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.3.0.bb new file mode 100644 index 0000000000..8c2999fd51 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.3.0.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | require xf86-input-common.inc | ||
2 | |||
3 | DESCRIPTION = "X.Org X server -- keyboard input driver" | ||
4 | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=e395e21f3c21d4fc3a243783e85e9ab5" | ||
6 | |||
7 | DEPENDS += "libxi" | ||
8 | |||
9 | # | ||
10 | # the xorg-synaptics.pc has hardcoded sdkdir=/usr/include/xorg, which is not correct | ||
11 | # for cross compiling, so pass the correct sdkdir as include path | ||
12 | # | ||
13 | EXTRA_OEMAKE += " sdkdir=${STAGING_INCDIR}/xorg " | ||
14 | |||
15 | SRC_URI[md5sum] = "b4e58eba1bdca13f0929a4b03b262135" | ||
16 | SRC_URI[sha256sum] = "30a33250c4f3d2daa8a61cab847dc7befd3248db0fca139d17fd7b890b5a8fd7" | ||