[vlc-commits] Contribs: update ZVBI (!) to 0.2.34

[Jean-Baptiste Kempf]

vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Aug  8 18:34:33 2013 +0200| [0656a09c70131c874f81ef0bbc55f5d1c771975e] | committer: Felix Paul Kühne

Contribs: update ZVBI (!) to 0.2.34

(cherry picked from commit f0fa97b3035cf6cb057fc52b3ae8f60846754351)
Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=0656a09c70131c874f81ef0bbc55f5d1c771975e
---

 contrib/src/zvbi/SHA512SUMS       |    2 +-
 contrib/src/zvbi/rules.mak        |    3 +--
 contrib/src/zvbi/zvbi-png15.patch |   16 ----------------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/contrib/src/zvbi/SHA512SUMS b/contrib/src/zvbi/SHA512SUMS
index b272ac2..b5a8fed 100644
--- a/contrib/src/zvbi/SHA512SUMS
+++ b/contrib/src/zvbi/SHA512SUMS
@@ -1 +1 @@
-aa89de27e0e939279fa072fdc32ed1ab0f07ab15f8e3404613eb331f433dad458c0d3e028a18c6ede54b37c0a8f477e363f07828b6200bafcbb862ca29fa271b  zvbi-0.2.33.tar.bz2
+838d1dd6a0c16ebe3e7ba0ab905d38842dee2f08742752cf2f470195dad8880b898d8fd530d27fab99b01def551a31ad97e4c29877def77cf88a048e0cc79a51  zvbi-0.2.34.tar.bz2
diff --git a/contrib/src/zvbi/rules.mak b/contrib/src/zvbi/rules.mak
index 07539b0..a34c2ca 100644
--- a/contrib/src/zvbi/rules.mak
+++ b/contrib/src/zvbi/rules.mak
@@ -1,6 +1,6 @@
 # zvbi
 
-ZVBI_VERSION := 0.2.33
+ZVBI_VERSION := 0.2.34
 ZVBI_URL := $(SF)/zapping/zvbi-$(ZVBI_VERSION).tar.bz2
 
 PKGS += zvbi
@@ -17,7 +17,6 @@ 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
deleted file mode 100644
index a3688bc..0000000
--- a/contrib/src/zvbi/zvbi-png15.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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);
-