update to 1.1.13

changes:
-fix for security issue in the TiVo demuxer (was patched in pkgsrc)
-bugfixes

5 files changed, 18 insertions, 34 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index e43650bc55a..69b2458dfed 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.123 2011/12/22 13:31:48 drochner Exp $
+# $NetBSD: Makefile,v 1.124 2012/01/09 17:12:57 drochner Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
-PKGREVISION=		4
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vlc/} \
 			http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=		.tar.bz2
 
-VLC_VERSION=		1.1.12
+VLC_VERSION=		1.1.13
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.videolan.org/
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index 3cf3ee79371..2a569db9905 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.47 2011/11/14 19:53:18 marino Exp $
+@comment $NetBSD: PLIST,v 1.48 2012/01/09 17:12:57 drochner Exp $
 bin/cvlc
 ${PLIST.x11}bin/qvlc
 bin/rvlc
@@ -319,6 +319,7 @@ lib/vlc/plugins/video_filter/libmosaic_plugin.la
 lib/vlc/plugins/video_filter/libmotionblur_plugin.la
 lib/vlc/plugins/video_filter/libmotiondetect_plugin.la
 lib/vlc/plugins/video_filter/libnoise_plugin.la
+lib/vlc/plugins/video_filter/libosdmenu_plugin.la
 ${PLIST.x11}lib/vlc/plugins/video_filter/libpanoramix_plugin.la
 lib/vlc/plugins/video_filter/libpostproc_plugin.la
 lib/vlc/plugins/video_filter/libpsychedelic_plugin.la
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 7829dcd4d7c..0f5f5498ee4 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.52 2011/12/22 13:31:48 drochner Exp $
+$NetBSD: distinfo,v 1.53 2012/01/09 17:12:57 drochner Exp $
 
-SHA1 (vlc-1.1.12.tar.bz2) = b39de66711a33746ce12f16a50e41d3def7b1452
-RMD160 (vlc-1.1.12.tar.bz2) = 117530abc8bd3f38d9233b7a7c91a3aaa17af87c
-Size (vlc-1.1.12.tar.bz2) = 26220996 bytes
+SHA1 (vlc-1.1.13.tar.bz2) = 05bbc7ff427f3b919b29a45ce014caff9ba92648
+RMD160 (vlc-1.1.13.tar.bz2) = c5aa438a9085ddbf28e849df442b75475693290d
+Size (vlc-1.1.13.tar.bz2) = 26226587 bytes
 SHA1 (patch-aa) = 684f7ad6a20ed6b9b8a8be2fc61836e6b471b686
 SHA1 (patch-ap) = 423b571ca8a1b740812aea021e331912ba34c868
-SHA1 (patch-ar) = f2a8b586c4672bbb0f7ccd163531c3f27eadc949
+SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3
 SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086
 SHA1 (patch-at) = 5761ec0809d2b03511666ae81f7b4ae01b6f5930
-SHA1 (patch-au) = f40733e9d48cd4db1eaec2367ccd86efc66d287e
 SHA1 (patch-modules_audio__output_pulse.c) = 994389b214f3e2b7b8b7ccaf3bb535a94523f81b
diff --git a/multimedia/vlc/patches/patch-ar b/multimedia/vlc/patches/patch-ar
index 5c6181053cb..0b0b1ed1e64 100644
--- a/multimedia/vlc/patches/patch-ar
+++ b/multimedia/vlc/patches/patch-ar
@@ -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 @@ $NetBSD: patch-ar,v 1.2 2011/10/07 19:13:20 drochner Exp $
  #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 @@ $NetBSD: patch-ar,v 1.2 2011/10/07 19:13:20 drochner Exp $
      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 @@ $NetBSD: patch-ar,v 1.2 2011/10/07 19:13:20 drochner Exp $
      }
      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 @@ $NetBSD: patch-ar,v 1.2 2011/10/07 19:13:20 drochner Exp $
      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 @@ $NetBSD: patch-ar,v 1.2 2011/10/07 19:13:20 drochner Exp $
          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 :( */
diff --git a/multimedia/vlc/patches/patch-au b/multimedia/vlc/patches/patch-au
deleted file mode 100644
index 55da9f1f81c..00000000000
--- a/multimedia/vlc/patches/patch-au
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-au,v 1.11 2011/12/22 13:31:48 drochner Exp $
-
-VideoLAN-SA-1108
-
---- modules/demux/ty.c.orig	2011-07-12 18:11:24.000000000 +0000
-+++ modules/demux/ty.c
-@@ -1894,6 +1894,7 @@ static int get_chunk_header(demux_t *p_d
-     /*msg_Dbg( p_demux, "chunk has %d records", i_num_recs );*/
- 
-     free(p_sys->rec_hdrs);
-+    p_sys->rec_hdrs = NULL;
- 
-     /* skip past the 4 bytes we "peeked" earlier */
-     stream_Read( p_demux->s, NULL, 4 );