Index: head/devel/libsigrok/Makefile =================================================================== --- head/devel/libsigrok/Makefile (revision 451799) +++ head/devel/libsigrok/Makefile (revision 451800) @@ -1,31 +1,35 @@ # Created by: Uffe Jakobsen # $FreeBSD$ PORTNAME= libsigrok -PORTVERSION= 0.3.0 -PORTREVISION= 2 +PORTVERSION= 0.5.0 CATEGORIES= devel MASTER_SITES= http://sigrok.org/download/source/libsigrok/ MAINTAINER= bsam@FreeBSD.org 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 USES= pathfix libtool pkgconfig 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 @${REINPLACE_CMD} -e 's/\(libusb-1\.0\) >= 1\.0\.[0-9]*/\1/' \ -e '/\*freebsd\*/,/;;/d' \ ${WRKSRC}/configure .include Index: head/devel/libsigrok/distinfo =================================================================== --- head/devel/libsigrok/distinfo (revision 451799) +++ head/devel/libsigrok/distinfo (revision 451800) @@ -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 Index: head/devel/libsigrok/files/patch-hardware-victor-dmm-api.c =================================================================== --- head/devel/libsigrok/files/patch-hardware-victor-dmm-api.c (revision 451799) +++ head/devel/libsigrok/files/patch-hardware-victor-dmm-api.c (nonexistent) @@ -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; - } Property changes on: head/devel/libsigrok/files/patch-hardware-victor-dmm-api.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/libsigrok/files/patch-hardware-lascar-el-usb-protocol.c =================================================================== --- head/devel/libsigrok/files/patch-hardware-lascar-el-usb-protocol.c (revision 451799) +++ head/devel/libsigrok/files/patch-hardware-lascar-el-usb-protocol.c (nonexistent) @@ -1,12 +0,0 @@ ---- ./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 @@ - } - - 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; - } Property changes on: head/devel/libsigrok/files/patch-hardware-lascar-el-usb-protocol.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/libsigrok/files/patch-src_hardware_lascar-el-usb_protocol.c =================================================================== --- head/devel/libsigrok/files/patch-src_hardware_lascar-el-usb_protocol.c (nonexistent) +++ head/devel/libsigrok/files/patch-src_hardware_lascar-el-usb_protocol.c (revision 451800) @@ -0,0 +1,12 @@ +--- 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)); +- libusb_handle_events_timeout_completed(drvc->sr_ctx->libusb_ctx, &tv, +- NULL); ++ libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv); + + return TRUE; + } Property changes on: head/devel/libsigrok/files/patch-src_hardware_lascar-el-usb_protocol.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/libsigrok/pkg-plist =================================================================== --- head/devel/libsigrok/pkg-plist (revision 451799) +++ head/devel/libsigrok/pkg-plist (revision 451800) @@ -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