From bf29fb0298650b80d2e9f34d20c20a7666994266 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C5=81ukasz=20Kie=C5=9B?= <kiesiu@pld-linux.org>
Date: Fri, 22 Nov 2013 13:52:24 +0100
Subject: [PATCH] - updated to 0.2.35 - patches zvbi-includes and zvbi-libpng15
 applied upstream

---
 zvbi-includes.patch | 30 ------------------------------
 zvbi-libpng15.patch | 16 ----------------
 zvbi.spec           | 12 ++++--------
 3 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100644 zvbi-includes.patch
 delete mode 100644 zvbi-libpng15.patch

diff --git a/zvbi-includes.patch b/zvbi-includes.patch
deleted file mode 100644
index 3078493..0000000
--- a/zvbi-includes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- zvbi-0.2.33/src/io-dvb.c.orig	2008-02-24 15:18:21.000000000 +0100
-+++ zvbi-0.2.33/src/io-dvb.c	2011-11-06 20:54:41.805070761 +0100
-@@ -29,6 +29,7 @@
- #include <errno.h>
- #include <sys/select.h>
- #include <sys/ioctl.h>
-+#include <sys/stat.h>
- 
- #ifndef HAVE_S64_U64
-   /* Linux 2.6.x asm/types.h defines __s64 and __u64 only
---- zvbi-0.2.33/src/io-v4l.c.orig	2008-02-24 15:17:28.000000000 +0100
-+++ zvbi-0.2.33/src/io-v4l.c	2011-11-06 20:54:23.938403497 +0100
-@@ -43,6 +43,7 @@
- #include <sys/time.h>		/* timeval */
- #include <sys/types.h>		/* fd_set, uid_t */
- #include <sys/ioctl.h>		/* for (_)videodev.h */
-+#include <sys/stat.h>
- #include <pthread.h>
- 
- #include "videodev.h"
---- zvbi-0.2.33/contrib/ntsc-cc.c.orig	2007-11-27 18:39:34.000000000 +0100
-+++ zvbi-0.2.33/contrib/ntsc-cc.c	2011-11-06 20:58:27.808411663 +0100
-@@ -35,6 +35,7 @@
- #include <sys/ioctl.h>
- #include <sys/types.h>
- #include <sys/time.h>
-+#include <sys/stat.h>
- #ifdef HAVE_GETOPT_LONG
- #  include <getopt.h>
- #endif
diff --git a/zvbi-libpng15.patch b/zvbi-libpng15.patch
deleted file mode 100644
index c6f08d9..0000000
--- a/zvbi-libpng15.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- zvbi-0.2.33/src/exp-gfx.c.orig	2012-02-08 10:55:47.761153160 +0100
-+++ zvbi-0.2.33/src/exp-gfx.c	2012-02-08 10:57:23.498167859 +0100
-@@ -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);
- 
diff --git a/zvbi.spec b/zvbi.spec
index 0647d51..ed43b9b 100644
--- a/zvbi.spec
+++ b/zvbi.spec
@@ -1,16 +1,14 @@
 Summary:	Raw VBI, Teletext and Closed Caption decoding library
 Summary(pl.UTF-8):	Biblioteka dekodująca VBI
 Name:		zvbi
-Version:	0.2.33
-Release:	5
+Version:	0.2.35
+Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2
-# Source0-md5:	1741a6045c3eedfb611d645f2da69ac8
+# Source0-md5:	95e53eb208c65ba6667fd4341455fa27
 Patch0:		%{name}-include.patch
-Patch1:		%{name}-includes.patch
-Patch2:		%{name}-link.patch
-Patch3:		%{name}-libpng15.patch
+Patch1:		%{name}-link.patch
 URL:		http://zapping.sourceforge.net/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
@@ -73,8 +71,6 @@ Statyczna biblioteka zvbi.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
-- 
2.44.0