Hello community, here is the log from the commit of package libsigrokdecode for openSUSE:Factory checked in at 2016-02-17 10:25:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsigrokdecode (Old) and /work/SRC/openSUSE:Factory/.libsigrokdecode.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsigrokdecode" Changes: -------- --- /work/SRC/openSUSE:Factory/libsigrokdecode/libsigrokdecode.changes 2015-08-12 15:14:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsigrokdecode.new/libsigrokdecode.changes 2016-02-17 12:14:52.000000000 +0100 @@ -1,0 +2,52 @@ +Fri Feb 12 16:56:06 UTC 2016 - stefan.bru...@rwth-aachen.de + +- Propagate metadata (e.g. samplerate) to stacked decoders + * Add 0001-Supply-metadata-to-stacked-decoders.patch + +------------------------------------------------------------------- +Sat Jan 30 12:21:20 UTC 2016 - stefan.bru...@rwth-aachen.de + +- Update to 0.4.0 + * New supported protocol decoders: + - adns5020: Bidirectional command and data over an + SPI-like protocol + - am230x: Aosong AM230x/DHTxx/RHTxx humidity/temperature + sensor + - arm_etmv3: Decode ETM instruction trace packets + - arm_itm: Trace data from Cortex-M / ARMv7m ITM module + - arm_tpiu: Filter TPIU formatted trace data into separate + streams + - eeprom24xx: 24xx series I²C EEPROM protocol + - em4100: EM4100 100-150kHz RFID protocol + - jitter: Retrieves the timing jitter between two digital + signals + - max7219: 8-digit LED display driver + - mdio: Half-duplex sync serial bus for MII management + (MAC/PHY) + - modbus: Modbus RTU protocol for industrial applications + - mrf24j40: IEEE 802.15.4 2.4 GHz RF tranceiver chip + - nrf24l01: 2.4GHz transceiver chip + - pwm: Analog level encoded in duty cycle percentage + - qi: Async serial protocol for Qi charger receivers + - rfm12: HopeRF RFM12 wireless transceiver control + protocol + - sdcard_sd: Secure Digital card (SD mode) low-level + protocol + - spdif: Serial bus for connecting digital audio devices + - stepper_motor: Absolute position and movement speed from + step/dir + - swd: Two-wire protocol for debug access to ARM CPUs + - tca6408a: Texas Instruments TCA6408A 8-bit I²C I/O + expander + - timing: Calculate time between edges + - usb_power_delivery: USB Power Delivery protocol + - usb_request: USB (low-speed and full-speed) + transaction/request protocol + +------------------------------------------------------------------- +Fri Sep 25 03:10:52 UTC 2015 - stefan.bru...@rwth-aachen.de + +- Track GIT version (upcoming 0.4.0) + * update libsigrokdecode-versioned-decoders.patch + +------------------------------------------------------------------- Old: ---- libsigrokdecode-0.3.1.tar.gz New: ---- 0001-Supply-metadata-to-stacked-decoders.patch libsigrokdecode-0.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsigrokdecode.spec ++++++ --- /var/tmp/diff_new_pack.Ary3mo/_old 2016-02-17 12:14:53.000000000 +0100 +++ /var/tmp/diff_new_pack.Ary3mo/_new 2016-02-17 12:14:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libsigrokdecode # -# Copyright (c) 2015 SUSE LINUX 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,8 +17,9 @@ Name: libsigrokdecode -%define libname %{name}2 -Version: 0.3.1 +%define libname %{name}3 +%define baseversion 0.4.0 +Version: 0.4.0 Release: 0 Summary: Protocol Decoders for sigrok License: GPL-3.0+ @@ -26,6 +27,7 @@ Url: http://sigrok.org Source0: http://sigrok.org/download/source/libsigrokdecode/%{name}-%{version}.tar.gz Patch0: libsigrokdecode-versioned-decoders.patch +Patch1: 0001-Supply-metadata-to-stacked-decoders.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: check-devel >= 0.9.4 @@ -78,6 +80,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build autoreconf -fiv @@ -97,7 +100,7 @@ %defattr(-,root,root,-) %doc COPYING README HACKING NEWS %{_libdir}/*.so.* -%{_datadir}/%{name}-%{version}/ +%{_datadir}/%{name}-%{baseversion}/ %files devel %defattr(-,root,root,-) ++++++ 0001-Supply-metadata-to-stacked-decoders.patch ++++++ >From 0bf303d90fd30f2a4a5571f73f8f31b498c72cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Sat, 3 Oct 2015 16:26:23 +0200 Subject: [PATCH] Supply metadata to stacked decoders Currently only toplevel decoders receive the samplerate, thus stacked decoders are not able to derive e.g. timestamps from the sample number. --- session.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/session.c b/session.c index 7673fee..16c8c9e 100644 --- a/session.c +++ b/session.c @@ -128,19 +128,27 @@ static int srd_inst_send_meta(struct srd_decoder_inst *di, int key, GVariant *data) { PyObject *py_ret; + GSList *l; + struct srd_decoder_inst *next_di; + int ret; if (key != SRD_CONF_SAMPLERATE) /* This is the only key we pass on to the decoder for now. */ return SRD_OK; - if (!PyObject_HasAttrString(di->py_inst, "metadata")) - /* This decoder doesn't want metadata, that's fine. */ - return SRD_OK; + if (PyObject_HasAttrString(di->py_inst, "metadata")) { + py_ret = PyObject_CallMethod(di->py_inst, "metadata", "lK", + (long)SRD_CONF_SAMPLERATE, + (unsigned long long)g_variant_get_uint64(data)); + Py_XDECREF(py_ret); + } - py_ret = PyObject_CallMethod(di->py_inst, "metadata", "lK", - (long)SRD_CONF_SAMPLERATE, - (unsigned long long)g_variant_get_uint64(data)); - Py_XDECREF(py_ret); + /* Push metadata to all the PDs stacked on top of this one. */ + for (l = di->next_di; l; l = l->next) { + next_di = l->data; + if ((ret = srd_inst_send_meta(next_di, key, data)) != SRD_OK) + return ret; + } return SRD_OK; } -- 2.1.4 ++++++ libsigrokdecode-0.3.1.tar.gz -> libsigrokdecode-0.4.0.tar.gz ++++++ ++++ 36314 lines of diff (skipped) ++++++ libsigrokdecode-versioned-decoders.patch ++++++ --- /var/tmp/diff_new_pack.Ary3mo/_old 2016-02-17 12:14:53.000000000 +0100 +++ /var/tmp/diff_new_pack.Ary3mo/_new 2016-02-17 12:14:53.000000000 +0100 @@ -1,24 +1,13 @@ -Index: libsigrokdecode-0.3.1/configure.ac -=================================================================== ---- libsigrokdecode-0.3.1.orig/configure.ac 2015-07-12 22:35:14.000000000 +0200 -+++ libsigrokdecode-0.3.1/configure.ac 2015-08-04 16:55:18.265462711 +0200 -@@ -137,15 +137,15 @@ - # Checks for header files. - # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h. +diff --git a/Makefile.am b/Makefile.am +index 02f76d9..1b9904d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -22,7 +22,7 @@ + AM_LIBTOOLFLAGS = --silent + GNUMAKEFLAGS = --no-print-directory --AC_SUBST(DECODERS_DIR, "$datadir/libsigrokdecode/decoders") --AC_SUBST(MAKEFLAGS, '--no-print-directory') --AC_SUBST(AM_LIBTOOLFLAGS, '--silent') -- - SRD_PACKAGE_VERSION_MAJOR=srd_package_version_major - SRD_PACKAGE_VERSION_MINOR=srd_package_version_minor - SRD_PACKAGE_VERSION_MICRO=srd_package_version_micro - SRD_PACKAGE_VERSION=srd_package_version - -+AC_SUBST(DECODERS_DIR, "$datadir/libsigrokdecode-${SRD_PACKAGE_VERSION}/decoders") -+AC_SUBST(MAKEFLAGS, '--no-print-directory') -+AC_SUBST(AM_LIBTOOLFLAGS, '--silent') -+ - AC_SUBST(SRD_PACKAGE_VERSION_MAJOR) - AC_SUBST(SRD_PACKAGE_VERSION_MINOR) - AC_SUBST(SRD_PACKAGE_VERSION_MICRO) +-DECODERS_DIR = $(pkgdatadir)/decoders ++DECODERS_DIR = $(pkgdatadir)-$(SRD_PACKAGE_VERSION)/decoders + # Do not hard-code the decoders location on Windows. + if WIN32 + AM_CPPFLAGS =