Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -1,28 +0,0 @@
|
||||
From f7d5081b727f69ae3a894a4a3310670a5d9ab077 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
||||
Date: Thu, 17 Sep 2015 22:18:10 +0200
|
||||
Subject: [PATCH] notify: Don't use constexpr on Haiku
|
||||
|
||||
[Thomas: taken from upstream commit bf73d0f9051fd5740c22bf6e5114ceb4535d548f.]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
src/notify.hxx | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/notify.hxx b/src/notify.hxx
|
||||
index 3e62a01..1ee413f 100644
|
||||
--- a/src/notify.hxx
|
||||
+++ b/src/notify.hxx
|
||||
@@ -28,7 +28,8 @@ struct notify {
|
||||
Cond cond;
|
||||
bool pending;
|
||||
|
||||
-#if !defined(WIN32) && !defined(__NetBSD__) && !defined(__BIONIC__)
|
||||
+#if !defined(WIN32) && !defined(__NetBSD__) && !defined(__BIONIC__) && \
|
||||
+ !defined(__HAIKU__)
|
||||
constexpr
|
||||
#endif
|
||||
notify():pending(false) {}
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From 09830d448d6299a47fbccf39af6f325be5f2b514 Mon Sep 17 00:00:00 2001
|
||||
From: Max Kellermann <max@duempel.org>
|
||||
Date: Thu, 17 Sep 2015 22:56:35 +0200
|
||||
Subject: [PATCH] notify: use "constexpr" only with glibc
|
||||
|
||||
The Mutex and Cond constructors are only "constexpr" with glibc, and
|
||||
this is what this #ifdef is about.
|
||||
|
||||
[Thomas: taken from upstream commit 459a812a54509ebfd634a3df2998395c9cb5b98f.]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
src/notify.hxx | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/notify.hxx b/src/notify.hxx
|
||||
index 1ee413f..c96390b 100644
|
||||
--- a/src/notify.hxx
|
||||
+++ b/src/notify.hxx
|
||||
@@ -28,8 +28,7 @@ struct notify {
|
||||
Cond cond;
|
||||
bool pending;
|
||||
|
||||
-#if !defined(WIN32) && !defined(__NetBSD__) && !defined(__BIONIC__) && \
|
||||
- !defined(__HAIKU__)
|
||||
+#ifdef __GLIBC__
|
||||
constexpr
|
||||
#endif
|
||||
notify():pending(false) {}
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@@ -1,97 +0,0 @@
|
||||
From 42a5f0c4435757505bd515b68c2a27e8f7565f34 Mon Sep 17 00:00:00 2001
|
||||
From: Max Kellermann <max@duempel.org>
|
||||
Date: Tue, 25 Aug 2015 12:46:12 +0200
|
||||
Subject: [PATCH] thread/Posix{Mutex,Cond}: use "constexpr" only with glibc
|
||||
|
||||
Apparently all other C libraries are not compatible with "constexpr".
|
||||
Those which are not will get a performance penalty, but at least they
|
||||
work at all.
|
||||
|
||||
[Thomas: taken from upstream commit 75dff6445063d9b49cca126fd661c9abbd680977.]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
src/thread/PosixCond.hxx | 16 ++++++++--------
|
||||
src/thread/PosixMutex.hxx | 16 ++++++++--------
|
||||
2 files changed, 16 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/src/thread/PosixCond.hxx b/src/thread/PosixCond.hxx
|
||||
index b3fe204..73dbe02 100644
|
||||
--- a/src/thread/PosixCond.hxx
|
||||
+++ b/src/thread/PosixCond.hxx
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (C) 2009-2013 Max Kellermann <max@duempel.org>
|
||||
+ * Copyright (C) 2009-2015 Max Kellermann <max@duempel.org>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
@@ -41,9 +41,13 @@ class PosixCond {
|
||||
pthread_cond_t cond;
|
||||
|
||||
public:
|
||||
-#if defined(__NetBSD__) || defined(__BIONIC__)
|
||||
- /* NetBSD's PTHREAD_COND_INITIALIZER is not compatible with
|
||||
- "constexpr" */
|
||||
+#ifdef __GLIBC__
|
||||
+ /* optimized constexpr constructor for pthread implementations
|
||||
+ that support it */
|
||||
+ constexpr PosixCond():cond(PTHREAD_COND_INITIALIZER) {}
|
||||
+#else
|
||||
+ /* slow fallback for pthread implementations that are not
|
||||
+ compatible with "constexpr" */
|
||||
PosixCond() {
|
||||
pthread_cond_init(&cond, nullptr);
|
||||
}
|
||||
@@ -51,10 +55,6 @@ public:
|
||||
~PosixCond() {
|
||||
pthread_cond_destroy(&cond);
|
||||
}
|
||||
-#else
|
||||
- /* optimized constexpr constructor for sane POSIX
|
||||
- implementations */
|
||||
- constexpr PosixCond():cond(PTHREAD_COND_INITIALIZER) {}
|
||||
#endif
|
||||
|
||||
PosixCond(const PosixCond &other) = delete;
|
||||
diff --git a/src/thread/PosixMutex.hxx b/src/thread/PosixMutex.hxx
|
||||
index 5805158..e0fd614 100644
|
||||
--- a/src/thread/PosixMutex.hxx
|
||||
+++ b/src/thread/PosixMutex.hxx
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (C) 2009-2013 Max Kellermann <max@duempel.org>
|
||||
+ * Copyright (C) 2009-2015 Max Kellermann <max@duempel.org>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
@@ -41,9 +41,13 @@ class PosixMutex {
|
||||
pthread_mutex_t mutex;
|
||||
|
||||
public:
|
||||
-#if defined(__NetBSD__) || defined(__BIONIC__)
|
||||
- /* NetBSD's PTHREAD_MUTEX_INITIALIZER is not compatible with
|
||||
- "constexpr" */
|
||||
+#ifdef __GLIBC__
|
||||
+ /* optimized constexpr constructor for pthread implementations
|
||||
+ that support it */
|
||||
+ constexpr PosixMutex():mutex(PTHREAD_MUTEX_INITIALIZER) {}
|
||||
+#else
|
||||
+ /* slow fallback for pthread implementations that are not
|
||||
+ compatible with "constexpr" */
|
||||
PosixMutex() {
|
||||
pthread_mutex_init(&mutex, nullptr);
|
||||
}
|
||||
@@ -51,10 +55,6 @@ public:
|
||||
~PosixMutex() {
|
||||
pthread_mutex_destroy(&mutex);
|
||||
}
|
||||
-#else
|
||||
- /* optimized constexpr constructor for sane POSIX
|
||||
- implementations */
|
||||
- constexpr PosixMutex():mutex(PTHREAD_MUTEX_INITIALIZER) {}
|
||||
#endif
|
||||
|
||||
PosixMutex(const PosixMutex &other) = delete;
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@@ -5,7 +5,6 @@ menuconfig BR2_PACKAGE_MPD
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
|
||||
depends on BR2_USE_MMU # libglib2
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
|
||||
depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_ATOMIC
|
||||
select BR2_PACKAGE_BOOST
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
@@ -77,8 +76,8 @@ config BR2_PACKAGE_MPD_FAAD2
|
||||
|
||||
config BR2_PACKAGE_MPD_FFMPEG
|
||||
bool "ffmpeg"
|
||||
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
|
||||
select BR2_PACKAGE_FFMPEG
|
||||
depends on !BR2_nios2 # ffmpeg
|
||||
help
|
||||
Enable ffmpeg input support.
|
||||
Select this if you want to play back files supported by
|
||||
@@ -190,7 +189,7 @@ config BR2_PACKAGE_MPD_LIBNFS
|
||||
comment "nfs support needs a toolchain w/ threads support"
|
||||
depends on !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
|
||||
|
||||
comment "samba support needs an (e)glibc toolchain w/ dynamic library, RPC"
|
||||
comment "samba support needs a glibc toolchain w/ dynamic library, RPC"
|
||||
depends on !BR2_nios2
|
||||
depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \
|
||||
!BR2_TOOLCHAIN_HAS_NATIVE_RPC
|
||||
@@ -263,6 +262,12 @@ comment "pulseaudio support needs a toolchain w/ dynamic library"
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on BR2_STATIC_LIBS
|
||||
|
||||
config BR2_PACKAGE_MPD_SHOUTCAST
|
||||
bool "shoutcast"
|
||||
select BR2_PACKAGE_LIBSHOUT
|
||||
help
|
||||
Enable shoutcast streaming output support.
|
||||
|
||||
comment "Miscellaneous plugins"
|
||||
|
||||
config BR2_PACKAGE_MPD_AVAHI_SUPPORT
|
||||
@@ -312,7 +317,6 @@ endif
|
||||
|
||||
comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 4.6"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_ATOMIC
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 7b6fe6c7ce72f5f80a276d680072b524ecb395e546e252b8f3a0756377e1e875 mpd-0.19.12.tar.xz
|
||||
sha256 487ec8ad2b1c1c193c2a7c8975a8b8fe2e4f0335bcc2e9356b2b34a0179fb2f7 mpd-0.19.17.tar.xz
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
MPD_VERSION_MAJOR = 0.19
|
||||
MPD_VERSION = $(MPD_VERSION_MAJOR).12
|
||||
MPD_VERSION = $(MPD_VERSION_MAJOR).17
|
||||
MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz
|
||||
MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR)
|
||||
MPD_DEPENDENCIES = host-pkgconf boost libglib2
|
||||
@@ -195,6 +195,13 @@ else
|
||||
MPD_CONF_OPTS += --disable-pulse
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MPD_SHOUTCAST),y)
|
||||
MPD_DEPENDENCIES += libshout
|
||||
MPD_CONF_OPTS += --enable-shout
|
||||
else
|
||||
MPD_CONF_OPTS += --disable-shout
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MPD_SOUNDCLOUD),y)
|
||||
MPD_DEPENDENCIES += yajl
|
||||
MPD_CONF_OPTS += --enable-soundcloud
|
||||
|
||||
Reference in New Issue
Block a user