Simon Quigley pushed to branch master at Debian Java Maintainers / jinput
Commits: 1b46cf5f by Juan Manuel Méndez Rey at 2026-10-03T06:00:07+02:00 Read input event times through input_event_sec/input_event_usec (Closes: #1069434) On armhf with 64-bit time_t, struct input_event has no time member and the JNI library fails to build. - - - - - 23aa10af by Simon Quigley at 2026-10-28T19:42:43-05:00 Merge branch 'fix-time64-input-event' into 'master' Fix the FTBFS on armhf with 64-bit time_t See merge request java-team/jinput!2 - - - - - 3 changed files: - debian/changelog - + debian/patches/07time64-input-event.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +jinput (20100502+dfsg-12) UNRELEASED; urgency=medium + + * Team upload. + * Read input event times through input_event_sec/input_event_usec, + fixing the FTBFS on armhf with 64-bit time_t (Closes: #1069434). + + -- Juan Manuel Méndez Rey <[email protected]> Sat, 03 Oct 2026 06:00:02 +0200 + jinput (20100502+dfsg-11) unstable; urgency=medium * Team upload. ===================================== debian/patches/07time64-input-event.patch ===================================== @@ -0,0 +1,36 @@ +Description: Read event times through input_event_sec/input_event_usec + On 32-bit architectures built with 64-bit time_t (armhf since the time64 + transition), struct input_event in linux/input.h has no "time" member; the + seconds and microseconds are only reachable through the input_event_sec + and input_event_usec macros, which the kernel headers define on every + architecture since Linux 4.16. Use them, and define them for older headers. +Author: Juan Manuel Méndez Rey <[email protected]> +Bug-Debian: https://bugs.debian.org/1069434 +Forwarded: no +Last-Update: 2026-10-03 +diff --git a/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c b/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c +index 18913c2..79c0945 100644 +--- a/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c ++++ b/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c +@@ -42,6 +42,12 @@ + #include <sys/ioctl.h> + #include <linux/input.h> + #include <unistd.h> ++ ++/* Kernel headers before 4.16 have no input_event_sec/input_event_usec */ ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif + #include <fcntl.h> + #include <errno.h> + #include "util.h" +@@ -173,7 +179,7 @@ JNIEXPORT jboolean JNICALL Java_net_java_games_input_LinuxEventDevice_nGetNextEv + throwIOException(env, "Failed to read next device event (%d)\n", errno); + return JNI_FALSE; + } +- (*env)->CallVoidMethod(env, linux_event_return, linux_event_set, (jlong)event.time.tv_sec, (jlong)event.time.tv_usec, (jint)event.type, (jint)event.code, (jint)event.value); ++ (*env)->CallVoidMethod(env, linux_event_return, linux_event_set, (jlong)event.input_event_sec, (jlong)event.input_event_usec, (jint)event.type, (jint)event.code, (jint)event.value); + return JNI_TRUE; + } + ===================================== debian/patches/series ===================================== @@ -4,3 +4,4 @@ 03javadoc 04jinput-remove-getDeviceUsageBits.patch 06java10-compat.patch +07time64-input-event.patch View it on GitLab: https://salsa.debian.org/java-team/jinput/-/compare/cecab06afa8a95e75fd24abacb515ad0af9357c9...23aa10afcc75c425778b53418137ac3c0f620218 -- View it on GitLab: https://salsa.debian.org/java-team/jinput/-/compare/cecab06afa8a95e75fd24abacb515ad0af9357c9...23aa10afcc75c425778b53418137ac3c0f620218 You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits

