contrib: patch zvbi for libpng15 api

diff --git a/contrib/src/zvbi/rules.mak b/contrib/src/zvbi/rules.mak
index 8e6493cfd1d8afe310a13e992ad5de8a3d8e17fb..50f372e7f8da5ee4b91877b1bb62d91c72f5b46b 100644 (file)
--- a/contrib/src/zvbi/rules.mak
+++ b/contrib/src/zvbi/rules.mak
@@ -17,6 +17,7 @@ zvbi: zvbi-$(ZVBI_VERSION).tar.bz2 .sum-zvbi
        $(UNPACK)
        $(APPLY) $(SRC)/zvbi/zvbi-ssize_max.patch
        $(APPLY) $(SRC)/zvbi/zvbi-ioctl.patch
+       $(APPLY) $(SRC)/zvbi/zvbi-png15.patch
 ifdef HAVE_WIN32
        $(APPLY) $(SRC)/zvbi/zvbi-win32.patch
 endif

diff --git a/contrib/src/zvbi/zvbi-png15.patch b/contrib/src/zvbi/zvbi-png15.patch
new file mode 100644 (file)
index 0000000..a3688bc
--- /dev/null
+++ b/contrib/src/zvbi/zvbi-png15.patch
@@ -0,0 +1,16 @@
+--- zvbi.orig/src/exp-gfx.c    2011-11-19 17:48:45.953865404 -0500
++++ zvbi/src/exp-gfx.c 2011-11-19 17:53:55.543400579 -0500
+@@ -1672,11 +1672,11 @@
+       char title[80];
+       unsigned int i;
+ 
+-      if (setjmp (png_ptr->jmpbuf))
++      if (setjmp (png_jmpbuf(png_ptr)))
+               return FALSE;
+ 
+       png_set_write_fn (png_ptr,
+-                        (voidp) gfx,
++                        (png_voidp) gfx,
+                         write_data,
+                         flush_data);
+