diff options
author | Ross Burton <ross.burton@arm.com> | 2023-05-02 14:14:56 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-03 11:50:09 +0100 |
commit | e222579ba7ce49bc3b50a09a164c5635ce14c4b2 (patch) | |
tree | 6ee55bdbe149e485507c4a2ff52ec22f2a04298a | |
parent | 3ce82d9737e80c032cfc8dc21f8f7357d012126e (diff) | |
download | poky-e222579ba7ce49bc3b50a09a164c5635ce14c4b2.tar.gz |
libinput: upgrade to 1.23.0
Remove determinism.patch, this is obsolete now that we set
GIT_CEILING_DIRECTORIES to stop git climbing the tree outside of the
work directory.
(From OE-Core rev: e652d9bee3940e8ee7c3346c801deef4801dbaeb)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/wayland/libinput/determinism.patch | 21 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/libinput_1.23.0.bb (renamed from meta/recipes-graphics/wayland/libinput_1.22.1.bb) | 5 |
2 files changed, 2 insertions, 24 deletions
diff --git a/meta/recipes-graphics/wayland/libinput/determinism.patch b/meta/recipes-graphics/wayland/libinput/determinism.patch deleted file mode 100644 index cb554030cf..0000000000 --- a/meta/recipes-graphics/wayland/libinput/determinism.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | This finds our outer git tree and that version information breaks | ||
2 | determinism of this recipe. Disable it. | ||
3 | |||
4 | RP 2020/2/6 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
8 | |||
9 | Index: libinput-1.14.3/meson.build | ||
10 | =================================================================== | ||
11 | --- libinput-1.14.3.orig/meson.build | ||
12 | +++ libinput-1.14.3/meson.build | ||
13 | @@ -387,7 +387,7 @@ pkgconfig.generate( | ||
14 | libraries : lib_libinput | ||
15 | ) | ||
16 | |||
17 | -git_version_h = vcs_tag(command : ['git', 'describe'], | ||
18 | +git_version_h = vcs_tag(command : ['false'], | ||
19 | fallback : 'unknown', | ||
20 | input : 'src/libinput-git-version.h.in', | ||
21 | output :'libinput-git-version.h') | ||
diff --git a/meta/recipes-graphics/wayland/libinput_1.22.1.bb b/meta/recipes-graphics/wayland/libinput_1.23.0.bb index f86885d3e3..b83d5fdb43 100644 --- a/meta/recipes-graphics/wayland/libinput_1.22.1.bb +++ b/meta/recipes-graphics/wayland/libinput_1.23.0.bb | |||
@@ -12,11 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bab4ac7dc1c10bc0fb037dc76c46ef8a" | |||
12 | 12 | ||
13 | DEPENDS = "libevdev udev mtdev libcheck" | 13 | DEPENDS = "libevdev udev mtdev libcheck" |
14 | 14 | ||
15 | SRC_URI = "git://gitlab.freedesktop.org/libinput/libinput.git;protocol=https;branch=1.22-branch \ | 15 | SRC_URI = "git://gitlab.freedesktop.org/libinput/libinput.git;protocol=https;branch=main \ |
16 | file://run-ptest \ | 16 | file://run-ptest \ |
17 | file://determinism.patch \ | ||
18 | " | 17 | " |
19 | SRCREV = "d9f45fd1261da85b4eb44f8aa82e1500b99f303b" | 18 | SRCREV = "0b005eb64b12603e65a620a77c67ec62fd03f413" |
20 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
21 | 20 | ||
22 | UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" | 21 | UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" |