diff -Nru pulseaudio-12.2/debian/changelog pulseaudio-12.2/debian/changelog --- pulseaudio-12.2/debian/changelog 2019-04-16 13:54:26.000000000 +0000 +++ pulseaudio-12.2/debian/changelog 2019-05-19 14:55:59.000000000 +0000 @@ -1,3 +1,18 @@ +pulseaudio (1:12.2-9~disco1) disco; urgency=medium + + * Backport "add an option that allows rewinds to be disabled" + https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/93 + * Sync with Ubuntu 19.04: + - Ubuntu dropped esound compatibility, keep it to not make regressions in 18.04 + - still keeping pulseaudio-module-gconf for compatibility with 18.04 + - synced updated 0700-modules-add-snappy-policy-module.patch + - synced updated 0700-modules-enable-snappy-policy-module.patch + - new volume-test.patch replacing 0050-disable-volume-test.patch + - new Don-t-compile-with-ffast-math.patch + - new steelseries.3.83675b374.patch, steelseries.4.fe6a9a8f5.patch, steelseries.5.3454c19f3.patch + + -- Mikhail Novosyolov Sun, 19 May 2019 17:55:59 +0300 + pulseaudio (1:12.2-2ubuntu3) disco; urgency=medium * debian/pulseaudio.links: chmod +x so that dh-exec actually works. @@ -48,7 +63,15 @@ to snaps with classic confinement. (LP: #1787324) -- Ken VanDine Wed, 29 Aug 2018 09:18:41 -0400 + +pulseaudio (1:12.2-5) unstable; urgency=medium + * Rebased on updated PulseAudio 12.2 from Ubuntu 18.10 + * Restore pulseaudio-module-gconf based on PulseAudio 11 from Ubuntu 18.04 + to prevent breaking e.g. plasma-pa + + -- Mikhail Novosyolov Tue, 24 Jul 2018 03:04:00 +0800 + pulseaudio (1:12.2-0ubuntu2) cosmic; urgency=medium * Update snap policy to make access to audio recording conditional on @@ -78,6 +101,12 @@ (LP: #1785556). -- Daniel van Vugt Mon, 06 Aug 2018 13:42:13 +0800 + +pulseaudio (1:12.2-4) unstable; urgency=medium + + * Build PulseAudio 12.2 for Ubuntu 18.04 using specs and patches from Ubuntu 18.10 and PulseAudio 12.0 + + -- Mikhail Novosyolov Tue, 24 Jul 2018 03:04:00 +0800 pulseaudio (1:12.0-1ubuntu1) cosmic; urgency=medium diff -Nru pulseaudio-12.2/debian/compat pulseaudio-12.2/debian/compat --- pulseaudio-12.2/debian/compat 1970-01-01 00:00:00.000000000 +0000 +++ pulseaudio-12.2/debian/compat 2018-08-06 05:42:13.000000000 +0000 @@ -0,0 +1 @@ +10 diff -Nru pulseaudio-12.2/debian/control pulseaudio-12.2/debian/control --- pulseaudio-12.2/debian/control 2018-12-11 08:59:57.000000000 +0000 +++ pulseaudio-12.2/debian/control 2018-08-23 11:19:24.000000000 +0000 @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Pulseaudio maintenance team Uploaders: Sjoerd Simons , Felipe Sateler -Build-Depends: debhelper-compat (= 11), +Build-Depends: debhelper (>= 10), check, dh-exec, dpkg-dev (>= 1.17.14), @@ -46,7 +46,7 @@ libx11-xcb-dev, libxcb1-dev, libxtst-dev -Standards-Version: 4.2.1 +Standards-Version: 4.1.3 Rules-Requires-Root: no Vcs-Browser: https://git.launchpad.net/~ubuntu-audio-dev/pulseaudio Vcs-Git: https://git.launchpad.net/~ubuntu-audio-dev/pulseaudio @@ -110,6 +110,23 @@ pax11publish - Store/retrieve PulseAudio default server/sink/source settings in the X11 root window. +Package: pulseaudio-esound-compat +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: pulseaudio (<< 0.9.7) +Conflicts: esound +Replaces: esound +Provides: esound +Description: PulseAudio ESD compatibility layer + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This package contains the ESD compatibility components used by some + older versions of complete desktop environments, e.g., GNOME, and + many useful applications. It enables a PulseAudio sound server to + fully replace ESD. + Package: pulseaudio-module-zeroconf Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, avahi-daemon @@ -148,9 +165,17 @@ . The module is called module-lirc. +####################################################################### +# pulseaudio-module-gconf was dropped in Ubuntu 18.10 and replaced with +# pulseaudio-module-gsettings. +# Try to build both gconf and gsettings. +# Build options in debian/rules also required changes. +# About Conflicts: see 'Notes for packagers' +# https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/12.0/ Package: pulseaudio-module-gsettings Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: pulseaudio-module-gconf Description: GSettings module for 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 @@ -161,6 +186,20 @@ . The module is called module-gsettings. +Package: pulseaudio-module-gconf +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: pulseaudio-module-gsettings +Description: GConf module for 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This module enables PulseAudio to store additional configuration in GConf. + . + The module is called module-gconf. +####################################################################### + Package: pulseaudio-module-raop Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, pulseaudio-module-zeroconf @@ -258,3 +297,4 @@ . This package provides the pre-load library used to redirect applications using OSS through pulseaudio. + diff -Nru pulseaudio-12.2/debian/patches/0001-Backport-add-an-option-that-allows-rewinds-to-be-dis.patch pulseaudio-12.2/debian/patches/0001-Backport-add-an-option-that-allows-rewinds-to-be-dis.patch --- pulseaudio-12.2/debian/patches/0001-Backport-add-an-option-that-allows-rewinds-to-be-dis.patch 1970-01-01 00:00:00.000000000 +0000 +++ pulseaudio-12.2/debian/patches/0001-Backport-add-an-option-that-allows-rewinds-to-be-dis.patch 2019-05-19 14:55:59.000000000 +0000 @@ -0,0 +1,130 @@ +From 15c0fd36aeecb56afefe6f2bd573f94eaed87d13 Mon Sep 17 00:00:00 2001 +From: Mikhail Novosyolov +Date: Sun, 19 May 2019 17:53:09 +0300 +Subject: [PATCH] Backport "add an option that allows rewinds to be disabled" + to PulseAudio 12.2 + +https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/93 + +Make PulseAudio version contain '-' to allow PulseEffects to detect this backported capability +https://github.com/wwmm/pulseeffects/issues/350#issuecomment-493766923 + +diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c +index baaf06477..be7738de5 100644 +--- a/src/modules/module-null-sink.c ++++ b/src/modules/module-null-sink.c +@@ -51,10 +51,13 @@ PA_MODULE_USAGE( + "format= " + "rate= " + "channels= " +- "channel_map="); ++ "channel_map=" ++ "formats=" ++ "norewinds="); + + #define DEFAULT_SINK_NAME "null" + #define BLOCK_USEC (PA_USEC_PER_SEC * 2) ++#define NOREWINDS_MAX_LATENCY_USEC (50*PA_USEC_PER_MSEC) + + struct userdata { + pa_core *core; +@@ -67,6 +70,8 @@ struct userdata { + + pa_usec_t block_usec; + pa_usec_t timestamp; ++ ++ bool norewinds; + }; + + static const char* const valid_modargs[] = { +@@ -76,6 +81,7 @@ static const char* const valid_modargs[] = { + "rate", + "channels", + "channel_map", ++ "norewinds", + NULL + }; + +@@ -130,7 +136,13 @@ static void sink_update_requested_latency_cb(pa_sink *s) { + u->block_usec = s->thread_info.max_latency; + + nbytes = pa_usec_to_bytes(u->block_usec, &s->sample_spec); +- pa_sink_set_max_rewind_within_thread(s, nbytes); ++ ++ if(u->norewinds){ ++ pa_sink_set_max_rewind_within_thread(s, 0); ++ } else { ++ pa_sink_set_max_rewind_within_thread(s, nbytes); ++ } ++ + pa_sink_set_max_request_within_thread(s, nbytes); + } + +@@ -312,7 +324,17 @@ int pa__init(pa_module*m) { + + u->block_usec = BLOCK_USEC; + nbytes = pa_usec_to_bytes(u->block_usec, &u->sink->sample_spec); +- pa_sink_set_max_rewind(u->sink, nbytes); ++ ++ if(pa_modargs_get_value_boolean(ma, "norewinds", &u->norewinds) < 0){ ++ pa_log("Invalid argument, norewinds expects a boolean value."); ++ } ++ ++ if(u->norewinds){ ++ pa_sink_set_max_rewind(u->sink, 0); ++ } else { ++ pa_sink_set_max_rewind(u->sink, nbytes); ++ } ++ + pa_sink_set_max_request(u->sink, nbytes); + + if (!(u->thread = pa_thread_new("null-sink", thread_func, u))) { +@@ -320,7 +342,11 @@ int pa__init(pa_module*m) { + goto fail; + } + +- pa_sink_set_latency_range(u->sink, 0, BLOCK_USEC); ++ if(u->norewinds){ ++ pa_sink_set_latency_range(u->sink, 0, NOREWINDS_MAX_LATENCY_USEC); ++ } else { ++ pa_sink_set_latency_range(u->sink, 0, BLOCK_USEC); ++ } + + pa_sink_put(u->sink); + +-- +2.20.1 + +--- pulseaudio-12.2/configure.orig 2019-05-19 19:19:06.008430847 +0300 ++++ pulseaudio-12.2/configure 2019-05-19 19:41:24.158979639 +0300 +@@ -590,8 +590,8 @@ + # Identity of this package. + PACKAGE_NAME='pulseaudio' + PACKAGE_TARNAME='pulseaudio' +-PACKAGE_VERSION='12.2' +-PACKAGE_STRING='pulseaudio 12.2' ++PACKAGE_VERSION='12.2-2' ++PACKAGE_STRING='pulseaudio 12.2-2' + PACKAGE_BUGREPORT='pulseaudio-discuss (at) lists (dot) freedesktop (dot) org' + PACKAGE_URL='http://pulseaudio.org/' + +@@ -3880,7 +3880,7 @@ + + # Define the identity of the package. + PACKAGE='pulseaudio' +- VERSION='12.2' ++ VERSION='12.2-2' + + + cat >>confdefs.h <<_ACEOF + +--- pulseaudio-12.2/.version.orig 2019-05-19 19:57:59.161220024 +0300 ++++ pulseaudio-12.2/.version 2019-05-19 19:56:45.995463874 +0300 +@@ -1 +1 @@ +-12.2 ++12.2-2 +--- pulseaudio-12.2/.tarball-version.orig 2019-05-19 19:57:55.585329436 +0300 ++++ pulseaudio-12.2/.tarball-version 2019-05-19 19:56:48.635382716 +0300 +@@ -1 +1 @@ +-12.2 ++12.2-2 diff -Nru pulseaudio-12.2/debian/patches/series pulseaudio-12.2/debian/patches/series --- pulseaudio-12.2/debian/patches/series 2019-04-16 13:23:01.000000000 +0000 +++ pulseaudio-12.2/debian/patches/series 2019-05-19 14:55:59.000000000 +0000 @@ -22,3 +22,5 @@ steelseries.3.83675b374.patch steelseries.4.fe6a9a8f5.patch steelseries.5.3454c19f3.patch + +0001-Backport-add-an-option-that-allows-rewinds-to-be-dis.patch diff -Nru pulseaudio-12.2/debian/pulseaudio-esound-compat.install pulseaudio-12.2/debian/pulseaudio-esound-compat.install --- pulseaudio-12.2/debian/pulseaudio-esound-compat.install 1970-01-01 00:00:00.000000000 +0000 +++ pulseaudio-12.2/debian/pulseaudio-esound-compat.install 2018-08-06 05:42:13.000000000 +0000 @@ -0,0 +1,7 @@ +usr/bin/esdcompat +usr/lib/pulse-*/modules/libprotocol-esound.so +usr/lib/pulse-*/modules/module-esound-compat-spawnfd.so +usr/lib/pulse-*/modules/module-esound-compat-spawnpid.so +usr/lib/pulse-*/modules/module-esound-protocol-tcp.so +usr/lib/pulse-*/modules/module-esound-protocol-unix.so +usr/share/man/man1/esdcompat.1 diff -Nru pulseaudio-12.2/debian/pulseaudio-esound-compat.links pulseaudio-12.2/debian/pulseaudio-esound-compat.links --- pulseaudio-12.2/debian/pulseaudio-esound-compat.links 1970-01-01 00:00:00.000000000 +0000 +++ pulseaudio-12.2/debian/pulseaudio-esound-compat.links 2018-08-06 05:42:13.000000000 +0000 @@ -0,0 +1,2 @@ +usr/bin/esdcompat usr/bin/esd +usr/share/man/man1/esdcompat.1.gz usr/share/man/man1/esd.1.gz diff -Nru pulseaudio-12.2/debian/pulseaudio.init.example pulseaudio-12.2/debian/pulseaudio.init.example --- pulseaudio-12.2/debian/pulseaudio.init.example 2018-12-11 08:59:57.000000000 +0000 +++ pulseaudio-12.2/debian/pulseaudio.init.example 2018-08-06 05:42:13.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh -e ### BEGIN INIT INFO -# Provides: pulseaudio +# Provides: pulseaudio esound # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog # Should-Start: avahi-daemon udev network-manager diff -Nru pulseaudio-12.2/debian/pulseaudio.install pulseaudio-12.2/debian/pulseaudio.install --- pulseaudio-12.2/debian/pulseaudio.install 2018-12-11 08:59:57.000000000 +0000 +++ pulseaudio-12.2/debian/pulseaudio.install 2018-08-07 09:01:22.000000000 +0000 @@ -31,6 +31,7 @@ usr/lib/pulse-*/modules/module-combine.so usr/lib/pulse-*/modules/module-default-device-restore.so usr/lib/pulse-*/modules/module-detect.so +usr/lib/pulse-*/modules/module-esound-sink.so usr/lib/pulse-*/modules/module-http-protocol-tcp.so usr/lib/pulse-*/modules/module-http-protocol-unix.so usr/lib/pulse-*/modules/module-intended-roles.so diff -Nru pulseaudio-12.2/debian/pulseaudio.links pulseaudio-12.2/debian/pulseaudio.links --- pulseaudio-12.2/debian/pulseaudio.links 2019-04-16 13:22:48.000000000 +0000 +++ pulseaudio-12.2/debian/pulseaudio.links 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -#!/usr/bin/dh-exec - -[linux-any] /usr/share/alsa/alsa.conf.d/pulse.conf /etc/alsa/conf.d/99-pulse.conf diff -Nru pulseaudio-12.2/debian/pulseaudio-module-gconf.install pulseaudio-12.2/debian/pulseaudio-module-gconf.install --- pulseaudio-12.2/debian/pulseaudio-module-gconf.install 1970-01-01 00:00:00.000000000 +0000 +++ pulseaudio-12.2/debian/pulseaudio-module-gconf.install 2018-08-23 11:15:40.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/pulse/gconf-helper +usr/lib/pulse-*/modules/module-gconf.so diff -Nru pulseaudio-12.2/debian/rules pulseaudio-12.2/debian/rules --- pulseaudio-12.2/debian/rules 2018-12-11 08:59:57.000000000 +0000 +++ pulseaudio-12.2/debian/rules 2018-08-23 11:17:46.000000000 +0000 @@ -24,9 +24,8 @@ --with-systemduserunitdir=\$${prefix}/lib/systemd/user \ --enable-snap \ --disable-bluez4 \ - --disable-esound \ --enable-gsettings \ - --disable-gconf + --enable-gconf PA_MAJORMINOR = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -r -e 's/^([0-9]+\.[0-9]+).*/\1/')