Skip to content

Instantly share code, notes, and snippets.

@arduent
Created March 13, 2020 02:17
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save arduent/b31025900ea675ecb7fc7c22fbb52a2f to your computer and use it in GitHub Desktop.
Save arduent/b31025900ea675ecb7fc7c22fbb52a2f to your computer and use it in GitHub Desktop.
diff -ruN /usr/ports/devel/libevdev/Makefile libevdev/Makefile
--- /usr/ports/devel/libevdev/Makefile 2019-11-27 05:53:10.000000000 -0400
+++ libevdev/Makefile 2020-03-12 21:48:45.150084000 -0400
@@ -1,8 +1,7 @@
# $FreeBSD: head/devel/libevdev/Makefile 518490 2019-11-27 09:53:10Z tobik $
PORTNAME= libevdev
-PORTVERSION= 1.5.9
-PORTREVISION= 1
+PORTVERSION= 1.9.0
CATEGORIES= devel
MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/
diff -ruN /usr/ports/devel/libevdev/distinfo libevdev/distinfo
--- /usr/ports/devel/libevdev/distinfo 2018-12-19 05:09:11.000000000 -0400
+++ libevdev/distinfo 2020-03-12 20:19:37.273086000 -0400
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522696039
-SHA256 (libevdev-1.5.9.tar.xz) = e1663751443bed9d3e76a4fe2caf6fa866a79705d91cacad815c04e706198a75
-SIZE (libevdev-1.5.9.tar.xz) = 408200
+TIMESTAMP = 1584058777
+SHA256 (libevdev-1.9.0.tar.xz) = e7e18a64264f2dea19b6c50a481f8c062529d42919ccda0bc861495bce28eb9e
+SIZE (libevdev-1.9.0.tar.xz) = 443208
diff -ruN /usr/ports/devel/libevdev/files/patch-libevdev_libevdev-uinput.c libevdev/files/patch-libevdev_libevdev-uinput.c
--- /usr/ports/devel/libevdev/files/patch-libevdev_libevdev-uinput.c 2018-12-19 05:09:11.000000000 -0400
+++ libevdev/files/patch-libevdev_libevdev-uinput.c 2020-03-12 21:42:12.070539000 -0400
@@ -1,6 +1,6 @@
---- libevdev/libevdev-uinput.c.orig 2017-05-04 00:37:30 UTC
-+++ libevdev/libevdev-uinput.c
-@@ -182,6 +182,7 @@ libevdev_uinput_get_fd(const struct libevdev_uinput *u
+--- libevdev/libevdev-uinput.c.orig 2020-03-02 00:17:04.000000000 -0400
++++ libevdev/libevdev-uinput.c 2020-03-12 21:42:01.861589000 -0400
+@@ -182,6 +182,7 @@
return uinput_dev->fd;
}
@@ -8,7 +8,7 @@
static int is_event_device(const struct dirent *dent) {
return strncmp("event", dent->d_name, 5) == 0;
}
-@@ -213,10 +214,12 @@ fetch_device_node(const char *path)
+@@ -213,10 +214,12 @@
static int is_input_device(const struct dirent *dent) {
return strncmp("input", dent->d_name, 5) == 0;
}
@@ -21,19 +21,19 @@
struct dirent **namelist;
int ndev, i;
int rc;
-@@ -290,6 +293,16 @@ fetch_syspath_and_devnode(struct libevdev_uinput *uinp
+@@ -290,6 +293,16 @@
free(namelist);
return uinput_dev->devnode ? 0 : -1;
+#elif defined(__FreeBSD__)
-+ char devnode[80];
-+ if (ioctl(uinput_dev->fd, UI_GET_SYSNAME(sizeof(devnode)), devnode) < 0)
-+ return -1;
-+ asprintf(&uinput_dev->devnode, "/dev/input/%s", devnode);
-+ uinput_dev->syspath = strdup(uinput_dev->devnode);
-+ return 0;
++ char devnode[80];
++ if (ioctl(uinput_dev->fd, UI_GET_SYSNAME(sizeof(devnode)), devnode) < 0)
++ return -1;
++ asprintf(&uinput_dev->devnode, "/dev/input/%s", devnode);
++ uinput_dev->syspath = strdup(uinput_dev->devnode);
++ return 0;
+#else
-+ return -1;
++ return -1;
+#endif
}
diff -ruN /usr/ports/devel/libevdev/files/patch-test_test-libevdev-events.c libevdev/files/patch-test_test-libevdev-events.c
--- /usr/ports/devel/libevdev/files/patch-test_test-libevdev-events.c 2018-12-19 05:09:11.000000000 -0400
+++ libevdev/files/patch-test_test-libevdev-events.c 2020-03-12 20:43:23.160604000 -0400
@@ -1,20 +1,20 @@
---- test/test-libevdev-events.c.orig 2017-05-04 00:37:30 UTC
-+++ test/test-libevdev-events.c
-@@ -1057,7 +1057,7 @@ START_TEST(test_syn_delta_late_sync)
+--- test/test-libevdev-events.c.orig 2020-03-02 00:17:04.000000000 -0400
++++ test/test-libevdev-events.c 2020-03-12 20:42:11.775854000 -0400
+@@ -1062,7 +1062,7 @@
} while (rc >= 0);
/* force enough events to trigger a SYN_DROPPED */
- for (i = 0; i < 100; i++) {
+ for (i = 0; i < 200; i++) {
- uinput_device_event(uidev, EV_ABS, ABS_X, 100 + i);
- uinput_device_event(uidev, EV_ABS, ABS_Y, 500 + i);
- uinput_device_event(uidev, EV_ABS, ABS_MT_POSITION_X, 100 + i);
-@@ -1152,7 +1152,7 @@ START_TEST(test_syn_delta_late_sync)
+ uinput_device_event_multiple(uidev,
+ EV_ABS, ABS_X, 100 + i,
+ EV_ABS, ABS_Y, 500 + i,
+@@ -1163,7 +1163,7 @@
} while (rc >= 0);
/* force enough events to trigger a SYN_DROPPED */
- for (i = 0; i < 100; i++) {
+ for (i = 0; i < 200; i++) {
- uinput_device_event(uidev, EV_ABS, ABS_X, 100 + i);
- uinput_device_event(uidev, EV_ABS, ABS_Y, 500 + i);
- uinput_device_event(uidev, EV_ABS, ABS_MT_POSITION_X, 100 + i);
+ uinput_device_event_multiple(uidev,
+ EV_ABS, ABS_X, 100 + i,
+ EV_ABS, ABS_Y, 500 + i,
diff -ruN /usr/ports/devel/libevdev/pkg-plist libevdev/pkg-plist
--- /usr/ports/devel/libevdev/pkg-plist 2018-12-19 05:09:11.000000000 -0400
+++ libevdev/pkg-plist 2020-03-12 21:50:37.766211000 -0400
@@ -6,6 +6,6 @@
lib/libevdev.a
lib/libevdev.so
lib/libevdev.so.2
-lib/libevdev.so.2.1.21
+lib/libevdev.so.2.3.0
libdata/pkgconfig/libevdev.pc
man/man3/libevdev.3.gz
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment