packages: zvbi/zvbi.spec, zvbi/zvbi-includes.patch (NEW), zvbi/zvbi-link.pa...

[qboosh]

Author: qboosh                       Date: Sun Nov  6 20:26:34 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added includes patch to fix build with recent glibc
- added link patch to fix libzvbi-chains linking

---- Files affected:
packages/zvbi:
   zvbi.spec (1.48 -> 1.49) , zvbi-includes.patch (NONE -> 1.1)  (NEW), zvbi-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/zvbi/zvbi.spec
diff -u packages/zvbi/zvbi.spec:1.48 packages/zvbi/zvbi.spec:1.49
--- packages/zvbi/zvbi.spec:1.48	Thu Jan 28 20:56:47 2010
+++ packages/zvbi/zvbi.spec	Sun Nov  6 21:26:29 2011
@@ -6,14 +6,16 @@
 Release:	2
 License:	GPL v2+
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/zapping/%{name}-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2
 # Source0-md5:	1741a6045c3eedfb611d645f2da69ac8
 Patch0:		%{name}-include.patch
+Patch1:		%{name}-includes.patch
+Patch2:		%{name}-link.patch
 URL:		http://zapping.sourceforge.net/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	doxygen
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-devel >= 0.16.1
 BuildRequires:	libpng-devel
 BuildRequires:	libtool
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -70,6 +72,8 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -127,6 +131,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49  2011/11/06 20:26:29  qboosh
+- added includes patch to fix build with recent glibc
+- added link patch to fix libzvbi-chains linking
+
 Revision 1.48  2010/01/28 19:56:47  arekm
 - release 2
 

================================================================
Index: packages/zvbi/zvbi-includes.patch
diff -u /dev/null packages/zvbi/zvbi-includes.patch:1.1
--- /dev/null	Sun Nov  6 21:26:34 2011
+++ packages/zvbi/zvbi-includes.patch	Sun Nov  6 21:26:29 2011
@@ -0,0 +1,30 @@
+--- 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

================================================================
Index: packages/zvbi/zvbi-link.patch
diff -u /dev/null packages/zvbi/zvbi-link.patch:1.1
--- /dev/null	Sun Nov  6 21:26:34 2011
+++ packages/zvbi/zvbi-link.patch	Sun Nov  6 21:26:29 2011
@@ -0,0 +1,10 @@
+--- zvbi-0.2.33/src/Makefile.am.orig	2008-02-19 01:35:14.000000000 +0100
++++ zvbi-0.2.33/src/Makefile.am	2011-11-06 21:08:18.708431447 +0100
+@@ -118,6 +118,7 @@
+ 	misc.c \
+ 	proxy-client.c \
+ 	proxy-msg.c
++libzvbi_chains_la_LIBADD = -ldl
+ 
+ if MAINTAINER_MODE
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zvbi/zvbi.spec?r1=1.48&r2=1.49&f=u