rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to 2019.02

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
bsp/buildroot/package/pulseview/0001-mainbar-fix-build-without-libsigrokdecode.patch Normal file
View File

@@ -0,0 +1,37 @@
From da124df864dd7555733d6690eacf856435d55b2d Mon Sep 17 00:00:00 2001
From: Bartosz Golaszewski <brgl@bgdev.pl>
Date: Mon, 3 Dec 2018 13:14:16 +0100
Subject: [PATCH] mainbar: fix build without libsigrokdecode
We must not include decodesignal.hpp if we're not using libsigrokdecode
or the build will fail due to libsigrokdecode.hpp not being present in
the system.
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
---
pv/toolbars/mainbar.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index e6beb2b..7c4d0fb 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -35,7 +35,6 @@
#include <boost/algorithm/string/join.hpp>
-#include <pv/data/decodesignal.hpp>
#include <pv/devicemanager.hpp>
#include <pv/devices/hardwaredevice.hpp>
#include <pv/devices/inputfile.hpp>
@@ -52,6 +51,7 @@
#include <pv/widgets/importmenu.hpp>
#ifdef ENABLE_DECODE
#include <pv/widgets/decodermenu.hpp>
+#include <pv/data/decodesignal.hpp>
#endif
#include <libsigrokcxx/libsigrokcxx.hpp>
--
2.19.1

7
bsp/buildroot/package/pulseview/Config.in
View File

@@ -10,6 +10,7 @@ config BR2_PACKAGE_PULSEVIEW
depends on !BR2_STATIC_LIBS
# libsigrok
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
depends on BR2_ENABLE_LOCALE
select BR2_PACKAGE_LIBSIGROK
select BR2_PACKAGE_LIBSIGROKCXX
select BR2_PACKAGE_QT5BASE_WIDGETS
@@ -18,7 +19,6 @@ config BR2_PACKAGE_PULSEVIEW
select BR2_PACKAGE_BOOST
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
@@ -26,8 +26,9 @@ config BR2_PACKAGE_PULSEVIEW
http://sigrok.org/wiki/PulseView
comment "pulseview needs a toolchain w/ wchar, threads, dynamic library, C++, gcc >= 4.9"
comment "pulseview needs a toolchain w/ locale, wchar, threads, dynamic library, C++, gcc >= 4.9"
depends on BR2_USE_MMU
depends on BR2_PACKAGE_QT5
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \
|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \
|| BR2_STATIC_LIBS || !BR2_ENABLE_LOCALE

2
bsp/buildroot/package/pulseview/pulseview.hash
View File

@@ -1,2 +1,2 @@
# Locally computed
sha256 78f8291045c6f65b4827b12e83c8e68cea2d5e7268b15a51aaca9726c8100eb9 pulseview-0.4.0.tar.gz
sha256 9ee7ce3dd1457c6a5f5e4e9c2469903a1f070ba077ea68535cc29ef1dfac6f2f pulseview-0.4.1.tar.gz

2
bsp/buildroot/package/pulseview/pulseview.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
PULSEVIEW_VERSION = 0.4.0
PULSEVIEW_VERSION = 0.4.1
PULSEVIEW_SITE = http://sigrok.org/download/source/pulseview
PULSEVIEW_LICENSE = GPL-3.0+
PULSEVIEW_LICENSE_FILES = COPYING