Update buidlroot to version 2016.08.1
This commit is contained in:
34
bsp/buildroot/package/jack2/0001-Add-support-for-nios2.patch
Normal file
34
bsp/buildroot/package/jack2/0001-Add-support-for-nios2.patch
Normal file
@@ -0,0 +1,34 @@
|
||||
From 3651f95d0433c84d2b67e30e68dd6140585535b0 Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Tue, 19 Apr 2016 19:32:35 +0200
|
||||
Subject: [PATCH 1/1] Add support for nios2
|
||||
|
||||
When compiling jack on nios2, compilation fails because NGREGS is not
|
||||
defined. Since this is only for debug output on segmentation faults, stub
|
||||
the debug print out like it's been done for other platforms before.
|
||||
|
||||
Inspired by
|
||||
https://github.com/jackaudio/jack2/commit/d11bb095291d8880508c87adfe625bf2bcab1456
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[Patch sent upstream: https://github.com/jackaudio/jack2/pull/199]
|
||||
---
|
||||
dbus/sigsegv.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dbus/sigsegv.c b/dbus/sigsegv.c
|
||||
index 64c3986..ee12f91 100644
|
||||
--- a/dbus/sigsegv.c
|
||||
+++ b/dbus/sigsegv.c
|
||||
@@ -104,7 +104,7 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) {
|
||||
jack_error("info.si_errno = %d", info->si_errno);
|
||||
jack_error("info.si_code = %d (%s)", info->si_code, si_code_str);
|
||||
jack_error("info.si_addr = %p", info->si_addr);
|
||||
-#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__)
|
||||
+#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__) && !defined(nios2)
|
||||
for(i = 0; i < NGREG; i++)
|
||||
jack_error("reg[%02d] = 0x" REGFORMAT, i,
|
||||
#if defined(__powerpc64__)
|
||||
--
|
||||
2.8.0.rc3
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
From 4b2c73ad056aa327dc3b505410da68cf384317ba Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Martin <s.martin49@gmail.com>
|
||||
Date: Mon, 16 May 2016 22:26:05 +0200
|
||||
Subject: [PATCH] Make backtrace support depends on execinfo.h existence
|
||||
|
||||
In some C-libraries (like uclibc), backtrace support is optional, so the
|
||||
execinfo.h file may not exist.
|
||||
|
||||
This change adds the check for execinfo.h header and conditionnaly enable
|
||||
backtrace support.
|
||||
|
||||
This issue has been triggered by Buildroot farms:
|
||||
http://autobuild.buildroot.org/results/391/391e71a988250ea66ec4dbee6f60fdce9eaf2766/build-end.log
|
||||
|
||||
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
||||
---
|
||||
dbus/sigsegv.c | 8 +++++++-
|
||||
wscript | 1 +
|
||||
2 files changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dbus/sigsegv.c b/dbus/sigsegv.c
|
||||
index ee12f91..0b31d89 100644
|
||||
--- a/dbus/sigsegv.c
|
||||
+++ b/dbus/sigsegv.c
|
||||
@@ -27,7 +27,9 @@
|
||||
#include <stdio.h>
|
||||
#include <signal.h>
|
||||
#include <dlfcn.h>
|
||||
-#include <execinfo.h>
|
||||
+#if defined(HAVE_EXECINFO_H)
|
||||
+# include <execinfo.h>
|
||||
+#endif /* defined(HAVE_EXECINFO_H) */
|
||||
#include <errno.h>
|
||||
#ifndef NO_CPP_DEMANGLE
|
||||
char * __cxa_demangle(const char * __mangled_name, char * __output_buffer, size_t * __length, int * __status);
|
||||
@@ -161,12 +163,16 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) {
|
||||
bp = (void**)bp[0];
|
||||
}
|
||||
#else
|
||||
+# if defined(HAVE_EXECINFO_H)
|
||||
jack_error("Stack trace (non-dedicated):");
|
||||
sz = backtrace(bt, 20);
|
||||
strings = backtrace_symbols(bt, sz);
|
||||
|
||||
for(i = 0; i < sz; ++i)
|
||||
jack_error("%s", strings[i]);
|
||||
+# else /* defined(HAVE_EXECINFO_H) */
|
||||
+ jack_error("Stack trace not available");
|
||||
+# endif /* defined(HAVE_EXECINFO_H) */
|
||||
#endif
|
||||
jack_error("End of stack trace");
|
||||
exit (-1);
|
||||
diff --git a/wscript b/wscript
|
||||
index aef4bd8..63ba3aa 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -166,6 +166,7 @@ def configure(conf):
|
||||
if conf.env['BUILD_JACKDBUS'] != True:
|
||||
conf.fatal('jackdbus was explicitly requested but cannot be built')
|
||||
|
||||
+ conf.check_cc(header_name='execinfo.h', define_name="HAVE_EXECINFO_H", mandatory=False)
|
||||
conf.check_cc(header_name='samplerate.h', define_name="HAVE_SAMPLERATE")
|
||||
|
||||
if conf.is_defined('HAVE_SAMPLERATE'):
|
||||
--
|
||||
2.8.2
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
From c971aaab74ca6e7d4ac3a06bd26e7309dfc5da45 Mon Sep 17 00:00:00 2001
|
||||
From: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
|
||||
Date: Mon, 22 Aug 2016 19:04:47 +0530
|
||||
Subject: [PATCH] tests: define __STDC_LIMIT_MACROS
|
||||
|
||||
With glibc 2.16, we get following build error when building jack2:
|
||||
|
||||
[193/247] cxx: tests/iodelay.cpp -> build/tests/iodelay.cpp.4.o
|
||||
../tests/iodelay.cpp:171:43: error: 'UINT32_MAX' was not declared in this scope
|
||||
../tests/iodelay.cpp:171:55: error: 'UINT32_MAX' was not declared in this scope
|
||||
../tests/iodelay.cpp:172:44: error: 'UINT32_MAX' was not declared in this scope
|
||||
../tests/iodelay.cpp:172:56: error: 'UINT32_MAX' was not declared in this scope
|
||||
|
||||
In glibc 2.17 or older version, Header <stdint.h> defines these macros
|
||||
for C++ only if explicitly requested by defining __STDC_LIMIT_MACROS.
|
||||
|
||||
We can't use <cstdint> since it requires C++11 standard.
|
||||
|
||||
This build issue found by Buildroot autobuilder.
|
||||
http://autobuild.buildroot.net/results/369/369ce208ffea43dad75ba0a13469159b341e3bf5/
|
||||
|
||||
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
|
||||
---
|
||||
tests/iodelay.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/tests/iodelay.cpp b/tests/iodelay.cpp
|
||||
index 1ef470f..f5c5836 100644
|
||||
--- a/tests/iodelay.cpp
|
||||
+++ b/tests/iodelay.cpp
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
+#define __STDC_LIMIT_MACROS
|
||||
#include <stdint.h>
|
||||
#include <math.h>
|
||||
#include <unistd.h>
|
||||
--
|
||||
2.6.2
|
||||
|
||||
@@ -11,6 +11,8 @@ config BR2_PACKAGE_JACK2
|
||||
select BR2_PACKAGE_ALSA_LIB_HWDEP
|
||||
select BR2_PACKAGE_ALSA_LIB_SEQ
|
||||
select BR2_PACKAGE_ALSA_LIB_RAWMIDI
|
||||
# Ensure we get at least one:
|
||||
select BR2_PACKAGE_JACK2_LEGACY if !BR2_PACKAGE_JACK2_DBUS
|
||||
help
|
||||
JACK Audio Connection Kit (server and example clients).
|
||||
|
||||
@@ -21,6 +23,30 @@ config BR2_PACKAGE_JACK2
|
||||
|
||||
http://jackaudio.org/
|
||||
|
||||
if BR2_PACKAGE_JACK2
|
||||
|
||||
config BR2_PACKAGE_JACK2_LEGACY
|
||||
bool "classic jack2"
|
||||
help
|
||||
Build and use jackd.
|
||||
|
||||
https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging
|
||||
|
||||
config BR2_PACKAGE_JACK2_DBUS
|
||||
bool "dbus jack2"
|
||||
depends on BR2_USE_WCHAR # dbus-python, python
|
||||
select BR2_PACKAGE_DBUS
|
||||
select BR2_PACKAGE_DBUS_PYTHON
|
||||
select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON # runtime
|
||||
select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
|
||||
select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
|
||||
help
|
||||
Build and use jackdbus.
|
||||
|
||||
https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging
|
||||
|
||||
endif
|
||||
|
||||
comment "jack2 needs a toolchain w/ threads, C++, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
|
||||
3
bsp/buildroot/package/jack2/jack2.hash
Normal file
3
bsp/buildroot/package/jack2/jack2.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 88f1b6601b7c8950e6a2d5940b423a33ee628ae5583da40bdce3d9317d8c600d jack2-v1.9.10.tar.gz
|
||||
sha256 f372c4300e3fb2c1ce053e47829df44f3f8b933feb820759392187723ae8e640 ff1ed2c4524095055140370c1008a2d9cccc5645.patch
|
||||
@@ -9,6 +9,7 @@ JACK2_SITE = $(call github,jackaudio,jack2,$(JACK2_VERSION))
|
||||
JACK2_LICENSE = GPLv2+ (jack server), LGPLv2.1+ (jack library)
|
||||
JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib host-python
|
||||
JACK2_INSTALL_STAGING = YES
|
||||
JACK2_PATCH = https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645.patch
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPUS),y)
|
||||
JACK2_DEPENDENCIES += opus
|
||||
@@ -18,12 +19,36 @@ ifeq ($(BR2_PACKAGE_READLINE),y)
|
||||
JACK2_DEPENDENCIES += readline
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_JACK2_LEGACY),y)
|
||||
JACK2_CONF_OPTS += --classic
|
||||
else
|
||||
define JACK2_REMOVE_JACK_CONTROL
|
||||
$(RM) -f $(TARGET_DIR)/usr/bin/jack_control
|
||||
endef
|
||||
JACK2_POST_INSTALL_TARGET_HOOKS += JACK2_REMOVE_JACK_CONTROL
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_JACK2_DBUS),y)
|
||||
JACK2_DEPENDENCIES += dbus
|
||||
JACK2_CONF_OPTS += --dbus
|
||||
endif
|
||||
|
||||
# Even though it advertises support for celt-0.5.x, jack2 really
|
||||
# requires celt >= 0.5.2 but we only have 0.5.1.3 and we cannot
|
||||
# upgrade, so we do not add a dependency to celt051, which it can't
|
||||
# find anyway as it looks for celt.pc but we only have celt-51.pc.
|
||||
|
||||
# The dependency against eigen is only useful in conjunction with
|
||||
# gtkiostream, which we do not have, so we don't need to depend on
|
||||
# eigen.
|
||||
|
||||
define JACK2_CONFIGURE_CMDS
|
||||
(cd $(@D); \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
$(HOST_DIR)/usr/bin/python2 ./waf configure \
|
||||
--prefix=/usr \
|
||||
--alsa \
|
||||
$(JACK2_CONF_OPTS) \
|
||||
)
|
||||
endef
|
||||
|
||||
|
||||
Reference in New Issue
Block a user