diff --git a/pulseaudio-dump-module-Ignore-invalid-module-init-tools.patch b/pulseaudio-dump-module-Ignore-invalid-module-init-tools.patch new file mode 100644 index 0000000..d5715ef --- /dev/null +++ b/pulseaudio-dump-module-Ignore-invalid-module-init-tools.patch @@ -0,0 +1,38 @@ +From: Takashi Iwai +Subject: dump-module: Ignore invalid module-init-tools entries +References: bsc#1194379 + +pulseaudio dump-modules iterates all entries beginning with "module-" +prefix, and unfortunately the directory /usr/lib/module-init-tools +that is installed by suse-module-tools package hitting incorrectly, +which results in spurious errors as: + E: [pulseaudio] ltdl-bind-now.c: Failed to open module /lib/module-init-tools.so: /lib/module-init-tools.so: cannot open shared object file: No such file or directory + .... + +Simply ignore this entry as a workaround. + +Signed-off-by: Takashi Iwai + +--- +diff --git a/src/daemon/dumpmodules.c b/src/daemon/dumpmodules.c +index 8410bbcdcca8..2abc3b8bb0c9 100644 +--- a/src/daemon/dumpmodules.c ++++ b/src/daemon/dumpmodules.c +@@ -115,6 +115,8 @@ static int callback(const char *path, lt_ptr data) { + + if (strlen(e) <= sizeof(PREFIX)-1 || strncmp(e, PREFIX, sizeof(PREFIX)-1)) + return 0; ++ if (!strcmp(e, "module-init-tools")) ++ return 0; + + if (is_preloaded(e)) + return 0; +@@ -141,6 +143,8 @@ void pa_dump_modules(pa_daemon_conf *c, int argc, char * const argv[]) { + + if (strlen(l->name) <= sizeof(PREFIX)-1 || strncmp(l->name, PREFIX, sizeof(PREFIX)-1)) + continue; ++ if (!strcmp(l->name, "module-init-tools")) ++ continue; + + pa_snprintf(buf, sizeof(buf), "%s", l->name); + if ((e = strrchr(buf, '.'))) diff --git a/pulseaudio.changes b/pulseaudio.changes index 9e78b5d..943ea06 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 14 15:06:37 CET 2022 - tiwai@suse.de + +- Workaround for spurious errors in dump-modules command + (bsc#1194379): + pulseaudio-dump-module-Ignore-invalid-module-init-tools.patch + ------------------------------------------------------------------- Wed Jan 5 11:22:18 UTC 2022 - Dominique Leuenberger diff --git a/pulseaudio.spec b/pulseaudio.spec index 9d74df8..6ce8191 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -53,6 +53,8 @@ Patch1: suppress-socket-error-msg.diff Patch5: qpaeq-shebang.patch # PATCH-FIX-OPENSUSE Workaround for old systemd on Leap 15.x Patch6: pulseaudio-old-systemd-workaround.patch +# PATCH-FIX-OPENSUSE Workaround for suse-module-tools directory +Patch7: pulseaudio-dump-module-Ignore-invalid-module-init-tools.patch BuildRequires: alsa-devel >= 1.0.19 BuildRequires: bluez-devel >= 5 BuildRequires: fdupes @@ -344,6 +346,7 @@ System user for PulseAudio %if 0%{?suse_version} < 1550 %patch6 -p1 %endif +%patch7 -p1 %build %meson \