Re: [ptxdist] [PATCH 3/3] pulseaudio: version bump 8.0 -> 12.2

[Lucas Stach <l.stach@pengutronix.de>]

Am Donnerstag, den 22.11.2018, 11:12 +0100 schrieb Michael Olbrich:
> On Thu, Nov 22, 2018 at 11:06:40AM +0100, Roland Hieber wrote:
> > On Mon, Nov 05, 2018 at 04:01:17PM +0100, Lucas Stach wrote:
> > > - version bump
> > > - add glib support
> > > - add speex resampler support
> > > - add bluetooth support
> > > 
> > > > > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> > > ---
> > >  rules/pulseaudio.in   | 25 +++++++++++++++++++++++--
> > >  rules/pulseaudio.make | 41 ++++++++++++++++++++++++++++++++---------
> > >  2 files changed, 55 insertions(+), 11 deletions(-)
> > > 
> > > diff --git a/rules/pulseaudio.in b/rules/pulseaudio.in
> > > index f59ad470e6df..13ec74b87cd5 100644
> > > --- a/rules/pulseaudio.in
> > > +++ b/rules/pulseaudio.in
> > > @@ -8,12 +8,16 @@ config PULSEAUDIO
> > > > > >  	select LIBC_PTHREAD
> > > > > >  	select ALSA_LIB
> > > > > >  	select ALSA_LIB_MIXER
> > > > > > -	select JSON_C
> > > > > >  	select LIBCAP
> > > > > >  	select LIBLTDL
> > > > > >  	select LIBSNDFILE
> > > > > >  	select ORC
> > > > > > > > > -	select SYSTEMD		if PULSEAUDIO_SYSTEMD
> > > > > > > > > +	select SYSTEMD			if PULSEAUDIO_SYSTEMD
> > > > > > > > > +	select GLIB			if PULSEAUDIO_GLIB
> > > > > > > > > +	select SBC			if PULSEAUDIO_BLUETOOTH
> > > > > > > > > +	select DBUS			if PULSEAUDIO_BLUETOOTH
> > > > > > > > > +	select SPEEXDSP			if PULSEAUDIO_SPEEX
> > > > > > > > > +	select SPEEXDSP_FLOAT_API	if PULSEAUDIO_SPEEX
> > > > > >  	select UDEV
> > > > > >  	select UDEV_LIBUDEV
> > > > > >  	prompt "pulseaudio"
> > > @@ -29,4 +33,21 @@ config PULSEAUDIO_SYSTEMD
> > > > > >  	bool
> > > > > >  	default INITMETHOD_SYSTEMD
> > >  
> > > +config PULSEAUDIO_BLUETOOTH
> > > +        bool
> > > +        prompt "enable bluetooth support"
> > > +
> > > +config PULSEAUDIO_GLIB
> > > > > > +	bool
> > > > > > +	prompt "enable glib support"
> > > +
> > > +config PULSEAUDIO_SPEEX
> > > > > > +	bool
> > > > > > +	default y
> > > > > > +	prompt "enable speex based resamplers"
> > > > > > +	help
> > > > > > +	  The speex based resamplers provide the best cost/quality
> > > > > > +	  trade-off on most platforms. It's recommended to only disable
> > > > > > +	  this when no resampling is required.
> > > +
> > >  endif
> > > diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make
> > > index 8dda3501a0a9..2e3d2167aa3c 100644
> > > --- a/rules/pulseaudio.make
> > > +++ b/rules/pulseaudio.make
> > > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_PULSEAUDIO) += pulseaudio
> > >  #
> > >  # Paths and names
> > >  #
> > > > > > -PULSEAUDIO_VERSION	:= 8.0
> > > > > > -PULSEAUDIO_MD5		:= 8678442ba0bb4b4c33ac6f62542962df
> > > > > > +PULSEAUDIO_VERSION	:= 12.2
> > > > > > +PULSEAUDIO_MD5		:= c42f1f1465e8df9859d023dc184734bf
> > > > > >  PULSEAUDIO		:= pulseaudio-$(PULSEAUDIO_VERSION)
> > > > > >  PULSEAUDIO_SUFFIX	:= tar.xz
> > > > > >  PULSEAUDIO_URL		:= http://freedesktop.org/software/pulseaudio/releases/$(PULSEAUDIO).$(PULSEAUDIO_SUFFIX)
> > > > > > @@ -51,6 +51,7 @@ PULSEAUDIO_CONF_OPT	:= \
> > > > > >  	--enable-atomic-arm-memory-barrier \
> > > > > >  	--$(call ptx/endis, PTXCONF_ARCH_ARM_NEON)-neon-opt \
> > > > > >  	$(GLOBAL_LARGE_FILE_OPTION) \
> > > > > > +	--enable-memfd \
> > > > > >  	--disable-x11 \
> > > > > >  	--disable-tests \
> > > > > >  	--disable-samplerate \
> > > > > > @@ -61,24 +62,25 @@ PULSEAUDIO_CONF_OPT	:= \
> > > > > >  	--disable-esound \
> > > > > >  	--disable-solaris \
> > > > > >  	--disable-waveout \
> > > > > > -	--disable-glib2 \
> > > > > > +	--$(call ptx/endis, PTXCONF_PULSEAUDIO_GLIB)-glib2 \
> > > > > >  	--disable-gtk3 \
> > > > > > +	--disable-gsettings \
> > > > > >  	--disable-gconf \
> > > > > > +	--disable-schemas-compile \
> > > > > >  	--disable-avahi \
> > > > > >  	--disable-jack \
> > > > > >  	--disable-asyncns \
> > > > > >  	--disable-tcpwrap \
> > > > > > -	--disable-tcpwrap \
> > > > > > -	--disable-dbus \
> > > > > > +	--disable-lirc \
> > > > > > +	--$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUETOOTH)-dbus \
> > > > > >  	--disable-bluez4 \
> > > > > > -	--disable-bluez5 \
> > > +	--$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUETOOTH)-bluez5 \
> > 
> > This suggests that a "select BLUEZ" should be present in the kconfig
> > snippet, but it looks like it is missing.
> 
> Maybe only 'select BLUEZ if RUNTIME'. Lucas?

There is no direct dependency between the 2 packages, as both are just
services exchanging some messages on the dbus to provide bluetooth
audio.

But then both need to be present in order to get a working bluetooth
audio stack, so I agree that having a RUNTIME dependency between them
is nice from a Kconfig user PoV. Will add that in the next revision.

Regards,
Lucas


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de