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
cvs diff -r1.123 -r1.124 pkgsrc/multimedia/vlc/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/Makefile 2011/12/22 13:31:48 1.123
+++ pkgsrc/multimedia/vlc/Makefile 2012/01/09 17:12:57 1.124
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1# $NetBSD: Makefile,v 1.123 2011/12/22 13:31:48 drochner Exp $ 1# $NetBSD: Makefile,v 1.124 2012/01/09 17:12:57 drochner Exp $
2# 2#
3 3
4DISTNAME= vlc-${VLC_VERSION} 4DISTNAME= vlc-${VLC_VERSION}
5PKGREVISION= 4 
6CATEGORIES= multimedia 5CATEGORIES= multimedia
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \ 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \
8 http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/ 7 http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
9EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
10 9
11VLC_VERSION= 1.1.12 10VLC_VERSION= 1.1.13
12 11
13MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://www.videolan.org/ 13HOMEPAGE= http://www.videolan.org/
15COMMENT= VLC media player and streaming server 14COMMENT= VLC media player and streaming server
16LICENSE= gnu-gpl-v2 15LICENSE= gnu-gpl-v2
17 16
18CONFLICTS= vlc07-[0-9]* vlc08-[0-9]* 17CONFLICTS= vlc07-[0-9]* vlc08-[0-9]*
19 18
20PKG_DESTDIR_SUPPORT= user-destdir 19PKG_DESTDIR_SUPPORT= user-destdir
21USE_LIBTOOL= yes 20USE_LIBTOOL= yes
22USE_TOOLS+= gmake perl pkg-config \ 21USE_TOOLS+= gmake perl pkg-config \
23 autoconf automake autoreconf 22 autoconf automake autoreconf
24USE_PKGLOCALEDIR= yes 23USE_PKGLOCALEDIR= yes
cvs diff -r1.47 -r1.48 pkgsrc/multimedia/vlc/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/PLIST 2011/11/14 19:53:18 1.47
+++ pkgsrc/multimedia/vlc/PLIST 2012/01/09 17:12:57 1.48
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.47 2011/11/14 19:53:18 marino Exp $ 1@comment $NetBSD: PLIST,v 1.48 2012/01/09 17:12:57 drochner Exp $
2bin/cvlc 2bin/cvlc
3${PLIST.x11}bin/qvlc 3${PLIST.x11}bin/qvlc
4bin/rvlc 4bin/rvlc
5${PLIST.skins}bin/svlc 5${PLIST.skins}bin/svlc
6bin/vlc 6bin/vlc
7bin/vlc-wrapper 7bin/vlc-wrapper
8include/vlc/deprecated.h 8include/vlc/deprecated.h
9include/vlc/libvlc.h 9include/vlc/libvlc.h
10include/vlc/libvlc_events.h 10include/vlc/libvlc_events.h
11include/vlc/libvlc_media.h 11include/vlc/libvlc_media.h
12include/vlc/libvlc_media_discoverer.h 12include/vlc/libvlc_media_discoverer.h
13include/vlc/libvlc_media_library.h 13include/vlc/libvlc_media_library.h
14include/vlc/libvlc_media_list.h 14include/vlc/libvlc_media_list.h
@@ -309,26 +309,27 @@ lib/vlc/plugins/video_filter/liberase_pl @@ -309,26 +309,27 @@ lib/vlc/plugins/video_filter/liberase_pl
309lib/vlc/plugins/video_filter/libextract_plugin.la 309lib/vlc/plugins/video_filter/libextract_plugin.la
310lib/vlc/plugins/video_filter/libgaussianblur_plugin.la 310lib/vlc/plugins/video_filter/libgaussianblur_plugin.la
311lib/vlc/plugins/video_filter/libgradient_plugin.la 311lib/vlc/plugins/video_filter/libgradient_plugin.la
312lib/vlc/plugins/video_filter/libgrain_plugin.la 312lib/vlc/plugins/video_filter/libgrain_plugin.la
313lib/vlc/plugins/video_filter/libinvert_plugin.la 313lib/vlc/plugins/video_filter/libinvert_plugin.la
314lib/vlc/plugins/video_filter/liblogo_plugin.la 314lib/vlc/plugins/video_filter/liblogo_plugin.la
315lib/vlc/plugins/video_filter/libmagnify_plugin.la 315lib/vlc/plugins/video_filter/libmagnify_plugin.la
316lib/vlc/plugins/video_filter/libmarq_plugin.la 316lib/vlc/plugins/video_filter/libmarq_plugin.la
317lib/vlc/plugins/video_filter/libmirror_plugin.la 317lib/vlc/plugins/video_filter/libmirror_plugin.la
318lib/vlc/plugins/video_filter/libmosaic_plugin.la 318lib/vlc/plugins/video_filter/libmosaic_plugin.la
319lib/vlc/plugins/video_filter/libmotionblur_plugin.la 319lib/vlc/plugins/video_filter/libmotionblur_plugin.la
320lib/vlc/plugins/video_filter/libmotiondetect_plugin.la 320lib/vlc/plugins/video_filter/libmotiondetect_plugin.la
321lib/vlc/plugins/video_filter/libnoise_plugin.la 321lib/vlc/plugins/video_filter/libnoise_plugin.la
 322lib/vlc/plugins/video_filter/libosdmenu_plugin.la
