[arch-commits] Commit in dvdauthor/trunk (PKGBUILD dvdauthor-0.7.0-libpng15.patch)

[Giovanni Scafora]

    Date: Thursday, January 19, 2012 @ 17:25:08
  Author: giovanni
Revision: 146984

upgpkg: dvdauthor 0.7.0-4

libpng 1.5 rebuild

Added:
  dvdauthor/trunk/dvdauthor-0.7.0-libpng15.patch
Modified:
  dvdauthor/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   10 +++++++---
 dvdauthor-0.7.0-libpng15.patch |   19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-19 22:19:37 UTC (rev 146983)
+++ PKGBUILD	2012-01-19 22:25:08 UTC (rev 146984)
@@ -6,19 +6,23 @@
 
 pkgname=dvdauthor
 pkgver=0.7.0
-pkgrel=3
+pkgrel=4
 pkgdesc="DVD authoring tools"
 arch=('i686' 'x86_64')
 url="http://dvdauthor.sourceforge.net/"
 license=('GPL')
 depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi')
 options=('!makeflags')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('33a447fb98ab3293ac40f869eedc17ff')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'dvdauthor-0.7.0-libpng15.patch')
+md5sums=('33a447fb98ab3293ac40f869eedc17ff'
+         '9ea90bbea6adb0469c8c1b2f7d033f11')
 
 build() {
   cd "${srcdir}/${pkgname}"
 
+  patch -Np0 -i "${srcdir}/dvdauthor-0.7.0-libpng15.patch"
+
   ./configure --prefix=/usr \
               --sysconfdir=/etc
   make

Added: dvdauthor-0.7.0-libpng15.patch
===================================================================
--- dvdauthor-0.7.0-libpng15.patch	                        (rev 0)
+++ dvdauthor-0.7.0-libpng15.patch	2012-01-19 22:25:08 UTC (rev 146984)
@@ -0,0 +1,19 @@
+--- src/spuunmux.c
++++ src/spuunmux.c
+@@ -39,6 +39,7 @@
+ #include <netinet/in.h>
+ 
+ #include <png.h>
++#include <zlib.h>
+ 
+ #include "rgb.h"
+ #include "common.h"
+@@ -610,7 +611,7 @@
+         png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+         return -1;
+       } /*if*/
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+       {
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+         fclose(fp);