Hello community, here is the log from the commit of package libsigrok for openSUSE:Factory checked in at 2016-02-17 10:25:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsigrok (Old) and /work/SRC/openSUSE:Factory/.libsigrok.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsigrok" Changes: -------- --- /work/SRC/openSUSE:Factory/libsigrok/libsigrok.changes 2014-08-07 12:37:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsigrok.new/libsigrok.changes 2016-02-17 12:14:51.000000000 +0100 @@ -1,0 +2,65 @@ +Sat Jan 30 12:05:22 UTC 2016 - [email protected] + +- Update to version 0.4.0 + * New supported hardware: + - Logic analyzers: + - AKIP-9101 + - BeagleLogic + - LeCroy LogicStudio + - mcupro Logic16 clone + - Pipistrello OLS + - SysClk LWLA1016 + - Oscilloscopes + - Rigol/Agilent DS1000Z series + - Yokogawa DLM2000 series + - Yokogawa DL9000 series + - Hung-Chang DSO-2100 + - GW Instek GDS-800 + - Multimeters + - Agilent U1241A/B + - Agilent U1242A/B + - Brymen BM25x series + - MASTECH MS8250B + - Metrahit 16T/16U/KMM2002 + - PeakTech 3415 + - Tenma 72-7730/72-7732/72-9380A + - Testo 435-4 + - UNI-T UT372 + - UNI-T UT71A/B/C/D/E + - Velleman DVM4100 + - Voltcraft VC-870/VC-920/VC-940/VC-960 + Programmable power supplies + - Fluke/Philips PM2800 series + - HP 663xx series + - Manson HCS-3xxx series + - Motech LPS-30x series + - Rigol DP800 series + - Korad KAxxxxP series (a.k.a Velleman LABPS3005D and others) + - AC/DC sources + - Agilent N5700A series (DC sources) + - Chroma 61600 series (AC sources) + - Chroma 62000 series (DC sources) + - Electronic loads + - Maynuo M97 (and compatibles) + - LCR meters + - DER EE DE-5000 + - Scales + - KERN EW 6200-2NM + - BeagleBone Black capes + - BayLibre ACME (revA and revB) + +------------------------------------------------------------------- +Sat Oct 3 01:36:52 UTC 2015 - [email protected] + +- fix build on openSUSE 13.1 + * Add fix_unknown_types_declarations.diff +- require libsigrok from libsigrokcxx with same version +- update source from GIT + +------------------------------------------------------------------- +Fri Sep 25 03:51:58 UTC 2015 - [email protected] + +- Track GIT version (upcoming 0.4.0) + * build C++ binding (libsigrokcxx), needed for pulseview + +------------------------------------------------------------------- Old: ---- libsigrok-0.3.0.tar.gz New: ---- fix_unknown_types_declarations.diff libsigrok-0.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsigrok.spec ++++++ --- /var/tmp/diff_new_pack.VNIlu5/_old 2016-02-17 12:14:52.000000000 +0100 +++ /var/tmp/diff_new_pack.VNIlu5/_new 2016-02-17 12:14:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libsigrok # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,21 @@ Name: libsigrok -Version: 0.3.0 -%define libname %{name}2 +Version: 0.4.0 Release: 0 +%define libname %{name}3 +%define libcxxname libsigrokcxx3 Summary: Basic API for talking to logic analyzer hardware License: GPL-3.0+ Group: Productivity/Scientific/Electronics Url: http://sigrok.org Source0: http://sigrok.org/download/source/libsigrok/%{name}-%{version}.tar.gz +Patch0: fix_unknown_types_declarations.diff BuildRequires: alsa-devel BuildRequires: autoconf BuildRequires: automake BuildRequires: check-devel >= 0.9.4 +BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: glib2-devel >= 2.32.0 BuildRequires: libftdi1-devel >= 0.16 @@ -38,6 +41,7 @@ BuildRequires: libusb-1_0-devel BuildRequires: libzip-devel >= 0.10 BuildRequires: zlib-devel +BuildRequires: pkgconfig(glibmm-2.4) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -63,6 +67,21 @@ for talking to logic analyzer hardware and reading/writing the acquired data into various input/output file formats. +%package -n %{libcxxname} +Summary: Basic API for talking to logic analyzer hardware +Group: System/Libraries +Requires: %{libname} >= %{version} +Requires: %{name}-data >= %{version} + +%description -n %{libcxxname} +The sigrok project aims at creating a portable, cross-platform, +Free/Libre/Open-Source logic analyzer software that supports various +logic analyzer hardware products. + +libsigrok is a shared library written in C which provides the basic API +for talking to logic analyzer hardware and reading/writing the acquired data +into various input/output file formats. + %package data Summary: Basic API for talking to logic analyzer hardware Group: Productivity/Scientific/Electronics @@ -80,6 +99,7 @@ %package devel Summary: Basic API for talking to logic analyzer hardware Group: Development/Libraries/C and C++ +Requires: %{libcxxname} = %{version} Requires: %{libname} = %{version} %description devel @@ -93,13 +113,16 @@ %prep %setup -q +%if 0%{?suse_version} <= 1310 +%patch0 -p1 +%endif %build # libusb 1.0.16 is not really required sed -i 's/libusb-1.0 >= 1.0.16/libusb-1.0 >= 1.0.9/' configure.ac -autoreconf +#./autogen.sh +autoreconf --force --install -CFLAGS=-fno-strict-aliasing \ %configure \ --disable-static \ --enable-fx2lafw @@ -118,9 +141,18 @@ %postun -n %{libname} -p /sbin/ldconfig +%post -n %{libcxxname} -p /sbin/ldconfig + +%postun -n %{libcxxname} -p /sbin/ldconfig + %files -n %{libname} %defattr(-,root,root,-) %{_libdir}/*.so.* +%exclude %{_libdir}/*cxx.so.* + +%files -n %{libcxxname} +%defattr(-,root,root,-) +%{_libdir}/*cxx.so.* %files data %defattr(-,root,root,-) ++++++ fix_unknown_types_declarations.diff ++++++ diff --git a/src/hardware/asix-sigma/protocol.h b/src/hardware/asix-sigma/protocol.h index d654e60..b2a7dec 100644 --- a/src/hardware/asix-sigma/protocol.h +++ b/src/hardware/asix-sigma/protocol.h @@ -24,6 +24,7 @@ #include <stdint.h> #include <glib.h> +#include <sys/types.h> #include <ftdi.h> #include <string.h> #include <libsigrok/libsigrok.h> diff --git a/src/hardware/brymen-dmm/protocol.c b/src/hardware/brymen-dmm/protocol.c index 4db460a..2834075 100644 --- a/src/hardware/brymen-dmm/protocol.c +++ b/src/hardware/brymen-dmm/protocol.c @@ -18,6 +18,7 @@ */ #include <config.h> +#include <sys/types.h> #include "protocol.h" static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi) diff --git a/src/hardware/fx2lafw/protocol.c b/src/hardware/fx2lafw/protocol.c index 12fc9e2..6101a26 100644 --- a/src/hardware/fx2lafw/protocol.c +++ b/src/hardware/fx2lafw/protocol.c @@ -240,6 +240,7 @@ SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di) break; } +#define LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER 0x0101 if (libusb_has_capability(LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER)) { if (libusb_kernel_driver_active(usb->devhdl, USB_INTERFACE) == 1) { if ((ret = libusb_detach_kernel_driver(usb->devhdl, USB_INTERFACE)) < 0) { diff --git a/src/hardware/ikalogic-scanaplus/protocol.h b/src/hardware/ikalogic-scanaplus/protocol.h index cdd684d..bd6fc9a 100644 --- a/src/hardware/ikalogic-scanaplus/protocol.h +++ b/src/hardware/ikalogic-scanaplus/protocol.h @@ -24,6 +24,7 @@ #include <stdint.h> #include <string.h> #include <glib.h> +#include <sys/types.h> #include <ftdi.h> #include <libsigrok/libsigrok.h> #include "libsigrok-internal.h" diff --git a/src/hardware/pipistrello-ols/protocol.h b/src/hardware/pipistrello-ols/protocol.h index c2bd2cc..139a028 100644 --- a/src/hardware/pipistrello-ols/protocol.h +++ b/src/hardware/pipistrello-ols/protocol.h @@ -23,6 +23,7 @@ #include <stdint.h> #include <string.h> #include <glib.h> +#include <sys/types.h> #include <ftdi.h> #include <libsigrok/libsigrok.h> #include "libsigrok-internal.h" diff --git a/src/hardware/testo/api.c b/src/hardware/testo/api.c index 0c37886..e23f1ff 100644 --- a/src/hardware/testo/api.c +++ b/src/hardware/testo/api.c @@ -188,6 +188,7 @@ static int dev_open(struct sr_dev_inst *sdi) return SR_ERR; } +#define LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER 0x0101 if (libusb_has_capability(LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER)) { if (libusb_kernel_driver_active(usb->devhdl, 0) == 1) { if ((ret = libusb_detach_kernel_driver(usb->devhdl, 0)) < 0) { diff --git a/src/serial.c b/src/serial.c index 27244da..9a1ef43 100644 --- a/src/serial.c +++ b/src/serial.c @@ -21,6 +21,7 @@ */ #include <config.h> +#include <sys/types.h> #include <string.h> #include <stdlib.h> #include <glib.h> diff --git a/src/usb.c b/src/usb.c index 35a3e80..a5fef9a 100644 --- a/src/usb.c +++ b/src/usb.c @@ -487,7 +487,12 @@ SR_PRIV int usb_get_port_path(libusb_device *dev, char *path, int path_len) if (libusb_open(dev, &devh) != 0) return SR_ERR; #endif +#if defined(LIBUSB_API_VERSION) && (LIBUSB_API_VERSION >= 0x01000102) n = libusb_get_port_numbers(dev, port_numbers, sizeof(port_numbers)); +#else + n = 1; + port_numbers[0] = libusb_get_device_address(dev); +#endif #if defined(__FreeBSD__) || defined(__APPLE__) libusb_close(devh); #endif ++++++ libsigrok-0.3.0.tar.gz -> libsigrok-0.4.0.tar.gz ++++++ ++++ 211564 lines of diff (skipped)
