head	1.2;
access;
symbols
	pkgsrc-2015Q3:1.1.0.8
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.6
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.4
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.2
	pkgsrc-2014Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2015.10.25.11.01.13;	author wiz;	state dead;
branches;
next	1.1;
commitid	S7fhp2KUyhezNtGy;

1.1
date	2014.12.13.11.15.45;	author wiz;	state Exp;
branches;
next	;
commitid	jRCnmCUiIzUn2S1y;


desc
@@


1.2
log
@Remove vlc21, vlc is now newer.
@
text
@$NetBSD: patch-ar,v 1.1 2014/12/13 11:15:45 wiz Exp $

--- modules/misc/inhibit/xdg.c.orig	2013-06-24 18:00:38.000000000 +0000
+++ modules/misc/inhibit/xdg.c
@@@@ -28,7 +28,9 @@@@
 #include <assert.h>
 #include <errno.h>
 #include <signal.h>
+#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0)
 #include <spawn.h>
+#endif
 #include <sys/wait.h>
 
 static int Open (vlc_object_t *);
@@@@ -46,7 +48,9 @@@@ vlc_module_end ()
 struct vlc_inhibit_sys
 {
     vlc_timer_t timer;
+#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0)
     posix_spawnattr_t attr;
+#endif
 };
 
 extern char **environ;
@@@@ -60,8 +64,12 @@@@ static void Timer (void *data)
     };
     pid_t pid;
 
+#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0)
     int err = posix_spawnp (&pid, "xdg-screensaver", NULL, &sys->attr,
                             argv, environ);
+#else
+    int err = EINVAL;
+#endif
     if (err == 0)
     {
         int status;
@@@@ -91,23 +99,31 @@@@ static int Open (vlc_object_t *obj)
     if (p_sys == NULL)
         return VLC_ENOMEM;
 
+#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0)
     posix_spawnattr_init (&p_sys->attr);
+#endif
     /* Reset signal handlers to default and clear mask in the child process */
     {
         sigset_t set;
 
         sigemptyset (&set);
+#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0)
         posix_spawnattr_setsigmask (&p_sys->attr, &set);
+#endif
         sigaddset (&set, SIGPIPE);
+#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0)
         posix_spawnattr_setsigdefault (&p_sys->attr, &set);
         posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF
                                               | POSIX_SPAWN_SETSIGMASK);
+#endif
     }
 
     ih->p_sys = p_sys;
     if (vlc_timer_create (&p_sys->timer, Timer, ih))
     {
+#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0)
         posix_spawnattr_destroy (&p_sys->attr);
+#endif
         free (p_sys);
         return VLC_ENOMEM;
     }
@@@@ -122,6 +138,8 @@@@ static void Close (vlc_object_t *obj)
     vlc_inhibit_sys_t *p_sys = ih->p_sys;
 
     vlc_timer_destroy (p_sys->timer);
+#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0)
     posix_spawnattr_destroy (&p_sys->attr);
+#endif
     free (p_sys);
 }
@


1.1
log
@Import vlc-2.1.5nb1 as multimedia/vlc21 from wip.

VideoLAN is a project of French students from the Ecole Centrale Paris
and developers from all over the world. Its main goals is MPEG streaming
on a network, but it also features a standalone multimedia player. The
VideoLAN Server can stream video read from a hard disk, a DVD player,
a satellite card or an MPEG 2 compression card, and unicast or multicast
it on a network. The VideoLAN Client can read the stream from the network
and display it. It can also be used to display video read locally on
the computer : DVDs, VCDs, MPEG and DivX files and from a satellite
card. It is multi-plaform : Linux, Windows, Mac OS X, BeOS, BSD, Solaris,
QNX, iPaq... The VideoLAN Client and Server now have a full IPv6 support.
@
text
@d1 1
a1 1
$NetBSD: patch-ar,v 1.1.1.1 2012/02/21 12:49:43 drochner Exp $
@