[arch-commits] Commit in zvbi/repos (8 files)
Eric Bélanger
eric at archlinux.org
Thu Jan 8 20:50:50 UTC 2015
Date: Thursday, January 8, 2015 @ 21:50:49
Author: eric
Revision: 228767
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
zvbi/repos/extra-i686/PKGBUILD
(from rev 228766, zvbi/trunk/PKGBUILD)
zvbi/repos/extra-x86_64/PKGBUILD
(from rev 228766, zvbi/trunk/PKGBUILD)
Deleted:
zvbi/repos/extra-i686/PKGBUILD
zvbi/repos/extra-i686/fix-includes.patch
zvbi/repos/extra-i686/zvbi-0.2.33-libpng15.patch
zvbi/repos/extra-x86_64/PKGBUILD
zvbi/repos/extra-x86_64/fix-includes.patch
zvbi/repos/extra-x86_64/zvbi-0.2.33-libpng15.patch
-----------------------------------------+
/PKGBUILD | 52 ++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 42 ------------------------
extra-i686/fix-includes.patch | 36 --------------------
extra-i686/zvbi-0.2.33-libpng15.patch | 21 ------------
extra-x86_64/PKGBUILD | 42 ------------------------
extra-x86_64/fix-includes.patch | 36 --------------------
extra-x86_64/zvbi-0.2.33-libpng15.patch | 21 ------------
7 files changed, 52 insertions(+), 198 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-01-08 20:48:15 UTC (rev 228766)
+++ extra-i686/PKGBUILD 2015-01-08 20:50:49 UTC (rev 228767)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=zvbi
-pkgver=0.2.33
-pkgrel=6
-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')
-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
-
- # usrmove
- cd "$pkgdir"
- mv usr/sbin/* usr/bin/
- rmdir usr/sbin
-}
Copied: zvbi/repos/extra-i686/PKGBUILD (from rev 228766, zvbi/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-01-08 20:50:49 UTC (rev 228767)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer:
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=zvbi
+pkgver=0.2.35
+pkgrel=1
+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')
+source=(http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('95e53eb208c65ba6667fd4341455fa27')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr --sbindir=/usr/bin
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/fix-includes.patch
===================================================================
--- extra-i686/fix-includes.patch 2015-01-08 20:48:15 UTC (rev 228766)
+++ extra-i686/fix-includes.patch 2015-01-08 20:50:49 UTC (rev 228767)
@@ -1,36 +0,0 @@
-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>
Deleted: extra-i686/zvbi-0.2.33-libpng15.patch
===================================================================
--- extra-i686/zvbi-0.2.33-libpng15.patch 2015-01-08 20:48:15 UTC (rev 228766)
+++ extra-i686/zvbi-0.2.33-libpng15.patch 2015-01-08 20:50:49 UTC (rev 228767)
@@ -1,21 +0,0 @@
-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);
-
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-01-08 20:48:15 UTC (rev 228766)
+++ extra-x86_64/PKGBUILD 2015-01-08 20:50:49 UTC (rev 228767)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=zvbi
-pkgver=0.2.33
-pkgrel=6
-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')
-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
-
- # usrmove
- cd "$pkgdir"
- mv usr/sbin/* usr/bin/
- rmdir usr/sbin
-}
Copied: zvbi/repos/extra-x86_64/PKGBUILD (from rev 228766, zvbi/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-01-08 20:50:49 UTC (rev 228767)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer:
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=zvbi
+pkgver=0.2.35
+pkgrel=1
+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')
+source=(http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('95e53eb208c65ba6667fd4341455fa27')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr --sbindir=/usr/bin
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/fix-includes.patch
===================================================================
--- extra-x86_64/fix-includes.patch 2015-01-08 20:48:15 UTC (rev 228766)
+++ extra-x86_64/fix-includes.patch 2015-01-08 20:50:49 UTC (rev 228767)
@@ -1,36 +0,0 @@
-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>
Deleted: extra-x86_64/zvbi-0.2.33-libpng15.patch
===================================================================
--- extra-x86_64/zvbi-0.2.33-libpng15.patch 2015-01-08 20:48:15 UTC (rev 228766)
+++ extra-x86_64/zvbi-0.2.33-libpng15.patch 2015-01-08 20:50:49 UTC (rev 228767)
@@ -1,21 +0,0 @@
-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