sigrok: version bumps

PATCH New Bartosz Golaszewski 2 participants 6 messages Jun 26, 2017 – Jul 1, 2017

Share & tools

Bartosz Golaszewski

author

2017-06-26 13:21 UTC #0 lore raw

cover sigrok: version bumps

This series contains version bumps for the sigrok suite. The API of libsigrok has been changed in this release and all frontends must be upgraded too.

Bartosz Golaszewski (4):
libsigrok: bump version to 0.5.0
libsigrokdecode: bump version to 0.5.0
sigrok-cli: bump version to 0.7.0
pulseview: bump version to 0.4.0

 ...01-beaglelogic.h-fix-build-with-musl-libc.patch |  36 -------
 package/libsigrok/libsigrok.hash                   |   2 +-
 package/libsigrok/libsigrok.mk                     |   2 +-
 package/libsigrokdecode/libsigrokdecode.hash       |   2 +-
 package/libsigrokdecode/libsigrokdecode.mk         |   2 +-
 package/pulseview/0001-musl.patch                  |  54 ----------
 ...heck-for-explicit-linking-against-libatom.patch | 117 ---------------------
 ...txt-Avoid-fext-numeric-literals-not-suppo.patch |  28 -----
 package/pulseview/Config.in                        |   1 +
 package/pulseview/pulseview.hash                   |   3 +-
 package/pulseview/pulseview.mk                     |   4 +-
 package/sigrok-cli/sigrok-cli.hash                 |   2 +-
 package/sigrok-cli/sigrok-cli.mk                   |   2 +-
 13 files changed, 9 insertions(+), 246 deletions(-)
 delete mode 100644 package/libsigrok/0001-beaglelogic.h-fix-build-with-musl-libc.patch
 delete mode 100644 package/pulseview/0001-musl.patch
 delete mode 100644 package/pulseview/0002-cmake-add-check-for-explicit-linking-against-libatom.patch
 delete mode 100644 package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch

Signature · 1 line

2.9.3

Bartosz Golaszewski

author

2017-06-26 13:21 UTC #1 lore raw

PATCH 1/4 libsigrok: bump version to 0.5.0

The patch is now upstream and can be removed.

Signed-off-by Bartosz Golaszewski <[email protected]>

---
 ...01-beaglelogic.h-fix-build-with-musl-libc.patch | 36 ----------------------
 package/libsigrok/libsigrok.hash                   |  2 +-
 package/libsigrok/libsigrok.mk                     |  2 +-
 3 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 package/libsigrok/0001-beaglelogic.h-fix-build-with-musl-libc.patch

package/libsigrok/0001-beaglelogic.h-fix-build-with-musl-libc.patch deleted +0 ~~-36~~

deleted file mode 100644
index 2b20680..0000000
@@ -1,36 +0,0 @@
-From 83bf4762e42a4d4a5c077f48d8f5715c9147d9b8 Mon Sep 17 00:00:00 2001
-From: Aurelien Jacobs <[email protected]>
-Date: Mon, 1 Feb 2016 22:37:36 +0100
-Subject: [PATCH] beaglelogic: use standard # operator instead of ugly __STRING
- macro
-
-Also note that the __ namespace is reserved by POSIX for its private
-usage, so user land software should never rely on any kind of API
-with a __ prefix.
-
-Signed-off-by: Aurelien Jacobs <[email protected]>
-Signed-off-by: Bernd Kuhls <[email protected]>
----
-Patch downloaded from upstream git:
-http://sigrok.org/gitweb/?p=libsigrok.git;a=commit;h=83bf4762e42a4d4a5c077f48d8f5715c9147d9b8
-
- src/hardware/beaglelogic/beaglelogic.h | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/hardware/beaglelogic/beaglelogic.h b/src/hardware/beaglelogic/beaglelogic.h
-index 9015c61..96713ba 100644
---- a/src/hardware/beaglelogic/beaglelogic.h
-+++ b/src/hardware/beaglelogic/beaglelogic.h
-@@ -30,8 +30,7 @@
- 
- /* BeagleLogic device node name */
- #define BEAGLELOGIC_DEV_NODE        "/dev/beaglelogic"
--#define BEAGLELOGIC_SYSFS_ATTR(a)   "/sys/devices/virtual/misc/beaglelogic/"\
--					__STRING(a)
-+#define BEAGLELOGIC_SYSFS_ATTR(a)   "/sys/devices/virtual/misc/beaglelogic/" #a
- 
- /* Reproduced verbatim from beaglelogic.h in the kernel tree until the kernel
-  * module hits the mainline. Contains the ABI, so DO NOT TOUCH this section */
--- 
-2.6.2
-

package/libsigrok/libsigrok.hash +1 -1

index 999cef5..47ad612 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	5f291f3fee36e6dab1336f1c78596e50588831bc5ebd7cddc2a95fe8c71d669e	libsigrok-0.4.0.tar.gz
+sha256	4c8c86779b880a5c419f6c77a08b1147021e5a19fa83b0f3b19da27463c9f3a4	libsigrok-0.5.0.tar.gz

