The branch, master has been updated via 303163b4486798c45d5a9c212cb8efe554a912e7 (commit) via 8657b3a9d04361b7306d2b7b469e4ac5bab1e13a (commit) via aa2b9fd0e38ef6cf531b7dd20f3c14f554110ac0 (commit) via ff1c626b6c468e0c5d5cbf3d66258914258bb180 (commit) via ceb5bf1d8ae033b8ea0e808b6188b8f54132098e (commit) via 8cf07d5be71e42d57357fd113c586d4bf36f9695 (commit) via be569f193bb99d42503505edfd69897d9d2ec5ff (commit) via 245d38ff432b6300a6656a9b189503499bd803f8 (commit) via e568b71757b46a9ce03f18c0a4dc5bd7d3cb3aab (commit) from afadf03e9fe6e3a5963f2f4f51c1f6c0f248f3e5 (commit)
- Shortlog ------------------------------------------------------------ 303163b Explain how to set up PulseAudio in a chroot (Closes: #649884) 8657b3a Make pulseaudio-utils suggest pulseaudio aa2b9fd Don't pass --disable-hal to ./configure (Closes: #729494) ff1c626 Move ALSA mixer configuration files under /etc/pulse (Closes: #736708) ceb5bf1 Exit PA with X session closing when PA is started by the session (Closes: 594001) 8cf07d5 Use channel 2 for raop sink (Closes: #658733) be569f1 Add stage1 DEB_BUILD_PROFILES initial bootstrap support (Closes: #735485) 245d38f Add myself to uploaders e568b71 Start working on new upload Summary of changes: debian/README.Debian | 12 ++++++++++++ debian/changelog | 6 ++++++ debian/control | 7 +++++-- debian/patches/0001-raop-sink-channels.patch | 20 +++++++++++++++++++ debian/patches/0003-exit-with-X-session.patch | 28 +++++++++++++++++++++++++++ debian/patches/series | 2 ++ debian/pulseaudio.install | 1 + debian/pulseaudio.links | 1 + debian/rules | 15 +++++++++++++- 9 files changed, 89 insertions(+), 3 deletions(-) ----------------------------------------------------------------------- Details of changes: commit 303163b4486798c45d5a9c212cb8efe554a912e7 Author: Luca Capello <l...@pca.it> Date: Sat Mar 22 22:02:32 2014 -0100 Explain how to set up PulseAudio in a chroot (Closes: #649884) diff --git a/debian/README.Debian b/debian/README.Debian index 84312b0..8b8ff8b 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -12,3 +12,15 @@ that may be overly CPU intensive. If PulseAudio's CPU usage is unacceptable on your hardware, please change the resample-method option in /etc/pulse/daemon.conf to either src-linear or trivial. See daemon.conf for more details. + +Configuration for chroot usage +============================== + +If you want to use PulseAudio from within a chroot, you need to mount +the host /run/udev and /run/dbus folders for the PulseAudio automatic +soundcards feature to work. Please see the following bug report for a +complete explanation: + + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649884 + + -- Luca Capello <l...@pca.it>, Thu, 24 Nov 2011 16:07:04 +0100 \ No newline at end of file commit 8657b3a9d04361b7306d2b7b469e4ac5bab1e13a Author: Justin B Rye <j...@edlug.org.uk> Date: Sat Mar 22 21:56:26 2014 -0100 Make pulseaudio-utils suggest pulseaudio diff --git a/debian/control b/debian/control index 54312ff..686c273 100644 --- a/debian/control +++ b/debian/control @@ -100,7 +100,7 @@ Description: PulseAudio sound server (debugging symbols) Package: pulseaudio-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libpulsedsp -Suggests: avahi-daemon +Suggests: avahi-daemon, pulseaudio Description: Command line tools for the PulseAudio sound server PulseAudio, previously known as Polypaudio, is a sound server for POSIX and WIN32 systems. It is a drop in replacement for the ESD sound server with commit aa2b9fd0e38ef6cf531b7dd20f3c14f554110ac0 Author: Balint Reczey <bal...@balintreczey.hu> Date: Sat Mar 22 21:21:45 2014 -0100 Don't pass --disable-hal to ./configure (Closes: #729494) diff --git a/debian/rules b/debian/rules index 8f8c426..97a3456 100755 --- a/debian/rules +++ b/debian/rules @@ -60,7 +60,7 @@ update-patch-series: # Libs should be in the multi-arch path, but the modules should be in the # normal directory as pulseaudio is foreign -DEB_CONFIGURE_EXTRA_FLAGS = --enable-x11 --disable-hal \ +DEB_CONFIGURE_EXTRA_FLAGS = --enable-x11 \ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --with-module-dir=\$${prefix}/lib/pulse-$(DEB_UPSTREAM_VERSION)/modules commit ff1c626b6c468e0c5d5cbf3d66258914258bb180 Author: Anthony DeRobertis <anth...@derobert.net> Date: Sat Mar 22 18:51:30 2014 -0100 Move ALSA mixer configuration files under /etc/pulse (Closes: #736708) diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install index dac03c3..2fcbbbb 100644 --- a/debian/pulseaudio.install +++ b/debian/pulseaudio.install @@ -1,3 +1,4 @@ +etc/pulse/alsa-mixer etc/pulse/default.pa etc/pulse/system.pa etc/pulse/daemon.conf diff --git a/debian/pulseaudio.links b/debian/pulseaudio.links new file mode 100644 index 0000000..f6424c6 --- /dev/null +++ b/debian/pulseaudio.links @@ -0,0 +1 @@ +etc/pulse/alsa-mixer usr/share/pulseaudio/alsa-mixer diff --git a/debian/rules b/debian/rules index 8f6707f..8f8c426 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,7 @@ common-build-arch:: common-install-arch:: find $(DEB_DESTDIR) -name "*.la" -delete + mv $(CURDIR)/debian/tmp/usr/share/pulseaudio/alsa-mixer $(CURDIR)/debian/tmp/etc/pulse/ mkdir -p $(CURDIR)/debian/tmp/usr/share/lintian cp -a $(CURDIR)/debian/overrides $(CURDIR)/debian/tmp/usr/share/lintian mkdir -p $(CURDIR)/debian/tmp/usr/share/alsa/alsa.conf.d commit ceb5bf1d8ae033b8ea0e808b6188b8f54132098e Author: Alexander Kurtz <kurtz.a...@googlemail.com> Date: Sat Mar 22 12:09:00 2014 -0100 Exit PA with X session closing when PA is started by the session (Closes: 594001) diff --git a/debian/patches/0003-exit-with-X-session.patch b/debian/patches/0003-exit-with-X-session.patch new file mode 100644 index 0000000..2f3165c --- /dev/null +++ b/debian/patches/0003-exit-with-X-session.patch @@ -0,0 +1,28 @@ +diff --git a/src/daemon/start-pulseaudio-x11.in b/src/daemon/start-pulseaudio-x11.in +index 391a6d3..e65dd9f 100755 +--- a/src/daemon/start-pulseaudio-x11.in ++++ b/src/daemon/start-pulseaudio-x11.in +@@ -19,6 +19,13 @@ + + set -e + ++# check if pulseaudio has already been started by someone else ++if /usr/bin/pulseaudio --check; then ++ EXIT_WITH_X_SESSION=no ++else ++ EXIT_WITH_X_SESSION=yes ++fi ++ + @PA_BINARY@ --start "$@" + + if [ x"$DISPLAY" != x ] ; then +@@ -30,3 +37,9 @@ if [ x"$DISPLAY" != x ] ; then + @PACTL_BINARY@ load-module module-x11-xsmp "display=$DISPLAY session_manager=$SESSION_MANAGER" > /dev/null + fi + fi ++ ++# fork and wait for X-session to end, then quit pulseaudio ++if [ "$EXIT_WITH_X_SESSION" = yes ]; then ++ /usr/bin/xprop -root -spy > /dev/null 2>&1 || true ++ /usr/bin/pulseaudio --kill ++fi & diff --git a/debian/patches/series b/debian/patches/series index 68a0ee3..dedec7e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,5 @@ 0001-raop-sink-channels.patch 0002-Use-the-fixed-point-speex-resampler-on-ARM.patch +0003-exit-with-X-session.patch kfreebsd_no_lock_and_threads_synchro.patch build-make-ARM-NEON-check-in-configure.ac-more-stric.patch commit 8cf07d5be71e42d57357fd113c586d4bf36f9695 Author: Jonas Eriksson <report...@zqad.se> Date: Sat Mar 22 11:02:06 2014 -0100 Use channel 2 for raop sink (Closes: #658733) diff --git a/debian/patches/0001-raop-sink-channels.patch b/debian/patches/0001-raop-sink-channels.patch new file mode 100644 index 0000000..f82665e --- /dev/null +++ b/debian/patches/0001-raop-sink-channels.patch @@ -0,0 +1,20 @@ +diff --git a/src/modules/raop/module-raop-discover.c b/src/modules/raop/module-raop-discover.c +index 4ebe5fc..74dde96 100644 +--- a/src/modules/raop/module-raop-discover.c ++++ b/src/modules/raop/module-raop-discover.c +@@ -190,6 +190,7 @@ static void resolver_cb( + + if (nicename) { + args = pa_sprintf_malloc("server=[%s]:%u " ++ "channels=2 " + "sink_name=%s " + "sink_properties='device.description=\"%s\"'", + avahi_address_snprint(at, sizeof(at), a), port, +@@ -198,6 +199,7 @@ static void resolver_cb( + pa_xfree(nicename); + } else { + args = pa_sprintf_malloc("server=[%s]:%u " ++ "channels=2 " + "sink_name=%s", + avahi_address_snprint(at, sizeof(at), a), port, + vname); diff --git a/debian/patches/series b/debian/patches/series index e4cbb58..68a0ee3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +0001-raop-sink-channels.patch 0002-Use-the-fixed-point-speex-resampler-on-ARM.patch kfreebsd_no_lock_and_threads_synchro.patch build-make-ARM-NEON-check-in-configure.ac-more-stric.patch commit be569f193bb99d42503505edfd69897d9d2ec5ff Author: Wookey <woo...@wookware.org> Date: Sat Mar 22 10:54:03 2014 -0100 Add stage1 DEB_BUILD_PROFILES initial bootstrap support (Closes: #735485) diff --git a/debian/control b/debian/control index e8d41d0..54312ff 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,8 @@ Maintainer: Pulseaudio maintenance team <pkg-pulseaudio-devel@lists.alioth.debia Uploaders: Sjoerd Simons <sjo...@debian.org>, Martin-Ãric Racine <martin-eric.rac...@iki.fi>, Balint Reczey <bal...@balintreczey.hu> +# The following packages can be omitted for bootstrapping (DEB_BUILD_PROFILES=stage1): +# libbluetooth-dev Build-Depends: debhelper (>= 8.1.3), cdbs (>= 0.4.93), dh-autoreconf, diff --git a/debian/rules b/debian/rules index 7bf0383..8f6707f 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,13 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/autoreconf.mk +#Don't build all the modules packages when bootstrapping +ifeq ($(words $(sort $(filter stage1,$(DEB_BUILD_PROFILES)))),1) + $(warning Bootstrap profile build) + export DH_OPTIONS += -Npulseaudio-module-bluetooth -Npulseaudio-module-bluetooth-dbg + DEB_CONFIGURE_EXTRA_FLAGS += --disable-bluez +endif + common-build-arch:: grep -v -e alsa -e evdev -e udev -e share/pulseaudio -e systemd \ debian/pulseaudio.install > debian/pulseaudio.install.kfreebsd-i386 @@ -56,6 +63,11 @@ DEB_CONFIGURE_EXTRA_FLAGS = --enable-x11 --disable-hal \ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --with-module-dir=\$${prefix}/lib/pulse-$(DEB_UPSTREAM_VERSION)/modules +ifeq ($(words $(sort $(filter stage1,$(DEB_BUILD_PROFILES)))),1) + DEB_CONFIGURE_EXTRA_FLAGS += --disable-bluez +endif + + DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-$(DEB_UPSTREAM_VERSION)/modules LDFLAGS += -Wl,--no-as-needed commit 245d38ff432b6300a6656a9b189503499bd803f8 Author: Balint Reczey <bal...@balintreczey.hu> Date: Fri Mar 21 21:42:34 2014 -0100 Add myself to uploaders diff --git a/debian/control b/debian/control index 9746673..e8d41d0 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: sound Priority: optional Maintainer: Pulseaudio maintenance team <pkg-pulseaudio-devel@lists.alioth.debian.org> Uploaders: Sjoerd Simons <sjo...@debian.org>, - Martin-Ãric Racine <martin-eric.rac...@iki.fi> + Martin-Ãric Racine <martin-eric.rac...@iki.fi>, + Balint Reczey <bal...@balintreczey.hu> Build-Depends: debhelper (>= 8.1.3), cdbs (>= 0.4.93), dh-autoreconf, commit e568b71757b46a9ce03f18c0a4dc5bd7d3cb3aab Author: Balint Reczey <bal...@balintreczey.hu> Date: Fri Mar 21 21:40:26 2014 -0100 Start working on new upload diff --git a/debian/changelog b/debian/changelog index 058c06e..f7e2fbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pulseaudio (4.0-7) UNRELEASED; urgency=low + + * Start working on new upload + + -- Balint Reczey <bal...@balintreczey.hu> Fri, 21 Mar 2014 21:39:44 -0100 + pulseaudio (4.0-6) unstable; urgency=low * debian/patches/build-make-ARM-NEON-check-in-configure.ac-more-stric.patch -- pulseaudio packaging
_______________________________________________ pkg-pulseaudio-devel mailing list pkg-pulseaudio-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel