diff options
Diffstat (limited to 'meta/recipes-graphics/wayland')
-rw-r--r-- | meta/recipes-graphics/wayland/libinput/0001-tools-Fix-race-in-autotools-install.patch | 37 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/libinput_1.8.1.bb (renamed from meta/recipes-graphics/wayland/libinput_1.7.3.bb) | 17 |
2 files changed, 49 insertions, 5 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 new file mode 100644 index 0000000000..4667538c5e --- /dev/null +++ b/meta/recipes-graphics/wayland/libinput/0001-tools-Fix-race-in-autotools-install.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 5e8864c5b7a2e258eea041b0ef66dac7fcab9b7f Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Wed, 9 Aug 2017 09:47:14 +0300 | ||
4 | Subject: [PATCH] tools: Fix race in (autotools) install | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | exec/data distinction is done based on install dir so compat scripts | ||
10 | must be moved in exec hook. | ||
11 | |||
12 | This should fix this occasional failure: | ||
13 | | install: cannot change permissions of | ||
14 | | ‘/usr/bin/libinput-debug-events.compat’: No such file or directory | ||
15 | |||
16 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
17 | Upstream-Status: Submitted | ||
18 | --- | ||
19 | tools/Makefile.am | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/tools/Makefile.am b/tools/Makefile.am | ||
23 | index 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 | -- | ||
36 | 2.13.3 | ||
37 | |||
diff --git a/meta/recipes-graphics/wayland/libinput_1.7.3.bb b/meta/recipes-graphics/wayland/libinput_1.8.1.bb index 6194fbad8f..f75298b899 100644 --- a/meta/recipes-graphics/wayland/libinput_1.7.3.bb +++ b/meta/recipes-graphics/wayland/libinput_1.8.1.bb | |||
@@ -9,17 +9,24 @@ DEPENDS = "libevdev udev mtdev" | |||
9 | 9 | ||
10 | SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ | 10 | SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ |
11 | file://touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch \ | 11 | file://touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch \ |
12 | file://0001-tools-Fix-race-in-autotools-install.patch \ | ||
12 | " | 13 | " |
13 | SRC_URI[md5sum] = "f2993b477db8d7ec0e785ce04ffecb03" | ||
14 | SRC_URI[sha256sum] = "096d612d2711f0caa2de544976ff3729e6233511ab373808644cc2dd5affcb1d" | ||
15 | 14 | ||
16 | inherit autotools pkgconfig | 15 | SRC_URI[md5sum] = "8247f0bb67052ffb272c50c3cb9c5998" |
16 | SRC_URI[sha256sum] = "e3590a9037e561a5791c8bd3b34bfd30fad5cacd8cbefc0d75fafe3a41d07147" | ||
17 | |||
18 | inherit autotools pkgconfig lib_package | ||
17 | 19 | ||
18 | PACKAGECONFIG ??= "" | 20 | PACKAGECONFIG ??= "" |
19 | PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" | 21 | PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" |
20 | PACKAGECONFIG[libwacom] = "--enable-libwacom,--disable-libwacom,libwacom" | 22 | PACKAGECONFIG[libwacom] = "--enable-libwacom,--disable-libwacom,libwacom" |
21 | PACKAGECONFIG[gui] = "--enable-event-gui,--disable-event-gui,cairo gtk+3" | 23 | PACKAGECONFIG[gui] = "--enable-debug-gui,--disable-debug-gui,cairo gtk+3" |
22 | 24 | ||
23 | UDEVDIR = "`pkg-config --variable=udevdir udev`" | 25 | UDEVDIR = "`pkg-config --variable=udevdir udev`" |
24 | 26 | ||
25 | EXTRA_OECONF += "--with-udev-dir=${UDEVDIR}" | 27 | EXTRA_OECONF += "--with-udev-dir=${UDEVDIR} --disable-documentation --disable-tests" |
28 | |||
29 | # package name changed in 1.8.1 upgrade: make sure package upgrades work | ||
30 | RPROVIDES_${PN} = "libinput" | ||
31 | RREPLACES_${PN} = "libinput" | ||
32 | RCONFLICTS_${PN} = "libinput" | ||