summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-10-10 15:04:37 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-09 12:33:17 +0000
commit43fac418b888d169d31f9d593695c570579c9cc8 (patch)
treee572cb4d8adfd22ce2155fe8db818ff31e59885e /meta/recipes-graphics
parent0e8f5b62507c679ca1d14d4ca10e4900e77889c4 (diff)
downloadpoky-43fac418b888d169d31f9d593695c570579c9cc8.tar.gz
libinput: update to 1.8.3
Drop upstreamed patch. (From OE-Core rev: ba8606db1b8b6d51cf76d4fb0db39780a4a72056) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/wayland/libinput/0001-tools-Fix-race-in-autotools-install.patch37
-rw-r--r--meta/recipes-graphics/wayland/libinput_1.8.3.bb (renamed from meta/recipes-graphics/wayland/libinput_1.8.1.bb)8
2 files changed, 3 insertions, 42 deletions
diff --git a/meta/recipes-graphics/wayland/libinput/0001-tools-Fix-race-in-autotools-install.patch b/meta/recipes-graphics/wayland/libinput/0001-tools-Fix-race-in-autotools-install.patch
deleted file mode 100644
index 4667538c5e..0000000000
--- a/meta/recipes-graphics/wayland/libinput/0001-tools-Fix-race-in-autotools-install.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 5e8864c5b7a2e258eea041b0ef66dac7fcab9b7f Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 9 Aug 2017 09:47:14 +0300
4Subject: [PATCH] tools: Fix race in (autotools) install
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9exec/data distinction is done based on install dir so compat scripts
10must be moved in exec hook.
11
12This should fix this occasional failure:
13| install: cannot change permissions of
14| ‘/usr/bin/libinput-debug-events.compat’: No such file or directory
15
16Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
17Upstream-Status: Submitted
18---
19 tools/Makefile.am | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/tools/Makefile.am b/tools/Makefile.am
23index 2c8660b..7ee8b90 100644
24--- a/tools/Makefile.am
25+++ b/tools/Makefile.am
26@@ -63,7 +63,7 @@ endif
27
28 EXTRA_DIST = make-ptraccel-graphs.sh install-compat-scripts.sh $(bin_SCRIPTS)
29
30-install-data-hook:
31+install-exec-hook:
32 (cd $(DESTDIR)$(bindir) && mv libinput-list-devices.compat libinput-list-devices)
33 (cd $(DESTDIR)$(bindir) && mv libinput-debug-events.compat libinput-debug-events)
34
35--
362.13.3
37
diff --git a/meta/recipes-graphics/wayland/libinput_1.8.1.bb b/meta/recipes-graphics/wayland/libinput_1.8.3.bb
index a21babeb09..3a02c4b1d2 100644
--- a/meta/recipes-graphics/wayland/libinput_1.8.1.bb
+++ b/meta/recipes-graphics/wayland/libinput_1.8.3.bb
@@ -7,12 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2184aef38ff137ed33ce9a63b9d1eb8f"
7 7
8DEPENDS = "libevdev udev mtdev" 8DEPENDS = "libevdev udev mtdev"
9 9
10SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ 10SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz"
11 file://0001-tools-Fix-race-in-autotools-install.patch \
12"
13 11
14SRC_URI[md5sum] = "8247f0bb67052ffb272c50c3cb9c5998" 12SRC_URI[md5sum] = "5265244853ad7cf41232b0d3ee805ab9"
15SRC_URI[sha256sum] = "e3590a9037e561a5791c8bd3b34bfd30fad5cacd8cbefc0d75fafe3a41d07147" 13SRC_URI[sha256sum] = "2fe2e2f52f0971a9c43541b8f26582ca8df6ed4bb9050e85eb40d4ff6b13142d"
16 14
17inherit autotools pkgconfig lib_package 15inherit autotools pkgconfig lib_package
18 16