Date: Monday, November 29, 2010 @ 04:37:06 Author: jgc Revision: 101442
upgpkg: zvbi 0.2.33-3 Fix build (FS#21901) Added: zvbi/trunk/fix-includes.patch Modified: zvbi/trunk/PKGBUILD --------------------+ PKGBUILD | 20 ++++++++++++-------- fix-includes.patch | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-11-29 09:07:57 UTC (rev 101441) +++ PKGBUILD 2010-11-29 09:37:06 UTC (rev 101442) @@ -1,21 +1,25 @@ # $Id$ -# Maintainer: Alexander Baldeck <[email protected]> +# Maintainer: +# Contributor: Alexander Baldeck <[email protected]> # Contributor: dorphell <[email protected]> pkgname=zvbi pkgver=0.2.33 -pkgrel=2 +pkgrel=3 pkgdesc="VBI capture and decoding library" url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome"; arch=(i686 x86_64) -depends=('libpng>=1.4.0' 'libx11') +depends=('libpng' 'libx11') license=('GPL') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2) -md5sums=('1741a6045c3eedfb611d645f2da69ac8') +source=(http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2 + fix-includes.patch) +md5sums=('1741a6045c3eedfb611d645f2da69ac8' + '38766bc59e1571133d0399f0102da653') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + patch -Np1 -i "${srcdir}/fix-includes.patch" + ./configure --prefix=/usr --disable-static --mandir=/usr/share/man + make + make DESTDIR="${pkgdir}" install } Added: fix-includes.patch =================================================================== --- fix-includes.patch (rev 0) +++ fix-includes.patch 2010-11-29 09:37:06 UTC (rev 101442) @@ -0,0 +1,36 @@ +Add proper #includes so that we do not get undef errors to S_ISCHR +during linking. + +Signed-off-by: Alex Chiang <[email protected]> +--- +--- zvbi-0.2.33.orig/src/io-dvb.c ++++ zvbi-0.2.33/src/io-dvb.c +@@ -29,6 +29,8 @@ + #include <errno.h> + #include <sys/select.h> + #include <sys/ioctl.h> ++#include <sys/types.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.orig/src/io-v4l.c ++++ zvbi-0.2.33/src/io-v4l.c +@@ -42,6 +42,7 @@ static const char rcsid [] = + #include <assert.h> + #include <sys/time.h> /* timeval */ + #include <sys/types.h> /* fd_set, uid_t */ ++#include <sys/stat.h> /* S_ISCHR */ + #include <sys/ioctl.h> /* for (_)videodev.h */ + #include <pthread.h> + +--- zvbi-0.2.33.orig/contrib/ntsc-cc.c ++++ zvbi-0.2.33/contrib/ntsc-cc.c +@@ -34,6 +34,7 @@ + #include <locale.h> + #include <sys/ioctl.h> + #include <sys/types.h> ++#include <sys/stat.h> + #include <sys/time.h> + #ifdef HAVE_GETOPT_LONG + # include <getopt.h>