322${PLIST.x11}lib/vlc/plugins/video_filter/libpanoramix_plugin.la 323${PLIST.x11}lib/vlc/plugins/video_filter/libpanoramix_plugin.la
323lib/vlc/plugins/video_filter/libpostproc_plugin.la 324lib/vlc/plugins/video_filter/libpostproc_plugin.la
324lib/vlc/plugins/video_filter/libpsychedelic_plugin.la 325lib/vlc/plugins/video_filter/libpsychedelic_plugin.la
325lib/vlc/plugins/video_filter/libpuzzle_plugin.la 326lib/vlc/plugins/video_filter/libpuzzle_plugin.la
326lib/vlc/plugins/video_filter/libremoteosd_plugin.la 327lib/vlc/plugins/video_filter/libremoteosd_plugin.la
327lib/vlc/plugins/video_filter/libripple_plugin.la 328lib/vlc/plugins/video_filter/libripple_plugin.la
328lib/vlc/plugins/video_filter/librotate_plugin.la 329lib/vlc/plugins/video_filter/librotate_plugin.la
329lib/vlc/plugins/video_filter/librss_plugin.la 330lib/vlc/plugins/video_filter/librss_plugin.la
330lib/vlc/plugins/video_filter/librv32_plugin.la 331lib/vlc/plugins/video_filter/librv32_plugin.la
331lib/vlc/plugins/video_filter/libscale_plugin.la 332lib/vlc/plugins/video_filter/libscale_plugin.la
332lib/vlc/plugins/video_filter/libscene_plugin.la 333lib/vlc/plugins/video_filter/libscene_plugin.la
333lib/vlc/plugins/video_filter/libsharpen_plugin.la 334lib/vlc/plugins/video_filter/libsharpen_plugin.la
334lib/vlc/plugins/video_filter/libswscale_plugin.la 335lib/vlc/plugins/video_filter/libswscale_plugin.la
cvs diff -r1.52 -r1.53 pkgsrc/multimedia/vlc/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/distinfo 2011/12/22 13:31:48 1.52
+++ pkgsrc/multimedia/vlc/distinfo 2012/01/09 17:12:57 1.53
@@ -1,12 +1,11 @@ @@ -1,12 +1,11 @@
1$NetBSD: distinfo,v 1.52 2011/12/22 13:31:48 drochner Exp $ 1$NetBSD: distinfo,v 1.53 2012/01/09 17:12:57 drochner Exp $
2 2
3SHA1 (vlc-1.1.12.tar.bz2) = b39de66711a33746ce12f16a50e41d3def7b1452 3SHA1 (vlc-1.1.13.tar.bz2) = 05bbc7ff427f3b919b29a45ce014caff9ba92648
4RMD160 (vlc-1.1.12.tar.bz2) = 117530abc8bd3f38d9233b7a7c91a3aaa17af87c 4RMD160 (vlc-1.1.13.tar.bz2) = c5aa438a9085ddbf28e849df442b75475693290d
5Size (vlc-1.1.12.tar.bz2) = 26220996 bytes 5Size (vlc-1.1.13.tar.bz2) = 26226587 bytes
6SHA1 (patch-aa) = 684f7ad6a20ed6b9b8a8be2fc61836e6b471b686 6SHA1 (patch-aa) = 684f7ad6a20ed6b9b8a8be2fc61836e6b471b686
7SHA1 (patch-ap) = 423b571ca8a1b740812aea021e331912ba34c868 7SHA1 (patch-ap) = 423b571ca8a1b740812aea021e331912ba34c868
8SHA1 (patch-ar) = f2a8b586c4672bbb0f7ccd163531c3f27eadc949 8SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3
9SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086 9SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086
10SHA1 (patch-at) = 5761ec0809d2b03511666ae81f7b4ae01b6f5930 10SHA1 (patch-at) = 5761ec0809d2b03511666ae81f7b4ae01b6f5930
11SHA1 (patch-au) = f40733e9d48cd4db1eaec2367ccd86efc66d287e 
12SHA1 (patch-modules_audio__output_pulse.c) = 994389b214f3e2b7b8b7ccaf3bb535a94523f81b 11SHA1 (patch-modules_audio__output_pulse.c) = 994389b214f3e2b7b8b7ccaf3bb535a94523f81b
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/vlc/patches/Attic/patch-ar (expand / switch to unified diff)

