Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11053719
D9324.id22508.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
6 KB
Referenced Files
None
Subscribers
None
D9324.id22508.diff
View Options
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=<sample format> "
+ "rate=<sample rate> "
+ "channels=<number of channels> "
+- "channel_map=<channel map>");
++ "channel_map=<channel map>"
++ "norewinds=<disable rewinds>");
+
+ #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 @@
<Name>pulseaudio</Name>
<Homepage>https://www.freedesktop.org/wiki/Software/PulseAudio/</Homepage>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@streambits.io</Email>
+ <Name>Jarno Turkki</Name>
+ <Email>watpi@posteo.net</Email>
</Packager>
<License>LGPL-2.1-or-later</License>
<PartOf>multimedia.audio</PartOf>
@@ -279,7 +279,7 @@
</Description>
<PartOf>emul32</PartOf>
<RuntimeDependencies>
- <Dependency release="43">pulseaudio</Dependency>
+ <Dependency release="44">pulseaudio</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/cmake/PulseAudio/PulseAudioConfig.cmake</Path>
@@ -395,8 +395,8 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="43">pulseaudio-devel</Dependency>
- <Dependency release="43">pulseaudio-32bit</Dependency>
+ <Dependency release="44">pulseaudio-devel</Dependency>
+ <Dependency release="44">pulseaudio-32bit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/usr/lib32/pkgconfig/libpulse-mainloop-glib.pc</Path>
@@ -411,7 +411,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="43">pulseaudio</Dependency>
+ <Dependency release="44">pulseaudio</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/pulse/cdecl.h</Path>
@@ -466,7 +466,7 @@
</Description>
<PartOf>multimedia.audio</PartOf>
<RuntimeDependencies>
- <Dependency release="43">pulseaudio</Dependency>
+ <Dependency release="44">pulseaudio</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/qpaeq</Path>
@@ -480,7 +480,7 @@
</Description>
<PartOf>multimedia.audio</PartOf>
<RuntimeDependencies>
- <Dependency release="43">pulseaudio</Dependency>
+ <Dependency release="44">pulseaudio</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib64/pulse-12.2/modules/module-jack-sink.so</Path>
@@ -495,7 +495,7 @@
</Description>
<PartOf>multimedia.audio</PartOf>
<RuntimeDependencies>
- <Dependency release="43">pulseaudio-32bit</Dependency>
+ <Dependency release="44">pulseaudio-32bit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/pulse-12.2/modules/module-jack-sink.so</Path>
@@ -504,12 +504,12 @@
</Files>
</Package>
<History>
- <Update release="43">
- <Date>2020-07-06</Date>
+ <Update release="44">
+ <Date>2020-07-28</Date>
<Version>12.2</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@streambits.io</Email>
+ <Name>Jarno Turkki</Name>
+ <Email>watpi@posteo.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Aug 11, 11:47 PM (2 h, 52 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5818755
Default Alt Text
D9324.id22508.diff (6 KB)
Attached To
Mode
D9324: Backport an option to disable rewinds
Attached
Detach File
Event Timeline
Log In to Comment