Attachment #255527 for bug #283038

View | Details | Raw Unified | Return to bug 283038
Collapse All | Expand All




PORTNAME=	hid-tools
DISTVERSION=	0.8
PORTREVISION=	1
CATEGORIES=	sysutils python

MAINTAINER=	wulf@FreeBSD.org


LICENSE=	GPLv2

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pypandoc>=0:textproc/py-pypandoc@${PY_FLAVOR}
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}parse>=0:textproc/py-parse@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pyudev>=0:devel/py-pyudev@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}

USES=		python shebangfix
USE_GITLAB=	yes
GL_SITE=	https://gitlab.freedesktop.org/
GL_ACCOUNT=	libevdev
USE_PYTHON=	autoplist pep517
USE_PYTHON=	autoplist noflavors distutils

python_OLD_CMD=	"/bin/env python3"
SHEBANG_GLOB=	*.py

MANPAGES_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pypandoc>=0:textproc/py-pypandoc@${PY_FLAVOR}

NO_ARCH=	yes


Lines 1-3 Link Here

(-)b/sysutils/hid-tools/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1665854737	1	TIMESTAMP = 1732351551
2	SHA256 (libevdev-hid-tools-0f71fd65d83b28b744a2fe0a6cc1e3139921c721_GL0.tar.gz) = 06b1443cc17ce4f177675cb28a3fa3338fd3a33965e6d7a8ba8de28cd9927cd6	2	SHA256 (hid-tools-0.8.tar.bz2) = 019fad5c42e51631077fd5a7d9194e6bf97ffb7a15713ede2edc57300eba2d9c
3	SIZE (libevdev-hid-tools-0f71fd65d83b28b744a2fe0a6cc1e3139921c721_GL0.tar.gz) = 162075	3	SIZE (hid-tools-0.8.tar.bz2) = 139381




Fix ioctl(2) definitions to match <sys/ioccom.h> and <dev/hid/hidraw.h>

--- hidtools/hidraw.py.orig	2024-07-29 08:55:11 UTC
+++ hidtools/hidraw.py
@@ -39,13 +39,14 @@ def _ioctl(fd, EVIOC, code, return_type, buf=None):
 
 
 # extracted from <asm-generic/ioctl.h>
-_IOC_WRITE: Final = 1
+_IOC_VOID: Final = 1
 _IOC_READ: Final = 2
+_IOC_WRITE: Final = 4
 
 _IOC_NRBITS: Final = 8
 _IOC_TYPEBITS: Final = 8
-_IOC_SIZEBITS: Final = 14
-_IOC_DIRBITS: Final = 2
+_IOC_SIZEBITS: Final = 13
+_IOC_DIRBITS: Final = 3
 
 _IOC_NRSHIFT: Final = 0
 _IOC_TYPESHIFT: Final = _IOC_NRSHIFT + _IOC_NRBITS
@@ -79,7 +80,7 @@ def _IOC_HIDIOCGRDESCSIZE(none, len):
 
 # define HIDIOCGRDESCSIZE	_IOR('H', 0x01, int)
 def _IOC_HIDIOCGRDESCSIZE(none, len):
-    return _IOR("H", 0x01, len)
+    return _IOR("U", 30, len)
 
 
 def _HIDIOCGRDESCSIZE(fd):
@@ -90,7 +91,7 @@ def _IOC_HIDIOCGRDESC(none, len):
 
 # define HIDIOCGRDESC		_IOR('H', 0x02, struct hidraw_report_descriptor)
 def _IOC_HIDIOCGRDESC(none, len):
-    return _IOR("H", 0x02, len)
+    return _IOC(_IOC_VOID, "U", 31, 0)
 
 
 def _HIDIOCGRDESC(fd, size):
@@ -106,7 +107,7 @@ def _IOC_HIDIOCGRAWINFO(none, len):
 
 # define HIDIOCGRAWINFO		_IOR('H', 0x03, struct hidraw_devinfo)
 def _IOC_HIDIOCGRAWINFO(none, len):
