[arch-commits] Commit in zvbi/repos (8 files)
Giovanni Scafora
giovanni at archlinux.org
Thu Jan 19 13:11:45 UTC 2012
Date: Thursday, January 19, 2012 @ 08:11:45
Author: giovanni
Revision: 146940
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
zvbi/repos/staging-i686/
zvbi/repos/staging-i686/PKGBUILD
(from rev 146939, zvbi/trunk/PKGBUILD)
zvbi/repos/staging-i686/fix-includes.patch
(from rev 146939, zvbi/trunk/fix-includes.patch)
zvbi/repos/staging-i686/zvbi-0.2.33-libpng15.patch
(from rev 146939, zvbi/trunk/zvbi-0.2.33-libpng15.patch)
zvbi/repos/staging-x86_64/
zvbi/repos/staging-x86_64/PKGBUILD
(from rev 146939, zvbi/trunk/PKGBUILD)
zvbi/repos/staging-x86_64/fix-includes.patch
(from rev 146939, zvbi/trunk/fix-includes.patch)
zvbi/repos/staging-x86_64/zvbi-0.2.33-libpng15.patch
(from rev 146939, zvbi/trunk/zvbi-0.2.33-libpng15.patch)
-------------------------------------------+
staging-i686/PKGBUILD | 38 ++++++++++++++++++++++++++++
staging-i686/fix-includes.patch | 36 ++++++++++++++++++++++++++
staging-i686/zvbi-0.2.33-libpng15.patch | 21 +++++++++++++++
staging-x86_64/PKGBUILD | 38 ++++++++++++++++++++++++++++
staging-x86_64/fix-includes.patch | 36 ++++++++++++++++++++++++++
staging-x86_64/zvbi-0.2.33-libpng15.patch | 21 +++++++++++++++
6 files changed, 190 insertions(+)
Copied: zvbi/repos/staging-i686/PKGBUILD (from rev 146939, zvbi/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-19 13:11:45 UTC (rev 146940)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer:
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=zvbi
+pkgver=0.2.33
+pkgrel=4
+pkgdesc="VBI capture and decoding library"
+url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome"
+arch=('i686' 'x86_64')
+depends=('libpng' 'libx11')
+license=('GPL')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2"
+ 'fix-includes.patch'
+ 'zvbi-0.2.33-libpng15.patch')
+md5sums=('1741a6045c3eedfb611d645f2da69ac8'
+ '38766bc59e1571133d0399f0102da653'
+ '4434de7addc438be8c5a33274146bd11')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -Np1 -i "${srcdir}/fix-includes.patch"
+ patch -Np0 -i "${srcdir}/zvbi-0.2.33-libpng15.patch"
+
+ ./configure --prefix=/usr \
+ --disable-static \
+ --mandir=/usr/share/man
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+}
Copied: zvbi/repos/staging-i686/fix-includes.patch (from rev 146939, zvbi/trunk/fix-includes.patch)
===================================================================
--- staging-i686/fix-includes.patch (rev 0)
+++ staging-i686/fix-includes.patch 2012-01-19 13:11:45 UTC (rev 146940)
@@ -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 <achiang at canonical.com>
+---
+--- 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>
Copied: zvbi/repos/staging-i686/zvbi-0.2.33-libpng15.patch (from rev 146939, zvbi/trunk/zvbi-0.2.33-libpng15.patch)
===================================================================
--- staging-i686/zvbi-0.2.33-libpng15.patch (rev 0)
+++ staging-i686/zvbi-0.2.33-libpng15.patch 2012-01-19 13:11:45 UTC (rev 146940)
@@ -0,0 +1,21 @@
+Index: src/exp-gfx.c
+===================================================================
+RCS file: /cvsroot/zapping/vbi/src/exp-gfx.c,v
+retrieving revision 1.16
+diff -u -B -r1.16 exp-gfx.c
+--- src/exp-gfx.c 24 Feb 2008 14:17:47 -0000 1.16
++++ src/exp-gfx.c 15 Feb 2011 20:03:58 -0000
+@@ -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);
+
Copied: zvbi/repos/staging-x86_64/PKGBUILD (from rev 146939, zvbi/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-19 13:11:45 UTC (rev 146940)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer:
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=zvbi
+pkgver=0.2.33
+pkgrel=4
+pkgdesc="VBI capture and decoding library"
+url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome"
+arch=('i686' 'x86_64')
+depends=('libpng' 'libx11')
+license=('GPL')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2"
+ 'fix-includes.patch'
+ 'zvbi-0.2.33-libpng15.patch')
+md5sums=('1741a6045c3eedfb611d645f2da69ac8'
+ '38766bc59e1571133d0399f0102da653'
+ '4434de7addc438be8c5a33274146bd11')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -Np1 -i "${srcdir}/fix-includes.patch"
+ patch -Np0 -i "${srcdir}/zvbi-0.2.33-libpng15.patch"
+
+ ./configure --prefix=/usr \
+ --disable-static \
+ --mandir=/usr/share/man
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+}
Copied: zvbi/repos/staging-x86_64/fix-includes.patch (from rev 146939, zvbi/trunk/fix-includes.patch)
===================================================================
--- staging-x86_64/fix-includes.patch (rev 0)
+++ staging-x86_64/fix-includes.patch 2012-01-19 13:11:45 UTC (rev 146940)
@@ -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 <achiang at canonical.com>
+---
+--- 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>
Copied: zvbi/repos/staging-x86_64/zvbi-0.2.33-libpng15.patch (from rev 146939, zvbi/trunk/zvbi-0.2.33-libpng15.patch)
===================================================================
--- staging-x86_64/zvbi-0.2.33-libpng15.patch (rev 0)
+++ staging-x86_64/zvbi-0.2.33-libpng15.patch 2012-01-19 13:11:45 UTC (rev 146940)
@@ -0,0 +1,21 @@
+Index: src/exp-gfx.c
+===================================================================
+RCS file: /cvsroot/zapping/vbi/src/exp-gfx.c,v
+retrieving revision 1.16
+diff -u -B -r1.16 exp-gfx.c
+--- src/exp-gfx.c 24 Feb 2008 14:17:47 -0000 1.16
++++ src/exp-gfx.c 15 Feb 2011 20:03:58 -0000
+@@ -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);
+
More information about the arch-commits
mailing list