Skip to contentSkip to conversation

libinput: upgrade to version 1.10.0

PATCH In review Maxin B. John 3 participants 6 messages Feb 27, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 libinput: upgrade to version 1.10.0

1. Split package into libinput and libinput-tools.
2. Since libinput-tools contains python3 scripts, set RDEPENDS to python3
3. Fix a QA error related to python3 path:
a) 0001-libinput-measure-touchpad-tap-fix-python-script-QA-e.patch

---
 ...asure-touchpad-tap-fix-python-script-QA-e.patch | 32 ++++++++++++++++++++++
 .../{libinput_1.9.4.bb => libinput_1.10.0.bb}      |  9 ++++--
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/wayland/libinput/0001-libinput-measure-touchpad-tap-fix-python-script-QA-e.patch
 rename meta/recipes-graphics/wayland/{libinput_1.9.4.bb => libinput_1.10.0.bb} (72%)
meta/recipes-graphics/wayland/libinput/0001-libinput-measure-touchpad-tap-fix-python-script-QA-e.patch new file +32 -0
new file mode 100644
index 0000000..eb771ab
@@ -0,0 +1,32 @@
+From f595219dd3564a5fbf61646f2054f04f2e22238a Mon Sep 17 00:00:00 2001
+From: "Maxin B. John" <[email protected]>
+Date: Mon, 19 Feb 2018 11:21:37 +0200
+Subject: [PATCH] libinput-measure-touchpad-tap: fix python script QA error
+
+Tweak this python scripts to use '/usr/bin/env python3', Otherwise,
+it generate a QA error:
+
+QA Issue: /usr/libexec/libinput/libinput-measure-touchpad-tap contained
+in package libinput requires /usr/bin/python3, but no providers found
+in RDEPENDS_libinput? [file-rdeps]
+
+Upstream-Status: Accepted [https://cgit.freedesktop.org/wayland/libinput/commit/?id=920debffd7ee591bbc1014ee0961c75473429651]
+
+Signed-off-by: Maxin B. John <[email protected]>
+---
+ tools/libinput-measure-touchpad-tap | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/libinput-measure-touchpad-tap b/tools/libinput-measure-touchpad-tap
+index 3037232..6f4f399 100755
+--- a/tools/libinput-measure-touchpad-tap
++++ b/tools/libinput-measure-touchpad-tap
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python3
++#!/usr/bin/env python3
+ # vim: set expandtab shiftwidth=4:
+ # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
+ #
+-- 
+2.4.0
+
meta/recipes-graphics/wayland/libinput_1.10.0.bb renamed from meta/recipes-graphics/wayland/libinput_1.9.4.bb +7 -2
similarity index 72%
rename from meta/recipes-graphics/wayland/libinput_1.9.4.bb
rename to meta/recipes-graphics/wayland/libinput_1.10.0.bb
index 67a49df..5b75ffe 100644
@@ -8,9 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2184aef38ff137ed33ce9a63b9d1eb8f"
 DEPENDS = "libevdev udev mtdev"
 
 SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
+           file://0001-libinput-measure-touchpad-tap-fix-python-script-QA-e.patch \
            "
-SRC_URI[md5sum] = "8b43d07d1698fb207a0492fc67554d4f"
-SRC_URI[sha256sum] = "0bcdbd4c4e3c2a2db322fbdf2ef3284f2e6d6fb7be3af80e6d8de7783f675190"
+SRC_URI[md5sum] = "dac92f0b094392c03ab1320d06173afd"
+SRC_URI[sha256sum] = "c2c72c2e0c63498b34d887c28ea84b8570b50fef7ffe489179a1253280d33f57"
 
 UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
 inherit meson pkgconfig lib_package
@@ -23,6 +24,10 @@ UDEVDIR = "`pkg-config --variable=udevdir udev`"
 
 EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} -Ddocumentation=false -Dtests=false"
 
+PACKAGES =+ "${PN}-tools"
+FILES_${PN}-tools = "${libexecdir}/libinput/libinput-*"
+RDEPENDS_${PN}-tools = "python3"
+
 # package name changed in 1.8.1 upgrade: make sure package upgrades work
 RPROVIDES_${PN} = "libinput"
 RREPLACES_${PN} = "libinput"
Signature · 1 line
2.4.0
#1 lore raw

PATCH 2/3 piglit: upgrade to current git master