package/libsigrok/libsigrok.mk +1 -1

index 9137165..fe7d6c4 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBSIGROK_VERSION = 0.4.0
+LIBSIGROK_VERSION = 0.5.0
 LIBSIGROK_SITE = http://sigrok.org/download/source/libsigrok
 LIBSIGROK_LICENSE = GPL-3.0+
 LIBSIGROK_LICENSE_FILES = COPYING

Signature · 1 line

2.9.3

Thomas Petazzoni

2017-07-01 22:42 UTC #2 lore raw

PATCH 1/4 libsigrok: bump version to 0.5.0

Hello,

Quoted 9 lines · Bartosz Golaszewski

The patch is now upstream and can be removed.

Signed-off-by Bartosz Golaszewski <[email protected]>

---
 ...01-beaglelogic.h-fix-build-with-musl-libc.patch | 36 ----------------------
 package/libsigrok/libsigrok.hash                   |  2 +-
 package/libsigrok/libsigrok.mk                     |  2 +-
 3 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 package/libsigrok/0001-beaglelogic.h-fix-build-with-musl-libc.patch

All four patches applied. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Bartosz Golaszewski

author

2017-06-26 13:21 UTC #3 lore raw

PATCH 2/4 libsigrokdecode: bump version to 0.5.0

In reply to Bartosz Golaszewski

Signed-off-by Bartosz Golaszewski <[email protected]>

---
 package/libsigrokdecode/libsigrokdecode.hash | 2 +-
 package/libsigrokdecode/libsigrokdecode.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

package/libsigrokdecode/libsigrokdecode.hash +1 -1

index ccb2016..a4914b2 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	065f70c10971173d86e03a8cf5534e600c7a622775113997d8061572135d4a95	libsigrokdecode-0.4.1.tar.gz
+sha256	4aa8579ecea9b421b8ac048a9b18c27e63206839f269374398d89c14a47bd1c1	libsigrokdecode-0.5.0.tar.gz

package/libsigrokdecode/libsigrokdecode.mk +1 -1

index ac53e7e..95e6e69 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBSIGROKDECODE_VERSION = 0.4.1
+LIBSIGROKDECODE_VERSION = 0.5.0
 LIBSIGROKDECODE_SITE = http://sigrok.org/download/source/libsigrokdecode
 LIBSIGROKDECODE_LICENSE = GPL-3.0+
 LIBSIGROKDECODE_LICENSE_FILES = COPYING

Signature · 1 line

2.9.3

Bartosz Golaszewski

author

2017-06-26 13:21 UTC #4 lore raw

PATCH 3/4 sigrok-cli: bump version to 0.7.0

In reply to Bartosz Golaszewski

Signed-off-by Bartosz Golaszewski <[email protected]>

---
 package/sigrok-cli/sigrok-cli.hash | 2 +-
 package/sigrok-cli/sigrok-cli.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

package/sigrok-cli/sigrok-cli.hash +1 -1

index b60b57e..42bbdc1 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	ab2ede4e245f3987e19a89a530bd204e0d792c07474d9fed3345d4af4e84723c	sigrok-cli-0.6.0.tar.gz
+sha256	5669d968c2de3dfc6adfda76e83789b6ba76368407c832438cef5e7099a65e1c	sigrok-cli-0.7.0.tar.gz

package/sigrok-cli/sigrok-cli.mk +1 -1

index 3e2d1bf..1e017d6 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SIGROK_CLI_VERSION = 0.6.0
+SIGROK_CLI_VERSION = 0.7.0
 SIGROK_CLI_SITE = http://sigrok.org/download/source/sigrok-cli
 SIGROK_CLI_LICENSE = GPL-3.0+
 SIGROK_CLI_LICENSE_FILES = COPYING

Signature · 1 line

2.9.3

Bartosz Golaszewski

author

2017-06-26 13:21 UTC #5 lore raw

PATCH 4/4 pulseview: bump version to 0.4.0

In reply to Bartosz Golaszewski

The patches are now upstream and can be removed. Remove the comment about Qt4 - it's no longer valid. Add boost-serialization to dependencies.

Signed-off-by Bartosz Golaszewski <[email protected]>

---
 package/pulseview/0001-musl.patch                  |  54 ----------
 ...heck-for-explicit-linking-against-libatom.patch | 117 ---------------------
 ...txt-Avoid-fext-numeric-literals-not-suppo.patch |  28 -----
 package/pulseview/Config.in                        |   1 +
 package/pulseview/pulseview.hash                   |   3 +-
 package/pulseview/pulseview.mk                     |   4 +-
 6 files changed, 3 insertions(+), 204 deletions(-)
 delete mode 100644 package/pulseview/0001-musl.patch
 delete mode 100644 package/pulseview/0002-cmake-add-check-for-explicit-linking-against-libatom.patch
 delete mode 100644 package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch

package/pulseview/0001-musl.patch deleted +0 ~~-54~~

