Sat May 21 17:23:10 2011 UTC ()
Fix build with png-1.5; I'm not sure this will work, but at least it builds
now.


(wiz)
diff -r1.9 -r1.10 pkgsrc/x11/xvidcap/distinfo
diff -r1.2 -r1.3 pkgsrc/x11/xvidcap/patches/patch-af
cvs diff -r1.9 -r1.10 pkgsrc/x11/xvidcap/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xvidcap/distinfo 2011/04/05 11:24:15 1.9
+++ pkgsrc/x11/xvidcap/distinfo 2011/05/21 17:23:10 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.9 2011/04/05 11:24:15 wiz Exp $ 1$NetBSD: distinfo,v 1.10 2011/05/21 17:23:10 wiz Exp $
2 2
3SHA1 (xvidcap-1.1.3.tar.gz) = e6d86a4184c8cc3e74738fb6e20d49c0d1640025 3SHA1 (xvidcap-1.1.3.tar.gz) = e6d86a4184c8cc3e74738fb6e20d49c0d1640025
4RMD160 (xvidcap-1.1.3.tar.gz) = cc7be360153f192b502ffedc6548cce163a9154c 4RMD160 (xvidcap-1.1.3.tar.gz) = cc7be360153f192b502ffedc6548cce163a9154c
5Size (xvidcap-1.1.3.tar.gz) = 1627036 bytes 5Size (xvidcap-1.1.3.tar.gz) = 1627036 bytes
6SHA1 (patch-aa) = 9196f59ec849a361821fd5cae800ec6aef2a1dfc 6SHA1 (patch-aa) = 9196f59ec849a361821fd5cae800ec6aef2a1dfc
7SHA1 (patch-ab) = cea05b76ffb2919e1fd4dcb5f489f641ca8e36bd 7SHA1 (patch-ab) = cea05b76ffb2919e1fd4dcb5f489f641ca8e36bd
8SHA1 (patch-ac) = 0de9d748e3808a210ec68d140eb1dfd5e18d9e4f 8SHA1 (patch-ac) = 0de9d748e3808a210ec68d140eb1dfd5e18d9e4f
9SHA1 (patch-ad) = ac40095849f721cfd8aa1e0143dff3ac9b705be7 9SHA1 (patch-ad) = ac40095849f721cfd8aa1e0143dff3ac9b705be7
10SHA1 (patch-ae) = 2ebab45421ab2782d48067f7b63e010190111397 10SHA1 (patch-ae) = 2ebab45421ab2782d48067f7b63e010190111397
11SHA1 (patch-af) = 7e5533775b68a2c2ade195660b859530e6422da4 11SHA1 (patch-af) = 52a10e0c278c956a3de8b77b8f89c4e1f28c6838
12SHA1 (patch-ag) = 44cb7ad63e477f21b013a43d06ce81fddb235ef7 12SHA1 (patch-ag) = 44cb7ad63e477f21b013a43d06ce81fddb235ef7
13SHA1 (patch-src_xtomng.c) = 474b082c94883fd367126e6835e91bfc856063b5 13SHA1 (patch-src_xtomng.c) = 474b082c94883fd367126e6835e91bfc856063b5
14SHA1 (patch-src_xtopng.c) = 5e4e8e7150ccb67e25a65ecf33e2900074fa1179 14SHA1 (patch-src_xtopng.c) = 5e4e8e7150ccb67e25a65ecf33e2900074fa1179
cvs diff -r1.2 -r1.3 pkgsrc/x11/xvidcap/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/x11/xvidcap/patches/Attic/patch-af 2006/05/17 01:53:17 1.2
+++ pkgsrc/x11/xvidcap/patches/Attic/patch-af 2011/05/21 17:23:10 1.3
@@ -1,27 +1,35 @@ @@ -1,27 +1,35 @@
1$NetBSD: patch-af,v 1.2 2006/05/17 01:53:17 reed Exp $ 1$NetBSD: patch-af,v 1.3 2011/05/21 17:23:10 wiz Exp $
2 2
3--- src/mngutil.c.orig 2004-02-14 11:55:36.000000000 +0100 3Do not redeclare png functions.
 4png_ptr's members are hidden now, so don't access them.
 5XXX: this patch won't work if some bytes were already written,
 6but why should they have been? Should be done better by upstream.
 7
 8--- src/mngutil.c.orig 2004-02-14 10:55:36.000000000 +0000
4+++ src/mngutil.c 9+++ src/mngutil.c
5@@ -30,13 +30,6 @@ 10@@ -30,13 +30,6 @@
6 #include <png.h> 11 #include <png.h>
7 #include "mngutil.h" 12 #include "mngutil.h"
8  13
9-extern void png_write_data (png_structp png_ptr, 14-extern void png_write_data (png_structp png_ptr,
10- png_bytep data,png_size_t length); 15- png_bytep data,png_size_t length);
11-extern void png_save_uint_32 (png_bytep buf, png_uint_32 i); 16-extern void png_save_uint_32 (png_bytep buf, png_uint_32 i);
12-extern void png_save_uint_16 (png_bytep buf, png_uint_16 i); 17-extern void png_save_uint_16 (png_bytep buf, png_uint_16 i);
13-extern void png_write_chunk (png_structp png_ptr, 18-extern void png_write_chunk (png_structp png_ptr,
14- png_bytep chunk_name, png_bytep data, png_size_t length); 19- png_bytep chunk_name, png_bytep data, png_size_t length);
15- 20-
16 png_byte mng_sig[8] = {138, 77, 78, 71, 13, 10, 26, 10}; 21 png_byte mng_sig[8] = {138, 77, 78, 71, 13, 10, 26, 10};
17  22
18 /* 23 /*
19@@ -46,7 +39,7 @@ void 24@@ -45,9 +38,8 @@ png_byte mng_sig[8] = {138, 77, 78, 71,
 25 void
20 mng_write_sig (png_structp png_ptr) 26 mng_write_sig (png_structp png_ptr)
21 { 27 {
22 /* write the rest of the 8 byte signature */ 28- /* write the rest of the 8 byte signature */
23- png_write_data (png_ptr, &mng_sig[png_ptr->sig_bytes], 29- png_write_data (png_ptr, &mng_sig[png_ptr->sig_bytes],
24+ png_write_chunk_data (png_ptr, &mng_sig[png_ptr->sig_bytes], 30- (png_size_t)8 - png_ptr->sig_bytes);
25 (png_size_t)8 - png_ptr->sig_bytes); 31+ /* write the 8 byte signature */
 32+ png_write_chunk_data (png_ptr, mng_sig, 8);
26 } 33 }
27  34
 35