summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Ham <bob.ham@collabora.com>2016-01-13 18:21:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-19 17:37:33 +0000
commitb8e11e2d6ec8e78051266dab4d58ee51c46b96fd (patch)
treea687b4f70d8187939c5055cca6039f5ba1ba2f01
parenta9f2e87bd52fb4c884bd8603531ff3ff6340f03b (diff)
downloadopenembedded-core-contrib-b8e11e2d6ec8e78051266dab4d58ee51c46b96fd.tar.gz
openembedded-core-contrib-b8e11e2d6ec8e78051266dab4d58ee51c46b96fd.tar.bz2
openembedded-core-contrib-b8e11e2d6ec8e78051266dab4d58ee51c46b96fd.zip
libinput: Upgrade 0.21.0 -> 1.1.4
yocto/jethro provides the version 0.21 from August 2015 while the current version is 1.1.4. The patch libinput-configure.ac-add-arg-with-libunwind.patch has been merged to upstream and was removed from the recipe. The patch touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch has not been merged to upstream and is still included in the recipe. Co-Authored-By: Joshua Lock <joshua.lock@collabora.co.uk> (From OE-Core rev: 7f6a5d2721631de5d6d2ce672c5a2879897354c4) Signed-off-by: Bob Ham <bob.ham@collabora.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch50
-rw-r--r--meta/recipes-graphics/wayland/libinput_1.1.4.bb (renamed from meta/recipes-graphics/wayland/libinput_0.21.0.bb)5
2 files changed, 2 insertions, 53 deletions
diff --git a/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch b/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch
deleted file mode 100644
index df5ebcca05..0000000000
--- a/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From cc6fce587f2628c8b342764e06fb0fc27c1e8274 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 3 Aug 2015 20:33:44 -0700
-Subject: [PATCH] configure.ac: add arg --with-libunwind
-
-Add arg --with-libunwind for configure so it's optional to check
-libunwind, which is helpfull to make deterministic builds.
-
-Upstream-Status: Submitted [wayland-devel]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- configure.ac | 19 ++++++++++++++-----
- 1 file changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 314b0d4..242d251 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -60,13 +60,22 @@ PKG_PROG_PKG_CONFIG()
- PKG_CHECK_MODULES(MTDEV, [mtdev >= 1.1.0])
- PKG_CHECK_MODULES(LIBUDEV, [libudev])
- PKG_CHECK_MODULES(LIBEVDEV, [libevdev >= 0.4])
--PKG_CHECK_MODULES(LIBUNWIND,
-+
-+AC_ARG_WITH(libunwind,
-+ AS_HELP_STRING([--without-libunwind],[Do not use libunwind]))
-+
-+AS_IF([test "x$with_libunwind" != "xno"],
-+ [PKG_CHECK_MODULES(LIBUNWIND,
- [libunwind],
- [HAVE_LIBUNWIND=yes],
-- [HAVE_LIBUNWIND=no])
--if test "x$HAVE_LIBUNWIND" = "xyes"; then
-- AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support])
--fi
-+ [HAVE_LIBUNWIND=no])],
-+ [HAVE_LIBUNWIND=no])
-+
-+AS_IF([test "x$HAVE_LIBUNWIND" = "xyes"],
-+ [AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support])],
-+ [AS_IF([test "x$with_libunwind" = "xyes"],
-+ [AC_MSG_ERROR([libunwind requested but not found])])])
-+
- AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$HAVE_LIBUNWIND" = xyes])
- AC_PATH_PROG(ADDR2LINE, [addr2line])
- if test "x$ADDR2LINE" != "x"; then
---
-2.3.5
-
diff --git a/meta/recipes-graphics/wayland/libinput_0.21.0.bb b/meta/recipes-graphics/wayland/libinput_1.1.4.bb
index f6c5975bcb..4167679c2c 100644
--- a/meta/recipes-graphics/wayland/libinput_0.21.0.bb
+++ b/meta/recipes-graphics/wayland/libinput_1.1.4.bb
@@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2184aef38ff137ed33ce9a63b9d1eb8f"
DEPENDS = "libevdev udev mtdev"
SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
- file://libinput-configure.ac-add-arg-with-libunwind.patch \
file://touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch \
"
-SRC_URI[md5sum] = "f91d8f4ced986f1ae16d52ea02bc7837"
-SRC_URI[sha256sum] = "7cce7a9e510dfe5c4a19ad00e9350808d4f59f8611fd2b5e87213c507283f550"
+SRC_URI[md5sum] = "0945318141c1a9f52857bbf65d175f32"
+SRC_URI[sha256sum] = "302cb76209b9c57a5a318e178f9bc446eede8ea79386103b5291cbfaa5fab5b6"
inherit autotools pkgconfig