diff --git a/files/0001-sounds-good.patch b/files/0001-Use-soxr-mq-by-default.patch rename from files/0001-sounds-good.patch rename to files/0001-Use-soxr-mq-by-default.patch diff --git a/files/allow-disabling-rewinds-12.2.patch b/files/allow-disabling-rewinds-12.2.patch new file mode 100644 --- /dev/null +++ b/files/allow-disabling-rewinds-12.2.patch @@ -0,0 +1,90 @@ +diff -ruN pulseaudio-12.2/src/modules/module-null-sink.c pulseaudio-12.2-new/src/modules/module-null-sink.c +--- pulseaudio-12.2/src/modules/module-null-sink.c 2018-07-16 17:40:33.000000000 +0300 ++++ pulseaudio-12.2-new/src/modules/module-null-sink.c 2020-07-28 15:35:36.011256277 +0300 +@@ -51,10 +51,12 @@ + "format= " + "rate= " + "channels= " +- "channel_map="); ++ "channel_map=" ++ "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 +69,8 @@ + + pa_usec_t block_usec; + pa_usec_t timestamp; ++ ++ bool norewinds; + }; + + static const char* const valid_modargs[] = { +@@ -76,6 +80,7 @@ + "rate", + "channels", + "channel_map", ++ "norewinds", + NULL + }; + +@@ -130,7 +135,13 @@ + 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); + } + +@@ -293,6 +304,8 @@ + pa_sink_new_data_done(&data); + goto fail; + } ++ ++ + + u->sink = pa_sink_new(m->core, &data, PA_SINK_LATENCY|PA_SINK_DYNAMIC_LATENCY); + pa_sink_new_data_done(&data); +@@ -312,7 +325,17 @@ + + 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 +343,11 @@ + 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); + diff --git a/files/series b/files/series --- a/files/series +++ b/files/series @@ -1,4 +1,5 @@ -0001-sounds-good.patch +allow-disabling-rewinds-12.2.patch +0001-Use-soxr-mq-by-default.patch 0001-Disable-flat-volumes-as-they-re-making-folks-unhappy.patch 0001-Enable-module-switch-on-connect-by-default.patch 0001-Support-a-stateless-configuration.patch diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : pulseaudio version : 12.2 -release : 43 +release : 44 source : - https://freedesktop.org/software/pulseaudio/releases/pulseaudio-12.2.tar.xz : 809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055 homepage : https://www.freedesktop.org/wiki/Software/PulseAudio/ diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -3,8 +3,8 @@ pulseaudio https://www.freedesktop.org/wiki/Software/PulseAudio/ - Joshua Strobl - joshua@streambits.io + Jarno Turkki + watpi@posteo.net LGPL-2.1-or-later multimedia.audio @@ -279,7 +279,7 @@ emul32 - pulseaudio + pulseaudio /usr/lib32/cmake/PulseAudio/PulseAudioConfig.cmake @@ -395,8 +395,8 @@ programming.devel - pulseaudio-devel - pulseaudio-32bit + pulseaudio-devel + pulseaudio-32bit /usr/lib32/pkgconfig/libpulse-mainloop-glib.pc @@ -411,7 +411,7 @@ programming.devel - pulseaudio + pulseaudio /usr/include/pulse/cdecl.h @@ -466,7 +466,7 @@ multimedia.audio - pulseaudio + pulseaudio /usr/bin/qpaeq @@ -480,7 +480,7 @@ multimedia.audio - pulseaudio + pulseaudio /usr/lib64/pulse-12.2/modules/module-jack-sink.so @@ -495,7 +495,7 @@ multimedia.audio - pulseaudio-32bit + pulseaudio-32bit /usr/lib32/pulse-12.2/modules/module-jack-sink.so @@ -504,12 +504,12 @@ - - 2020-07-06 + + 2020-07-28 12.2 Packaging update - Joshua Strobl - joshua@streambits.io + Jarno Turkki + watpi@posteo.net \ No newline at end of file