summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangmy <wangmy@fujitsu.com>2021-11-15 23:02:35 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-16 22:20:33 +0000
commit3131a1b38fc69c414e8a41d5060bd786e8d9ca13 (patch)
tree3aa4d012d3f861597e233d92da7ec692bd204421
parent698d994e51aeb8476f1e50af227a2ebb83bd405f (diff)
downloadpoky-3131a1b38fc69c414e8a41d5060bd786e8d9ca13.tar.gz
libevdev: upgrade 1.11.0 -> 1.12.0
determinism.patch removed since it is included in 1.12.0 (From OE-Core rev: d2b063f64ef00ef1fe947d3a92e79876e5df541e) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libevdev/libevdev/determinism.patch44
-rw-r--r--meta/recipes-support/libevdev/libevdev_1.12.0.bb (renamed from meta/recipes-support/libevdev/libevdev_1.11.0.bb)5
2 files changed, 2 insertions, 47 deletions
diff --git a/meta/recipes-support/libevdev/libevdev/determinism.patch b/meta/recipes-support/libevdev/libevdev/determinism.patch
deleted file mode 100644
index 71cbd876eb..0000000000
--- a/meta/recipes-support/libevdev/libevdev/determinism.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 4f196323aba5b0f49979826533c65633b8a9b6a2 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Fri, 7 Feb 2020 12:29:56 +0000
4Subject: [PATCH] libevdev: Fix determinism issue
5
6The order of dict values is not deterministic leading to differing header file generation.
7Sort to remove this inconsistency.
8
9RP 2020/2/7
10
11Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
12Submitted: https://lists.freedesktop.org/archives/input-tools/2021-February/001560.html
13Upstream-Status: Backport [https://gitlab.freedesktop.org/libevdev/libevdev/-/commit/8d70f449892c6f7659e07bb0f06b8347677bb7d8]
14
15---
16 libevdev/make-event-names.py | 6 +++---
17 1 file changed, 3 insertions(+), 3 deletions(-)
18
19diff --git a/libevdev/make-event-names.py b/libevdev/make-event-names.py
20index 88addd7..c973e2a 100755
21--- a/libevdev/make-event-names.py
22+++ b/libevdev/make-event-names.py
23@@ -70,10 +70,10 @@ def print_bits(bits, prefix):
24 if not hasattr(bits, prefix):
25 return
26 print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper()))
27- for val, name in list(getattr(bits, prefix).items()):
28+ for val, name in sorted(list(getattr(bits, prefix).items())):
29 print(" [%s] = \"%s\"," % (name, name))
30 if prefix == "key":
31- for val, name in list(getattr(bits, "btn").items()):
32+ for val, name in sorted(list(getattr(bits, "btn").items())):
33 print(" [%s] = \"%s\"," % (name, name))
34 print("};")
35 print("")
36@@ -118,7 +118,7 @@ def print_lookup(bits, prefix):
37 if not hasattr(bits, prefix):
38 return
39
40- names = list(getattr(bits, prefix).items())
41+ names = sorted(list(getattr(bits, prefix).items()))
42 if prefix == "btn":
43 names = names + btn_additional
44
diff --git a/meta/recipes-support/libevdev/libevdev_1.11.0.bb b/meta/recipes-support/libevdev/libevdev_1.12.0.bb
index 5aca76dbd7..38f2bad606 100644
--- a/meta/recipes-support/libevdev/libevdev_1.11.0.bb
+++ b/meta/recipes-support/libevdev/libevdev_1.12.0.bb
@@ -9,9 +9,8 @@ LICENSE = "MIT"
9LIC_FILES_CHKSUM = "file://COPYING;md5=80c550b3197bcb8da7d7557ebcc3fc46 \ 9LIC_FILES_CHKSUM = "file://COPYING;md5=80c550b3197bcb8da7d7557ebcc3fc46 \
10 " 10 "
11 11
12SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \ 12SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz"
13 file://determinism.patch" 13SRC_URI[sha256sum] = "2f729e3480695791f9482e8388bd723402b89f0eaf118057bbdea3cecee9b237"
14SRC_URI[sha256sum] = "63f4ea1489858a109080e0b40bd43e4e0903a1e12ea888d581db8c495747c2d0"
15 14
16inherit autotools pkgconfig 15inherit autotools pkgconfig
17 16