Upgrade to revision:
4ce0887e2f7f848d2be2e435a2d0f3c80e44ea3b

remove backported patch:

        0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch

i# Your branch is ahead of 'origin/master' by 2 commits.

---
 ...gl-context-priority.c-Use-piglit_egl_get_.patch | 41 ----------------------
 meta/recipes-graphics/piglit/piglit_git.bb         |  5 ++-
 2 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch
meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch deleted +0 -41
deleted file mode 100644
index e2e87cc..0000000
@@ -1,41 +0,0 @@
-From cb562a383229074b44db6998b85572d2abe7c363 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <[email protected]>
-Date: Fri, 24 Nov 2017 10:31:55 -0600
-Subject: [PATCH] tests/egl/egl-context-priority.c: Use
- piglit_egl_get_default_display
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The entry point is not guaranteed to exist, so use the
-piglit_egl_get_default_display() helper which does the correct thing.
-
-Signed-off-by: Aníbal Limón <[email protected]>
-Signed-off-by: Daniel Díaz <[email protected]>
-Reviewed-by: Tapani Pälli <[email protected]>
-Reviewed-by: Emil Velikov <[email protected]>
-
-Upstream-Status: Backport
-
-https://cgit.freedesktop.org/piglit/commit/?id=cb562a3832
----
- tests/egl/egl-context-priority.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/tests/egl/egl-context-priority.c b/tests/egl/egl-context-priority.c
-index 7f26fc614..9590ccae3 100644
---- a/tests/egl/egl-context-priority.c
-+++ b/tests/egl/egl-context-priority.c
-@@ -99,8 +99,7 @@ piglit_init(int argc, char **argv)
- 	if (!strstr(exts, "EGL_MESA_platform_surfaceless"))
- 		piglit_report_result(PIGLIT_SKIP);
- 
--	dpy = eglGetPlatformDisplay(EGL_PLATFORM_SURFACELESS_MESA,
--				    EGL_DEFAULT_DISPLAY, NULL);
-+	dpy = piglit_egl_get_default_display(EGL_PLATFORM_SURFACELESS_MESA);
- 
- 	ok = eglInitialize(dpy, &major, &minor);
- 	if (!ok) {
--- 
-2.11.0
-
meta/recipes-graphics/piglit/piglit_git.bb +2 -3
index 2839f1d..b936ad8 100644
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
 SRC_URI = "git://anongit.freedesktop.org/piglit \
            file://0001-cmake-install-bash-completions-in-the-right-place.patch \
            file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
-           file://0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-# From 2017-07-03
-SRCREV = "c8f4fd9eeb298a2ef0855927f22634f794ef3eff"
+# From 2018-02-26
+SRCREV = "4ce0887e2f7f848d2be2e435a2d0f3c80e44ea3b"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr${SRCPV}"
 
Signature · 1 line
2.4.0
#2 lore raw

Re: [PATCH 2/3] piglit: upgrade to current git master

Quoted 11 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Maxin B. John
Sent: den 27 februari 2018 13:37
To: [email protected]
Subject: [OE-core] [PATCH 2/3] piglit: upgrade to current git master

Upgrade to revision:
4ce0887e2f7f848d2be2e435a2d0f3c80e44ea3b

Quoted 6 lines

remove backported patch:

        0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch

i# Your branch is ahead of 'origin/master' by 2 commits.

^
I guess that was an accidental key press turning the comment into an actual part of the commit message. ;)

Quoted 1 line

//Peter

#3 lore raw

Re: [PATCH 2/3] piglit: upgrade to current git master

Hi Peter,

Quoted 14 lines · Peter Kjellerstedt
Quoted 14 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Maxin B. John
Sent: den 27 februari 2018 13:37
To: [email protected]
Subject: [OE-core] [PATCH 2/3] piglit: upgrade to current git master

Upgrade to revision:
4ce0887e2f7f848d2be2e435a2d0f3c80e44ea3b

remove backported patch:

        0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch
Quoted 6 lines
Quoted 3 lines

i# Your branch is ahead of 'origin/master' by 2 commits.

^
I guess that was an accidental key press turning the comment into an actual part of the commit message. ;)

Oops.. yes, blaming vim here :)

Also will send a corrected one. Thanks for spotting it.

Quoted 3 lines
Quoted 1 line

//Peter

Best Regards,
Maxin

