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

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

- 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 \
 	--disable-bluez5-ofono-headset \
 	--disable-bluez5-native-headset \
 	--enable-udev \
 	--disable-hal-compat \
 	$(GLOBAL_IPV6_OPTION) \
 	--disable-openssl \
-	--disable-xen \
 	--disable-gcov \
 	--enable-orc \
 	--$(call ptx/endis, PTXCONF_PULSEAUDIO_SYSTEMD)-systemd-daemon \
@@ -95,10 +97,20 @@ PULSEAUDIO_CONF_OPT	:= \
 	--disable-force-preopen \
 	--with-caps \
 	--with-database=simple \
+	--with-pulsedsp-location= \
 	--without-fftw \
-	--without-speex \
+	--$(call ptx/wwo, PTXCONF_PULSEAUDIO_SPEEX)-speex \
 	--without-soxr \
-	--with-systemduserunitdir=/usr/lib/systemd/user
+	--with-systemduserunitdir=/usr/lib/systemd/user \
+	--with-system-user= \
+	--with-system-group= \
+	--with-access-group=pulse-access \
+	--with-mac-version-min= \
+	--with-mac-sysroot= \
+	--with-preopen-mods=all \
+	--with-module-dir=/usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules \
+	--with-udev-rules-dir=lib/udev/rules.d \
+	--with-zsh-completion-dir=
 
 PULSEAUDIO_LDFLAGS	:= -Wl,-rpath,/usr/lib/pulseaudio:/usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules
 
@@ -129,9 +141,16 @@ $(STATEDIR)/pulseaudio.targetinstall:
 	@$(call install_alternative, pulseaudio, 0, 0, 0644, /etc/pulse/system.pa)
 	@$(call install_alternative, pulseaudio, 0, 0, 0644, /etc/pulse/default.pa)
 
+ifdef PTXCONF_PULSEAUDIO_BLUETOOTH
+	@$(call install_alternative, pulseaudio, 0, 0, 0644, \
+		/usr/share/dbus-1/system.d/org.PulseAudio1.conf)
+endif
+
 ifdef PTXCONF_PULSEAUDIO_SYSTEMD
 	@$(call install_alternative, pulseaudio, 0, 0, 0644, \
 		/usr/lib/systemd/system/pulseaudio.service)
+	@$(call install_link, pulseaudio, ../pulseaudio.service, \
+                /usr/lib/systemd/system/multi-user.target.wants/pulseaudio.service)
 	@$(call install_alternative, pulseaudio, 0, 0, 0644, \
 		/usr/lib/systemd/system/pulseaudio.socket)
 	@$(call install_link, pulseaudio, ../pulseaudio.socket, \
@@ -153,6 +172,10 @@ endif
 	@$(call install_lib, pulseaudio, 0, 0, 0644, pulseaudio/libpulsecommon-$(PULSEAUDIO_VERSION))
 	@$(call install_tree, pulseaudio, 0, 0, -, /usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules)
 
+ifdef PTXCONF_PULSEAUDIO_GLIB
+	@$(call install_lib, pulseaudio, 0, 0, 0644, libpulse-mainloop-glib)
+endif
+
 	@$(call install_tree, pulseaudio, 0, 0, -, /usr/share/pulseaudio)
 
 	@$(call install_finish, pulseaudio)
-- 
2.19.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de