From patchwork Sun Feb 7 13:10:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 579989 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 5D085140774 for ; Mon, 8 Feb 2016 00:10:34 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6C98633ACB; Sun, 7 Feb 2016 13:10:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 87zEABbP3aMg; Sun, 7 Feb 2016 13:10:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 8BC3733A40; Sun, 7 Feb 2016 13:10:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 697451C09CE for ; Sun, 7 Feb 2016 13:10:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 62A1095A57 for ; Sun, 7 Feb 2016 13:10:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TdZPaQD92JUH for ; Sun, 7 Feb 2016 13:10:28 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout05.t-online.de (mailout05.t-online.de [194.25.134.82]) by hemlock.osuosl.org (Postfix) with ESMTPS id D00E495A2E for ; Sun, 7 Feb 2016 13:10:27 +0000 (UTC) Received: from fwd08.aul.t-online.de (fwd08.aul.t-online.de [172.20.26.151]) by mailout05.t-online.de (Postfix) with SMTP id 301D851036 for ; Sun, 7 Feb 2016 14:10:25 +0100 (CET) Received: from fli4l.lan.fli4l (VU0EKeZZZhog2zNbYp6CCOXNGK-Z0ows7AA41P+K1Ojp6AClsMA9Ic94suUA+P2ZUx@[84.178.232.206]) by fwd08.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1aSP6e-0JPs7E0; Sun, 7 Feb 2016 14:10:24 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:54862 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.86) (envelope-from ) id 1aSP6d-0008It-2m; Sun, 07 Feb 2016 14:10:23 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 7 Feb 2016 14:10:22 +0100 Message-Id: <1454850622-9888-1-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.7.0 X-ID: VU0EKeZZZhog2zNbYp6CCOXNGK-Z0ows7AA41P+K1Ojp6AClsMA9Ic94suUA+P2ZUx X-TOI-MSGID: 7759c6e6-9a75-448e-853d-72e0341791a9 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 1/1] package/pulseview: update musl patch X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Upstream requested to update the source of the musl patch: http://article.gmane.org/gmane.comp.debugging.sigrok.devel/1954 Signed-off-by: Bernd Kuhls --- package/pulseview/0001-musl.patch | 54 +++++++++++++++++++++++++++++++++++++++ package/pulseview/pulseview.mk | 4 --- 2 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 package/pulseview/0001-musl.patch diff --git a/package/pulseview/0001-musl.patch b/package/pulseview/0001-musl.patch new file mode 100644 index 0000000..1acee73 --- /dev/null +++ b/package/pulseview/0001-musl.patch @@ -0,0 +1,54 @@ +From dcfe0a01f72021aab961245d0ebcc9f8d4504b40 Mon Sep 17 00:00:00 2001 +From: Soeren Apel +Date: Sun, 31 Jan 2016 14:12:44 +0100 +Subject: [PATCH] View: Honor ENABLE_DECODE compiler switch + +Signed-off-by: Soeren Apel +Signed-off-by: Bernd Kuhls +--- +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 + + #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 d = dynamic_pointer_cast(i); + if (d) + d->set_coloured_bg(state); ++#endif + } + + viewport_->update(); +-- +2.6.2 + diff --git a/package/pulseview/pulseview.mk b/package/pulseview/pulseview.mk index 35d852c..cc97187 100644 --- a/package/pulseview/pulseview.mk +++ b/package/pulseview/pulseview.mk @@ -8,10 +8,6 @@ PULSEVIEW_VERSION = 0.3.0 PULSEVIEW_SITE = http://sigrok.org/download/source/pulseview -# bug fixed upstream -# http://article.gmane.org/gmane.comp.debugging.sigrok.devel/1950 -PULSEVIEW_PATCH = \ - https://github.com/abraxa/pulseview/commit/dcfe0a01f72021aab961245d0ebcc9f8d4504b40.patch PULSEVIEW_LICENSE = GPLv3+ PULSEVIEW_LICENSE_FILES = COPYING PULSEVIEW_DEPENDENCIES = libsigrok qt5base qt5svg boost