Attachment #231511 for bug #261667

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

Lines 1-11 Link Here

(-)b/devel/libnfc/Makefile (-4 / +2 lines)
1	# Created by: Romain Tartiere <romain@blogreen.org>	1	# Created by: Romain Tartiere <romain@blogreen.org>
2		2
3	PORTNAME= libnfc	3	PORTNAME= libnfc
4	PORTVERSION= 1.7.1	4	PORTVERSION= 1.8.0
5	PORTREVISION= 5
6	CATEGORIES= devel	5	CATEGORIES= devel
7	MASTER_SITES= http://dl.bintray.com/nfc-tools/sources/ \	6	MASTER_SITES= https://github.com/nfc-tools/libnfc/releases/download/libnfc-${PORTVERSION}/
8	http://romain.blogreen.org/distfiles/
9		7
10	MAINTAINER= romain@FreeBSD.org	8	MAINTAINER= romain@FreeBSD.org
11	COMMENT= Near Field Communication (NFC) library	9	COMMENT= Near Field Communication (NFC) library

Lines 1-2 Link Here

(-)b/devel/libnfc/distinfo (-2 / +3 lines)
1	SHA256 (libnfc-1.7.1.tar.bz2) = 945e74d8e27683f9b8a6f6e529557b305d120df347a960a6a7ead6cb388f4072	1	TIMESTAMP = 1643747630
2	SIZE (libnfc-1.7.1.tar.bz2) = 484309	2	SHA256 (libnfc-1.8.0.tar.bz2) = 6d9ad31c86408711f0a60f05b1933101c7497683c2e0d8917d1611a3feba3dd5
		3	SIZE (libnfc-1.8.0.tar.bz2) = 553511




--- libnfc/drivers/acr122_usb.c.orig	2022-02-01 22:26:36 UTC
+++ libnfc/drivers/acr122_usb.c
@@ -419,6 +419,9 @@ acr122_usb_open(const nfc_context *context, const nfc_
         continue;
       // Reset device
       usb_reset(data.pudh);
+      // Reopen the device
+      if ((data.pudh = usb_open(dev)) == NULL)
+        continue;
       // Retrieve end points
       acr122_usb_get_end_points(dev, &data);
       // Claim interface




bin/nfc-anticol
bin/nfc-barcode
bin/nfc-dep-initiator
bin/nfc-dep-target
bin/nfc-emulate-forum-tag2

include/nfc/nfc.h
lib/libnfc.a
lib/libnfc.so
lib/libnfc.so.6
lib/libnfc.so.6.0.0
libdata/pkgconfig/libnfc.pc
man/man1/nfc-anticol.1.gz
man/man1/nfc-barcode.1.gz
man/man1/nfc-dep-initiator.1.gz
man/man1/nfc-dep-target.1.gz
man/man1/nfc-emulate-forum-tag2.1.gz

Return to bug 261667

Added Link Here

(-)b/devel/libnfc/files/patch-libnfc_drivers_acr122__usb.c (+12 lines)
1	--- libnfc/drivers/acr122_usb.c.orig 2022-02-01 22:26:36 UTC
2	+++ libnfc/drivers/acr122_usb.c
3	@@ -419,6 +419,9 @@ acr122_usb_open(const nfc_context *context, const nfc_
4	continue;
5	// Reset device
6	usb_reset(data.pudh);
7	+ // Reopen the device
8	+ if ((data.pudh = usb_open(dev)) == NULL)
9	+ continue;
10	// Retrieve end points
11	acr122_usb_get_end_points(dev, &data);
12	// Claim interface

Lines 1-4 Link Here

(-)b/devel/libnfc/pkg-plist (-2 / +4 lines)
1	bin/nfc-anticol	1	bin/nfc-anticol
		2	bin/nfc-barcode
2	bin/nfc-dep-initiator	3	bin/nfc-dep-initiator
3	bin/nfc-dep-target	4	bin/nfc-dep-target
4	bin/nfc-emulate-forum-tag2	5	bin/nfc-emulate-forum-tag2
Lines 23-32 include/nfc/nfc-types.h Link Here
23	include/nfc/nfc.h	24	include/nfc/nfc.h
24	lib/libnfc.a	25	lib/libnfc.a
25	lib/libnfc.so	26	lib/libnfc.so
26	lib/libnfc.so.5	27	lib/libnfc.so.6
27	lib/libnfc.so.5.0.1	28	lib/libnfc.so.6.0.0
28	libdata/pkgconfig/libnfc.pc	29	libdata/pkgconfig/libnfc.pc
29	man/man1/nfc-anticol.1.gz	30	man/man1/nfc-anticol.1.gz
		31	man/man1/nfc-barcode.1.gz
30	man/man1/nfc-dep-initiator.1.gz	32	man/man1/nfc-dep-initiator.1.gz
31	man/man1/nfc-dep-target.1.gz	33	man/man1/nfc-dep-target.1.gz
32	man/man1/nfc-emulate-forum-tag2.1.gz	34	man/man1/nfc-emulate-forum-tag2.1.gz