mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
libinput: Upgrade 1.7.3 -> 1.8.1
New feature release, see https://lists.freedesktop.org/archives/wayland-devel/2017-June/034286.html for the major features. This is the last major release to support autotools. Configure flag "--enable-event-gui" changed name. Configure flags no longer default to "auto": explicitly disable the things that were previously automatically disabled. Package the binaries into libinput-bin while being careful with packaging as the main package gets renamed to libinput10. Add patch to fix a race in install. (From OE-Core rev: df7f5221a56118da7654476f072c37ae1e75dc50) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
07514c9003
commit
5e4bd86130
@@ -0,0 +1,37 @@
|
|||||||
|
From 5e8864c5b7a2e258eea041b0ef66dac7fcab9b7f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||||
|
Date: Wed, 9 Aug 2017 09:47:14 +0300
|
||||||
|
Subject: [PATCH] tools: Fix race in (autotools) install
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
exec/data distinction is done based on install dir so compat scripts
|
||||||
|
must be moved in exec hook.
|
||||||
|
|
||||||
|
This should fix this occasional failure:
|
||||||
|
| install: cannot change permissions of
|
||||||
|
| ‘/usr/bin/libinput-debug-events.compat’: No such file or directory
|
||||||
|
|
||||||
|
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||||
|
Upstream-Status: Submitted
|
||||||
|
---
|
||||||
|
tools/Makefile.am | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
||||||
|
index 2c8660b..7ee8b90 100644
|
||||||
|
--- a/tools/Makefile.am
|
||||||
|
+++ b/tools/Makefile.am
|
||||||
|
@@ -63,7 +63,7 @@ endif
|
||||||
|
|
||||||
|
EXTRA_DIST = make-ptraccel-graphs.sh install-compat-scripts.sh $(bin_SCRIPTS)
|
||||||
|
|
||||||
|
-install-data-hook:
|
||||||
|
+install-exec-hook:
|
||||||
|
(cd $(DESTDIR)$(bindir) && mv libinput-list-devices.compat libinput-list-devices)
|
||||||
|
(cd $(DESTDIR)$(bindir) && mv libinput-debug-events.compat libinput-debug-events)
|
||||||
|
|
||||||
|
--
|
||||||
|
2.13.3
|
||||||
|
|
||||||
+12
-5
@@ -9,17 +9,24 @@ DEPENDS = "libevdev udev mtdev"
|
|||||||
|
|
||||||
SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
|
SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
|
||||||
file://touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch \
|
file://touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch \
|
||||||
|
file://0001-tools-Fix-race-in-autotools-install.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "f2993b477db8d7ec0e785ce04ffecb03"
|
|
||||||
SRC_URI[sha256sum] = "096d612d2711f0caa2de544976ff3729e6233511ab373808644cc2dd5affcb1d"
|
|
||||||
|
|
||||||
inherit autotools pkgconfig
|
SRC_URI[md5sum] = "8247f0bb67052ffb272c50c3cb9c5998"
|
||||||
|
SRC_URI[sha256sum] = "e3590a9037e561a5791c8bd3b34bfd30fad5cacd8cbefc0d75fafe3a41d07147"
|
||||||
|
|
||||||
|
inherit autotools pkgconfig lib_package
|
||||||
|
|
||||||
PACKAGECONFIG ??= ""
|
PACKAGECONFIG ??= ""
|
||||||
PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind"
|
PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind"
|
||||||
PACKAGECONFIG[libwacom] = "--enable-libwacom,--disable-libwacom,libwacom"
|
PACKAGECONFIG[libwacom] = "--enable-libwacom,--disable-libwacom,libwacom"
|
||||||
PACKAGECONFIG[gui] = "--enable-event-gui,--disable-event-gui,cairo gtk+3"
|
PACKAGECONFIG[gui] = "--enable-debug-gui,--disable-debug-gui,cairo gtk+3"
|
||||||
|
|
||||||
UDEVDIR = "`pkg-config --variable=udevdir udev`"
|
UDEVDIR = "`pkg-config --variable=udevdir udev`"
|
||||||
|
|
||||||
EXTRA_OECONF += "--with-udev-dir=${UDEVDIR}"
|
EXTRA_OECONF += "--with-udev-dir=${UDEVDIR} --disable-documentation --disable-tests"
|
||||||
|
|
||||||
|
# package name changed in 1.8.1 upgrade: make sure package upgrades work
|
||||||
|
RPROVIDES_${PN} = "libinput"
|
||||||
|
RREPLACES_${PN} = "libinput"
|
||||||
|
RCONFLICTS_${PN} = "libinput"
|
||||||
Reference in New Issue
Block a user