Sun Jun 20 15:58:06 2010 UTC ()
Add bug report URLs/commit IDs.


(wiz)
diff -r1.36 -r1.37 pkgsrc/multimedia/vlc/distinfo
diff -r1.11 -r1.12 pkgsrc/multimedia/vlc/patches/patch-aa
diff -r1.5 -r1.6 pkgsrc/multimedia/vlc/patches/patch-ab
diff -r1.4 -r1.5 pkgsrc/multimedia/vlc/patches/patch-configure
diff -r1.2 -r1.3 pkgsrc/multimedia/vlc/patches/patch-v4l2
cvs diff -r1.36 -r1.37 pkgsrc/multimedia/vlc/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/distinfo 2010/06/13 22:45:07 1.36
+++ pkgsrc/multimedia/vlc/distinfo 2010/06/20 15:58:06 1.37
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.36 2010/06/13 22:45:07 wiz Exp $ 1$NetBSD: distinfo,v 1.37 2010/06/20 15:58:06 wiz Exp $
2 2
3SHA1 (vlc-1.0.6.tar.bz2) = 834346a84a71d915440b7741e04b6e02de451786 3SHA1 (vlc-1.0.6.tar.bz2) = 834346a84a71d915440b7741e04b6e02de451786
4RMD160 (vlc-1.0.6.tar.bz2) = 2185eb418748f2aadfce5e61b7a9de66a62ef2d1 4RMD160 (vlc-1.0.6.tar.bz2) = 2185eb418748f2aadfce5e61b7a9de66a62ef2d1
5Size (vlc-1.0.6.tar.bz2) = 22149704 bytes 5Size (vlc-1.0.6.tar.bz2) = 22149704 bytes
6SHA1 (patch-aa) = 76ef868076df4e423acfe5ca65999fbd26167bfe 6SHA1 (patch-aa) = 4d662c0e4e97ebfa6eccfa8df821c132441df58c
7SHA1 (patch-ab) = c7d5cde0f0e4a678360adfb43d027d25bdc147e1 7SHA1 (patch-ab) = b17a4f0b5c9712d953ae45ff7d8c72ff8f323271
8SHA1 (patch-configure) = 508d9fc4ee8bc8526fb5cdf1b161c573216036c4 8SHA1 (patch-configure) = 44f3bc76668d9529ce35812d2c194199a0623a09
9SHA1 (patch-v4l2) = 1f91206f8e2f78514056386977a6c2230a710211 9SHA1 (patch-v4l2) = 578622c5233f7f5024ab5a3dca8719e1a258a407
cvs diff -r1.11 -r1.12 pkgsrc/multimedia/vlc/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/patches/Attic/patch-aa 2009/10/26 07:38:21 1.11
+++ pkgsrc/multimedia/vlc/patches/Attic/patch-aa 2010/06/20 15:58:06 1.12
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.11 2009/10/26 07:38:21 hasso Exp $ 1$NetBSD: patch-aa,v 1.12 2010/06/20 15:58:06 wiz Exp $
 2
 3http://trac.videolan.org/vlc/ticket/3762
2 4
3--- modules/access/file.c.orig 2009-09-18 19:37:45 +0300 5--- modules/access/file.c.orig 2009-09-18 19:37:45 +0300
4+++ modules/access/file.c 2009-09-26 07:18:35 +0300 6+++ modules/access/file.c 2009-09-26 07:18:35 +0300
5@@ -50,6 +50,9 @@ 7@@ -50,6 +50,9 @@
6 #if defined (__linux__) 8 #if defined (__linux__)
7 # include <sys/vfs.h> 9 # include <sys/vfs.h>
8 # include <linux/magic.h> 10 # include <linux/magic.h>
9+#elif defined (HAVE_FSTATVFS) 11+#elif defined (HAVE_FSTATVFS)
10+# include <sys/statvfs.h> 12+# include <sys/statvfs.h>
11+# include <sys/mount.h> 13+# include <sys/mount.h>
12 #elif defined (HAVE_SYS_MOUNT_H) 14 #elif defined (HAVE_SYS_MOUNT_H)
13 # include <sys/param.h> 15 # include <sys/param.h>
14 # include <sys/mount.h> 16 # include <sys/mount.h>
cvs diff -r1.5 -r1.6 pkgsrc/multimedia/vlc/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/patches/Attic/patch-ab 2010/06/13 22:45:07 1.5
+++ pkgsrc/multimedia/vlc/patches/Attic/patch-ab 2010/06/20 15:58:06 1.6
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ab,v 1.5 2010/06/13 22:45:07 wiz Exp $ 1$NetBSD: patch-ab,v 1.6 2010/06/20 15:58:06 wiz Exp $
 2
 3Fixed in git version ffa6a2fa83452afe6a6ec67c4a3e8a5f1a6aaeef.
