NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/pulseaudio: bump version to 11.1

Browse Source 
Dependency to json-c was dropped, updated reverse dependencies as well
and added optional dependency to libatomic_ops
https://cgit.freedesktop.org/pulseaudio/pulseaudio/tree/configure.ac#n250
when __sync_bool_compare_and_swap is not available.

Removed patch applied upstream:
0002-webrtc-C-11-is-only-required-for-WebRTC-support.patch

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Bernd Kuhls 2017-09-19 19:35:42 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent f079c1953c
commit c56942aaa7
10 changed files with 26 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/efl/Config.in
View File

@ -97,7 +97,6 @@ config BR2_PACKAGE_EFL_LIBSNDFILE
config BR2_PACKAGE_EFL_PULSEAUDIO
bool "Enable pulseaudio support (recommended)"
default y
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c
select BR2_PACKAGE_PULSEAUDIO
help
The only audio output method supported by Ecore right now is

1
package/espeak/Config.in
View File

@ -35,7 +35,6 @@ config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA
config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_PULSEAUDIO
bool "pulseaudio"
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c
select BR2_PACKAGE_PULSEAUDIO
endchoice

2
package/gstreamer/gst-plugins-good/Config.in
View File

@ -205,12 +205,10 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE
depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
depends on BR2_USE_MMU # pulseaudio
depends on !BR2_STATIC_LIBS # pulseaudio
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c
select BR2_PACKAGE_PULSEAUDIO
comment "pulseaudio support needs a toolchain w/ threads, dynamic library"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC

2
package/gstreamer1/gst1-plugins-good/Config.in
View File

@ -320,14 +320,12 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE
depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
depends on BR2_USE_MMU # pulseaudio
depends on !BR2_STATIC_LIBS # pulseaudio
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c
select BR2_PACKAGE_PULSEAUDIO
help
PulseAudio plugin library
comment "pulseaudio support needs a toolchain w/ threads, dynamic library"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC

1
package/kodi/Config.in
View File

@ -193,7 +193,6 @@ config BR2_PACKAGE_KODI_NONFREE
config BR2_PACKAGE_KODI_PULSEAUDIO
bool "pulseaudio"
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c
# Pulseaudio support in kodi needs glib support in Pulseaudio,
# see FindPulseAudio.cmake. Kodi meets all dependencies of
# libglib2, so there is no need to propagate them here.

2
package/mpd/Config.in
View File

@ -255,13 +255,11 @@ config BR2_PACKAGE_MPD_OSS
config BR2_PACKAGE_MPD_PULSEAUDIO
bool "pulseaudio"
depends on !BR2_STATIC_LIBS # pulseaudio
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c
select BR2_PACKAGE_PULSEAUDIO
help
Enable pulseaudio output support.
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

41
package/pulseaudio/0002-webrtc-C-11-is-only-required-for-WebRTC-support.patch
View File

@ -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

15
package/pulseaudio/Config.in
View File

@ -1,13 +1,22 @@
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
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_LIBTOOL
select BR2_PACKAGE_JSON_C
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
@ -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

8
package/pulseaudio/pulseaudio.hash
View File

@ -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

20
package/pulseaudio/pulseaudio.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
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
@ -15,17 +15,8 @@ PULSEAUDIO_CONF_OPTS = \
--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 \
host-pkgconf libtool libsndfile speex host-intltool \
$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
$(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) \
$(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \
@ -49,6 +40,13 @@ 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)/bin/orcc