Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,54 @@
|
||||
From dcfe0a01f72021aab961245d0ebcc9f8d4504b40 Mon Sep 17 00:00:00 2001
|
||||
From: Soeren Apel <soeren@apelpie.net>
|
||||
Date: Sun, 31 Jan 2016 14:12:44 +0100
|
||||
Subject: [PATCH] View: Honor ENABLE_DECODE compiler switch
|
||||
|
||||
Signed-off-by: Soeren Apel <soeren@apelpie.net>
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
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
|
||||
|
||||
32
deprecated/firmware/buildroot/package/pulseview/Config.in
Normal file
32
deprecated/firmware/buildroot/package/pulseview/Config.in
Normal file
@@ -0,0 +1,32 @@
|
||||
config BR2_PACKAGE_PULSEVIEW
|
||||
bool "pulseview"
|
||||
select BR2_PACKAGE_LIBSIGROK
|
||||
select BR2_PACKAGE_LIBSIGROKCXX
|
||||
depends on BR2_PACKAGE_QT5
|
||||
select BR2_PACKAGE_QT5BASE_WIDGETS
|
||||
select BR2_PACKAGE_QT5BASE_PNG
|
||||
select BR2_PACKAGE_QT5SVG
|
||||
select BR2_PACKAGE_BOOST
|
||||
select BR2_PACKAGE_BOOST_FILESYSTEM
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
select BR2_PACKAGE_BOOST_THREAD
|
||||
# libsigrok->libglib2:
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
|
||||
# libsigrok
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
|
||||
help
|
||||
PulseView is a Qt based logic analyzer, oscilloscope
|
||||
and MSO GUI for sigrok.
|
||||
|
||||
http://sigrok.org/wiki/PulseView
|
||||
|
||||
comment "pulseview needs a toolchain w/ wchar, threads, C++, gcc >= 4.8"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_PACKAGE_QT5
|
||||
depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \
|
||||
|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 5ffe2cb7a602fcdc60933d400c77bcd66e6ce529bc4f6e97d6a5e5a86f2f530e pulseview-0.3.0.tar.gz
|
||||
sha256 7de425dfe3b0f76e76e266374dca8b2951510d232380901ef2abda71c7c30bb0 dcfe0a01f72021aab961245d0ebcc9f8d4504b40.patch
|
||||
29
deprecated/firmware/buildroot/package/pulseview/pulseview.mk
Normal file
29
deprecated/firmware/buildroot/package/pulseview/pulseview.mk
Normal file
@@ -0,0 +1,29 @@
|
||||
################################################################################
|
||||
#
|
||||
# pulseview
|
||||
#
|
||||
################################################################################
|
||||
|
||||
# TODO Pulseview can be built and linked against Qt4 as well.
|
||||
|
||||
PULSEVIEW_VERSION = 0.3.0
|
||||
PULSEVIEW_SITE = http://sigrok.org/download/source/pulseview
|
||||
PULSEVIEW_LICENSE = GPLv3+
|
||||
PULSEVIEW_LICENSE_FILES = COPYING
|
||||
PULSEVIEW_DEPENDENCIES = libsigrok qt5base qt5svg boost
|
||||
PULSEVIEW_CONF_OPTS = -DDISABLE_WERROR=TRUE
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BOOST_TEST),y)
|
||||
PULSEVIEW_CONF_OPTS += -DENABLE_TESTS=TRUE
|
||||
else
|
||||
PULSEVIEW_CONF_OPTS += -DENABLE_TESTS=FALSE
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSIGROKDECODE),y)
|
||||
PULSEVIEW_CONF_OPTS += -DENABLE_DECODE=TRUE
|
||||
PULSEVIEW_DEPENDENCIES += libsigrokdecode
|
||||
else
|
||||
PULSEVIEW_CONF_OPTS += -DENABLE_DECODE=FALSE
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user