mirror of
https://git.yoctoproject.org/poky
synced 2026-04-23 00:32:12 +02:00
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>
This commit is contained in:
@@ -1,44 +0,0 @@
|
||||
From 4f196323aba5b0f49979826533c65633b8a9b6a2 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Date: Fri, 7 Feb 2020 12:29:56 +0000
|
||||
Subject: [PATCH] libevdev: Fix determinism issue
|
||||
|
||||
The order of dict values is not deterministic leading to differing header file generation.
|
||||
Sort to remove this inconsistency.
|
||||
|
||||
RP 2020/2/7
|
||||
|
||||
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Submitted: https://lists.freedesktop.org/archives/input-tools/2021-February/001560.html
|
||||
Upstream-Status: Backport [https://gitlab.freedesktop.org/libevdev/libevdev/-/commit/8d70f449892c6f7659e07bb0f06b8347677bb7d8]
|
||||
|
||||
---
|
||||
libevdev/make-event-names.py | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/libevdev/make-event-names.py b/libevdev/make-event-names.py
|
||||
index 88addd7..c973e2a 100755
|
||||
--- a/libevdev/make-event-names.py
|
||||
+++ b/libevdev/make-event-names.py
|
||||
@@ -70,10 +70,10 @@ def print_bits(bits, prefix):
|
||||
if not hasattr(bits, prefix):
|
||||
return
|
||||
print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper()))
|
||||
- for val, name in list(getattr(bits, prefix).items()):
|
||||
+ for val, name in sorted(list(getattr(bits, prefix).items())):
|
||||
print(" [%s] = \"%s\"," % (name, name))
|
||||
if prefix == "key":
|
||||
- for val, name in list(getattr(bits, "btn").items()):
|
||||
+ for val, name in sorted(list(getattr(bits, "btn").items())):
|
||||
print(" [%s] = \"%s\"," % (name, name))
|
||||
print("};")
|
||||
print("")
|
||||
@@ -118,7 +118,7 @@ def print_lookup(bits, prefix):
|
||||
if not hasattr(bits, prefix):
|
||||
return
|
||||
|
||||
- names = list(getattr(bits, prefix).items())
|
||||
+ names = sorted(list(getattr(bits, prefix).items()))
|
||||
if prefix == "btn":
|
||||
names = names + btn_additional
|
||||
|
||||
@@ -9,9 +9,8 @@ LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=80c550b3197bcb8da7d7557ebcc3fc46 \
|
||||
"
|
||||
|
||||
SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \
|
||||
file://determinism.patch"
|
||||
SRC_URI[sha256sum] = "63f4ea1489858a109080e0b40bd43e4e0903a1e12ea888d581db8c495747c2d0"
|
||||
SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz"
|
||||
SRC_URI[sha256sum] = "2f729e3480695791f9482e8388bd723402b89f0eaf118057bbdea3cecee9b237"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
Reference in New Issue
Block a user