Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bwbar/PKGBUILD
	community/directfb/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gnash/PKGBUILD
	community/guake/PKGBUILD
	community/pidgin-libnotify/PKGBUILD
	community/png2ico/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/torcs/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/abiword/PKGBUILD
	extra/alsaplayer/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-desktop2/PKGBUILD
	extra/gnome-python/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gnugo/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/koffice/PKGBUILD
	extra/lcms/PKGBUILD
	extra/libao/PKGBUILD
	extra/libcue/PKGBUILD
	extra/libdaemon/PKGBUILD
	extra/libgnome-media-profiles/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libots/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxfcegui4/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/rssh/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim-pinyin/PKGBUILD
	extra/scim-tables/PKGBUILD
	extra/scim-uim/PKGBUILD
	extra/tsocks/PKGBUILD
	extra/vigra/PKGBUILD
	extra/w3m/PKGBUILD
	extra/wv/PKGBUILD
	extra/xclip/PKGBUILD
	extra/xfce4-datetime-plugin/PKGBUILD
	extra/xfce4-notes-plugin/PKGBUILD
	extra/xfce4-quicklauncher-plugin/PKGBUILD
	extra/xfce4-sensors-plugin/PKGBUILD
	extra/xorg-font-util/PKGBUILD
	extra/xorg-setxkbmap/PKGBUILD
	extra/xorg-xev/PKGBUILD
	extra/xsane/PKGBUILD
	extra/yakuake/PKGBUILD
	extra/zvbi/PKGBUILD
	multilib/lib32-cairo/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-libcanberra/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-libglade/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/wine/PKGBUILD
	testing/vlc/PKGBUILD
	testing/xulrunner/PKGBUILD

2 files changed, 41 insertions, 7 deletions

diff --git a/extra/zvbi/PKGBUILD b/extra/zvbi/PKGBUILD
index 4f3dd1622..8e26d7ebd 100644
--- a/extra/zvbi/PKGBUILD
+++ b/extra/zvbi/PKGBUILD
@@ -1,25 +1,38 @@
-# $Id: PKGBUILD 101442 2010-11-29 09:37:06Z jgc $
+# $Id: PKGBUILD 148988 2012-02-05 11:59:13Z ibiru $
 # Maintainer: 
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: dorphell <dorphell@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 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 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
 }
diff --git a/extra/zvbi/zvbi-0.2.33-libpng15.patch b/extra/zvbi/zvbi-0.2.33-libpng15.patch
new file mode 100644
index 000000000..262677376
--- /dev/null
+++ b/extra/zvbi/zvbi-0.2.33-libpng15.patch
@@ -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);
+