jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

x11vnc: fix build w/ musl-1.2.1 (time64)

Browse source
This commit is contained in:
Jürgen Buchmüller 2020-12-06 17:36:46 +01:00
parent 11692f7df2
commit 5a0e8a934c
1 changed files with 79 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
srcpkgs/x11vnc/patches/time64.patch Normal file
View file

@ -0,0 +1,79 @@
--- src/uinput.c.old 2019-01-05 13:22:11.000000000 +0000
+++ src/uinput.c 2020-01-24 04:49:39.479206612 +0000
@@ -710,6 +710,7 @@
static void ptr_move(int dx, int dy) {
#ifdef UINPUT_OK
struct input_event ev;
+ struct timeval tv;
int d = direct_rel_fd < 0 ? fd : direct_rel_fd;
if (injectable && strchr(injectable, 'M') == NULL) {
@@ -720,7 +721,9 @@
if (db) fprintf(stderr, "ptr_move(%d, %d) fd=%d\n", dx, dy, d);
- gettimeofday(&ev.time, NULL);
+ gettimeofday(&tv, NULL);
+ ev.input_event_sec = tv.tv_sec;
+ ev.input_event_usec = tv.tv_usec;
ev.type = EV_REL;
ev.code = REL_Y;
ev.value = dy;
@@ -755,6 +758,7 @@
static void ptr_abs(int x, int y, int p) {
#ifdef UINPUT_OK
struct input_event ev;
+ struct timeval tv;
int x0, y0;
int d = direct_abs_fd < 0 ? fd : direct_abs_fd;
@@ -773,7 +777,9 @@
if (db) fprintf(stderr, "ptr_abs(%d, %d => %d %d, p=%d) fd=%d\n", x0, y0, x, y, p, d);
- gettimeofday(&ev.time, NULL);
+ gettimeofday(&tv, NULL);
+ ev.input_event_sec = tv.tv_sec;
+ ev.input_event_usec = tv.tv_usec;
ev.type = EV_ABS;
ev.code = ABS_Y;
ev.value = y;
@@ -950,6 +956,7 @@
static void button_click(int down, int btn) {
#ifdef UINPUT_OK
struct input_event ev;
+ struct timeval tv;
int d = direct_btn_fd < 0 ? fd : direct_btn_fd;
if (injectable && strchr(injectable, 'B') == NULL) {
@@ -959,7 +966,9 @@
if (db) fprintf(stderr, "button_click: btn %d %s fd=%d\n", btn, down ? "down" : "up", d);
memset(&ev, 0, sizeof(ev));
- gettimeofday(&ev.time, NULL);
+ gettimeofday(&tv, NULL);
+ ev.input_event_sec = tv.tv_sec;
+ ev.input_event_usec = tv.tv_usec;
ev.type = EV_KEY;
ev.value = down;
@@ -1230,6 +1239,7 @@
void uinput_key_command(int down, int keysym, rfbClientPtr client) {
#ifdef UINPUT_OK
struct input_event ev;
+ struct timeval tv;
int scancode;
allowed_input_t input;
int d = direct_key_fd < 0 ? fd : direct_key_fd;
@@ -1253,7 +1263,9 @@
if (db) fprintf(stderr, "uinput_key_command: %d -> %d %s fd=%d\n", keysym, scancode, down ? "down" : "up", d);
memset(&ev, 0, sizeof(ev));
- gettimeofday(&ev.time, NULL);
+ gettimeofday(&tv, NULL);
+ ev.input_event_sec = tv.tv_sec;
+ ev.input_event_usec = tv.tv_usec;
ev.type = EV_KEY;
ev.code = (unsigned char) scancode;
ev.value = down;