package/pulseview/0001-musl.patch

   1 From dcfe0a01f72021aab961245d0ebcc9f8d4504b40 Mon Sep 17 00:00:00 2001
   2 From: Soeren Apel <soeren@apelpie.net>
   3 Date: Sun, 31 Jan 2016 14:12:44 +0100
   4 Subject: [PATCH] View: Honor ENABLE_DECODE compiler switch
   5
   6 Signed-off-by: Soeren Apel <soeren@apelpie.net>
   7 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
   8 ---
   9 Patch downloaded from upstream git:
  10 http://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff;h=dcfe0a01f72021aab961245d0ebcc9f8d4504b40
  11 as suggested by upstream:
  12 http://article.gmane.org/gmane.comp.debugging.sigrok.devel/1954
  13
  14  pv/view/view.cpp | 7 ++++++-
  15  1 file changed, 6 insertions(+), 1 deletion(-)
  16
  17 diff --git a/pv/view/view.cpp b/pv/view/view.cpp
  18 index c9b08bf..6ad7dea 100644
  19 --- a/pv/view/view.cpp
  20 +++ b/pv/view/view.cpp
  21 @@ -43,7 +43,6 @@
  22  #include <libsigrokcxx/libsigrokcxx.hpp>
  23
  24  #include "analogsignal.hpp"
  25 -#include "decodetrace.hpp"
  26  #include "header.hpp"
  27  #include "logicsignal.hpp"
  28  #include "ruler.hpp"
  29 @@ -59,6 +58,10 @@
  30  #include "pv/data/logicsegment.hpp"
  31  #include "pv/util.hpp"
  32
  33 +#ifdef ENABLE_DECODE
  34 +#include "decodetrace.hpp"
  35 +#endif
  36 +
  37  using boost::shared_lock;
  38  using boost::shared_mutex;
  39
  40 @@ -455,9 +458,11 @@ void View::enable_coloured_bg(bool state)
  41                 if (l)
  42                         l->set_coloured_bg(state);
  43
  44 +#ifdef ENABLE_DECODE
  45                 shared_ptr<DecodeTrace> d = dynamic_pointer_cast<DecodeTrace>(i);
  46                 if (d)
  47                         d->set_coloured_bg(state);
  48 +#endif
  49         }
  50
  51         viewport_->update();
  52 --
  53 2.6.2
  54