Mon Jan 9 17:12:57 2012 UTC ()
update to 1.1.13
changes:
-fix for security issue in the TiVo demuxer (was patched in pkgsrc)
-bugfixes
(drochner)
diff -r1.123 -r1.124 pkgsrc/multimedia/vlc/Makefile
diff -r1.47 -r1.48 pkgsrc/multimedia/vlc/PLIST
diff -r1.52 -r1.53 pkgsrc/multimedia/vlc/distinfo
diff -r1.2 -r1.3 pkgsrc/multimedia/vlc/patches/patch-ar
diff -r1.11 -r0 pkgsrc/multimedia/vlc/patches/patch-au
--- pkgsrc/multimedia/vlc/Makefile 2011/12/22 13:31:48 1.123
+++ pkgsrc/multimedia/vlc/Makefile 2012/01/09 17:12:57 1.124
--- pkgsrc/multimedia/vlc/PLIST 2011/11/14 19:53:18 1.47
+++ pkgsrc/multimedia/vlc/PLIST 2012/01/09 17:12:57 1.48
--- pkgsrc/multimedia/vlc/distinfo 2011/12/22 13:31:48 1.52
+++ pkgsrc/multimedia/vlc/distinfo 2012/01/09 17:12:57 1.53
--- pkgsrc/multimedia/vlc/patches/Attic/patch-ar 2011/10/07 19:13:20 1.2
+++ pkgsrc/multimedia/vlc/patches/Attic/patch-ar 2012/01/09 17:12:57 1.3
@@ -1,12 +1,11 @@
-$NetBSD: patch-ar,v 1.2 2011/10/07 19:13:20 drochner Exp $
+$NetBSD: patch-ar,v 1.3 2012/01/09 17:12:57 drochner Exp $
---- modules/misc/inhibit/xdg.c.orig 2011-10-05 21:21:12.000000000 +0000
+--- modules/misc/inhibit/xdg.c.orig 2011-11-22 20:30:36.000000000 +0000
+++ modules/misc/inhibit/xdg.c
-@@ -26,7 +26,12 @@
- #include <vlc_plugin.h>
+@@ -27,7 +27,11 @@
#include <vlc_inhibit.h>
#include <assert.h>
-+#include <signal.h>
+ #include <signal.h>
+#ifdef _POSIX_SPAWN
+# if (_POSIX_SPAWN >= 0)
#include <spawn.h>
@@ -15,7 +14,7 @@
#include <sys/wait.h>
static int Open (vlc_object_t *);
-@@ -46,7 +51,11 @@ struct vlc_inhibit_sys
+@@ -47,7 +51,11 @@ struct vlc_inhibit_sys
vlc_thread_t thread;
vlc_cond_t update, inactive;
vlc_mutex_t lock;
@@ -27,7 +26,7 @@
bool suspend, suspended;
};
-@@ -66,17 +75,29 @@ static int Open (vlc_object_t *obj)
+@@ -67,17 +75,29 @@ 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);
@@ -57,7 +56,7 @@
}
p_sys->suspend = false;
p_sys->suspended = false;
-@@ -105,7 +126,11 @@ static void Close (vlc_object_t *obj)
+@@ -106,7 +126,11 @@ static void Close (vlc_object_t *obj)
vlc_cancel (p_sys->thread);
vlc_join (p_sys->thread, NULL);
@@ -69,7 +68,7 @@
vlc_cond_destroy (&p_sys->inactive);
vlc_cond_destroy (&p_sys->update);
vlc_mutex_destroy (&p_sys->lock);
-@@ -151,6 +176,8 @@ static void *Thread (void *data)
+@@ -152,6 +176,8 @@ static void *Thread (void *data)
pid_t pid;
vlc_mutex_unlock (&p_sys->lock);
@@ -78,7 +77,7 @@
if (!posix_spawnp (&pid, "xdg-screensaver", NULL, &p_sys->attr,
argv, environ))
{
-@@ -161,6 +188,8 @@ static void *Thread (void *data)
+@@ -162,6 +188,8 @@ static void *Thread (void *data)
while (waitpid (pid, &status, 0) == -1);
}
else/* We don't handle the error, but busy looping would be worse :( */