diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-12-22 10:31:21 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-12-22 10:32:41 +0000 |
| commit | 7cb979f0f90f2644da24a049cb13e4c21861a857 (patch) | |
| tree | b3f45ca5a27f72db36ad384803082dc8fd762797 /main/vlc/uclibc-inhibit-spawn.patch | |
| parent | 780e600cc1e01e1efa81f8dafef0b5bc92433661 (diff) | |
| download | aports-7cb979f0f90f2644da24a049cb13e4c21861a857.tar.bz2 aports-7cb979f0f90f2644da24a049cb13e4c21861a857.tar.xz | |
main/vlc: upgrade to 1.1.13
Diffstat (limited to 'main/vlc/uclibc-inhibit-spawn.patch')
| -rw-r--r-- | main/vlc/uclibc-inhibit-spawn.patch | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/main/vlc/uclibc-inhibit-spawn.patch b/main/vlc/uclibc-inhibit-spawn.patch index 75cff1bb6..c34ebe0f7 100644 --- a/main/vlc/uclibc-inhibit-spawn.patch +++ b/main/vlc/uclibc-inhibit-spawn.patch @@ -1,11 +1,11 @@ diff --git a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c -index cfb3b2a..16a2ce9 100644 +index 3f297c6..e16a21e 100644 --- a/modules/misc/inhibit/xdg.c +++ b/modules/misc/inhibit/xdg.c -@@ -26,7 +26,11 @@ - #include <vlc_plugin.h> +@@ -27,7 +27,11 @@ #include <vlc_inhibit.h> #include <assert.h> + #include <signal.h> -#include <spawn.h> +#if !defined(_POSIX_SPAWN) +# define _POSIX_SPAWN -1 @@ -15,7 +15,7 @@ index cfb3b2a..16a2ce9 100644 #include <sys/wait.h> static int Open (vlc_object_t *); -@@ -46,7 +50,9 @@ struct vlc_inhibit_sys +@@ -47,7 +51,9 @@ struct vlc_inhibit_sys vlc_thread_t thread; vlc_cond_t update, inactive; vlc_mutex_t lock; @@ -25,13 +25,11 @@ index cfb3b2a..16a2ce9 100644 bool suspend, suspended; }; -@@ -66,17 +72,21 @@ static int Open (vlc_object_t *obj) +@@ -67,17 +73,19 @@ static int Open (vlc_object_t *obj) vlc_mutex_init (&p_sys->lock); vlc_cond_init (&p_sys->update); vlc_cond_init (&p_sys->inactive); -+#if (_POSIX_SPAWN >= 0) - posix_spawnattr_init (&p_sys->attr); -+#endif +- posix_spawnattr_init (&p_sys->attr); /* Reset signal handlers to default and clear mask in the child process */ { sigset_t set; @@ -40,6 +38,7 @@ index cfb3b2a..16a2ce9 100644 - posix_spawnattr_setsigmask (&p_sys->attr, &set); sigaddset (&set, SIGPIPE); +#if (_POSIX_SPAWN >= 0) ++ posix_spawnattr_init (&p_sys->attr); + posix_spawnattr_setsigmask (&p_sys->attr, &set); posix_spawnattr_setsigdefault (&p_sys->attr, &set); posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF @@ -48,7 +47,7 @@ index cfb3b2a..16a2ce9 100644 } p_sys->suspend = false; p_sys->suspended = false; -@@ -105,7 +115,9 @@ static void Close (vlc_object_t *obj) +@@ -106,7 +114,9 @@ static void Close (vlc_object_t *obj) vlc_cancel (p_sys->thread); vlc_join (p_sys->thread, NULL); @@ -58,7 +57,7 @@ index cfb3b2a..16a2ce9 100644 vlc_cond_destroy (&p_sys->inactive); vlc_cond_destroy (&p_sys->update); vlc_mutex_destroy (&p_sys->lock); -@@ -152,8 +164,16 @@ static void *Thread (void *data) +@@ -153,8 +163,16 @@ static void *Thread (void *data) pid_t pid; vlc_mutex_unlock (&p_sys->lock); |