#4 lore raw

PATCH 3/3 puzzles: upgrade to latest revision

In reply to Maxin B. John

1. Remove upstreamed patch:
0001-signpost-Add-paranthesis-to-remove-doubt-about-prece.patch
2. Bump PE to prevent version going backwards
3. LICENSE checksum change is due to Standardization of character encoding of source tree on UTF-8.

---
 ...d-paranthesis-to-remove-doubt-about-prece.patch | 47 ----------------------
 meta/recipes-sato/puzzles/puzzles_git.bb           |  7 ++--
 2 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 meta/recipes-sato/puzzles/files/0001-signpost-Add-paranthesis-to-remove-doubt-about-prece.patch
meta/recipes-sato/puzzles/files/0001-signpost-Add-paranthesis-to-remove-doubt-about-prece.patch deleted +0 -47
deleted file mode 100644
index 19abdd5..0000000
@@ -1,47 +0,0 @@
-From 7b2949c48a178861f6568a18c8f45e841e36f89e Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 7 Feb 2018 23:57:12 -0800
-Subject: [PATCH] signpost: Add paranthesis to remove doubt about precendence
-
-Clang complains e.g.
-
-error: logical not is only applied to the left hand side of
-      this bitwise operator [-Werror,-Wlogical-not-parentheses]
-
-Signed-off-by: Khem Raj <[email protected]>
----
-Upstream-Status: Pending
-
- signpost.c | 2 +-
- tracks.c   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/signpost.c b/signpost.c
-index aa2e13a..2e2dff2 100644
---- a/signpost.c
-+++ b/signpost.c
-@@ -284,7 +284,7 @@ static int check_nums(game_state *orig, game_state *copy, int only_immutable)
-     int i, ret = 1;
-     assert(copy->n == orig->n);
-     for (i = 0; i < copy->n; i++) {
--        if (only_immutable && !copy->flags[i] & FLAG_IMMUTABLE) continue;
-+        if (only_immutable && !(copy->flags[i] & FLAG_IMMUTABLE)) continue;
-         assert(copy->nums[i] >= 0);
-         assert(copy->nums[i] <= copy->n);
-         if (copy->nums[i] != orig->nums[i]) {
-diff --git a/tracks.c b/tracks.c
-index 5b27350..ca44ce1 100644
---- a/tracks.c
-+++ b/tracks.c
-@@ -1072,7 +1072,7 @@ static int solve_check_single_sub(game_state *state, int si, int id, int n,
-         x = i%w;
-         y = i/w;
-         if (abs(ox-x) > 1 || abs(oy-y) > 1) {
--            if (!state->sflags[i] & S_TRACK)
-+            if (!(state->sflags[i] & S_TRACK))
-                 did += solve_set_sflag(state, x, y, S_NOTRACK, what);
-         }
-     }
--- 
-2.16.1
-
meta/recipes-sato/puzzles/puzzles_git.bb +3 -4
index 4fe6298..bfd8177 100644
@@ -7,18 +7,17 @@ DEPENDS = "libxt"
 REQUIRED_DISTRO_FEATURES = "x11"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=da6110d4ed1225a287eab2bf0ac0193b"
 
 SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
            file://fix-compiling-failure-with-option-g-O.patch \
            file://0001-Use-labs-instead-of-abs.patch \
            file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \
            file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \
-           file://0001-signpost-Add-paranthesis-to-remove-doubt-about-prece.patch \
            "
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "8dfe5cec31e784e4ece2955ecc8cc35ee7e8fbb3"
-PE = "1"
+SRCREV = "2adf0052d66eae88c7a5e55e67fe16e13f7018b5"
+PE = "2"
 PV = "0.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.4.0
#5 lore raw

✗ patchtest: failure for "libinput: upgrade to version 1..." and 2 more (rev2)

In reply to Maxin B. John

== Series Details ==

Series: "libinput: upgrade to version 1..." and 2 more (rev2)
Revision: 2
URL : https://patchwork.openembedded.org/series/10793/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue LIC_FILES_CHKSUM changed on target puzzles but there is no "License-Update" tag in commit message [test_lic_files_chksum_modified_not_mentioned]
Suggested fix Include "License-Update: <description>" into the commit message with a brief description
Current checksum file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc
New checksum file://LICENCE;md5=da6110d4ed1225a287eab2bf0ac0193b

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe