diff options
| author | jsa <jsa@FreeBSD.org> | 2011-11-27 11:38:47 +0800 |
|---|---|---|
| committer | jsa <jsa@FreeBSD.org> | 2011-11-27 11:38:47 +0800 |
| commit | 0813c8c672ac759e43e9a6339cdee0fa1ec74a85 (patch) | |
| tree | 57ce9ee2d16f7475fa57d8812307f3b8cc53b5c2 /multimedia/vlc | |
| parent | 529f69202733e5d03bd8ad4b6446fb516e3b7a74 (diff) | |
| download | freebsd-ports-gnome-0813c8c672ac759e43e9a6339cdee0fa1ec74a85.tar.gz freebsd-ports-gnome-0813c8c672ac759e43e9a6339cdee0fa1ec74a85.tar.zst freebsd-ports-gnome-0813c8c672ac759e43e9a6339cdee0fa1ec74a85.zip | |
Fix build on 7.x.
Approved by: kwm (mentor)
Feature safe: yes
Diffstat (limited to 'multimedia/vlc')
| -rw-r--r-- | multimedia/vlc/files/extra-patch-modules__misc__inhibit__xdg.c | 47 |
1 files changed, 42 insertions, 5 deletions
diff --git a/multimedia/vlc/files/extra-patch-modules__misc__inhibit__xdg.c b/multimedia/vlc/files/extra-patch-modules__misc__inhibit__xdg.c index 0e40f4f1ba08..048050c655d1 100644 --- a/multimedia/vlc/files/extra-patch-modules__misc__inhibit__xdg.c +++ b/multimedia/vlc/files/extra-patch-modules__misc__inhibit__xdg.c @@ -1,21 +1,58 @@ ---- ./modules/misc/inhibit/xdg.c.orig 2011-02-02 06:49:43.000000000 -0500 -+++ ./modules/misc/inhibit/xdg.c 2011-02-02 06:50:22.000000000 -0500 +B +--- ./modules/misc/inhibit/xdg.c.orig 2011-11-25 13:17:54.000000000 -0500 ++++ ./modules/misc/inhibit/xdg.c 2011-11-25 13:31:37.000000000 -0500 @@ -26,7 +26,6 @@ #include <vlc_plugin.h> #include <vlc_inhibit.h> #include <assert.h> -#include <spawn.h> #include <sys/wait.h> + #include <signal.h> - static int Open (vlc_object_t *); -@@ -134,19 +133,10 @@ +@@ -47,7 +46,6 @@ + vlc_thread_t thread; + vlc_cond_t update, inactive; + vlc_mutex_t lock; +- posix_spawnattr_t attr; + bool suspend, suspended; + }; + +@@ -67,18 +65,6 @@ + vlc_mutex_init (&p_sys->lock); + vlc_cond_init (&p_sys->update); + vlc_cond_init (&p_sys->inactive); +- posix_spawnattr_init (&p_sys->attr); +- /* Reset signal handlers to default and clear mask in the child process */ +- { +- sigset_t set; +- +- sigemptyset (&set); +- posix_spawnattr_setsigmask (&p_sys->attr, &set); +- sigaddset (&set, SIGPIPE); +- posix_spawnattr_setsigdefault (&p_sys->attr, &set); +- posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF +- | POSIX_SPAWN_SETSIGMASK); +- } + p_sys->suspend = false; + p_sys->suspended = false; + +@@ -106,7 +92,6 @@ + + vlc_cancel (p_sys->thread); + vlc_join (p_sys->thread, NULL); +- posix_spawnattr_destroy (&p_sys->attr); + vlc_cond_destroy (&p_sys->inactive); + vlc_cond_destroy (&p_sys->update); + vlc_mutex_destroy (&p_sys->lock); +@@ -149,20 +134,10 @@ id, NULL, }; - pid_t pid; vlc_mutex_unlock (&p_sys->lock); -- if (!posix_spawnp (&pid, "xdg-screensaver", NULL, NULL, argv, environ)) +- if (!posix_spawnp (&pid, "xdg-screensaver", NULL, &p_sys->attr, +- argv, environ)) - { - int status; |