-    return _IOR("H", 0x03, len)
+    return _IOR("U", 32, len)
 
 
 def _HIDIOCGRAWINFO(fd):
@@ -117,7 +118,7 @@ def _IOC_HIDIOCGRAWNAME(none, len):
 
 # define HIDIOCGRAWNAME(len)     _IOC(_IOC_READ, 'H', 0x04, len)
 def _IOC_HIDIOCGRAWNAME(none, len):
-    return _IOC(_IOC_READ, "H", 0x04, len)
+    return _IOC(_IOC_READ, "U", 33, len)
 
 
 def _HIDIOCGRAWNAME(fd):
@@ -130,7 +131,7 @@ def _IOC_HIDIOCGFEATURE(none, len):
 
 # define HIDIOCGFEATURE(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x07, len)
 def _IOC_HIDIOCGFEATURE(none, len):
-    return _IOC(_IOC_WRITE | _IOC_READ, "H", 0x07, len)
+    return _IOC(_IOC_WRITE | _IOC_READ, "U", 36, len)
 
 
 def _HIDIOCGFEATURE(fd, report_id, rsize):
@@ -145,7 +146,7 @@ def _IOC_HIDIOCSFEATURE(none, len):
 
 # define HIDIOCSFEATURE(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x06, len)
 def _IOC_HIDIOCSFEATURE(none, len):
-    return _IOC(_IOC_WRITE | _IOC_READ, "H", 0x06, len)
+    return _IOC(_IOC_WRITE, "U", 35, len)
 
 
 def _HIDIOCSFEATURE(fd, data):

Added Link Here

(-)b/sysutils/hid-tools/files/patch-pyproject.toml (+11 lines)
1	--- pyproject.toml.orig 2024-11-23 09:55:52 UTC
2	+++ pyproject.toml
3	@@ -52,7 +52,7 @@ dependencies = [
4
5	[tool.hatch.build.targets.wheel.hooks.custom]
6	dependencies = [
7	- "pypandoc_binary",
8	+ "pypandoc",
9	]
10
11	[tool.hatch.build.targets.wheel.shared-data]

Return to bug 283038

Lines 1-6 Link Here

(-)b/sysutils/hid-tools/Makefile (-13 / +10 lines)
1	PORTNAME= hid-tools	1	PORTNAME= hid-tools
2	DISTVERSION= 0.3.1	2	DISTVERSION= 0.8
3	PORTREVISION= 1
4	CATEGORIES= sysutils python	3	CATEGORIES= sysutils python
5		4
6	MAINTAINER= wulf@FreeBSD.org	5	MAINTAINER= wulf@FreeBSD.org
Lines 9-31 WWW= https://gitlab.freedesktop.org/libevdev/hid-tools Link Here
9		8
10	LICENSE= GPLv2	9	LICENSE= GPLv2
11		10
12	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \	11	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR} \
13	${PYTHON_PKGNAMEPREFIX}parse>=0:textproc/py-parse@${PY_FLAVOR} \	12	${PYTHON_PKGNAMEPREFIX}pypandoc>=0:textproc/py-pypandoc@${PY_FLAVOR}
14	${PYTHON_PKGNAMEPREFIX}pyudev>=0:devel/py-pyudev@${PY_FLAVOR} \	13	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \
15	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \	14	${PYTHON_PKGNAMEPREFIX}parse>=0:textproc/py-parse@${PY_FLAVOR} \
16	${RUN_DEPENDS_${OPSYS}_${OSREL:R}}	15	${PYTHON_PKGNAMEPREFIX}pyudev>=0:devel/py-pyudev@${PY_FLAVOR} \
		16	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
