diff options
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 32d5d807e..2a982ba50 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" PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" PREFERRED_VERSION_xf86-input-mouse ?= "1.6.0" PREFERRED_VERSION_xf86-input-keyboard ?= "1.5.0" -PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1" +PREFERRED_VERSION_xf86-input-synaptics ?= "1.3.0" PREFERRED_VERSION_xf86-video-intel ?= "2.13.0" 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 84adb85ef..000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xf86-input-common.inc - -DESCRIPTION = "X.Org X server -- keyboard input driver" - -LIC_FILES_CHKSUM = "file://COPYING;md5=08955125302e95a16628a4bec64ade5f" - -DEPENDS += "libxi" - -SRC_URI[md5sum] = "29a6f9da5123149e4abc8ff83880ed5c" -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 000000000..8c2999fd5 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.3.0.bb @@ -0,0 +1,16 @@ +require xf86-input-common.inc + +DESCRIPTION = "X.Org X server -- keyboard input driver" + +LIC_FILES_CHKSUM = "file://COPYING;md5=e395e21f3c21d4fc3a243783e85e9ab5" + +DEPENDS += "libxi" + +# +# the xorg-synaptics.pc has hardcoded sdkdir=/usr/include/xorg, which is not correct +# for cross compiling, so pass the correct sdkdir as include path +# +EXTRA_OEMAKE += " sdkdir=${STAGING_INCDIR}/xorg " + +SRC_URI[md5sum] = "b4e58eba1bdca13f0929a4b03b262135" +SRC_URI[sha256sum] = "30a33250c4f3d2daa8a61cab847dc7befd3248db0fca139d17fd7b890b5a8fd7" |