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

54
bsp/buildroot/package/ncmpc/0001-Fix-unique_ptr-error-with-some-old-toolchains.patch Normal file
View File

@@ -0,0 +1,54 @@
From 63c0c47106007f7b2a791e3e4b062a5424d3dfe8 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 12 Aug 2018 09:02:50 +0200
Subject: [PATCH] Fix unique_ptr error with some old toolchains
With some "old" toolchains (glibc, uclibc in version 4.9.4, 5.3, 5.4,
5.5 ...), the following error is raised by the compiler:
../src/screen.cxx:60:29: required from here
/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/ext/new_allocator.h:120:4:
error: no matching function for call to 'std::pair<const screen_functions* const, std::unique_ptr<Page> >::pair(const screen_functions*, Page*)'
[...]
/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/stl_pair.h:112:26:
note: candidate: constexpr std::pair<_T1, _T2>::pair(const _T1&, const _T2&) [with _T1 = const screen_functions* const; _T2 = std::unique_ptr<Page>]
_GLIBCXX_CONSTEXPR pair(const _T1& __a, const _T2& __b)
^
/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/stl_pair.h:112:26:
note: no known conversion for argument 2 from 'Page*' to 'const
std::unique_ptr<Page>&'
This is due to the fact that init function of screen_functions
structure returns Page* but PageMap wants a std::unique_ptr<Page>
To fix this, cast raw pointer into a unique_ptr with an explicit cast
Fixes:
- http://autobuild.buildroot.net/results/d8a7339d8bdd5cdc6bd1716585d4bcf15a2e8015
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
src/screen.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/screen.cxx b/src/screen.cxx
index dd42b25..56afd11 100644
--- a/src/screen.cxx
+++ b/src/screen.cxx
@@ -56,8 +56,9 @@ ScreenManager::MakePage(const struct screen_functions &sf)
return i;
auto j = pages.emplace(&sf,
- sf.init(*this, main_window.w,
- main_window.size));
+ std::unique_ptr<Page>(sf.init(*this,
+ main_window.w,
+ main_window.size)));
assert(j.second);
return j.first;
}
--
2.14.1

217
bsp/buildroot/package/ncmpc/0002-Global-Bindings-add-KeyBindings-constructor-to-simplify-initializers.patch Normal file
View File

