svn commit: r481952 - in head/devel/libsigrok: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Sat Oct 13 00:44:29 2018
New Revision: 481952
URL: https://svnweb.freebsd.org/changeset/ports/481952

Log:
  - Unbreak some drivers by importing patch from upstream
  
  PR:		228789
  Submitted by:	romain
  Approved by:	maintainer timeout (bsam, 4 months)

Added:
  head/devel/libsigrok/files/patch-src_hardware_chronovu-la_api.c   (contents, props changed)
  head/devel/libsigrok/files/patch-src_hardware_fx2lafw_api.c   (contents, props changed)
Modified:
  head/devel/libsigrok/Makefile

Modified: head/devel/libsigrok/Makefile
==============================================================================
--- head/devel/libsigrok/Makefile	Fri Oct 12 23:53:29 2018	(r481951)
+++ head/devel/libsigrok/Makefile	Sat Oct 13 00:44:29 2018	(r481952)
@@ -3,13 +3,15 @@
 
 PORTNAME=	libsigrok
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://sigrok.org/download/source/libsigrok/
 
 MAINTAINER=	bsam at FreeBSD.org
 COMMENT=	Framework for hardware logic analyzers, core library
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	doxygen:devel/doxygen
 LIB_DEPENDS=	libftdi1.so:devel/libftdi1 \

Added: head/devel/libsigrok/files/patch-src_hardware_chronovu-la_api.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libsigrok/files/patch-src_hardware_chronovu-la_api.c	Sat Oct 13 00:44:29 2018	(r481952)
@@ -0,0 +1,15 @@
+--- src/hardware/chronovu-la/api.c.orig
++++ src/hardware/chronovu-la/api.c
+@@ -200,10 +200,10 @@
+ 			continue;
+ 		}
+ 
+-		usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+-
+ 		libusb_close(hdl);
+ 
++		usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
++
+ 		if (!strcmp(product, "ChronoVu LA8")) {
+ 			model = 0;
+ 		} else if (!strcmp(product, "ChronoVu LA16")) {

Added: head/devel/libsigrok/files/patch-src_hardware_fx2lafw_api.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libsigrok/files/patch-src_hardware_fx2lafw_api.c	Sat Oct 13 00:44:29 2018	(r481952)
@@ -0,0 +1,15 @@
+--- src/hardware/fx2lafw/api.c.orig
++++ src/hardware/fx2lafw/api.c
+@@ -325,10 +325,10 @@
+ 			continue;
+ 		}
+ 
+-		usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+-
+ 		libusb_close(hdl);
+ 
++		usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
++
+ 		prof = NULL;
+ 		for (j = 0; supported_fx2[j].vid; j++) {
+ 			if (des.idVendor == supported_fx2[j].vid &&