From 3131a1b38fc69c414e8a41d5060bd786e8d9ca13 Mon Sep 17 00:00:00 2001 From: wangmy Date: Mon, 15 Nov 2021 23:02:35 +0800 Subject: 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 Signed-off-by: Richard Purdie --- .../libevdev/libevdev/determinism.patch | 44 ---------------------- meta/recipes-support/libevdev/libevdev_1.11.0.bb | 18 --------- meta/recipes-support/libevdev/libevdev_1.12.0.bb | 17 +++++++++ 3 files changed, 17 insertions(+), 62 deletions(-) delete mode 100644 meta/recipes-support/libevdev/libevdev/determinism.patch delete mode 100644 meta/recipes-support/libevdev/libevdev_1.11.0.bb create mode 100644 meta/recipes-support/libevdev/libevdev_1.12.0.bb (limited to 'meta/recipes-support/libevdev') 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 @@ -From 4f196323aba5b0f49979826533c65633b8a9b6a2 Mon Sep 17 00:00:00 2001 -From: Richard Purdie -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 -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 - diff --git a/meta/recipes-support/libevdev/libevdev_1.11.0.bb b/meta/recipes-support/libevdev/libevdev_1.11.0.bb deleted file mode 100644 index 5aca76dbd7..0000000000 --- a/meta/recipes-support/libevdev/libevdev_1.11.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Wrapper library for evdev devices" -DESCRIPTION = "A library for handling evdev kernel devices. It abstracts \ -the evdev ioctls through type-safe interfaces and provides functions \ -to change the appearance of the device." -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libevdev/" -SECTION = "libs" - -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" - -inherit autotools pkgconfig - -UPSTREAM_CHECK_REGEX = "libevdev-(?P(\d+\.)+(?!90\d+)\d+)" diff --git a/meta/recipes-support/libevdev/libevdev_1.12.0.bb b/meta/recipes-support/libevdev/libevdev_1.12.0.bb new file mode 100644 index 0000000000..38f2bad606 --- /dev/null +++ b/meta/recipes-support/libevdev/libevdev_1.12.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "Wrapper library for evdev devices" +DESCRIPTION = "A library for handling evdev kernel devices. It abstracts \ +the evdev ioctls through type-safe interfaces and provides functions \ +to change the appearance of the device." +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libevdev/" +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=80c550b3197bcb8da7d7557ebcc3fc46 \ + " + +SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" +SRC_URI[sha256sum] = "2f729e3480695791f9482e8388bd723402b89f0eaf118057bbdea3cecee9b237" + +inherit autotools pkgconfig + +UPSTREAM_CHECK_REGEX = "libevdev-(?P(\d+\.)+(?!90\d+)\d+)" -- cgit v1.2.3-54-g00ecf