* [Buildroot] [PATCH v2] pulseaudio: bump version to 10.0
@ 2017-06-26 22:25 Peter Seiderer
2017-06-27 4:19 ` Bernd Kuhls
0 siblings, 1 reply; 4+ messages in thread
From: Peter Seiderer @ 2017-06-26 22:25 UTC (permalink / raw)
To: buildroot
- remove 0002-webrtc-C-11-is-only-required-for-WebRTC-support.patch
(committed upstream, see [1])
[1] https://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/configure.ac?id=a7231692e907ca5d4c7c30beb8629b5c49e95c09
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v1 -> v2:
- add lost pulseaudio.hash and pulseaudio.mk changes
ToDo/FollowUp: pulseaudio uses now a built-in json parser (see [2]),
drop the json-c (and maybe the BR2_TOOLCHAIN_HAS_SYNC_4) dependency.
[2] https://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=c692ec3afdba560398fd9a6871cddcca6d5c9cc5
---
...-C-11-is-only-required-for-WebRTC-support.patch | 41 ----------------------
package/pulseaudio/pulseaudio.hash | 6 ++--
package/pulseaudio/pulseaudio.mk | 5 +--
3 files changed, 4 insertions(+), 48 deletions(-)
delete mode 100644 package/pulseaudio/0002-webrtc-C-11-is-only-required-for-WebRTC-support.patch
diff --git a/package/pulseaudio/0002-webrtc-C-11-is-only-required-for-WebRTC-support.patch b/package/pulseaudio/0002-webrtc-C-11-is-only-required-for-WebRTC-support.patch
deleted file mode 100644
index b2c065196b..0000000000
--- a/package/pulseaudio/0002-webrtc-C-11-is-only-required-for-WebRTC-support.patch
+++ /dev/null
@@ -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
-
diff --git a/package/pulseaudio/pulseaudio.hash b/package/pulseaudio/pulseaudio.hash
index 0ef825d83a..4bbc481cca 100644
--- a/package/pulseaudio/pulseaudio.hash
+++ b/package/pulseaudio/pulseaudio.hash
@@ -1,3 +1,3 @@
-# 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://freedesktop.org/software/pulseaudio/releases/pulseaudio-10.0.tar.xz.{md5,sha1}
+md5 4950d2799bf55ab91f6b7f990b7f0971 pulseaudio-10.0.tar.xz
+sha1 ab7cc41a2dc2b9da0794e3a51a4eb7e82e7da511 pulseaudio-10.0.tar.xz
diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk
index 0c409a74fe..47abd5eb1e 100644
--- a/package/pulseaudio/pulseaudio.mk
+++ b/package/pulseaudio/pulseaudio.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PULSEAUDIO_VERSION = 9.0
+PULSEAUDIO_VERSION = 10.0
PULSEAUDIO_SOURCE = pulseaudio-$(PULSEAUDIO_VERSION).tar.xz
PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases
PULSEAUDIO_INSTALL_STAGING = YES
@@ -21,9 +21,6 @@ PULSEAUDIO_CONF_OPTS = \
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) \
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Buildroot] [PATCH v2] pulseaudio: bump version to 10.0
2017-06-26 22:25 [Buildroot] [PATCH v2] pulseaudio: bump version to 10.0 Peter Seiderer
@ 2017-06-27 4:19 ` Bernd Kuhls
2017-06-27 19:15 ` Peter Seiderer
0 siblings, 1 reply; 4+ messages in thread
From: Bernd Kuhls @ 2017-06-27 4:19 UTC (permalink / raw)
To: buildroot
Am Tue, 27 Jun 2017 00:25:58 +0200 schrieb Peter Seiderer:
> ToDo/FollowUp: pulseaudio uses now a built-in json parser (see [2]),
> drop the json-c (and maybe the BR2_TOOLCHAIN_HAS_SYNC_4) dependency.
Hi Peter,
in http://patchwork.ozlabs.org/patch/718184/ I tried that but the
configure logic of pulseaudio seems not to be an easy one. Can you help
here?
Regards, Bernd
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v2] pulseaudio: bump version to 10.0
2017-06-27 4:19 ` Bernd Kuhls
@ 2017-06-27 19:15 ` Peter Seiderer
2017-06-27 20:03 ` Peter Seiderer
0 siblings, 1 reply; 4+ messages in thread
From: Peter Seiderer @ 2017-06-27 19:15 UTC (permalink / raw)
To: buildroot
Hello Bernd,
On Tue, 27 Jun 2017 06:19:00 +0200, Bernd Kuhls <bernd.kuhls@t-online.de> wrote:
> Am Tue, 27 Jun 2017 00:25:58 +0200 schrieb Peter Seiderer:
>
> > ToDo/FollowUp: pulseaudio uses now a built-in json parser (see [2]),
> > drop the json-c (and maybe the BR2_TOOLCHAIN_HAS_SYNC_4) dependency.
>
> Hi Peter,
>
> in http://patchwork.ozlabs.org/patch/718184/ I tried that but the
Ups, missed your patch, sorry for the noise...
> configure logic of pulseaudio seems not to be an easy one. Can you help
> here?
Did take a quick look today at it...yes seems tricky, no quick solution
from my side...
Regards,
Peter
>
> Regards, Bernd
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v2] pulseaudio: bump version to 10.0
2017-06-27 19:15 ` Peter Seiderer
@ 2017-06-27 20:03 ` Peter Seiderer
0 siblings, 0 replies; 4+ messages in thread
From: Peter Seiderer @ 2017-06-27 20:03 UTC (permalink / raw)
To: buildroot
Hello Bernd,
On Tue, 27 Jun 2017 21:15:57 +0200, Peter Seiderer <ps.report@gmx.net> wrote:
> Hello Bernd,
>
>
> On Tue, 27 Jun 2017 06:19:00 +0200, Bernd Kuhls <bernd.kuhls@t-online.de> wrote:
>
> > Am Tue, 27 Jun 2017 00:25:58 +0200 schrieb Peter Seiderer:
> >
> > > ToDo/FollowUp: pulseaudio uses now a built-in json parser (see [2]),
> > > drop the json-c (and maybe the BR2_TOOLCHAIN_HAS_SYNC_4) dependency.
> >
> > Hi Peter,
> >
> > in http://patchwork.ozlabs.org/patch/718184/ I tried that but the
>
> Ups, missed your patch, sorry for the noise...
>
> > configure logic of pulseaudio seems not to be an easy one. Can you help
> > here?
>
> Did take a quick look today at it...yes seems tricky, no quick solution
> from my side...
>
Did take a second look at the configure.ac file, I think the wanted (and
straight forward) solution is to to relay on the __sync_ built-ins (as
before Thomas Petazzoni patch 'pulseaudio: remove BR2_ARCH_HAS_ATOMICS dependency'
(see [1]), to avoid the special atomic-arm-linux-helpers/atomic-arm-memory-barrier
handling and/or the handling in the else case of the __sync_ test....
The solution would be a partly revert of Thomas commit with a change to BR2_TOOLCHAIN_HAS_SYNC_4
(or similar, not sure how to check which are needed)...
Regards,
Peter
[1] https://git.buildroot.net/buildroot/commit/?id=7290dc1e87b23fe21c75c50b2238004273a0ec5c
$ grep -R __sync_ pulseaudio-10.0/
pulseaudio-10.0/src/pulsecore/atomic.h: __sync_synchronize();
pulseaudio-10.0/src/pulsecore/atomic.h: __sync_synchronize();
pulseaudio-10.0/src/pulsecore/atomic.h: return __sync_fetch_and_add(&a->value, i);
pulseaudio-10.0/src/pulsecore/atomic.h: return __sync_fetch_and_sub(&a->value, i);
pulseaudio-10.0/src/pulsecore/atomic.h: return __sync_bool_compare_and_swap(&a->value, old_i, new_i);
pulseaudio-10.0/src/pulsecore/atomic.h: __sync_synchronize();
pulseaudio-10.0/src/pulsecore/atomic.h: __sync_synchronize();
pulseaudio-10.0/src/pulsecore/atomic.h: return __sync_bool_compare_and_swap(&a->value, (long) old_p, (long) new_p);
> Regards,
> Peter
>
> >
> > Regards, Bernd
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-06-27 20:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-26 22:25 [Buildroot] [PATCH v2] pulseaudio: bump version to 10.0 Peter Seiderer
2017-06-27 4:19 ` Bernd Kuhls
2017-06-27 19:15 ` Peter Seiderer
2017-06-27 20:03 ` Peter Seiderer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox