From 9f4550392db9ad9bb70f86b6d57a0efef93bc77b Mon Sep 17 00:00:00 2001
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Wed, 11 Oct 2017 21:18:39 +0000
Subject: [PATCH] devel/libsigrok: Update to version 0.5.0.

---
 devel/libsigrok/Makefile                           | 10 +++++++---
 devel/libsigrok/distinfo                           |  5 +++--
 .../files/patch-hardware-victor-dmm-api.c          | 12 ------------
 ...=> patch-src_hardware_lascar-el-usb_protocol.c} |  6 +++---
 devel/libsigrok/pkg-plist                          | 14 ++++++++++++--
 5 files changed, 25 insertions(+), 22 deletions(-)
 delete mode 100644 devel/libsigrok/files/patch-hardware-victor-dmm-api.c
 rename devel/libsigrok/files/{patch-hardware-lascar-el-usb-protocol.c => patch-src_hardware_lascar-el-usb_protocol.c} (54%)

diff --git a/devel/libsigrok/Makefile b/devel/libsigrok/Makefile
index 002153c05506..aa2999065dff 100644
--- a/devel/libsigrok/Makefile
+++ b/devel/libsigrok/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libsigrok
-PORTVERSION=	0.3.0
-PORTREVISION=	2
+PORTVERSION=	0.5.0
 CATEGORIES=	devel
 MASTER_SITES=	http://sigrok.org/download/source/libsigrok/
 
@@ -12,7 +11,10 @@ COMMENT=	Framework for hardware logic analyzers, core library
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libserialport.so:devel/libserialport \
+BUILD_DEPENDS=	doxygen:devel/doxygen
+LIB_DEPENDS=	libftdi1.so:devel/libftdi1 \
+		libserialport.so:devel/libserialport \
+		libvisa.so:devel/librevisa \
 		libzip.so:archivers/libzip
 
 GNU_CONFIGURE=	yes
@@ -21,6 +23,8 @@ USE_GNOME=	glib20
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
+USE_GNOME=	glibmm
+INSTALLS_ICONS=	yes
 
 post-patch:
 # libusb can be disabled via src.conf(5), so detect via pkg-config
diff --git a/devel/libsigrok/distinfo b/devel/libsigrok/distinfo
index a16705031d84..e8969a34b2b3 100644
--- a/devel/libsigrok/distinfo
+++ b/devel/libsigrok/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libsigrok-0.3.0.tar.gz) = 43926907a06f1d7aa73c68ae379d66412ac2728483eed7d20a8cf061f73f7050
-SIZE (libsigrok-0.3.0.tar.gz) = 924503
+TIMESTAMP = 1507555128
+SHA256 (libsigrok-0.5.0.tar.gz) = 4c8c86779b880a5c419f6c77a08b1147021e5a19fa83b0f3b19da27463c9f3a4
+SIZE (libsigrok-0.5.0.tar.gz) = 1560400
diff --git a/devel/libsigrok/files/patch-hardware-victor-dmm-api.c b/devel/libsigrok/files/patch-hardware-victor-dmm-api.c
deleted file mode 100644
index fd04ff1809b0..000000000000
--- a/devel/libsigrok/files/patch-hardware-victor-dmm-api.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./hardware/victor-dmm/api.c.orig	2013-06-22 17:57:10.000000000 +0200
-+++ ./hardware/victor-dmm/api.c	2013-06-22 17:57:36.000000000 +0200
-@@ -379,8 +379,7 @@
- 	}
- 
- 	memset(&tv, 0, sizeof(struct timeval));
--	libusb_handle_events_timeout_completed(drvc->sr_ctx->libusb_ctx, &tv,
--					       NULL);
-+	libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
- 
- 	return TRUE;
- }
diff --git a/devel/libsigrok/files/patch-hardware-lascar-el-usb-protocol.c b/devel/libsigrok/files/patch-src_hardware_lascar-el-usb_protocol.c
similarity index 54%
rename from devel/libsigrok/files/patch-hardware-lascar-el-usb-protocol.c
rename to devel/libsigrok/files/patch-src_hardware_lascar-el-usb_protocol.c
index 95dbcc53368f..ad70f2a7aaa2 100644
--- a/devel/libsigrok/files/patch-hardware-lascar-el-usb-protocol.c
+++ b/devel/libsigrok/files/patch-src_hardware_lascar-el-usb_protocol.c
@@ -1,6 +1,6 @@
---- ./hardware/lascar-el-usb/protocol.c.orig	2013-06-22 17:57:14.000000000 +0200
-+++ ./hardware/lascar-el-usb/protocol.c	2013-06-22 17:57:56.000000000 +0200
-@@ -512,8 +512,7 @@
+--- src/hardware/lascar-el-usb/protocol.c.orig	2017-06-12 01:07:28 UTC
++++ src/hardware/lascar-el-usb/protocol.c
+@@ -508,8 +508,7 @@ SR_PRIV int lascar_el_usb_handle_events(int fd, int re
  	}
  
  	memset(&tv, 0, sizeof(struct timeval));
diff --git a/devel/libsigrok/pkg-plist b/devel/libsigrok/pkg-plist
index 3ea32370316b..a6f95daa8816 100644
--- a/devel/libsigrok/pkg-plist
+++ b/devel/libsigrok/pkg-plist
@@ -1,8 +1,18 @@
 include/libsigrok/libsigrok.h
 include/libsigrok/proto.h
 include/libsigrok/version.h
+include/libsigrokcxx/enums.hpp
+include/libsigrokcxx/libsigrokcxx.hpp
 lib/libsigrok.a
 lib/libsigrok.so
-lib/libsigrok.so.2
-lib/libsigrok.so.2.0.0
+lib/libsigrok.so.4
+lib/libsigrok.so.4.0.0
+lib/libsigrokcxx.a
+lib/libsigrokcxx.so
+lib/libsigrokcxx.so.4
+lib/libsigrokcxx.so.4.0.0
 libdata/pkgconfig/libsigrok.pc
+libdata/pkgconfig/libsigrokcxx.pc
+share/icons/hicolor/48x48/mimetypes/libsigrok.png
+share/icons/hicolor/scalable/mimetypes/libsigrok.svg
+share/mime/application/vnd.sigrok.session.xml