diff options
| author | wiz <wiz> | 2011-05-21 17:23:10 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-05-21 17:23:10 +0000 |
| commit | 3ec83124070ee618ea8bd56c26d907bb36bac6c7 (patch) | |
| tree | 816814a9f5b113dc8c2b9a78b84cd83097eb7d72 /x11 | |
| parent | 07801fdc3592f470e58894c7ba3eaa7ffeb8fa63 (diff) | |
| download | pkgsrc-3ec83124070ee618ea8bd56c26d907bb36bac6c7.tar.gz | |
Fix build with png-1.5; I'm not sure this will work, but at least it builds
now.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xvidcap/distinfo | 4 | ||||
| -rw-r--r-- | x11/xvidcap/patches/patch-af | 20 |
2 files changed, 16 insertions, 8 deletions
diff --git a/x11/xvidcap/distinfo b/x11/xvidcap/distinfo index 3c0b975dfda..dd97e612d5b 100644 --- a/x11/xvidcap/distinfo +++ b/x11/xvidcap/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2011/04/05 11:24:15 wiz Exp $ +$NetBSD: distinfo,v 1.10 2011/05/21 17:23:10 wiz Exp $ SHA1 (xvidcap-1.1.3.tar.gz) = e6d86a4184c8cc3e74738fb6e20d49c0d1640025 RMD160 (xvidcap-1.1.3.tar.gz) = cc7be360153f192b502ffedc6548cce163a9154c @@ -8,7 +8,7 @@ SHA1 (patch-ab) = cea05b76ffb2919e1fd4dcb5f489f641ca8e36bd SHA1 (patch-ac) = 0de9d748e3808a210ec68d140eb1dfd5e18d9e4f SHA1 (patch-ad) = ac40095849f721cfd8aa1e0143dff3ac9b705be7 SHA1 (patch-ae) = 2ebab45421ab2782d48067f7b63e010190111397 -SHA1 (patch-af) = 7e5533775b68a2c2ade195660b859530e6422da4 +SHA1 (patch-af) = 52a10e0c278c956a3de8b77b8f89c4e1f28c6838 SHA1 (patch-ag) = 44cb7ad63e477f21b013a43d06ce81fddb235ef7 SHA1 (patch-src_xtomng.c) = 474b082c94883fd367126e6835e91bfc856063b5 SHA1 (patch-src_xtopng.c) = 5e4e8e7150ccb67e25a65ecf33e2900074fa1179 diff --git a/x11/xvidcap/patches/patch-af b/x11/xvidcap/patches/patch-af index dc808e0b19d..f595bb2a15f 100644 --- a/x11/xvidcap/patches/patch-af +++ b/x11/xvidcap/patches/patch-af @@ -1,6 +1,11 @@ -$NetBSD: patch-af,v 1.2 2006/05/17 01:53:17 reed Exp $ +$NetBSD: patch-af,v 1.3 2011/05/21 17:23:10 wiz Exp $ ---- src/mngutil.c.orig 2004-02-14 11:55:36.000000000 +0100 +Do not redeclare png functions. +png_ptr's members are hidden now, so don't access them. +XXX: this patch won't work if some bytes were already written, +but why should they have been? Should be done better by upstream. + +--- src/mngutil.c.orig 2004-02-14 10:55:36.000000000 +0000 +++ src/mngutil.c @@ -30,13 +30,6 @@ #include <png.h> @@ -16,12 +21,15 @@ $NetBSD: patch-af,v 1.2 2006/05/17 01:53:17 reed Exp $ png_byte mng_sig[8] = {138, 77, 78, 71, 13, 10, 26, 10}; /* -@@ -46,7 +39,7 @@ void +@@ -45,9 +38,8 @@ png_byte mng_sig[8] = {138, 77, 78, 71, + void mng_write_sig (png_structp png_ptr) { - /* write the rest of the 8 byte signature */ +- /* write the rest of the 8 byte signature */ - png_write_data (png_ptr, &mng_sig[png_ptr->sig_bytes], -+ png_write_chunk_data (png_ptr, &mng_sig[png_ptr->sig_bytes], - (png_size_t)8 - png_ptr->sig_bytes); +- (png_size_t)8 - png_ptr->sig_bytes); ++ /* write the 8 byte signature */ ++ png_write_chunk_data (png_ptr, mng_sig, 8); } + |