diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/meta-openembedded/meta-oe/recipes-test/evtest | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-test/evtest')
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch | 41 | ||||
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-test/evtest/evtest/add_missing_limits_h_include.patch | 37 | ||||
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb (renamed from external/meta-openembedded/meta-oe/recipes-test/evtest/evtest_git.bb) | 9 |
3 files changed, 83 insertions, 4 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 00000000..706322d5 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,41 @@ +From fa57c78c33d26084f85f1a6b4c29378631dc9395 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Nov 2019 11:58:58 -0800 +Subject: [PATCH] Fix build on 32bit arches with 64bit time_t + +time element is deprecated on new input_event structure in kernel's +input.h [1] + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/libevdev/evtest/merge_requests/6] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + evtest.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/evtest.c b/evtest.c +index 548c203..93063cd 100644 +--- a/evtest.c ++++ b/evtest.c +@@ -61,6 +61,11 @@ + #include <sys/types.h> + #include <unistd.h> + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #define BITS_PER_LONG (sizeof(long) * 8) + #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) + #define OFF(x) ((x)%BITS_PER_LONG) +@@ -1140,7 +1145,7 @@ static int print_events(int fd) + type = ev[i].type; + code = ev[i].code; + +- printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec); ++ printf("Event: time %ld.%06ld, ", ev[i].input_event_sec, ev[i].input_event_sec); + + if (type == EV_SYN) { + if (code == SYN_MT_REPORT) diff --git a/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest/add_missing_limits_h_include.patch b/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest/add_missing_limits_h_include.patch new file mode 100644 index 00000000..b2bf94fd --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest/add_missing_limits_h_include.patch @@ -0,0 +1,37 @@ +From 5eb4ab1c139ea38ebe6bb4acba08b09ee7d77d3c Mon Sep 17 00:00:00 2001 +From: Baruch Siach <baruch@tkos.co.il> +Date: Sun, 18 Aug 2019 10:01:06 +0300 +Subject: Add missing limits.h include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes build with musl libc that does not include limits.h indirectly via +other headers. + +evtest.c: In function ‘scan_devices’: +evtest.c:886:14: error: ‘PATH_MAX’ undeclared (first use in this function); did you mean INT8_MAX’? + char fname[PATH_MAX]; + ^~~~~~~~ + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- + evtest.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/evtest.c b/evtest.c +index 37d4f85..548c203 100644 +--- a/evtest.c ++++ b/evtest.c +@@ -56,6 +56,7 @@ + #include <getopt.h> + #include <ctype.h> + #include <signal.h> ++#include <limits.h> + #include <sys/time.h> + #include <sys/types.h> + #include <unistd.h> +-- +cgit v1.1 + diff --git a/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest_git.bb b/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb index fa0d6e2f..a3a23c89 100644 --- a/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest_git.bb +++ b/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb @@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "libxml2" -SRCREV = "ab140a2dab1547f7deb5233be6d94a388cf08b26" -SRC_URI = "git://anongit.freedesktop.org/evtest;protocol=git" - -PV = "1.33+${SRCPV}" +SRCREV = "16e5104127a620686bdddc4a9ad62881134d6c69" +SRC_URI = "git://gitlab.freedesktop.org/libevdev/evtest.git;protocol=https \ + file://add_missing_limits_h_include.patch \ + file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ + " S = "${WORKDIR}/git" |