--- 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,43 +1,42 @@ @@ -1,43 +1,42 @@
1$NetBSD: patch-ar,v 1.2 2011/10/07 19:13:20 drochner Exp $ 1$NetBSD: patch-ar,v 1.3 2012/01/09 17:12:57 drochner Exp $
2 2
3--- modules/misc/inhibit/xdg.c.orig 2011-10-05 21:21:12.000000000 +0000 3--- modules/misc/inhibit/xdg.c.orig 2011-11-22 20:30:36.000000000 +0000
4+++ modules/misc/inhibit/xdg.c 4+++ modules/misc/inhibit/xdg.c
5@@ -26,7 +26,12 @@ 5@@ -27,7 +27,11 @@
6 #include <vlc_plugin.h> 
7 #include <vlc_inhibit.h> 6 #include <vlc_inhibit.h>
8 #include <assert.h> 7 #include <assert.h>
9+#include <signal.h> 8 #include <signal.h>
10+#ifdef _POSIX_SPAWN 9+#ifdef _POSIX_SPAWN
11+# if (_POSIX_SPAWN >= 0) 10+# if (_POSIX_SPAWN >= 0)
12 #include <spawn.h> 11 #include <spawn.h>
13+# endif 12+# endif
14+#endif 13+#endif
15 #include <sys/wait.h> 14 #include <sys/wait.h>
16  15
17 static int Open (vlc_object_t *); 16 static int Open (vlc_object_t *);
18@@ -46,7 +51,11 @@ struct vlc_inhibit_sys 17@@ -47,7 +51,11 @@ struct vlc_inhibit_sys
19 vlc_thread_t thread; 18 vlc_thread_t thread;
20 vlc_cond_t update, inactive; 19 vlc_cond_t update, inactive;
21 vlc_mutex_t lock; 20 vlc_mutex_t lock;
22+#ifdef _POSIX_SPAWN 21+#ifdef _POSIX_SPAWN
23+# if (_POSIX_SPAWN >= 0) 22+# if (_POSIX_SPAWN >= 0)
24 posix_spawnattr_t attr; 23 posix_spawnattr_t attr;
25+# endif 24+# endif
26+#endif 25+#endif
27 bool suspend, suspended; 26 bool suspend, suspended;
28 }; 27 };
29  28
30@@ -66,17 +75,29 @@ static int Open (vlc_object_t *obj) 29@@ -67,17 +75,29 @@ static int Open (vlc_object_t *obj)
31 vlc_mutex_init (&p_sys->lock); 30 vlc_mutex_init (&p_sys->lock);
32 vlc_cond_init (&p_sys->update); 31 vlc_cond_init (&p_sys->update);
33 vlc_cond_init (&p_sys->inactive); 32 vlc_cond_init (&p_sys->inactive);
34+#ifdef _POSIX_SPAWN 33+#ifdef _POSIX_SPAWN
35+# if (_POSIX_SPAWN >= 0) 34+# if (_POSIX_SPAWN >= 0)
36 posix_spawnattr_init (&p_sys->attr); 35 posix_spawnattr_init (&p_sys->attr);
37+# endif 36+# endif
38+#endif 37+#endif
39 /* Reset signal handlers to default and clear mask in the child process */ 38 /* Reset signal handlers to default and clear mask in the child process */
40 { 39 {
41 sigset_t set; 40 sigset_t set;
42  41
43 sigemptyset (&set); 42 sigemptyset (&set);
@@ -47,43 +46,43 @@ $NetBSD: patch-ar,v 1.2 2011/10/07 19:13 @@ -47,43 +46,43 @@ $NetBSD: patch-ar,v 1.2 2011/10/07 19:13
47+# endif 46+# endif
48+#endif 47+#endif
49 sigaddset (&set, SIGPIPE); 48 sigaddset (&set, SIGPIPE);
50+#ifdef _POSIX_SPAWN 49+#ifdef _POSIX_SPAWN
51+# if (_POSIX_SPAWN >= 0) 50+# if (_POSIX_SPAWN >= 0)
52 posix_spawnattr_setsigdefault (&p_sys->attr, &set); 51 posix_spawnattr_setsigdefault (&p_sys->attr, &set);
53 posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF 52 posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF
54 | POSIX_SPAWN_SETSIGMASK); 53 | POSIX_SPAWN_SETSIGMASK);
55+# endif 54+# endif
56+#endif 55+#endif
57 } 56 }
58 p_sys->suspend = false; 57 p_sys->suspend = false;
59 p_sys->suspended = false; 58 p_sys->suspended = false;
60@@ -105,7 +126,11 @@ static void Close (vlc_object_t *obj) 59@@ -106,7 +126,11 @@ static void Close (vlc_object_t *obj)
61  60
62 vlc_cancel (p_sys->thread); 61 vlc_cancel (p_sys->thread);
63 vlc_join (p_sys->thread, NULL); 62 vlc_join (p_sys->thread, NULL);
64+#ifdef _POSIX_SPAWN 63+#ifdef _POSIX_SPAWN
65+# if (_POSIX_SPAWN >= 0) 64+# if (_POSIX_SPAWN >= 0)
66 posix_spawnattr_destroy (&p_sys->attr); 65 posix_spawnattr_destroy (&p_sys->attr);
67+# endif 66+# endif
68+#endif 67+#endif
69 vlc_cond_destroy (&p_sys->inactive); 68 vlc_cond_destroy (&p_sys->inactive);
70 vlc_cond_destroy (&p_sys->update); 69 vlc_cond_destroy (&p_sys->update);
71 vlc_mutex_destroy (&p_sys->lock); 70 vlc_mutex_destroy (&p_sys->lock);
72@@ -151,6 +176,8 @@ static void *Thread (void *data) 71@@ -152,6 +176,8 @@ static void *Thread (void *data)
73 pid_t pid; 72 pid_t pid;
74  73
75 vlc_mutex_unlock (&p_sys->lock); 74 vlc_mutex_unlock (&p_sys->lock);
76+#ifdef _POSIX_SPAWN 75+#ifdef _POSIX_SPAWN
77+# if (_POSIX_SPAWN >= 0) 76+# if (_POSIX_SPAWN >= 0)
78 if (!posix_spawnp (&pid, "xdg-screensaver", NULL, &p_sys->attr, 77 if (!posix_spawnp (&pid, "xdg-screensaver", NULL, &p_sys->attr,
79 argv, environ)) 78 argv, environ))
80 { 79 {
81@@ -161,6 +188,8 @@ static void *Thread (void *data) 80@@ -162,6 +188,8 @@ static void *Thread (void *data)
82 while (waitpid (pid, &status, 0) == -1); 81 while (waitpid (pid, &status, 0) == -1);
83 } 82 }
84 else/* We don't handle the error, but busy looping would be worse :( */ 83 else/* We don't handle the error, but busy looping would be worse :( */
85+# endif 84+# endif
86+#endif 85+#endif
87 msg_Warn (ih, "could not start xdg-screensaver"); 86 msg_Warn (ih, "could not start xdg-screensaver");
88  87
89 vlc_mutex_lock (&p_sys->lock); 88 vlc_mutex_lock (&p_sys->lock);
File Deleted: pkgsrc/multimedia/vlc/patches/Attic/patch-au