17		17
18	USES= python shebangfix	18	USES= python shebangfix
19	USE_GITLAB= yes	19	USE_GITLAB= yes
20	GL_SITE= https://gitlab.freedesktop.org/	20	GL_SITE= https://gitlab.freedesktop.org/
21	GL_ACCOUNT= libevdev	21	GL_ACCOUNT= libevdev
22	GL_TAGNAME= 0f71fd65d83b28b744a2fe0a6cc1e3139921c721	22	USE_PYTHON= autoplist pep517
23	USE_PYTHON= autoplist noflavors distutils
24		23
25	OPTIONS_DEFINE= MANPAGES	24	python_OLD_CMD= "/bin/env python3"
26	OPTIONS_DEFAULT= MANPAGES	25	SHEBANG_GLOB= *.py
27
28	MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pypandoc>=0:textproc/py-pypandoc@${PY_FLAVOR}
29		26
30	NO_ARCH= yes	27	NO_ARCH= yes
31		28

Lines 1-58 Link Here

(-)b/sysutils/hid-tools/files/patch-hidtools_hidraw.py (-28 / +46 lines)
1	Fix ioctl(2) definitions to match <sys/ioccom.h> and <dev/hid/hidraw.h>	1	Fix ioctl(2) definitions to match <sys/ioccom.h> and <dev/hid/hidraw.h>
2		2
3	--- hidtools/hidraw.py.orig 2019-03-29 01:29:29 UTC	3	--- hidtools/hidraw.py.orig 2024-07-29 08:55:11 UTC
4	+++ hidtools/hidraw.py	4	+++ hidtools/hidraw.py
5	@@ -36,13 +36,14 @@ def _ioctl(fd, EVIOC, code, return_type, buf=None):	5	@@ -39,13 +39,14 @@ def _ioctl(fd, EVIOC, code, return_type, buf=None):
6		6
7		7
8	# extracted from <asm-generic/ioctl.h>	8	# extracted from <asm-generic/ioctl.h>
9	-_IOC_WRITE = 1	9	-_IOC_WRITE: Final = 1
10	+_IOC_VOID = 1	10	+_IOC_VOID: Final = 1
11	_IOC_READ = 2	11	_IOC_READ: Final = 2
12	+_IOC_WRITE = 4	12	+_IOC_WRITE: Final = 4
13		13
14	_IOC_NRBITS = 8	14	_IOC_NRBITS: Final = 8
15	_IOC_TYPEBITS = 8	15	_IOC_TYPEBITS: Final = 8
16	-_IOC_SIZEBITS = 14	16	-_IOC_SIZEBITS: Final = 14
17	-_IOC_DIRBITS = 2	17	-_IOC_DIRBITS: Final = 2
18	+_IOC_SIZEBITS = 13	18	+_IOC_SIZEBITS: Final = 13
19	+_IOC_DIRBITS = 3	19	+_IOC_DIRBITS: Final = 3
20		20
21	_IOC_NRSHIFT = 0	21	_IOC_NRSHIFT: Final = 0
22	_IOC_TYPESHIFT = _IOC_NRSHIFT + _IOC_NRBITS	22	_IOC_TYPESHIFT: Final = _IOC_NRSHIFT + _IOC_NRBITS
23	@@ -74,7 +75,7 @@ def _IOW(type, nr, size):	23	@@ -79,7 +80,7 @@ def _IOC_HIDIOCGRDESCSIZE(none, len):
24		24
25	# define HIDIOCGRDESCSIZE _IOR('H', 0x01, int)	25	# define HIDIOCGRDESCSIZE _IOR('H', 0x01, int)
26	def _IOC_HIDIOCGRDESCSIZE(none, len):	26	def _IOC_HIDIOCGRDESCSIZE(none, len):
27	- return _IOR('H', 0x01, len)	27	- return _IOR("H", 0x01, len)
28	+ return _IOR('U', 30, len)	28	+ return _IOR("U", 30, len)
29		29
30		30
31	def _HIDIOCGRDESCSIZE(fd):	31	def _HIDIOCGRDESCSIZE(fd):
32	@@ -85,7 +86,7 @@ def _HIDIOCGRDESCSIZE(fd):	32	@@ -90,7 +91,7 @@ def _IOC_HIDIOCGRDESC(none, len):
33		33
34	# define HIDIOCGRDESC _IOR('H', 0x02, struct hidraw_report_descriptor)	34	# define HIDIOCGRDESC _IOR('H', 0x02, struct hidraw_report_descriptor)
35	def _IOC_HIDIOCGRDESC(none, len):	35	def _IOC_HIDIOCGRDESC(none, len):
36	- return _IOR('H', 0x02, len)	36	- return _IOR("H", 0x02, len)
37	+ return _IOC(_IOC_VOID, 'U', 31, 0)	37	+ return _IOC(_IOC_VOID, "U", 31, 0)
38		38
39		39
40	def _HIDIOCGRDESC(fd, size):	40	def _HIDIOCGRDESC(fd, size):
41	@@ -102,7 +103,7 @@ def _HIDIOCGRDESC(fd, size):	41	@@ -106,7 +107,7 @@ def _IOC_HIDIOCGRAWINFO(none, len):
42		42
43	# define HIDIOCGRAWINFO _IOR('H', 0x03, struct hidraw_devinfo)	43	# define HIDIOCGRAWINFO _IOR('H', 0x03, struct hidraw_devinfo)
44	def _IOC_HIDIOCGRAWINFO(none, len):	44	def _IOC_HIDIOCGRAWINFO(none, len):
45	- return _IOR('H', 0x03, len)	45	- return _IOR("H", 0x03, len)
46	+ return _IOR('U', 32, len)	46	+ return _IOR("U", 32, len)
47		47
48		48
49	def _HIDIOCGRAWINFO(fd):	49	def _HIDIOCGRAWINFO(fd):
50	@@ -113,7 +114,7 @@ def _HIDIOCGRAWINFO(fd):	50	@@ -117,7 +118,7 @@ def _IOC_HIDIOCGRAWNAME(none, len):
51		51
52	# define HIDIOCGRAWNAME(len) _IOC(_IOC_READ, 'H', 0x04, len)	52	# define HIDIOCGRAWNAME(len) _IOC(_IOC_READ, 'H', 0x04, len)
53	def _IOC_HIDIOCGRAWNAME(none, len):	53	def _IOC_HIDIOCGRAWNAME(none, len):
54	- return _IOC(_IOC_READ, 'H', 0x04, len)	54	- return _IOC(_IOC_READ, "H", 0x04, len)
55	+ return _IOC(_IOC_READ, 'U', 33, len)	55	+ return _IOC(_IOC_READ, "U", 33, len)
56		56
57		57
58	def _HIDIOCGRAWNAME(fd):	58	def _HIDIOCGRAWNAME(fd):
		59	@@ -130,7 +131,7 @@ def _IOC_HIDIOCGFEATURE(none, len):
		60
		61	# define HIDIOCGFEATURE(len) _IOC(_IOC_WRITE\|_IOC_READ, 'H', 0x07, len)
		62	def _IOC_HIDIOCGFEATURE(none, len):
		63	- return _IOC(_IOC_WRITE \| _IOC_READ, "H", 0x07, len)
		64	+ return _IOC(_IOC_WRITE \| _IOC_READ, "U", 36, len)
		65
		66
		67	def _HIDIOCGFEATURE(fd, report_id, rsize):
		68	@@ -145,7 +146,7 @@ def _IOC_HIDIOCSFEATURE(none, len):
		69
		70	# define HIDIOCSFEATURE(len) _IOC(_IOC_WRITE\|_IOC_READ, 'H', 0x06, len)
		71	def _IOC_HIDIOCSFEATURE(none, len):
		72	- return _IOC(_IOC_WRITE \| _IOC_READ, "H", 0x06, len)
		73	+ return _IOC(_IOC_WRITE, "U", 35, len)
		74
		75
		76	def _HIDIOCSFEATURE(fd, data):