rpms/pulseaudio
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix multilib fix

Browse Source
This commit is contained in:
Lubomir Rintel 2008-02-29 16:42:01 +00:00
parent 8e3c045996
commit 5ca56d8378
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pulseaudio-0.9.8-multilib.patch
View File

@ -1,6 +1,13 @@
Attempt to resolve the multilib conflicts by getting all the config files
look equally for all plattforms. This includes getting rid go pathnames
with libdir; let's make ps search for files with relative paths there.
https://bugzilla.redhat.com/show_bug.cgi?id=228383
Lubomir Kundrak <lkundrak@redhat.com>
diff -urp pulseaudio-0.9.8.orig/src/daemon/daemon.conf.in pulseaudio-0.9.8/src/daemon/daemon.conf.in
--- pulseaudio-0.9.8.orig/src/daemon/daemon.conf.in 2007-11-21 02:30:42.000000000 +0100
+++ pulseaudio-0.9.8/src/daemon/daemon.conf.in 2008-02-29 09:04:27.000000000 +0100
--- pulseaudio-0.9.8.orig/src/daemon/daemon.conf.in 2008-02-29 12:44:07.000000000 +0100
+++ pulseaudio-0.9.8/src/daemon/daemon.conf.in 2008-02-29 12:43:27.000000000 +0100
@@ -38,7 +38,7 @@
; module-idle-time = 20
; scache-idle-time = 20
@ -11,8 +18,8 @@ diff -urp pulseaudio-0.9.8.orig/src/daemon/daemon.conf.in pulseaudio-0.9.8/src/d
; default-script-file = @PA_DEFAULT_CONFIG_FILE@
diff -urp pulseaudio-0.9.8.orig/src/daemon/default.pa.in pulseaudio-0.9.8/src/daemon/default.pa.in
--- pulseaudio-0.9.8.orig/src/daemon/default.pa.in 2008-02-29 06:40:07.000000000 +0100
+++ pulseaudio-0.9.8/src/daemon/default.pa.in 2008-02-29 09:04:27.000000000 +0100
--- pulseaudio-0.9.8.orig/src/daemon/default.pa.in 2008-02-29 12:44:07.000000000 +0100
+++ pulseaudio-0.9.8/src/daemon/default.pa.in 2008-02-29 12:43:27.000000000 +0100
@@ -37,7 +37,7 @@ load-sample-lazy pulse-hotplug /usr/shar
#load-module module-pipe-sink
@ -41,8 +48,8 @@ diff -urp pulseaudio-0.9.8.orig/src/daemon/default.pa.in pulseaudio-0.9.8/src/da
.endif
diff -urp pulseaudio-0.9.8.orig/src/pulsecore/cli-command.c pulseaudio-0.9.8/src/pulsecore/cli-command.c
--- pulseaudio-0.9.8.orig/src/pulsecore/cli-command.c 2007-11-01 01:32:49.000000000 +0100
+++ pulseaudio-0.9.8/src/pulsecore/cli-command.c 2008-02-29 09:04:27.000000000 +0100
--- pulseaudio-0.9.8.orig/src/pulsecore/cli-command.c 2008-02-29 12:44:07.000000000 +0100
+++ pulseaudio-0.9.8/src/pulsecore/cli-command.c 2008-02-29 12:44:48.000000000 +0100
@@ -31,6 +31,7 @@
#include <stdlib.h>
#include <errno.h>
@ -51,7 +58,7 @@ diff -urp pulseaudio-0.9.8.orig/src/pulsecore/cli-command.c pulseaudio-0.9.8/src
#include <pulse/xmalloc.h>
@@ -1314,9 +1315,38 @@ int pa_cli_command_execute_line_stateful
@@ -1314,9 +1315,39 @@ int pa_cli_command_execute_line_stateful
return -1;
} else {
const char *filename = cs+l+strspn(cs+l, whitespace);
@ -75,9 +82,10 @@ diff -urp pulseaudio-0.9.8.orig/src/pulsecore/cli-command.c pulseaudio-0.9.8/src
+ char *pathname = malloc (strlen(path) + strlen(filename) + 2);
+ if (pathname == NULL)
+ return -1;
+ pathname[0] = '\0';
+
+ strcat(pathname, path);
+ strcat(pathname, '/'); /* XXX: Is this OK for Windows? */
+ strcat(pathname, "/"); /* XXX: Is this OK for Windows? */
+ strcat(pathname, filename);
+
+ *ifstate = access(pathname, F_OK) == 0 ? IFSTATE_TRUE : IFSTATE_FALSE;

5
pulseaudio.spec
View File

@ -394,7 +394,10 @@ fi
%{_mandir}/man1/pax11publish.1.gz
%changelog
* Fri Feb 29 2008 Lubomir Kundrak <lkundrak@redhat.com> 0.9.8-8
* Fri Feb 29 2008 Lubomir Kundrak <lkundrak@redhat.com> 0.9.8-9
- Fix the fix.
* Fri Feb 29 2008 Lubomir Kundrak <lkundrak@redhat.com> 0.9.8-9
- Fix multilib issue (#228383)
- Prevent dumping core if exiting sooner that ltdl initializaion (#427962)