Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -1,41 +0,0 @@
|
||||
From 7af6cbe74d48a9853b60b029d4ce38a963386138 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Sun, 3 Jul 2016 20:19:48 +0200
|
||||
Subject: [PATCH] webrtc: C++11 is only required for WebRTC support
|
||||
|
||||
Make C++11 support optional and explicitely check for gnu++11.
|
||||
|
||||
Stop the build only if no C++11 support has been found and WebRTC
|
||||
support has been resquested.
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
configure.ac | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4edc8e0..fea93a9 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -84,7 +84,7 @@ AM_PROG_CC_C_O
|
||||
# Only required if you want the WebRTC canceller -- no runtime dep on
|
||||
# libstdc++ otherwise
|
||||
AC_PROG_CXX
|
||||
-AX_CXX_COMPILE_STDCXX_11
|
||||
+AX_CXX_COMPILE_STDCXX_11([ext],[optional])
|
||||
AC_PROG_GCC_TRADITIONAL
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
|
||||
@@ -1414,6 +1414,9 @@ fi
|
||||
AC_ARG_ENABLE([webrtc-aec],
|
||||
AS_HELP_STRING([--enable-webrtc-aec], [Enable the optional WebRTC-based echo canceller]))
|
||||
|
||||
+AS_IF([test "x$enable_webrtc_aec" = "xyes" && test "$HAVE_CXX11" = "0"],
|
||||
+ [AC_MSG_ERROR([*** webrtc-audio-processing needs C++11 support])])
|
||||
+
|
||||
AS_IF([test "x$enable_webrtc_aec" != "xno"],
|
||||
[PKG_CHECK_MODULES(WEBRTC, [ webrtc-audio-processing >= 0.2 ], [HAVE_WEBRTC=1], [HAVE_WEBRTC=0])],
|
||||
[HAVE_WEBRTC=0])
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -1,14 +1,23 @@
|
||||
config BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
|
||||
bool
|
||||
default y if BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS || \
|
||||
BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
|
||||
config BR2_PACKAGE_PULSEAUDIO_ENABLE_ATOMIC
|
||||
bool
|
||||
select BR2_PACKAGE_LIBATOMIC_OPS if !BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
|
||||
config BR2_PACKAGE_PULSEAUDIO
|
||||
bool "pulseaudio"
|
||||
depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
|
||||
select BR2_PACKAGE_LIBTOOL
|
||||
select BR2_PACKAGE_JSON_C
|
||||
select BR2_PACKAGE_LIBSNDFILE
|
||||
select BR2_PACKAGE_SPEEX
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_LIBTOOL
|
||||
select BR2_PACKAGE_LIBSNDFILE
|
||||
select BR2_PACKAGE_PULSEAUDIO_ENABLE_ATOMIC
|
||||
select BR2_PACKAGE_SPEEX
|
||||
help
|
||||
PulseAudio is a sound system for POSIX OSes, meaning that it
|
||||
is a proxy for your sound applications. It allows you to do
|
||||
@@ -33,5 +42,5 @@ endif
|
||||
|
||||
comment "pulseaudio needs a toolchain w/ wchar, threads, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
# From http://freedesktop.org/software/pulseaudio/releases/pulseaudio-9.0.tar.xz.{md5,sha1}
|
||||
md5 da7162541b3a9bc20576dbd0d7d1489a pulseaudio-9.0.tar.xz
|
||||
sha1 d9a9d7cb667ed95ee1de4b6544d5c7444c5a0064 pulseaudio-9.0.tar.xz
|
||||
# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2017-September/028733.html
|
||||
md5 390de38231d5cdd6b43ada8939eb74f1 pulseaudio-11.1.tar.xz
|
||||
sha1 53bde72b6bfe715c19b1519db8845f7a58346b67 pulseaudio-11.1.tar.xz
|
||||
# Locally computed
|
||||
sha256 f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e pulseaudio-11.1.tar.xz
|
||||
|
||||
@@ -4,39 +4,33 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PULSEAUDIO_VERSION = 9.0
|
||||
PULSEAUDIO_VERSION = 11.1
|
||||
PULSEAUDIO_SOURCE = pulseaudio-$(PULSEAUDIO_VERSION).tar.xz
|
||||
PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases
|
||||
PULSEAUDIO_INSTALL_STAGING = YES
|
||||
PULSEAUDIO_LICENSE = LGPLv2.1+ (specific license for modules, see LICENSE file)
|
||||
PULSEAUDIO_LICENSE = LGPL-2.1+ (specific license for modules, see LICENSE file)
|
||||
PULSEAUDIO_LICENSE_FILES = LICENSE GPL LGPL
|
||||
PULSEAUDIO_CONF_OPTS = \
|
||||
--disable-default-build-tests \
|
||||
--disable-legacy-database-entry-format \
|
||||
--disable-manpages
|
||||
|
||||
# Make sure we don't detect libatomic_ops. Indeed, since pulseaudio
|
||||
# requires json-c, which needs 4 bytes __sync builtins, there should
|
||||
# be no need for pulseaudio to rely on libatomic_ops.
|
||||
PULSEAUDIO_CONF_ENV += \
|
||||
ac_cv_header_atomic_ops_h=no
|
||||
|
||||
# 0002-webrtc-C-11-is-only-required-for-WebRTC-support.patch
|
||||
PULSEAUDIO_AUTORECONF = YES
|
||||
|
||||
PULSEAUDIO_DEPENDENCIES = \
|
||||
host-pkgconf libtool json-c libsndfile speex host-intltool \
|
||||
$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
|
||||
$(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) \
|
||||
host-pkgconf libtool libsndfile speex host-intltool \
|
||||
$(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \
|
||||
$(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \
|
||||
$(if $(BR2_PACKAGE_DBUS),dbus) \
|
||||
$(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) \
|
||||
$(if $(BR2_PACKAGE_BLUEZ5_UTILS),bluez5_utils) \
|
||||
$(if $(BR2_PACKAGE_OPENSSL),openssl) \
|
||||
$(if $(BR2_PACKAGE_FFTW),fftw) \
|
||||
$(if $(BR2_PACKAGE_SYSTEMD),systemd)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y)
|
||||
PULSEAUDIO_CONF_OPTS += --enable-samplerate
|
||||
PULSEAUDIO_DEPENDENCIES += libsamplerate
|
||||
else
|
||||
PULSEAUDIO_CONF_OPTS += --disable-samplerate
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GDBM),y)
|
||||
PULSEAUDIO_CONF_OPTS += --with-database=gdbm
|
||||
PULSEAUDIO_DEPENDENCIES += gdbm
|
||||
@@ -51,9 +45,16 @@ else
|
||||
PULSEAUDIO_CONF_OPTS += --disable-jack
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y)
|
||||
PULSEAUDIO_DEPENDENCIES += libatomic_ops
|
||||
ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y)
|
||||
PULSEAUDIO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -DAO_NO_SPARC_V9"
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ORC),y)
|
||||
PULSEAUDIO_DEPENDENCIES += orc
|
||||
PULSEAUDIO_CONF_ENV += ORCC=$(HOST_DIR)/usr/bin/orcc
|
||||
PULSEAUDIO_CONF_ENV += ORCC=$(HOST_DIR)/bin/orcc
|
||||
PULSEAUDIO_CONF_OPTS += --enable-orc
|
||||
else
|
||||
PULSEAUDIO_CONF_OPTS += --disable-orc
|
||||
@@ -81,6 +82,20 @@ else
|
||||
PULSEAUDIO_CONF_OPTS += --without-soxr
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_SBC),yy)
|
||||
PULSEAUDIO_CONF_OPTS += --enable-bluez4
|
||||
PULSEAUDIO_DEPENDENCIES += bluez_utils sbc
|
||||
else
|
||||
PULSEAUDIO_CONF_OPTS += --disable-bluez4
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_SBC),yy)
|
||||
PULSEAUDIO_CONF_OPTS += --enable-bluez5
|
||||
PULSEAUDIO_DEPENDENCIES += bluez5_utils sbc
|
||||
else
|
||||
PULSEAUDIO_CONF_OPTS += --disable-bluez5
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
|
||||
PULSEAUDIO_CONF_OPTS += --enable-udev
|
||||
PULSEAUDIO_DEPENDENCIES += udev
|
||||
@@ -109,7 +124,10 @@ PULSEAUDIO_CONF_OPTS += --enable-neon-opt=no
|
||||
endif
|
||||
|
||||
# pulseaudio alsa backend needs pcm/mixer apis
|
||||
ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
|
||||
ifeq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
|
||||
PULSEAUDIO_DEPENDENCIES += alsa-lib
|
||||
PULSEAUDIO_CONF_OPTS += --enable-alsa
|
||||
else
|
||||
PULSEAUDIO_CONF_OPTS += --disable-alsa
|
||||
endif
|
||||
|
||||
@@ -118,7 +136,7 @@ PULSEAUDIO_DEPENDENCIES += libxcb xlib_libSM xlib_libXtst
|
||||
|
||||
# .desktop file generation needs nls support, so fake it for !locale builds
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=54658
|
||||
ifneq ($(BR2_ENABLE_LOCALE),y)
|
||||
ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
|
||||
define PULSEAUDIO_FIXUP_DESKTOP_FILES
|
||||
cp $(@D)/src/daemon/pulseaudio.desktop.in \
|
||||
$(@D)/src/daemon/pulseaudio.desktop
|
||||
@@ -130,11 +148,17 @@ else
|
||||
PULSEAUDIO_CONF_OPTS += --disable-x11
|
||||
endif
|
||||
|
||||
# ConsoleKit module init failure breaks user daemon startup
|
||||
define PULSEAUDIO_REMOVE_CONSOLE_KIT
|
||||
rm -f $(TARGET_DIR)/usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules/module-console-kit.so
|
||||
endef
|
||||
|
||||
define PULSEAUDIO_REMOVE_VALA
|
||||
rm -rf $(TARGET_DIR)/usr/share/vala
|
||||
endef
|
||||
|
||||
PULSEAUDIO_POST_INSTALL_TARGET_HOOKS += PULSEAUDIO_REMOVE_VALA
|
||||
PULSEAUDIO_POST_INSTALL_TARGET_HOOKS += PULSEAUDIO_REMOVE_VALA \
|
||||
PULSEAUDIO_REMOVE_CONSOLE_KIT
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PULSEAUDIO_DAEMON),y)
|
||||
define PULSEAUDIO_USERS
|
||||
|
||||
Reference in New Issue
Block a user