From 180c6d87f35bf6d16f77293d5d7a283f066cf8cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= Date: Thu, 26 Sep 2013 14:10:26 +0200 Subject: main/vlc: yet another rebase of uclibc-inhibit-spawn.patch --- main/vlc/uclibc-inhibit-spawn.patch | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'main/vlc/uclibc-inhibit-spawn.patch') diff --git a/main/vlc/uclibc-inhibit-spawn.patch b/main/vlc/uclibc-inhibit-spawn.patch index 9c7e72ed6..f1da2a152 100644 --- a/main/vlc/uclibc-inhibit-spawn.patch +++ b/main/vlc/uclibc-inhibit-spawn.patch @@ -1,6 +1,6 @@ diff -rupN a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c --- a/modules/misc/inhibit/xdg.c 2013-06-24 20:00:38.000000000 +0200 -+++ b/modules/misc/inhibit/xdg.c 2013-09-26 13:57:19.839770148 +0200 ++++ b/modules/misc/inhibit/xdg.c 2013-09-26 14:08:51.209759907 +0200 @@ -28,7 +28,11 @@ #include #include @@ -24,7 +24,18 @@ diff -rupN a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c }; extern char **environ; -@@ -91,6 +97,7 @@ static int Open (vlc_object_t *obj) +@@ -60,8 +66,10 @@ static void Timer (void *data) + }; + pid_t pid; + ++#if (_POSIX_SPAWN >= 0) + int err = posix_spawnp (&pid, "xdg-screensaver", NULL, &sys->attr, + argv, environ); ++#endif + if (err == 0) + { + int status; +@@ -91,6 +99,7 @@ static int Open (vlc_object_t *obj) if (p_sys == NULL) return VLC_ENOMEM; @@ -32,12 +43,11 @@ diff -rupN a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c posix_spawnattr_init (&p_sys->attr); /* Reset signal handlers to default and clear mask in the child process */ { -@@ -102,12 +109,15 @@ static int Open (vlc_object_t *obj) - posix_spawnattr_setsigdefault (&p_sys->attr, &set); +@@ -103,11 +112,14 @@ static int Open (vlc_object_t *obj) posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK); -+#endif } ++#endif ih->p_sys = p_sys; if (vlc_timer_create (&p_sys->timer, Timer, ih)) @@ -48,7 +58,7 @@ diff -rupN a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c free (p_sys); return VLC_ENOMEM; } -@@ -122,6 +132,8 @@ static void Close (vlc_object_t *obj) +@@ -122,6 +134,8 @@ static void Close (vlc_object_t *obj) vlc_inhibit_sys_t *p_sys = ih->p_sys; vlc_timer_destroy (p_sys->timer); -- cgit v1.2.3