Attachment 218385 Details for Bug 249961 – v1

[patch] v1

ports.devel.libevdev.1.9.1.diff (text/plain), 7.56 KB, created by Niclas Zeising on 2020-09-28 20:35:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Niclas Zeising

Created: 2020-09-28 20:35:14 UTC

Size: 7.56 KB

patch

obsolete

>diff --git a/devel/libevdev/Makefile b/devel/libevdev/Makefile
>index d3d54183ed9d..508b4076e490 100644
>--- a/devel/libevdev/Makefile
>+++ b/devel/libevdev/Makefile
>@@ -1,43 +1,25 @@
> # $FreeBSD$
> 
> PORTNAME=	libevdev
>-PORTVERSION=	1.5.9
>-PORTREVISION=	1
>+PORTVERSION=	1.9.1.20200928
> CATEGORIES=	devel
>-MASTER_SITES=	http://freedesktop.org/software/${PORTNAME}/
>+#MASTER_SITES=	http://freedesktop.org/software/${PORTNAME}/
> 
>-MAINTAINER=	hselasky@FreeBSD.org
>+MAINTAINER=	x11@FreeBSD.org
> COMMENT=	Linux Event Device library
> 
> LICENSE=	MIT # without linux/*.h
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
>-LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim
>-
>-USES=		gmake libtool localbase pathfix pkgconfig python:build tar:xz
>-EXTRACT_AFTER_ARGS=	--exclude include # v4l_compat
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ENV=	ac_cv_path_DOXYGEN="" ac_cv_path_VALGRIND=""
>-CPPFLAGS+=	-I${LOCALBASE}/include/libepoll-shim
>-INSTALL_TARGET=	install-strip
>+USES=		meson pkgconfig python:3.5+,build shebangfix
> USE_LDCONFIG=	yes
> 
>-# Test requires /dev/uinput and should be run as root
>-.if exists(/dev/uinput)
>-TEST_DEPENDS=	checkmk:devel/check
>-TEST_TARGET=	check
>-TEST_WRKSRC=	${WRKSRC}/test
>-.endif
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e '/input\.h/s,top_srcdir,LOCALBASE,g' \
>-		${WRKSRC}/libevdev/Makefile.in
>-	@${REINPLACE_CMD} -e '/^LIBS = /s/$$/ -pthread -lrt -lepoll-shim/' \
>-		${WRKSRC}/tools/Makefile.in
>-	@${REINPLACE_CMD} -e 's|program_invocation_short_name|getprogname()|' \
>-		${WRKSRC}/tools/mouse-dpi-tool.c \
>-		${WRKSRC}/tools/touchpad-edge-detector.c \
>-		${WRKSRC}/tools/libevdev-tweak-device.c
>+USE_GITLAB=	yes
>+GL_SITE=	https://gitlab.freedesktop.org
>+GL_COMMIT=	6ea230bc72353c54fac628987b87cc1d3b6fd842
>+
>+MESON_ARGS=	-Ddocumentation=disabled -Dtests=disabled
>+
>+BINARY_ALIAS=	python3=${PYTHON_CMD}
> 
> .include <bsd.port.mk>
>diff --git a/devel/libevdev/distinfo b/devel/libevdev/distinfo
>index 83224e5f8150..83241be98745 100644
>--- a/devel/libevdev/distinfo
>+++ b/devel/libevdev/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1522696039
>-SHA256 (libevdev-1.5.9.tar.xz) = e1663751443bed9d3e76a4fe2caf6fa866a79705d91cacad815c04e706198a75
>-SIZE (libevdev-1.5.9.tar.xz) = 408200
>+TIMESTAMP = 1601324574
>+SHA256 (libevdev-libevdev-6ea230bc72353c54fac628987b87cc1d3b6fd842_GL0.tar.gz) = 05964dc64500ff48bd2227178e1220d7c32d2c1757e5b8248226d867ab47d6bf
>+SIZE (libevdev-libevdev-6ea230bc72353c54fac628987b87cc1d3b6fd842_GL0.tar.gz) = 166196
>diff --git a/devel/libevdev/files/patch-libevdev_libevdev-uinput.c b/devel/libevdev/files/patch-libevdev_libevdev-uinput.c
>deleted file mode 100644
>index c6f92480bca9..000000000000
>--- a/devel/libevdev/files/patch-libevdev_libevdev-uinput.c
>+++ /dev/null
>@@ -1,40 +0,0 @@
>---- 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
>- 	return uinput_dev->fd;
>- }
>- 
>-+#if defined(linux)
>- 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)
>- static int is_input_device(const struct dirent *dent) {
>- 	return strncmp("input", dent->d_name, 5) == 0;
>- }
>-+#endif
>- 
>- static int
>- fetch_syspath_and_devnode(struct libevdev_uinput *uinput_dev)
>- {
>-+#if defined(linux)
>- 	struct dirent **namelist;
>- 	int ndev, i;
>- 	int rc;
>-@@ -290,6 +293,16 @@ fetch_syspath_and_devnode(struct libevdev_uinput *uinp
>- 	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;
>-+#else
>-+	return -1;
>-+#endif
>- }
>- 
>- static int
>diff --git a/devel/libevdev/files/patch-test_test-libevdev-events.c b/devel/libevdev/files/patch-test_test-libevdev-events.c
>deleted file mode 100644
>index b4d960c1daf6..000000000000
>--- a/devel/libevdev/files/patch-test_test-libevdev-events.c
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- 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)
>- 	} 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)
>- 	} 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);
>diff --git a/devel/libevdev/files/patch-test_test-libevdev-has-event.c b/devel/libevdev/files/patch-test_test-libevdev-has-event.c
>deleted file mode 100644
>index adac5377008c..000000000000
>--- a/devel/libevdev/files/patch-test_test-libevdev-has-event.c
>+++ /dev/null
>@@ -1,16 +0,0 @@
>---- test/test-libevdev-has-event.c.orig	2017-05-04 00:37:30 UTC
>-+++ test/test-libevdev-has-event.c
>-@@ -116,6 +116,13 @@ START_TEST(test_event_codes)
>- 			evbit++;
>- 			continue;
>- 		}
>-+#ifdef __FreeBSD__
>-+		/* Force feedback events are not supported by FreeBSD */
>-+		if (*evbit == EV_FF) {
>-+			evbit++;
>-+			continue;
>-+		}
>-+#endif
>- 
>- 		max = libevdev_event_type_get_max(*evbit);
>- 
>diff --git a/devel/libevdev/files/patch-test_test-libevdev-init.c b/devel/libevdev/files/patch-test_test-libevdev-init.c
>deleted file mode 100644
>index c9f48d1f9aa8..000000000000
>--- a/devel/libevdev/files/patch-test_test-libevdev-init.c
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- test/test-libevdev-init.c.orig	2018-03-08 05:27:35 UTC
>-+++ test/test-libevdev-init.c
>-@@ -577,7 +577,7 @@ START_TEST(test_set_clock_id)
>- 	rc = libevdev_set_clock_id(dev, CLOCK_MONOTONIC);
>- 	ck_assert_int_eq(rc, 0);
>- 
>--	rc = libevdev_set_clock_id(dev, CLOCK_MONOTONIC_RAW);
>-+	rc = libevdev_set_clock_id(dev, CLOCK_MONOTONIC_FAST);
>- 	ck_assert_int_eq(rc, -EINVAL);
>- 
>- 	uinput_device_free(uidev);
>diff --git a/devel/libevdev/files/patch-test_test-main.c b/devel/libevdev/files/patch-test_test-main.c
>deleted file mode 100644
>index 3e4259a18e95..000000000000
>--- a/devel/libevdev/files/patch-test_test-main.c
>+++ /dev/null
>@@ -1,26 +0,0 @@
>---- test/test-main.c.orig	2018-03-08 05:27:35 UTC
>-+++ test/test-main.c
>-@@ -43,6 +43,7 @@ extern Suite *uinput_suite(void);
>- static int
>- is_debugger_attached(void)
>- {
>-+#if defined (linux)
>- 	int status;
>- 	int rc;
>- 	int pid = fork();
>-@@ -66,6 +67,15 @@ is_debugger_attached(void)
>- 	}
>- 
>- 	return rc;
>-+#else
>-+	/*
>-+	 * Skip useless gdb test as setting CK_FORK environment variable in
>-+	 * absence of attached debugger gives no harm to user.
>-+	 * Moreover this test is broken on most nonlinux systems, look at
>-+	 * discussion here: http://stackoverflow.com/questions/3596781/
>-+	 */
>-+	return 1;
>-+#endif
>- }
>- 
>- int main(void)
>diff --git a/devel/libevdev/pkg-plist b/devel/libevdev/pkg-plist
>index 566fee11b2f9..debd556e1b7b 100644
>--- a/devel/libevdev/pkg-plist
>+++ b/devel/libevdev/pkg-plist
>@@ -3,9 +3,8 @@ bin/mouse-dpi-tool
> bin/touchpad-edge-detector
> include/libevdev-1.0/libevdev/libevdev-uinput.h
> include/libevdev-1.0/libevdev/libevdev.h
>-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

Actions: View | Diff

Attachments on bug 249961: 218385