diff mbox series

libinput: upgrade to 1.23.0

Message ID 20230502131456.1447115-1-ross.burton@arm.com
State Accepted, archived
Commit e652d9bee3940e8ee7c3346c801deef4801dbaeb
Headers show
Series libinput: upgrade to 1.23.0 | expand

Commit Message

Ross Burton May 2, 2023, 1:14 p.m. UTC 
Remove determinism.patch, this is obsolete now that we set
GIT_CEILING_DIRECTORIES to stop git climbing the tree outside of the
work directory.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../wayland/libinput/determinism.patch        | 21 -------------------
 ...{libinput_1.22.1.bb => libinput_1.23.0.bb} |  5 ++---
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 meta/recipes-graphics/wayland/libinput/determinism.patch
 rename meta/recipes-graphics/wayland/{libinput_1.22.1.bb => libinput_1.23.0.bb} (93%)
diff mbox series

Patch

diff --git a/meta/recipes-graphics/wayland/libinput/determinism.patch b/meta/recipes-graphics/wayland/libinput/determinism.patch
deleted file mode 100644
index cb554030cf3..00000000000
--- a/meta/recipes-graphics/wayland/libinput/determinism.patch
+++ /dev/null
@@ -1,21 +0,0 @@ 
-This finds our outer git tree and that version information breaks
-determinism of this recipe. Disable it.
-
-RP 2020/2/6
-
-Upstream-Status: Pending
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-Index: libinput-1.14.3/meson.build
-===================================================================
---- libinput-1.14.3.orig/meson.build
-+++ libinput-1.14.3/meson.build
-@@ -387,7 +387,7 @@ pkgconfig.generate(
- 	libraries : lib_libinput
- )
- 
--git_version_h = vcs_tag(command : ['git', 'describe'],
-+git_version_h = vcs_tag(command : ['false'],
- 			fallback : 'unknown',
- 			input : 'src/libinput-git-version.h.in',
- 			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
similarity index 93%
rename from meta/recipes-graphics/wayland/libinput_1.22.1.bb
rename to meta/recipes-graphics/wayland/libinput_1.23.0.bb
index f86885d3e3c..b83d5fdb436 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"
 
 DEPENDS = "libevdev udev mtdev libcheck"
 
-SRC_URI = "git://gitlab.freedesktop.org/libinput/libinput.git;protocol=https;branch=1.22-branch \
+SRC_URI = "git://gitlab.freedesktop.org/libinput/libinput.git;protocol=https;branch=main \
            file://run-ptest \
-           file://determinism.patch \
            "
-SRCREV = "d9f45fd1261da85b4eb44f8aa82e1500b99f303b"
+SRCREV = "0b005eb64b12603e65a620a77c67ec62fd03f413"
 S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"