diff options
Diffstat (limited to 'main/vlc/fix-waitpid-usage.patch')
| -rw-r--r-- | main/vlc/fix-waitpid-usage.patch | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/main/vlc/fix-waitpid-usage.patch b/main/vlc/fix-waitpid-usage.patch index 01b9e1c50..dc64a4f3e 100644 --- a/main/vlc/fix-waitpid-usage.patch +++ b/main/vlc/fix-waitpid-usage.patch @@ -1,6 +1,15 @@ ---- vlc-2.1.0.orig/modules/misc/inhibit/xdg.c 2013-06-24 21:00:38.000000000 +0300 -+++ vlc-2.1.0/modules/misc/inhibit/xdg.c 2013-10-07 14:06:43.450029073 +0300 -@@ -66,7 +66,7 @@ +diff -ru vlc-2.2.0.orig/modules/misc/inhibit/xdg.c vlc-2.2.0/modules/misc/inhibit/xdg.c +--- vlc-2.2.0.orig/modules/misc/inhibit/xdg.c 2015-02-28 08:48:24.264968381 -0200 ++++ vlc-2.2.0/modules/misc/inhibit/xdg.c 2015-02-28 08:48:43.081636013 -0200 +@@ -26,6 +26,7 @@ + #include <vlc_plugin.h> + #include <vlc_inhibit.h> + #include <assert.h> ++#include <errno.h> + #include <signal.h> + #include <spawn.h> + #include <sys/wait.h> +@@ -65,7 +66,7 @@ { int status; @@ -8,10 +17,11 @@ + while (waitpid (pid, &status, 0) == -1 && errno != ECHILD); } else - { ---- vlc-2.1.0.orig/modules/stream_filter/decomp.c 2013-09-12 18:18:33.000000000 +0300 -+++ vlc-2.1.0/modules/stream_filter/decomp.c 2013-10-07 14:07:58.616288530 +0300 -@@ -386,7 +386,7 @@ + msg_Warn (ih, "error starting xdg-screensaver: %s", +diff -ru vlc-2.2.0.orig/modules/stream_filter/decomp.c vlc-2.2.0/modules/stream_filter/decomp.c +--- vlc-2.2.0.orig/modules/stream_filter/decomp.c 2015-02-28 08:48:24.264968381 -0200 ++++ vlc-2.2.0/modules/stream_filter/decomp.c 2015-02-28 08:40:58.824945520 -0200 +@@ -404,7 +404,7 @@ return VLC_SUCCESS; if (p_sys->pid != -1) @@ -20,7 +30,7 @@ vlc_mutex_destroy (&p_sys->lock); vlc_cond_destroy (&p_sys->wait); free (p_sys); -@@ -411,7 +411,7 @@ +@@ -429,7 +429,7 @@ close (p_sys->write_fd); msg_Dbg (obj, "waiting for PID %u", (unsigned)p_sys->pid); @@ -29,8 +39,9 @@ msg_Dbg (obj, "exit status %d", status); if (p_sys->peeked) ---- vlc-2.1.0.orig/src/posix/netconf.c 2013-06-24 21:00:39.000000000 +0300 -+++ vlc-2.1.0/src/posix/netconf.c 2013-10-07 14:05:49.603654117 +0300 +diff -ru vlc-2.2.0.orig/src/posix/netconf.c vlc-2.2.0/src/posix/netconf.c +--- vlc-2.2.0.orig/src/posix/netconf.c 2015-02-28 08:48:24.264968381 -0200 ++++ vlc-2.2.0/src/posix/netconf.c 2015-02-28 08:40:58.824945520 -0200 @@ -28,6 +28,7 @@ #include <sys/types.h> @@ -39,7 +50,7 @@ #include <fcntl.h> #include <spawn.h> #include <unistd.h> -@@ -93,7 +93,7 @@ +@@ -94,7 +95,7 @@ while (len < sizeof (buf)); close(fd[0]); |