deleted file mode 100644
index 1acee73..0000000
@@ -1,54 +0,0 @@
-From dcfe0a01f72021aab961245d0ebcc9f8d4504b40 Mon Sep 17 00:00:00 2001
-From: Soeren Apel <[email protected]>
-Date: Sun, 31 Jan 2016 14:12:44 +0100
-Subject: [PATCH] View: Honor ENABLE_DECODE compiler switch
-
-Signed-off-by: Soeren Apel <[email protected]>
-Signed-off-by: Bernd Kuhls <[email protected]>
----
-Patch downloaded from upstream git:
-http://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff;h=dcfe0a01f72021aab961245d0ebcc9f8d4504b40
-as suggested by upstream:
-http://article.gmane.org/gmane.comp.debugging.sigrok.devel/1954
-
- pv/view/view.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/pv/view/view.cpp b/pv/view/view.cpp
-index c9b08bf..6ad7dea 100644
---- a/pv/view/view.cpp
-+++ b/pv/view/view.cpp
-@@ -43,7 +43,6 @@
- #include <libsigrokcxx/libsigrokcxx.hpp>
- 
- #include "analogsignal.hpp"
--#include "decodetrace.hpp"
- #include "header.hpp"
- #include "logicsignal.hpp"
- #include "ruler.hpp"
-@@ -59,6 +58,10 @@
- #include "pv/data/logicsegment.hpp"
- #include "pv/util.hpp"
- 
-+#ifdef ENABLE_DECODE
-+#include "decodetrace.hpp"
-+#endif
-+
- using boost::shared_lock;
- using boost::shared_mutex;
- 
-@@ -455,9 +458,11 @@ void View::enable_coloured_bg(bool state)
- 		if (l)
- 			l->set_coloured_bg(state);
- 
-+#ifdef ENABLE_DECODE
- 		shared_ptr<DecodeTrace> d = dynamic_pointer_cast<DecodeTrace>(i);
- 		if (d)
- 			d->set_coloured_bg(state);
-+#endif
- 	}
- 
- 	viewport_->update();
--- 
-2.6.2
-

package/pulseview/0002-cmake-add-check-for-explicit-linking-against-libatom.patch deleted +0 ~~-117~~

117 lines not on this page · raw message

package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch deleted +0 ~~-28~~

deleted file mode 100644
index 89137f2..0000000
@@ -1,28 +0,0 @@
-From 6ad4d7a6f17edecc3523a7ab3d627f9a70dbacc1 Mon Sep 17 00:00:00 2001
-From: Uwe Hermann <[email protected]>
-Date: Wed, 17 May 2017 11:00:44 +0200
-Subject: [PATCH] CMakeLists.txt: Avoid -fext-numeric-literals, (not supported
- by clang).
-
-This (re-)fixes bug #863.
-
-Signed-off-by: Bartosz Golaszewski <[email protected]>
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e8bc79f..e7e4432 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -395,6 +395,7 @@ add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS)
- add_definitions(-D__STDC_LIMIT_MACROS)
- add_definitions(-Wall -Wextra)
- add_definitions(-std=c++11)
-+add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1)
- 
- if(ENABLE_DECODE)
- 	add_definitions(-DENABLE_DECODE)
--- 
-2.9.3
-

package/pulseview/Config.in +1 -0

index daa0fba..81c73e3 100644
@@ -17,6 +17,7 @@ config BR2_PACKAGE_PULSEVIEW
 	select BR2_PACKAGE_BOOST_FILESYSTEM
 	select BR2_PACKAGE_BOOST_SYSTEM
 	select BR2_PACKAGE_BOOST_THREAD
+	select BR2_PACKAGE_BOOST_SERIALIZATION
 	help
 	  PulseView is a Qt based logic analyzer, oscilloscope
 	  and MSO GUI for sigrok.

package/pulseview/pulseview.hash +1 -2

index dc50ec6..7883eab 100644
@@ -1,3 +1,2 @@
 # Locally computed
-sha256	5ffe2cb7a602fcdc60933d400c77bcd66e6ce529bc4f6e97d6a5e5a86f2f530e	pulseview-0.3.0.tar.gz
-sha256	7de425dfe3b0f76e76e266374dca8b2951510d232380901ef2abda71c7c30bb0	dcfe0a01f72021aab961245d0ebcc9f8d4504b40.patch
+sha256	78f8291045c6f65b4827b12e83c8e68cea2d5e7268b15a51aaca9726c8100eb9	pulseview-0.4.0.tar.gz

package/pulseview/pulseview.mk +1 -3

index fbcf451..e9bbf4f 100644
@@ -4,9 +4,7 @@
 #
 ################################################################################
 
-# TODO Pulseview can be built and linked against Qt4 as well.
-
-PULSEVIEW_VERSION = 0.3.0
+PULSEVIEW_VERSION = 0.4.0
 PULSEVIEW_SITE = http://sigrok.org/download/source/pulseview
 PULSEVIEW_LICENSE = GPL-3.0+
 PULSEVIEW_LICENSE_FILES = COPYING

Signature · 1 line

2.9.3