mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Lucas Stach <l.stach@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH v2] pulseaudio: version bump 8.0 -> 12.2
Date: Fri, 22 Mar 2019 16:24:58 +0100	[thread overview]
Message-ID: <20190322152458.4842-1-l.stach@pengutronix.de> (raw)

- version bump
- add speex resampler support
- add bluetooth support

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
v2:
- fix license file md5sum
- install correct dbus policy file
- add runtime dependency to bluez if bluetooth support is enabled
- add pulse user and group for system mode (untested)
---
 projectroot/etc/group  |  1 +
 projectroot/etc/passwd |  1 +
 rules/pulseaudio.in    | 21 +++++++++++++++++++--
 rules/pulseaudio.make  | 35 ++++++++++++++++++++++++++---------
 4 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/projectroot/etc/group b/projectroot/etc/group
index ea6127b7a3c2..ca3fe0d89d05 100644
--- a/projectroot/etc/group
+++ b/projectroot/etc/group
@@ -27,4 +27,5 @@ systemd-journal-gateway:x:206:
 systemd-journal-remote:x:203:
 systemd-journal-upload:x:208:
 render:x:209:
+pulse:x:210:
 nogroup:x:65534:
diff --git a/projectroot/etc/passwd b/projectroot/etc/passwd
index 65653c044638..f559f3c6a34d 100644
--- a/projectroot/etc/passwd
+++ b/projectroot/etc/passwd
@@ -12,5 +12,6 @@ systemd-coredump:x:205:65534:systemd-coredump:/dev/null:/bin/false
 systemd-journal-gateway:x:206:206:systemd-journal-gateway:/dev/null:/bin/false
 systemd-journal-remote:x:207:203:systemd-journal-remote:/dev/null:/bin/false
 systemd-journal-upload:x:208:208:systemd-journal-upload:/dev/null:/bin/false
+pulse:x:209:210:pulse:/dev/null:/bin/false
 rpcuser:x:65533:65534:RPC user:/dev/null:/bin/false
 nobody:x:65534:65534:Unprivileged Nobody:/dev/null:/bin/false
diff --git a/rules/pulseaudio.in b/rules/pulseaudio.in
index f59ad470e6df..3614f6c50811 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 SBC			if PULSEAUDIO_BLUETOOTH
+	select DBUS			if PULSEAUDIO_BLUETOOTH
+	select BLUEZ			if PULSEAUDIO_BLUETOOTH && RUNTIME
+	select SPEEXDSP			if PULSEAUDIO_SPEEX
+	select SPEEXDSP_FLOAT_API	if PULSEAUDIO_SPEEX
 	select UDEV
 	select UDEV_LIBUDEV
 	prompt "pulseaudio"
@@ -29,4 +33,17 @@ config PULSEAUDIO_SYSTEMD
 	bool
 	default INITMETHOD_SYSTEMD
 
+config PULSEAUDIO_BLUETOOTH
+        bool
+        prompt "enable bluetooth 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..9334e86814ee 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)
@@ -25,7 +25,7 @@ PULSEAUDIO_SOURCE	:= $(SRCDIR)/$(PULSEAUDIO).$(PULSEAUDIO_SUFFIX)
 PULSEAUDIO_DIR		:= $(BUILDDIR)/$(PULSEAUDIO)
 PULSEAUDIO_LICENSE	:= MIT AND GPL-2.0-or-later AND LGPL-2.1-or-later AND Rdisc AND ADRIAN
 PULSEAUDIO_LICENSE_FILES	:= \
-	file://LICENSE;md5=d9ae089c8dc5339f8ac9d8563038a29f \
+	file://LICENSE;md5=0e5cd938de1a7a53ea5adac38cc10c39 \
 	file://GPL;md5=4325afd396febcb659c36b49533135d4 \
 	file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 	file://src/pulsecore/g711.c;startline=2;endline=24;md5=663902612456e1794f328632f8b6a20a \
@@ -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 \
@@ -63,22 +64,23 @@ PULSEAUDIO_CONF_OPT	:= \
 	--disable-waveout \
 	--disable-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,6 +141,11 @@ $(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, \
+		/etc/dbus-1/system.d/pulseaudio-system.conf)
+endif
+
 ifdef PTXCONF_PULSEAUDIO_SYSTEMD
 	@$(call install_alternative, pulseaudio, 0, 0, 0644, \
 		/usr/lib/systemd/system/pulseaudio.service)
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

                 reply	other threads:[~2019-03-22 15:24 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190322152458.4842-1-l.stach@pengutronix.de \
    --to=l.stach@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox