0003-src-evemu.c-fix-build-with-kernels-4.16.patch 1.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  1. From fd204f628021c9bb13870a8c983d9c63e1a53ebb Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Mon, 23 Mar 2020 11:04:11 +0100
  4. Subject: [PATCH] src/evemu.c: fix build with kernels >= 4.16
  5. Commit 30973c0b forgot to update all occurences of input_event, this
  6. will result in the following build failure with kernel >= 4.16:
  7. evemu.c: In function 'write_event_desc':
  8. evemu.c:753:23: error: 'const struct input_event' has no member named 'time'; did you mean 'type'?
  9. time = millis(&ev->time);
  10. ^~~~
  11. type
  12. Fixes:
  13. - http://autobuild.buildroot.org/results/487dd5056ec0a977d55b23417d5db2664dcc91fa
  14. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  15. [Retrieved from:
  16. https://gitlab.freedesktop.org/libevdev/evemu/-/commit/fd204f628021c9bb13870a8c983d9c63e1a53ebb]
  17. ---
  18. src/evemu.c | 7 +------
  19. 1 file changed, 1 insertion(+), 6 deletions(-)
  20. diff --git a/src/evemu.c b/src/evemu.c
  21. index c7ff561..42dbe1d 100644
  22. --- a/src/evemu.c
  23. +++ b/src/evemu.c
  24. @@ -733,11 +733,6 @@ out:
  25. return rc;
  26. }
  27. -static inline unsigned long millis(const struct timeval *tv)
  28. -{
  29. - return tv->tv_sec * 1000 + tv->tv_usec/1000;
  30. -}
  31. -
  32. static int write_event_desc(FILE *fp, const struct input_event *ev)
  33. {
  34. int rc;
  35. @@ -750,7 +745,7 @@ static int write_event_desc(FILE *fp, const struct input_event *ev)
  36. libevdev_event_code_get_name(ev->type, ev->code),
  37. ev->value);
  38. } else {
  39. - time = millis(&ev->time);
  40. + time = ev->input_event_sec * 1000 + ev->input_event_usec/1000;
  41. dt = time - last_ms;
  42. last_ms = time;
  43. rc = fprintf(fp, "# ------------ %s (%d) ---------- %+ldms\n",
  44. --
  45. 2.24.1