@@ -0,0 +1,217 @@
From da27fcc39e187671b5e4373848f701a3d910446c Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Wed, 26 Sep 2018 09:51:09 +0200
Subject: [PATCH] {Global,}Bindings: add KeyBindings constructor to simplify
initializers
As a side effect, this works around a build failure with GCC 4.9.
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Retrieved from
https://github.com/MusicPlayerDaemon/ncmpc/commit/da27fcc39e187671b5e4373848f701a3d910446c
and updated for 0.31 (remove NEWS update)]
---
src/Bindings.hxx | 3 +
src/GlobalBindings.cxx | 142 ++++++++++++++++++++---------------------
3 files changed, 75 insertions(+), 71 deletions(-)
diff --git a/src/Bindings.hxx b/src/Bindings.hxx
index 342d951..0c630dc 100644
--- a/src/Bindings.hxx
+++ b/src/Bindings.hxx
@@ -42,6 +42,9 @@ struct KeyBinding {
bool modified = false;
#endif
+ constexpr KeyBinding(int a, int b=0, int c=0) noexcept
+ :keys{{a, b, c}} {}
+
gcc_pure
bool HasKey(int key) const {
return std::find(keys.begin(), keys.end(), key) != keys.end();
diff --git a/src/GlobalBindings.cxx b/src/GlobalBindings.cxx
index b565848..8049ed2 100644
--- a/src/GlobalBindings.cxx
+++ b/src/GlobalBindings.cxx
@@ -51,110 +51,110 @@
static KeyBindings global_key_bindings{{{
#ifdef ENABLE_KEYDEF_SCREEN
- { {'K', 0, 0 } },
+ {'K'},
#endif
- { { 'q', 'Q', C('C') } },
+ {'q', 'Q', C('C')},
/* movement */
- { { UP, 'k', 0 } },
- { { DWN, 'j', 0 } },
- { { 'H', 0, 0 } },
- { { 'M', 0, 0 } },
- { { 'L', 0, 0 } },
- { { HOME, C('A'), 0 } },
- { { END, C('E'), 0 } },
- { { PGUP, 0, 0 } },
- { { PGDN, 0, 0 } },
- { { 'v', 0, 0 } },
- { { C('N'), 0, 0 } },
- { { C('B'), 0, 0 } },
- { { 'N', 0, 0 } },
- { { 'B', 0, 0 } },
- { { 'l', 0, 0 } },
+ {UP, 'k'},
+ {DWN, 'j'},
+ {'H'},
+ {'M'},
+ {'L'},
+ {HOME, C('A')},
+ {END, C('E')},
+ {PGUP},
+ {PGDN},
+ {'v', 0},
+ {C('N'), 0},
+ {C('B'), 0},
+ {'N', 0},
+ {'B', 0},
+ {'l'},
/* basic screens */
- { { '1', F1, 'h' } },
- { { '2', F2, 0 } },
- { { '3', F3, 0 } },
+ {'1', F1, 'h'},
+ {'2', F2},
+ {'3', F3},
/* player commands */
- { { RET, 0, 0 } },
- { { 'P', 0, 0 } },
- { { 's', BS, 0 } },
- { { 'o', 0, 0 } },
- { { '>', 0, 0 } },
- { { '<', 0, 0 } },
- { { 'f', 0, 0 } },
- { { 'b', 0, 0 } },
- { { '+', RGHT, 0 } },
- { { '-', LEFT, 0 } },
- { { ' ', 0, 0 } },
- { { 't', 0, 0 } },
- { { DEL, 'd', 0 } },
- { { 'Z', 0, 0 } },
- { { 'c', 0, 0 } },
- { { 'r', 0, 0 } },
- { { 'z', 0, 0 } },
- { { 'y', 0, 0 } },
- { { 'C', 0, 0 } },
- { { 'x', 0, 0 } },
- { { C('U'), 0, 0 } },
- { { 'S', 0, 0 } },
- { { 'a', 0, 0 } },
-
- { { '!', 0, 0 } },
- { { '"', 0, 0 } },
-
- { { 'G', 0, 0 } },
+ {RET},
+ {'P'},
+ {'s', BS},
+ {'o'},
+ {'>'},
+ {'<'},
+ {'f'},
+ {'b'},
+ {'+', RGHT},
+ {'-', LEFT},
+ {' '},
+ {'t'},
+ {DEL, 'd'},
+ {'Z'},
+ {'c'},
+ {'r'},
+ {'z'},
+ {'y'},
+ {'C'},
+ {'x'},
+ {C('U')},
+ {'S'},
+ {'a'},
+
+ {'!'},
+ {'"'},
+
+ {'G'},
/* lists */
- { { C('K'), 0, 0 } },
- { { C('J'), 0, 0 } },
- { { C('L'), 0, 0 } },
+ {C('K')},
+ {C('J')},
+ {C('L')},
/* ncmpc options */
- { { 'w', 0, 0 } },
- { { 'U', 0, 0 } },
+ {'w'},
+ {'U'},
/* change screen */
- { { TAB, 0, 0 } },
- { { STAB, 0, 0 } },
- { { '`', 0, 0 } },
+ {TAB},
+ {STAB},
+ {'`'},
/* find */
- { { '/', 0, 0 } },
- { { 'n', 0, 0 } },
- { { '?', 0, 0 } },
- { { 'p', 0, 0 } },
- { { '.', 0, 0 } },
+ {'/'},
+ {'n'},
+ {'?'},
+ {'p'},
+ {'.'},
/* extra screens */
#ifdef ENABLE_ARTIST_SCREEN
- { {'4', F4, 0 } },
+ {'4', F4},
#endif
#ifdef ENABLE_SEARCH_SCREEN
- { {'5', F5, 0 } },
- { {'m', 0, 0 } },
+ {'5', F5},
+ {'m'},
#endif
#ifdef ENABLE_SONG_SCREEN
- { { 'i', 0, 0 } },
+ {'i'},
#endif
#ifdef ENABLE_LYRICS_SCREEN
- { {'7', F7, 0 } },
- { {ESC, 0, 0 } },
- { {'u', 0, 0 } },
- { {'e', 0, 0 } },
+ {'7', F7},
+ {ESC},
+ {'u'},
+ {'e'},
#endif
#ifdef ENABLE_OUTPUTS_SCREEN
- { {'8', F8, 0 } },
+ {'8', F8},
#endif
#ifdef ENABLE_CHAT_SCREEN
- { {'9', F9, 0} },
+ {'9', F9},
#endif
}}};

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

@@ -1,8 +1,10 @@
config BR2_PACKAGE_NCMPC
bool "ncmpc"
depends on BR2_USE_MMU # fork()
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR # libglib2 -> gettext
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBMPDCLIENT
select BR2_PACKAGE_NCURSES
@@ -13,6 +15,7 @@ config BR2_PACKAGE_NCMPC
http://www.musicpd.org/clients/ncmpc/
comment "ncmpc needs a toolchain w/ wchar, threads"
comment "ncmpc needs a toolchain w/ C++, wchar, threads, gcc >= 4.9"
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9

5
bsp/buildroot/package/ncmpc/ncmpc.hash
View File

@@ -1,2 +1,5 @@
# Locally calculated after checking pgp signature
sha256 f9a26a3fc869cfdf0a16b0ea3e6512c2fe28a031bbc71b1d24a2bf0bbd3e15d9 ncmpc-0.27.tar.xz
sha256 8d3416c5b99ec21527b506f75bd7e536ddff60e61695b05989e791a751611bcc ncmpc-0.31.tar.xz
# Hash for license file:
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING

15
bsp/buildroot/package/ncmpc/ncmpc.mk
View File

@@ -5,11 +5,22 @@
################################################################################
NCMPC_VERSION_MAJOR = 0
NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).27
NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).31
NCMPC_SOURCE = ncmpc-$(NCMPC_VERSION).tar.xz
NCMPC_SITE = http://www.musicpd.org/download/ncmpc/$(NCMPC_VERSION_MAJOR)
NCMPC_DEPENDENCIES = host-pkgconf libglib2 libmpdclient ncurses
NCMPC_LICENSE = GPL-2.0+
NCMPC_LICENSE_FILES = COPYING
$(eval $(autotools-package))
NCMPC_CONF_OPTS = \
-Dcurses=ncurses \
-Ddocumentation=false
ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y)
NCMPC_DEPENDENCIES += lirc-tools
NCMPC_CONF_OPTS += -Dlirc=true
else
NCMPC_CONF_OPTS += -Dlirc=false
endif
$(eval $(meson-package))