2 4
3--- modules/codec/png.c.orig 2010-03-07 18:38:01.000000000 +0000 5--- modules/codec/png.c.orig 2010-03-07 18:38:01.000000000 +0000
4+++ modules/codec/png.c 6+++ modules/codec/png.c
5@@ -155,7 +155,7 @@ static picture_t *DecodeBlock( decoder_t 7@@ -155,7 +155,7 @@ static picture_t *DecodeBlock( decoder_t
6 p_info = png_create_info_struct( p_png ); 8 p_info = png_create_info_struct( p_png );
7 if( p_info == NULL ) 9 if( p_info == NULL )
8 { 10 {
9- png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL ); 11- png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL );
10+ png_destroy_read_struct( &p_png, NULL, NULL ); 12+ png_destroy_read_struct( &p_png, NULL, NULL );
11 block_Release( p_block ); *pp_block = NULL; 13 block_Release( p_block ); *pp_block = NULL;
12 return NULL; 14 return NULL;
13 } 15 }
14@@ -163,7 +163,7 @@ static picture_t *DecodeBlock( decoder_t 16@@ -163,7 +163,7 @@ static picture_t *DecodeBlock( decoder_t
cvs diff -r1.4 -r1.5 pkgsrc/multimedia/vlc/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/patches/Attic/patch-configure 2009/09/24 22:14:57 1.4
+++ pkgsrc/multimedia/vlc/patches/Attic/patch-configure 2010/06/20 15:58:06 1.5
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: patch-configure,v 1.4 2009/09/24 22:14:57 ahoka Exp $ 1$NetBSD: patch-configure,v 1.5 2010/06/20 15:58:06 wiz Exp $
 2
 3First chunk: http://trac.videolan.org/vlc/ticket/3762
 4Second chunk: http://trac.videolan.org/vlc/ticket/3761
2 5
3--- configure.ac.orig 2009-09-19 21:30:21.000000000 +0200 6--- configure.ac.orig 2009-09-19 21:30:21.000000000 +0200
4+++ configure.ac 7+++ configure.ac
5@@ -572,7 +572,7 @@ AC_CHECK_FUNCS(fdatasync,, 8@@ -572,7 +572,7 @@ AC_CHECK_FUNCS(fdatasync,,
6 ]) 9 ])
7  10
8 dnl Check for non-standard system calls 11 dnl Check for non-standard system calls
9-AC_CHECK_FUNCS([vmsplice eventfd fstatfs]) 12-AC_CHECK_FUNCS([vmsplice eventfd fstatfs])
10+AC_CHECK_FUNCS([vmsplice eventfd fstatvfs fstatfs]) 13+AC_CHECK_FUNCS([vmsplice eventfd fstatvfs fstatfs])
11  14
12 AH_BOTTOM([#include <vlc_fixups.h>]) 15 AH_BOTTOM([#include <vlc_fixups.h>])
13  16
14@@ -2498,7 +2498,7 @@ then 17@@ -2498,7 +2498,7 @@ then
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/vlc/patches/Attic/patch-v4l2 (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/patches/Attic/patch-v4l2 2009/07/07 16:17:47 1.2
+++ pkgsrc/multimedia/vlc/patches/Attic/patch-v4l2 2010/06/20 15:58:06 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-v4l2,v 1.2 2009/07/07 16:17:47 tnn Exp $ 1$NetBSD: patch-v4l2,v 1.3 2010/06/20 15:58:06 wiz Exp $
 2
 3http://trac.videolan.org/vlc/ticket/3761
2 4
3--- modules/access/v4l2.c.orig 2009-05-22 01:06:04.000000000 +0200 5--- modules/access/v4l2.c.orig 2009-05-22 01:06:04.000000000 +0200
4+++ modules/access/v4l2.c 6+++ modules/access/v4l2.c
5@@ -48,7 +48,13 @@ 7@@ -48,7 +48,13 @@
6 #include <sys/ioctl.h> 8 #include <sys/ioctl.h>
7 #include <sys/mman.h> 9 #include <sys/mman.h>
8  10
9-#include <linux/videodev2.h> 11-#include <linux/videodev2.h>
10+#if defined(HAVE_LINUX_VIDEODEV2_H) 12+#if defined(HAVE_LINUX_VIDEODEV2_H)
11+# include <linux/videodev2.h> 13+# include <linux/videodev2.h>
12+#elif defined(HAVE_SYS_VIDEOIO_H) 14+#elif defined(HAVE_SYS_VIDEOIO_H)
13+# include <sys/videoio.h> 15+# include <sys/videoio.h>
14+#else 16+#else