Attachment 172492 Details for Bug 211101 – Patch file

[patch] Patch file

srp (text/plain), 28.85 KB, created by mwm on 2016-07-14 01:06:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mwm

Created: 2016-07-14 01:06:52 UTC

Size: 28.85 KB

patch

obsolete

>diff -r -u -N sigrokstuff/devel/libserialport/Makefile sigrokstuff-new/devel/libserialport/Makefile
>--- sigrokstuff/devel/libserialport/Makefile	2016-07-13 19:43:23.899433000 -0500
>+++ sigrokstuff-new/devel/libserialport/Makefile	2016-07-13 14:44:18.645898000 -0500
>@@ -2,17 +2,17 @@
> # $FreeBSD: head/devel/libserialport/Makefile 363269 2014-07-28 22:53:10Z wg $
> 
> PORTNAME=	libserialport
>-PORTVERSION=	0.1.0
>+PORTVERSION=	0.1.1
> CATEGORIES=	devel
> MASTER_SITES=	http://sigrok.org/download/source/libserialport/
> 
>-MAINTAINER=	uffe@uffe.org
>+MAINTAINER=	mwm@mired.org
> COMMENT=	Framework for hardware logic analyzers, serial port support library
> 
> LICENSE=	LGPL3
> 
> USE_LDCONFIG=	yes
>-USES=		gmake libtool pathfix pkgconfig
>+USES=		libtool pathfix pkgconfig
> 
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
>diff -r -u -N sigrokstuff/devel/libserialport/distinfo sigrokstuff-new/devel/libserialport/distinfo
>--- sigrokstuff/devel/libserialport/distinfo	2016-07-13 19:43:23.899486000 -0500
>+++ sigrokstuff-new/devel/libserialport/distinfo	2016-07-13 14:25:32.714990000 -0500
>@@ -1,2 +1,3 @@
>-SHA256 (libserialport-0.1.0.tar.gz) = ec905bd64bd8b82234b68a5eded5fd79b67704fe0cd73bf092666b9679a319af
>-SIZE (libserialport-0.1.0.tar.gz) = 382395
>+TIMESTAMP = 1468437932
>+SHA256 (libserialport-0.1.1.tar.gz) = 4a2af9d9c3ff488e92fb75b4ba38b35bcf9b8a66df04773eba2a7bbf1fa7529d
>+SIZE (libserialport-0.1.1.tar.gz) = 405251
>diff -r -u -N sigrokstuff/devel/libserialport/files/patch-freebsd.c sigrokstuff-new/devel/libserialport/files/patch-freebsd.c
>--- sigrokstuff/devel/libserialport/files/patch-freebsd.c	1969-12-31 18:00:00.000000000 -0600
>+++ sigrokstuff-new/devel/libserialport/files/patch-freebsd.c	2016-07-13 14:34:39.561932000 -0500
>@@ -0,0 +1,184 @@
>+--- freebsd.c.orig	2016-01-27 14:12:27 UTC
>++++ freebsd.c
>+@@ -18,61 +18,18 @@
>+  */
>+ 
>+ /*
>+- * FreeBSD platform specific serial port information:
>+- *
>+- * FreeBSD has two device nodes for each serial port:
>+- *
>+- *  1) a call-in port
>+- *  2) a call-out port
>+- *
>+- * Quoting FreeBSD Handbook section 26.2.1
>+- * (https://www.freebsd.org/doc/handbook/serial.html)
>+- *
>+- * In FreeBSD, each serial port is accessed through an entry in /dev.
>+- * There are two different kinds of entries:
>+- *
>+- * 1) Call-in ports are named /dev/ttyuN where N is the port number,
>+- *    starting from zero. If a terminal is connected to the first serial port
>+- *    (COM1), use /dev/ttyu0 to refer to the terminal. If the terminal is on
>+- *    the second serial port (COM2), use /dev/ttyu1, and so forth.
>+- *    Generally, the call-in port is used for terminals. Call-in ports require
>+- *    that the serial line assert the "Data Carrier Detect" signal to work
>+- *    correctly.
>+- *
>+- * 2) Call-out ports are named /dev/cuauN on FreeBSD versions 10.x and higher
>+- *    and /dev/cuadN on FreeBSD versions 9.x and lower. Call-out ports are
>+- *    usually not used for terminals, but are used for modems. The call-out
>+- *    port can be used if the serial cable or the terminal does not support
>+- *    the "Data Carrier Detect" signal.
>+- *
>+- * FreeBSD also provides initialization devices (/dev/ttyuN.init and
>+- * /dev/cuauN.init or /dev/cuadN.init) and locking devices (/dev/ttyuN.lock
>+- * and /dev/cuauN.lock or /dev/cuadN.lock). The initialization devices are
>+- * used to initialize communications port parameters each time a port is
>+- * opened, such as crtscts for modems which use RTS/CTS signaling for flow
>+- * control. The locking devices are used to lock flags on ports to prevent
>+- * users or programs changing certain parameters.
>+- *
>+- * In line with the above device naming USB-serial devices have
>+- * the following naming:
>+- *
>+- * 1) call-in ports: /dev/ttyUN where N is the port number
>+- * 2) call-out ports: /dev/cuaUN where N is the port number
>+- *
>+- * See also: ucom(4), https://www.freebsd.org/cgi/man.cgi?query=ucom
>+- *
>+  * Getting USB serial port device description:
>+  *
>+  * In order to query USB serial ports for device description - the mapping
>+  * between the kernel device driver instances must be correlated with the
>+  * above mentioned device nodes.
>+  *
>+- * 1) For each USB-serial port (/dev/cuaUN) use libusb to lookup the device
>++ * 1) For each USB-serial port (/dev/ttyUN) use libusb to lookup the device
>+  *    description and the name of the kernel device driver instance.
>+  * 2) Query sysctl for the kernel device driver instance info.
>+  * 3) Derive the ttyname and (serial) port count for the kernel device
>+  *    driver instance.
>+- * 4) If sysctl ttyname and port matches /dev/cuaUN apply the libusb
>++ * 4) If sysctl ttyname and port matches /dev/tty apply the libusb
>+  *    device description.
>+  */
>+ 
>+@@ -91,7 +48,7 @@
>+ #include "libserialport.h"
>+ #include "libserialport_internal.h"
>+ 
>+-#define DEV_CUA_PATH "/dev/cua"
>++#define DEV_TTY_PATH "/dev/tty"
>+ 
>+ //#define DBG(...) printf(__VA_ARGS__)
>+ #define DBG(...)
>+@@ -240,24 +197,25 @@ SP_PRIV enum sp_return get_port_details(
>+ 	struct libusb20_backend *be;
>+ 	struct libusb20_device *dev, *dev_last;
>+ 	char tbuf[FILENAME_MAX];
>+-	char *cua_sfx;
>+-	int cua_dev_found;
>++	char *tty_sfx;
>++	int tty_dev_found;
>+ 	uint8_t idx;
>+ 	int sub_inst;
>+ 
>+ 	DBG("Portname: '%s'\n", port->name);
>+ 
>+-	if (!strncmp(port->name, DEV_CUA_PATH, strlen(DEV_CUA_PATH))) {
>+-		cua_sfx = port->name + strlen(DEV_CUA_PATH);
>+-		DBG("'%s': '%s'\n", DEV_CUA_PATH, cua_sfx);
>+-	} else {
>++	if (!strncmp(port->name, DEV_TTY_PATH, strlen(DEV_TTY_PATH))) {
>++		tty_sfx = port->name + strlen(DEV_TTY_PATH);
>++		DBG("'%s': '%s'\n", DEV_TTY_PATH, tty_sfx);
>++
>++        } else {
>+ 		RETURN_ERROR(SP_ERR_ARG, "Device name not recognized");
>+ 	}
>+ 
>+ 	/* Native UART enumeration. */
>+-	if ((cua_sfx[0] == 'u') || (cua_sfx[0] == 'd')) {
>++	if ((tty_sfx[0] == 'u') || (tty_sfx[0] == 'd')) {
>+ 		port->transport = SP_TRANSPORT_NATIVE;
>+-		snprintf(tbuf, sizeof(tbuf), "cua%s", cua_sfx);
>++		snprintf(tbuf, sizeof(tbuf), "tty%s", tty_sfx);
>+ 		port->description = strdup(tbuf);
>+ 		RETURN_OK();
>+ 	}
>+@@ -265,8 +223,8 @@ SP_PRIV enum sp_return get_port_details(
>+ 	/* USB device enumeration. */
>+ 	dev = dev_last = NULL;
>+ 	be = libusb20_be_alloc_default();
>+-	cua_dev_found = 0;
>+-	while (cua_dev_found == 0) {
>++	tty_dev_found = 0;
>++	while (tty_dev_found == 0) {
>+ 		dev = libusb20_be_device_foreach(be, dev_last);
>+ 		if (!dev)
>+ 			break;
>+@@ -291,9 +249,9 @@ SP_PRIV enum sp_return get_port_details(
>+ 							snprintf(tbuf, sizeof(tbuf), "%s", ttyname);
>+ 						else
>+ 							snprintf(tbuf, sizeof(tbuf), "%s.%d", ttyname, sub_inst);
>+-						if (!strcmp(cua_sfx, tbuf)) {
>+-							DBG("MATCH: '%s' == '%s'\n", cua_sfx, tbuf);
>+-							cua_dev_found = 1;
>++						if (!strcmp(tty_sfx, tbuf)) {
>++							DBG("MATCH: '%s' == '%s'\n", tty_sfx, tbuf);
>++							tty_dev_found = 1;
>+ 							populate_port_struct_from_libusb_desc(port, dev);
>+ 							break; /* Break out of sub instance loop. */
>+ 						}
>+@@ -308,7 +266,7 @@ SP_PRIV enum sp_return get_port_details(
>+ 				free(drv_name_str);
>+ 			if (drv_inst_str)
>+ 				free(drv_inst_str);
>+-			if (cua_dev_found)
>++			if (tty_dev_found)
>+ 				break; /* Break out of USB device port idx loop. */
>+ 		}
>+ 		libusb20_dev_close(dev);
>+@@ -316,8 +274,8 @@ SP_PRIV enum sp_return get_port_details(
>+ 	}
>+ 	libusb20_be_free(be);
>+ 
>+-	if (cua_dev_found == 0)
>+-		DBG("WARN: Found no match '%s' %s'\n", port->name, cua_sfx);
>++	if (tty_dev_found == 0)
>++		DBG("WARN: Found no match '%s' %s'\n", port->name, tty_sfx);
>+ 
>+ 	RETURN_OK();
>+ }
>+@@ -340,9 +298,9 @@ SP_PRIV enum sp_return list_ports(struct
>+ 		ret = SP_OK;
>+ 		if (entry.d_type != DT_CHR)
>+ 			continue;
>+-		if (strncmp(entry.d_name, "cuaU", 4) != 0)
>+-			if (strncmp(entry.d_name, "cuau", 4) != 0)
>+-				if (strncmp(entry.d_name, "cuad", 4) != 0)
>++		if (strncmp(entry.d_name, "ttyU", 4) != 0)
>++			if (strncmp(entry.d_name, "ttyu", 4) != 0)
>++				if (strncmp(entry.d_name, "ttyd", 4) != 0)
>+ 					continue;
>+ 		if (strend(entry.d_name, ".init"))
>+ 			continue;
>+@@ -352,7 +310,7 @@ SP_PRIV enum sp_return list_ports(struct
>+ 		snprintf(name, sizeof(name), "/dev/%s", entry.d_name);
>+ 		DEBUG_FMT("Found device %s", name);
>+ 
>+-		/* Check that we can open tty/cua device in rw mode - we need that. */
>++		/* Check that we can open tty device in rw mode - we need that. */
>+ 		if ((fd = open(name, O_RDWR | O_NONBLOCK | O_NOCTTY | O_TTY_INIT | O_CLOEXEC)) < 0) {
>+ 			DEBUG("Open failed, skipping");
>+ 			continue;
>+@@ -373,7 +331,7 @@ SP_PRIV enum sp_return list_ports(struct
>+ 		DBG("%s: %s\n", __func__, entry.d_name);
>+ 
>+ 		*list = list_append(*list, name);
>+-		if (!list) {
>++		if (!*list) {
>+ 			SET_ERROR(ret, SP_ERR_MEM, "List append failed");
>+ 			break;
>+ 		}
>diff -r -u -N sigrokstuff/devel/libserialport/pkg-plist sigrokstuff-new/devel/libserialport/pkg-plist
>--- sigrokstuff/devel/libserialport/pkg-plist	2016-07-13 19:43:23.899538000 -0500
>+++ sigrokstuff-new/devel/libserialport/pkg-plist	2016-07-13 14:54:30.270529000 -0500
>@@ -2,5 +2,5 @@
> lib/libserialport.a
> lib/libserialport.so
> lib/libserialport.so.0
>-lib/libserialport.so.0.0.0
>+lib/libserialport.so.0.1.0
> libdata/pkgconfig/libserialport.pc
>diff -r -u -N sigrokstuff/devel/libsigrok/Makefile sigrokstuff-new/devel/libsigrok/Makefile
>--- sigrokstuff/devel/libsigrok/Makefile	2016-07-13 19:43:23.900011000 -0500
>+++ sigrokstuff-new/devel/libsigrok/Makefile	2016-07-13 15:21:52.666452000 -0500
>@@ -2,12 +2,11 @@
> # $FreeBSD: head/devel/libsigrok/Makefile 412346 2016-04-01 14:00:51Z mat $
> 
> PORTNAME=	libsigrok
>-PORTVERSION=	0.3.0
>-PORTREVISION=	1
>-CATEGORIES=	devel
>+PORTVERSION=	0.4.0
>+CATEGORIES=	devel java
> MASTER_SITES=	http://sigrok.org/download/source/libsigrok/
> 
>-MAINTAINER=	uffe@uffe.org
>+MAINTAINER=	mwm@mired.org
> COMMENT=	Framework for hardware logic analyzers, core library
> 
> LICENSE=	GPLv3
>@@ -15,8 +14,13 @@
> LIB_DEPENDS=	libserialport.so:devel/libserialport \
> 		libzip.so:archivers/libzip
> 
>+USE_JAVA=	yes
>+JAVA_OS=	native
>+JAVA_BUILD=	yes
>+
> GNU_CONFIGURE=	yes
>-USES=		gmake pathfix libtool pkgconfig
>+CONFIGURE_ENV=	JAVA_HOME=$(JAVA_HOME)
>+USES=		pathfix libtool pkgconfig
> USE_GNOME=	glib20
> INSTALL_TARGET=	install-strip
> MAKE_JOBS_UNSAFE=	yes
>diff -r -u -N sigrokstuff/devel/libsigrok/distinfo sigrokstuff-new/devel/libsigrok/distinfo
>--- sigrokstuff/devel/libsigrok/distinfo	2016-07-13 19:43:23.899957000 -0500
>+++ sigrokstuff-new/devel/libsigrok/distinfo	2016-07-13 14:37:48.988115000 -0500
>@@ -1,2 +1,3 @@
>-SHA256 (libsigrok-0.3.0.tar.gz) = 43926907a06f1d7aa73c68ae379d66412ac2728483eed7d20a8cf061f73f7050
>-SIZE (libsigrok-0.3.0.tar.gz) = 924503
>+TIMESTAMP = 1468438668
>+SHA256 (libsigrok-0.4.0.tar.gz) = 5f291f3fee36e6dab1336f1c78596e50588831bc5ebd7cddc2a95fe8c71d669e
>+SIZE (libsigrok-0.4.0.tar.gz) = 1387329
>diff -r -u -N sigrokstuff/devel/libsigrok/files/patch-hardware-lascar-el-usb-protocol.c sigrokstuff-new/devel/libsigrok/files/patch-hardware-lascar-el-usb-protocol.c
>--- sigrokstuff/devel/libsigrok/files/patch-hardware-lascar-el-usb-protocol.c	2016-07-13 19:43:23.899746000 -0500
>+++ sigrokstuff-new/devel/libsigrok/files/patch-hardware-lascar-el-usb-protocol.c	1969-12-31 18:00:00.000000000 -0600
>@@ -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;
>- }
>diff -r -u -N sigrokstuff/devel/libsigrok/files/patch-hardware-victor-dmm-api.c sigrokstuff-new/devel/libsigrok/files/patch-hardware-victor-dmm-api.c
>--- sigrokstuff/devel/libsigrok/files/patch-hardware-victor-dmm-api.c	2016-07-13 19:43:23.899801000 -0500
>+++ sigrokstuff-new/devel/libsigrok/files/patch-hardware-victor-dmm-api.c	1969-12-31 18:00:00.000000000 -0600
>@@ -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 -r -u -N sigrokstuff/devel/libsigrok/pkg-plist sigrokstuff-new/devel/libsigrok/pkg-plist
>--- sigrokstuff/devel/libsigrok/pkg-plist	2016-07-13 19:43:23.899906000 -0500
>+++ sigrokstuff-new/devel/libsigrok/pkg-plist	2016-07-13 16:44:59.859577000 -0500
>@@ -1,8 +1,29 @@
> include/libsigrok/libsigrok.h
> include/libsigrok/proto.h
> include/libsigrok/version.h
>+include/libsigrokcxx/libsigrokcxx.hpp
>+include/libsigrokcxx/enums.hpp
>+share/java/sigrok-core.jar
> lib/libsigrok.a
> lib/libsigrok.so
>-lib/libsigrok.so.2
>-lib/libsigrok.so.2.0.0
>+lib/libsigrok.so.3
>+lib/libsigrok.so.3.0.0
>+lib/libsigrokcxx.a
>+lib/libsigrokcxx.so
>+lib/libsigrokcxx.so.3
>+lib/libsigrokcxx.so.3.0.0
>+lib/jni/libsigrok_java_core_classes.so
>+lib/python2.7/site-packages/libsigrok-0.4.0-py2.7-nspkg.pth
>+lib/python2.7/site-packages/libsigrok-0.4.0-py2.7.egg-info/PKG-INFO
>+lib/python2.7/site-packages/libsigrok-0.4.0-py2.7.egg-info/SOURCES.txt
>+lib/python2.7/site-packages/libsigrok-0.4.0-py2.7.egg-info/dependency_links.txt
>+lib/python2.7/site-packages/libsigrok-0.4.0-py2.7.egg-info/namespace_packages.txt
>+lib/python2.7/site-packages/libsigrok-0.4.0-py2.7.egg-info/not-zip-safe
>+lib/python2.7/site-packages/libsigrok-0.4.0-py2.7.egg-info/top_level.txt
>+lib/python2.7/site-packages/sigrok/core/__init__.py
>+lib/python2.7/site-packages/sigrok/core/__init__.pyc
>+lib/python2.7/site-packages/sigrok/core/_classes.so
>+lib/python2.7/site-packages/sigrok/core/classes.py
>+lib/python2.7/site-packages/sigrok/core/classes.pyc
> libdata/pkgconfig/libsigrok.pc
>+libdata/pkgconfig/libsigrokcxx.pc
>diff -r -u -N sigrokstuff/devel/libsigrokdecode/Makefile sigrokstuff-new/devel/libsigrokdecode/Makefile
>--- sigrokstuff/devel/libsigrokdecode/Makefile	2016-07-13 19:43:23.900249000 -0500
>+++ sigrokstuff-new/devel/libsigrokdecode/Makefile	2016-07-13 15:17:21.485683000 -0500
>@@ -2,19 +2,18 @@
> # $FreeBSD: head/devel/libsigrokdecode/Makefile 376731 2015-01-10 23:15:27Z demon $
> 
> PORTNAME=	libsigrokdecode
>-PORTVERSION=	0.3.0
>-PORTREVISION=	1
>+PORTVERSION=	0.4.0
> CATEGORIES=	devel
> MASTER_SITES=	http://sigrok.org/download/source/libsigrokdecode/
> 
>-MAINTAINER=	uffe@uffe.org
>+MAINTAINER=	mwm@mired.org
> COMMENT=	Framework for hardware logic analyzers, protocol decoders library
> 
> LICENSE=	GPLv3
> 
> GNU_CONFIGURE=	yes
> USE_GNOME=	glib20
>-USES=		gmake libtool pathfix pkgconfig python:3
>+USES=		libtool pathfix pkgconfig python:3
> MAKE_JOBS_UNSAFE=	yes
> USE_LDCONFIG=	yes
> INSTALL_TARGET=	install-strip
>diff -r -u -N sigrokstuff/devel/libsigrokdecode/distinfo sigrokstuff-new/devel/libsigrokdecode/distinfo
>--- sigrokstuff/devel/libsigrokdecode/distinfo	2016-07-13 19:43:23.900145000 -0500
>+++ sigrokstuff-new/devel/libsigrokdecode/distinfo	2016-07-13 15:17:52.474049000 -0500
>@@ -1,2 +1,3 @@
>-SHA256 (libsigrokdecode-0.3.0.tar.gz) = ee4ebb1df99fbd1df40234d08a6c7f3e10393f087de627197347e2268ad6478f
>-SIZE (libsigrokdecode-0.3.0.tar.gz) = 607691
>+TIMESTAMP = 1468441072
>+SHA256 (libsigrokdecode-0.4.0.tar.gz) = fd7e9d1b73245e844ead97a16d5321c766196f946c9b28a8646cab2e98ec3537
>+SIZE (libsigrokdecode-0.4.0.tar.gz) = 694223
>diff -r -u -N sigrokstuff/devel/libsigrokdecode/pkg-plist sigrokstuff-new/devel/libsigrokdecode/pkg-plist
>--- sigrokstuff/devel/libsigrokdecode/pkg-plist	2016-07-13 19:43:23.900197000 -0500
>+++ sigrokstuff-new/devel/libsigrokdecode/pkg-plist	2016-07-13 15:20:40.571747000 -0500
>@@ -2,83 +2,135 @@
> include/libsigrokdecode/version.h
> lib/libsigrokdecode.a
> lib/libsigrokdecode.so
>-lib/libsigrokdecode.so.2
>-lib/libsigrokdecode.so.2.0.0
>+lib/libsigrokdecode.so.3
>+lib/libsigrokdecode.so.3.0.0
> libdata/pkgconfig/libsigrokdecode.pc
>-%%DATADIR%%/decoders/avr_isp/__init__.py
>-%%DATADIR%%/decoders/avr_isp/parts.py
>-%%DATADIR%%/decoders/avr_isp/pd.py
>-%%DATADIR%%/decoders/can/__init__.py
>-%%DATADIR%%/decoders/can/pd.py
>-%%DATADIR%%/decoders/dcf77/__init__.py
>-%%DATADIR%%/decoders/dcf77/pd.py
>-%%DATADIR%%/decoders/ds1307/__init__.py
>-%%DATADIR%%/decoders/ds1307/pd.py
>-%%DATADIR%%/decoders/edid/__init__.py
>-%%DATADIR%%/decoders/edid/pd.py
>-%%DATADIR%%/decoders/guess_bitrate/__init__.py
>-%%DATADIR%%/decoders/guess_bitrate/pd.py
>+%%DATADIR%%/decoders/sdcard_sd/pd.py
>+%%DATADIR%%/decoders/sdcard_sd/__init__.py
>+%%DATADIR%%/decoders/sdcard_sd/lists.py
>+%%DATADIR%%/decoders/tca6408a/__init__.py
>+%%DATADIR%%/decoders/tca6408a/pd.py
> %%DATADIR%%/decoders/i2c/__init__.py
> %%DATADIR%%/decoders/i2c/pd.py
>-%%DATADIR%%/decoders/i2cdemux/__init__.py
>-%%DATADIR%%/decoders/i2cdemux/pd.py
>-%%DATADIR%%/decoders/i2cfilter/__init__.py
>-%%DATADIR%%/decoders/i2cfilter/pd.py
>+%%DATADIR%%/decoders/modbus/__init__.py
>+%%DATADIR%%/decoders/modbus/pd.py
>+%%DATADIR%%/decoders/am230x/__init__.py
>+%%DATADIR%%/decoders/am230x/pd.py
>+%%DATADIR%%/decoders/rgb_led_spi/pd.py
>+%%DATADIR%%/decoders/rgb_led_spi/__init__.py
>+%%DATADIR%%/decoders/guess_bitrate/pd.py
>+%%DATADIR%%/decoders/guess_bitrate/__init__.py
>+%%DATADIR%%/decoders/usb_power_delivery/pd.py
>+%%DATADIR%%/decoders/usb_power_delivery/__init__.py
>+%%DATADIR%%/decoders/usb_signalling/pd.py
>+%%DATADIR%%/decoders/usb_signalling/__init__.py
>+%%DATADIR%%/decoders/spdif/pd.py
>+%%DATADIR%%/decoders/spdif/__init__.py
>+%%DATADIR%%/decoders/ir_rc5/lists.py
>+%%DATADIR%%/decoders/ir_rc5/pd.py
>+%%DATADIR%%/decoders/ir_rc5/__init__.py
>+%%DATADIR%%/decoders/rtc8564/__init__.py
>+%%DATADIR%%/decoders/rtc8564/pd.py
>+%%DATADIR%%/decoders/arm_itm/pd.py
>+%%DATADIR%%/decoders/arm_itm/__init__.py
>+%%DATADIR%%/decoders/qi/__init__.py
>+%%DATADIR%%/decoders/qi/pd.py
>+%%DATADIR%%/decoders/ds1307/pd.py
>+%%DATADIR%%/decoders/ds1307/__init__.py
>+%%DATADIR%%/decoders/arm_tpiu/__init__.py
>+%%DATADIR%%/decoders/arm_tpiu/pd.py
>+%%DATADIR%%/decoders/midi/lists.py
>+%%DATADIR%%/decoders/midi/__init__.py
>+%%DATADIR%%/decoders/midi/pd.py
>+%%DATADIR%%/decoders/timing/__init__.py
>+%%DATADIR%%/decoders/timing/pd.py
>+%%DATADIR%%/decoders/mxc6225xu/__init__.py
>+%%DATADIR%%/decoders/mxc6225xu/pd.py
>+%%DATADIR%%/decoders/onewire_network/pd.py
>+%%DATADIR%%/decoders/onewire_network/__init__.py
>+%%DATADIR%%/decoders/jitter/pd.py
>+%%DATADIR%%/decoders/jitter/__init__.py
>+%%DATADIR%%/decoders/parallel/pd.py
>+%%DATADIR%%/decoders/parallel/__init__.py
>+%%DATADIR%%/decoders/spiflash/pd.py
>+%%DATADIR%%/decoders/spiflash/lists.py
>+%%DATADIR%%/decoders/spiflash/__init__.py
> %%DATADIR%%/decoders/i2s/__init__.py
> %%DATADIR%%/decoders/i2s/pd.py
>-%%DATADIR%%/decoders/ir_nec/__init__.py
>+%%DATADIR%%/decoders/z80/__init__.py
>+%%DATADIR%%/decoders/z80/tables.py
>+%%DATADIR%%/decoders/z80/pd.py
>+%%DATADIR%%/decoders/lm75/pd.py
>+%%DATADIR%%/decoders/lm75/__init__.py
>+%%DATADIR%%/decoders/can/pd.py
>+%%DATADIR%%/decoders/can/__init__.py
>+%%DATADIR%%/decoders/arm_etmv3/pd.py
>+%%DATADIR%%/decoders/arm_etmv3/__init__.py
>+%%DATADIR%%/decoders/stepper_motor/__init__.py
>+%%DATADIR%%/decoders/stepper_motor/pd.py
> %%DATADIR%%/decoders/ir_nec/lists.py
> %%DATADIR%%/decoders/ir_nec/pd.py
>-%%DATADIR%%/decoders/ir_rc5/__init__.py
>-%%DATADIR%%/decoders/ir_rc5/lists.py
>-%%DATADIR%%/decoders/ir_rc5/pd.py
>-%%DATADIR%%/decoders/jtag/__init__.py
>+%%DATADIR%%/decoders/ir_nec/__init__.py
>+%%DATADIR%%/decoders/uart/__init__.py
>+%%DATADIR%%/decoders/uart/pd.py
> %%DATADIR%%/decoders/jtag/pd.py
>+%%DATADIR%%/decoders/jtag/__init__.py
> %%DATADIR%%/decoders/jtag_stm32/__init__.py
> %%DATADIR%%/decoders/jtag_stm32/pd.py
>-%%DATADIR%%/decoders/lm75/__init__.py
>-%%DATADIR%%/decoders/lm75/pd.py
>-%%DATADIR%%/decoders/lpc/__init__.py
>-%%DATADIR%%/decoders/lpc/pd.py
>-%%DATADIR%%/decoders/maxim_ds28ea00/__init__.py
>-%%DATADIR%%/decoders/maxim_ds28ea00/pd.py
>-%%DATADIR%%/decoders/midi/__init__.py
>-%%DATADIR%%/decoders/midi/lists.py
>-%%DATADIR%%/decoders/midi/pd.py
>-%%DATADIR%%/decoders/mlx90614/__init__.py
> %%DATADIR%%/decoders/mlx90614/pd.py
>-%%DATADIR%%/decoders/mx25lxx05d/__init__.py
>-%%DATADIR%%/decoders/mx25lxx05d/pd.py
>-%%DATADIR%%/decoders/mxc6225xu/__init__.py
>-%%DATADIR%%/decoders/mxc6225xu/pd.py
>+%%DATADIR%%/decoders/mlx90614/__init__.py
>+%%DATADIR%%/decoders/em4100/pd.py
>+%%DATADIR%%/decoders/em4100/__init__.py
> %%DATADIR%%/decoders/nunchuk/__init__.py
> %%DATADIR%%/decoders/nunchuk/pd.py
>-%%DATADIR%%/decoders/onewire_link/__init__.py
>-%%DATADIR%%/decoders/onewire_link/pd.py
>-%%DATADIR%%/decoders/onewire_network/__init__.py
>-%%DATADIR%%/decoders/onewire_network/pd.py
>-%%DATADIR%%/decoders/pan1321/__init__.py
>-%%DATADIR%%/decoders/pan1321/pd.py
>-%%DATADIR%%/decoders/parallel/__init__.py
>-%%DATADIR%%/decoders/parallel/pd.py
>-%%DATADIR%%/decoders/rgb_led_spi/__init__.py
>-%%DATADIR%%/decoders/rgb_led_spi/pd.py
>-%%DATADIR%%/decoders/rtc8564/__init__.py
>-%%DATADIR%%/decoders/rtc8564/pd.py
>-%%DATADIR%%/decoders/sdcard_spi/__init__.py
>+%%DATADIR%%/decoders/avr_isp/parts.py
>+%%DATADIR%%/decoders/avr_isp/pd.py
>+%%DATADIR%%/decoders/avr_isp/__init__.py
>+%%DATADIR%%/decoders/edid/pd.py
>+%%DATADIR%%/decoders/edid/__init__.py
>+%%DATADIR%%/decoders/usb_packet/pd.py
>+%%DATADIR%%/decoders/usb_packet/__init__.py
>+%%DATADIR%%/decoders/xfp/pd.py
>+%%DATADIR%%/decoders/xfp/__init__.py
> %%DATADIR%%/decoders/sdcard_spi/pd.py
>-%%DATADIR%%/decoders/spi/__init__.py
>+%%DATADIR%%/decoders/sdcard_spi/__init__.py
>+%%DATADIR%%/decoders/pan1321/pd.py
>+%%DATADIR%%/decoders/pan1321/__init__.py
>+%%DATADIR%%/decoders/onewire_link/pd.py
>+%%DATADIR%%/decoders/onewire_link/__init__.py
>+%%DATADIR%%/decoders/mrf24j40/__init__.py
>+%%DATADIR%%/decoders/mrf24j40/lists.py
>+%%DATADIR%%/decoders/mrf24j40/pd.py
>+%%DATADIR%%/decoders/nrf24l01/pd.py
>+%%DATADIR%%/decoders/nrf24l01/__init__.py
>+%%DATADIR%%/decoders/usb_request/__init__.py
>+%%DATADIR%%/decoders/usb_request/pd.py
>+%%DATADIR%%/decoders/i2cdemux/pd.py
>+%%DATADIR%%/decoders/i2cdemux/__init__.py
> %%DATADIR%%/decoders/spi/pd.py
>+%%DATADIR%%/decoders/spi/__init__.py
>+%%DATADIR%%/decoders/maxim_ds28ea00/__init__.py
>+%%DATADIR%%/decoders/maxim_ds28ea00/pd.py
>+%%DATADIR%%/decoders/lpc/pd.py
>+%%DATADIR%%/decoders/lpc/__init__.py
>+%%DATADIR%%/decoders/dcf77/__init__.py
>+%%DATADIR%%/decoders/dcf77/pd.py
>+%%DATADIR%%/decoders/i2cfilter/pd.py
>+%%DATADIR%%/decoders/i2cfilter/__init__.py
>+%%DATADIR%%/decoders/swd/__init__.py
>+%%DATADIR%%/decoders/swd/pd.py
>+%%DATADIR%%/decoders/pwm/pd.py
>+%%DATADIR%%/decoders/pwm/__init__.py
>+%%DATADIR%%/decoders/mdio/pd.py
>+%%DATADIR%%/decoders/mdio/__init__.py
>+%%DATADIR%%/decoders/adns5020/pd.py
>+%%DATADIR%%/decoders/adns5020/__init__.py
>+%%DATADIR%%/decoders/eeprom24xx/lists.py
>+%%DATADIR%%/decoders/eeprom24xx/pd.py
>+%%DATADIR%%/decoders/eeprom24xx/__init__.py
>+%%DATADIR%%/decoders/rfm12/pd.py
>+%%DATADIR%%/decoders/rfm12/__init__.py
> %%DATADIR%%/decoders/tlc5620/__init__.py
> %%DATADIR%%/decoders/tlc5620/pd.py
>-%%DATADIR%%/decoders/uart/__init__.py
>-%%DATADIR%%/decoders/uart/pd.py
>-%%DATADIR%%/decoders/usb_packet/__init__.py
>-%%DATADIR%%/decoders/usb_packet/pd.py
>-%%DATADIR%%/decoders/usb_signalling/__init__.py
>-%%DATADIR%%/decoders/usb_signalling/pd.py
>-%%DATADIR%%/decoders/xfp/__init__.py
>-%%DATADIR%%/decoders/xfp/pd.py
>-%%DATADIR%%/decoders/z80/__init__.py
>-%%DATADIR%%/decoders/z80/pd.py
>-%%DATADIR%%/decoders/z80/tables.py
>+%%DATADIR%%/decoders/max7219/pd.py
>+%%DATADIR%%/decoders/max7219/__init__.py
>diff -r -u -N sigrokstuff/science/pulseview/Makefile sigrokstuff-new/science/pulseview/Makefile
>--- sigrokstuff/science/pulseview/Makefile	2016-07-13 19:43:23.900495000 -0500
>+++ sigrokstuff-new/science/pulseview/Makefile	2016-07-13 15:55:47.283302000 -0500
>@@ -2,12 +2,11 @@
> # $FreeBSD: head/science/pulseview/Makefile 412349 2016-04-01 14:25:16Z mat $
> 
> PORTNAME=	pulseview
>-PORTVERSION=	0.2.0
>-PORTREVISION=	2
>+PORTVERSION=	0.3.0
> CATEGORIES=	science cad
> MASTER_SITES=	http://sigrok.org/download/source/pulseview/
> 
>-MAINTAINER=	uffe@uffe.org
>+MAINTAINER=	mwm@mired.org
> COMMENT=	GUI client that supports various hardware logic analyzers
> 
> LICENSE=	GPLv3
>@@ -17,7 +16,7 @@
> 		libsigrok.so:devel/libsigrok \
> 		libsigrokdecode.so:devel/libsigrokdecode
> 
>-USES=		cmake gmake pkgconfig
>+USES=		cmake pkgconfig
> USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build
> CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \
> 		-DDISABLE_WERROR:BOOL=TRUE
>diff -r -u -N sigrokstuff/science/pulseview/distinfo sigrokstuff-new/science/pulseview/distinfo
>--- sigrokstuff/science/pulseview/distinfo	2016-07-13 19:43:23.900548000 -0500
>+++ sigrokstuff-new/science/pulseview/distinfo	2016-07-13 15:54:53.310877000 -0500
>@@ -1,2 +1,3 @@
>-SHA256 (pulseview-0.2.0.tar.gz) = feb5d33a0a91c989bfc39fa758195755e78e87c3cf445bb135a8c8d4f86bc1dd
>-SIZE (pulseview-0.2.0.tar.gz) = 148799
>+TIMESTAMP = 1468443293
>+SHA256 (pulseview-0.3.0.tar.gz) = 5ffe2cb7a602fcdc60933d400c77bcd66e6ce529bc4f6e97d6a5e5a86f2f530e
>+SIZE (pulseview-0.3.0.tar.gz) = 188602
>diff -r -u -N sigrokstuff/science/pulseview/files/patch-pv_data_signaldata.cpp sigrokstuff-new/science/pulseview/files/patch-pv_data_signaldata.cpp
>--- sigrokstuff/science/pulseview/files/patch-pv_data_signaldata.cpp	2016-07-13 19:43:23.900680000 -0500
>+++ sigrokstuff-new/science/pulseview/files/patch-pv_data_signaldata.cpp	1969-12-31 18:00:00.000000000 -0600
>@@ -1,13 +0,0 @@
>---- pv/data/signaldata.cpp.orig	2014-05-06 21:43:51 UTC
>-+++ pv/data/signaldata.cpp
>-@@ -29,6 +29,10 @@ SignalData::SignalData() :
>- {
>- }
>- 
>-+SignalData::~SignalData()
>-+{
>-+}
>-+
>- double SignalData::samplerate() const
>- {
>- 	return _samplerate;
>diff -r -u -N sigrokstuff/science/pulseview/files/patch-pv_data_signaldata.h sigrokstuff-new/science/pulseview/files/patch-pv_data_signaldata.h
>--- sigrokstuff/science/pulseview/files/patch-pv_data_signaldata.h	2016-07-13 19:43:23.900735000 -0500
>+++ sigrokstuff-new/science/pulseview/files/patch-pv_data_signaldata.h	1969-12-31 18:00:00.000000000 -0600
>@@ -1,10 +0,0 @@
>---- pv/data/signaldata.h.orig	2014-05-06 21:43:51 UTC
>-+++ pv/data/signaldata.h
>-@@ -30,6 +30,7 @@ class SignalData
>- {
>- public:
>- 	SignalData();
>-+	virtual ~SignalData();
>- 
>- public:
>- 	double samplerate() const;
>diff -r -u -N sigrokstuff/science/sigrok-cli/Makefile sigrokstuff-new/science/sigrok-cli/Makefile
>--- sigrokstuff/science/sigrok-cli/Makefile	2016-07-13 19:43:23.901209000 -0500
>+++ sigrokstuff-new/science/sigrok-cli/Makefile	2016-07-13 15:23:03.641620000 -0500
>@@ -2,12 +2,11 @@
> # $FreeBSD: head/science/sigrok-cli/Makefile 412349 2016-04-01 14:25:16Z mat $
> 
> PORTNAME=	sigrok-cli
>-PORTVERSION=	0.5.0
>-PORTREVISION=	1
>+PORTVERSION=	0.6.0
> CATEGORIES=	science cad
> MASTER_SITES=	http://sigrok.org/download/source/sigrok-cli/
> 
>-MAINTAINER=	uffe@uffe.org
>+MAINTAINER=	mwm@mired.org
> COMMENT=	Framework for hardware logic analyzers, CLI client
> 
> LICENSE=	GPLv3
>@@ -19,7 +18,7 @@
> PLIST_FILES=	bin/sigrok-cli man/man1/sigrok-cli.1.gz
> 
> GNU_CONFIGURE=	yes
>-USES=		gmake pathfix libtool pkgconfig
>+USES=		pathfix libtool pkgconfig
> MAKE_JOBS_UNSAFE=	yes
> 
> .include <bsd.port.mk>
>diff -r -u -N sigrokstuff/science/sigrok-cli/distinfo sigrokstuff-new/science/sigrok-cli/distinfo
>--- sigrokstuff/science/sigrok-cli/distinfo	2016-07-13 19:43:23.901158000 -0500
>+++ sigrokstuff-new/science/sigrok-cli/distinfo	2016-07-13 15:23:19.199894000 -0500
>@@ -1,2 +1,3 @@
>-SHA256 (sigrok-cli-0.5.0.tar.gz) = 73a30501525b13c09624ae00d37041cdaa50238d89c6febf169fc784affe723c
>-SIZE (sigrok-cli-0.5.0.tar.gz) = 390077
>+TIMESTAMP = 1468441399
>+SHA256 (sigrok-cli-0.6.0.tar.gz) = ab2ede4e245f3987e19a89a530bd204e0d792c07474d9fed3345d4af4e84723c
>+SIZE (sigrok-cli-0.6.0.tar.gz) = 206733
>diff -r -u -N sigrokstuff/science/sigrok-firmware-fx2lafw/Makefile sigrokstuff-new/science/sigrok-firmware-fx2lafw/Makefile
>--- sigrokstuff/science/sigrok-firmware-fx2lafw/Makefile	2016-07-13 19:43:23.900916000 -0500
>+++ sigrokstuff-new/science/sigrok-firmware-fx2lafw/Makefile	2016-07-13 15:29:18.417703000 -0500
>@@ -2,14 +2,14 @@
> # $FreeBSD: head/science/sigrok-firmware-fx2lafw/Makefile 375110 2014-12-20 19:35:10Z bapt $
> 
> PORTNAME=	firmware
>-PORTVERSION=	0.1.2
>+PORTVERSION=	0.1.3
> CATEGORIES=	science
> MASTER_SITES=	http://sigrok.org/download/binary/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}/
> PKGNAMEPREFIX=	sigrok-
> PKGNAMESUFFIX=	-fx2lafw
> DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-bin-${PORTVERSION}
> 
>-MAINTAINER=	uffe@uffe.org
>+MAINTAINER=	mwm@mired.org
> COMMENT=	Cypress FX2 firmware for hardware logic analyzers
> 
> LICENSE=	GPLv2
>@@ -21,7 +21,9 @@
> 		fx2lafw-cwav-usbeedx.fw \
> 		fx2lafw-cwav-usbeesx.fw \
> 		fx2lafw-cypress-fx2.fw \
>-		fx2lafw-saleae-logic.fw
>+		fx2lafw-saleae-logic.fw \
>+		fx2lafw-sigrok-fx2-8ch.fw \
>+		fx2lafw-sigrok-fx2-16ch.fw
> 
> PORTDOCS=	README NEWS
> PLIST_FILES=	${FW_FILES:S,^,share/sigrok-firmware/,}
>diff -r -u -N sigrokstuff/science/sigrok-firmware-fx2lafw/distinfo sigrokstuff-new/science/sigrok-firmware-fx2lafw/distinfo
>--- sigrokstuff/science/sigrok-firmware-fx2lafw/distinfo	2016-07-13 19:43:23.900969000 -0500
>+++ sigrokstuff-new/science/sigrok-firmware-fx2lafw/distinfo	2016-07-13 15:27:40.722688000 -0500
>@@ -1,2 +1,3 @@
>-SHA256 (sigrok-firmware-fx2lafw-bin-0.1.2.tar.gz) = f28d411240a2f460d334e89ad18f5a632fa2a0f4afa25e030a26b41200351c70
>-SIZE (sigrok-firmware-fx2lafw-bin-0.1.2.tar.gz) = 36486
>+TIMESTAMP = 1468441660
>+SHA256 (sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz) = 741d84ccd40b506957629b4a541380c67d7f845001775372c75bd993bc1520e3
>+SIZE (sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz) = 38531

Flags:

koobs: maintainer-approval? (uffe)

Actions: View | Diff

Attachments on bug 211101: 172492