diff options
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio/pulseaudio/0001-client-conf-Add-allow-autospawn-for-root.patch')
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio/0001-client-conf-Add-allow-autospawn-for-root.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-client-conf-Add-allow-autospawn-for-root.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-client-conf-Add-allow-autospawn-for-root.patch index bc32775836..33f7709ae4 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-client-conf-Add-allow-autospawn-for-root.patch +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-client-conf-Add-allow-autospawn-for-root.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1cb5647f76dc8cd7bacbce2a64fac9e6c2dc3b16 Mon Sep 17 00:00:00 2001 | 1 | From babec3a50dd710d26b72f6c6d43bd79b04e954a6 Mon Sep 17 00:00:00 2001 |
2 | From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2 | From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> |
3 | Date: Tue, 28 Apr 2015 14:32:43 +0300 | 3 | Date: Tue, 28 Apr 2015 14:32:43 +0300 |
4 | Subject: [PATCH] client-conf: Add allow-autospawn-for-root | 4 | Subject: [PATCH] client-conf: Add allow-autospawn-for-root |
@@ -24,10 +24,10 @@ Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | |||
24 | 5 files changed, 13 insertions(+), 1 deletion(-) | 24 | 5 files changed, 13 insertions(+), 1 deletion(-) |
25 | 25 | ||
26 | diff --git a/man/pulse-client.conf.5.xml.in b/man/pulse-client.conf.5.xml.in | 26 | diff --git a/man/pulse-client.conf.5.xml.in b/man/pulse-client.conf.5.xml.in |
27 | index 1002dbe..0058490 100644 | 27 | index b88898c..e737c96 100644 |
28 | --- a/man/pulse-client.conf.5.xml.in | 28 | --- a/man/pulse-client.conf.5.xml.in |
29 | +++ b/man/pulse-client.conf.5.xml.in | 29 | +++ b/man/pulse-client.conf.5.xml.in |
30 | @@ -71,6 +71,15 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. | 30 | @@ -82,6 +82,15 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. |
31 | </option> | 31 | </option> |
32 | 32 | ||
33 | <option> | 33 | <option> |
@@ -44,7 +44,7 @@ index 1002dbe..0058490 100644 | |||
44 | run when autospawning. Defaults to a path configured at compile | 44 | run when autospawning. Defaults to a path configured at compile |
45 | time.</p> | 45 | time.</p> |
46 | diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c | 46 | diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c |
47 | index 83331f8..0474583 100644 | 47 | index a3c9486..9f68ee5 100644 |
48 | --- a/src/pulse/client-conf.c | 48 | --- a/src/pulse/client-conf.c |
49 | +++ b/src/pulse/client-conf.c | 49 | +++ b/src/pulse/client-conf.c |
50 | @@ -138,6 +138,7 @@ void pa_client_conf_load(pa_client_conf *c, bool load_from_x11, bool load_from_e | 50 | @@ -138,6 +138,7 @@ void pa_client_conf_load(pa_client_conf *c, bool load_from_x11, bool load_from_e |
@@ -56,13 +56,13 @@ index 83331f8..0474583 100644 | |||
56 | { "disable-shm", pa_config_parse_bool, &c->disable_shm, NULL }, | 56 | { "disable-shm", pa_config_parse_bool, &c->disable_shm, NULL }, |
57 | { "enable-shm", pa_config_parse_not_bool, &c->disable_shm, NULL }, | 57 | { "enable-shm", pa_config_parse_not_bool, &c->disable_shm, NULL }, |
58 | diff --git a/src/pulse/client-conf.h b/src/pulse/client-conf.h | 58 | diff --git a/src/pulse/client-conf.h b/src/pulse/client-conf.h |
59 | index eac705a..131393a 100644 | 59 | index 7691ec7..19db7ed 100644 |
60 | --- a/src/pulse/client-conf.h | 60 | --- a/src/pulse/client-conf.h |
61 | +++ b/src/pulse/client-conf.h | 61 | +++ b/src/pulse/client-conf.h |
62 | @@ -38,6 +38,7 @@ typedef struct pa_client_conf { | 62 | @@ -38,6 +38,7 @@ typedef struct pa_client_conf { |
63 | char *cookie_file_from_application; | 63 | char *cookie_file_from_application; |
64 | char *cookie_file_from_client_conf; | 64 | char *cookie_file_from_client_conf; |
65 | bool autospawn, disable_shm, auto_connect_localhost, auto_connect_display; | 65 | bool autospawn, disable_shm, disable_memfd, auto_connect_localhost, auto_connect_display; |
66 | + bool allow_autospawn_for_root; | 66 | + bool allow_autospawn_for_root; |
67 | size_t shm_size; | 67 | size_t shm_size; |
68 | } pa_client_conf; | 68 | } pa_client_conf; |
@@ -80,10 +80,10 @@ index 26b7790..69830ef 100644 | |||
80 | ; extra-arguments = --log-target=syslog | 80 | ; extra-arguments = --log-target=syslog |
81 | 81 | ||
82 | diff --git a/src/pulse/context.c b/src/pulse/context.c | 82 | diff --git a/src/pulse/context.c b/src/pulse/context.c |
83 | index 4bc445f..d6c3f6d 100644 | 83 | index 69be5f4..d6e13e8 100644 |
84 | --- a/src/pulse/context.c | 84 | --- a/src/pulse/context.c |
85 | +++ b/src/pulse/context.c | 85 | +++ b/src/pulse/context.c |
86 | @@ -976,7 +976,7 @@ int pa_context_connect( | 86 | @@ -1027,7 +1027,7 @@ int pa_context_connect( |
87 | if (!(flags & PA_CONTEXT_NOAUTOSPAWN) && c->conf->autospawn) { | 87 | if (!(flags & PA_CONTEXT_NOAUTOSPAWN) && c->conf->autospawn) { |
88 | 88 | ||
89 | #ifdef HAVE_GETUID | 89 | #ifdef HAVE_GETUID |
@@ -93,5 +93,5 @@ index 4bc445f..d6c3f6d 100644 | |||
93 | else { | 93 | else { |
94 | c->do_autospawn = true; | 94 | c->do_autospawn = true; |
95 | -- | 95 | -- |
96 | 1.9.3 | 96 | 2.8.1 |
97 | 97 | ||