[arch-commits] Commit in zvbi/trunk (PKGBUILD zvbi-0.2.33-libpng15.patch)

[Giovanni Scafora]

    Date: Thursday, January 19, 2012 @ 08:11:21
  Author: giovanni
Revision: 146939

upgpkg: zvbi 0.2.33-4

libpng 1.5 rebuild

Added:
  zvbi/trunk/zvbi-0.2.33-libpng15.patch
Modified:
  zvbi/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   25 +++++++++++++++++++------
 zvbi-0.2.33-libpng15.patch |   21 +++++++++++++++++++++
 2 files changed, 40 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-19 12:54:40 UTC (rev 146938)
+++ PKGBUILD	2012-01-19 13:11:21 UTC (rev 146939)
@@ -2,24 +2,37 @@
 # Maintainer: 
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: dorphell <dorphell at archlinux.org>
+
 pkgname=zvbi
 pkgver=0.2.33
-pkgrel=3
+pkgrel=4
 pkgdesc="VBI capture and decoding library"
 url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome"
-arch=(i686 x86_64)
+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)
+source=("http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2"
+        'fix-includes.patch'
+        'zvbi-0.2.33-libpng15.patch')
 md5sums=('1741a6045c3eedfb611d645f2da69ac8'
-         '38766bc59e1571133d0399f0102da653')
+         '38766bc59e1571133d0399f0102da653'
+         '4434de7addc438be8c5a33274146bd11')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   patch -Np1 -i "${srcdir}/fix-includes.patch"
-  ./configure --prefix=/usr --disable-static --mandir=/usr/share/man
+  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
 }

Added: zvbi-0.2.33-libpng15.patch
===================================================================
--- zvbi-0.2.33-libpng15.patch	                        (rev 0)
+++ zvbi-0.2.33-libpng15.patch	2012-01-19 13:11:21 UTC (rev 146939)
@@ -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);
+