From 7cf39465f1d1d2b11149ae85d42d2d3d7085abb9 Mon Sep 17 00:00:00 2001
From: sibel <lesibel@free.fr>
Date: Tue, 19 Apr 2011 07:58:27 +0200
Subject: dvdauthor, 0.7.0-2

---
 extra/dvdauthor/.md5sum.i686                     |  3 ++-
 extra/dvdauthor/.md5sum.x86_64                   |  3 ++-
 extra/dvdauthor/Pkgfile                          | 22 ++++++++++-----------
 extra/dvdauthor/dvdauthor-0.7.0-libpng-1.5.patch | 25 ++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 14 deletions(-)
 create mode 100644 extra/dvdauthor/dvdauthor-0.7.0-libpng-1.5.patch

diff --git a/extra/dvdauthor/.md5sum.i686 b/extra/dvdauthor/.md5sum.i686
index a945ac85b..bd47437eb 100644
--- a/extra/dvdauthor/.md5sum.i686
+++ b/extra/dvdauthor/.md5sum.i686
@@ -1 +1,2 @@
-bd646b47950c4091ffd781d43fd2c5e9  dvdauthor-0.6.14.tar.gz
+72e72ab45f58c10206244d90f159325d  dvdauthor-0.7.0-libpng-1.5.patch
+33a447fb98ab3293ac40f869eedc17ff  dvdauthor-0.7.0.tar.gz
diff --git a/extra/dvdauthor/.md5sum.x86_64 b/extra/dvdauthor/.md5sum.x86_64
index a945ac85b..bd47437eb 100644
--- a/extra/dvdauthor/.md5sum.x86_64
+++ b/extra/dvdauthor/.md5sum.x86_64
@@ -1 +1,2 @@
-bd646b47950c4091ffd781d43fd2c5e9  dvdauthor-0.6.14.tar.gz
+72e72ab45f58c10206244d90f159325d  dvdauthor-0.7.0-libpng-1.5.patch
+33a447fb98ab3293ac40f869eedc17ff  dvdauthor-0.7.0.tar.gz
diff --git a/extra/dvdauthor/Pkgfile b/extra/dvdauthor/Pkgfile
index 1efdc53b2..297ca3f28 100644
--- a/extra/dvdauthor/Pkgfile
+++ b/extra/dvdauthor/Pkgfile
@@ -6,19 +6,17 @@
 # Run on: libxml2,libdvdread,fribidi,imagemagick
 
 name=dvdauthor
-version=0.6.14
-release=3
-source=( http://switch.dl.sourceforge.net/sourceforge/dvdauthor/$name-$version.tar.gz)
-
-
+version=0.7.0
+release=2
+source=( http://switch.dl.sourceforge.net/sourceforge/dvdauthor/$name-$version.tar.gz
+	dvdauthor-0.7.0-libpng-1.5.patch)
 
 build() {
-	# build package
-		cd $name-$version
-                ./configure --prefix=/usr\
-                            --mandir=/usr/share/man\
-                            --infodir=/usr/share/info
-		make 
-		make DESTDIR=$PKG install
+	cd $name
+	patch -Np0 -i ../dvdauthor-0.7.0-libpng-1.5.patch
+        ./configure --prefix=/usr \
+		 --sysconfdir=/etc
+	make 
+	make DESTDIR=$PKG install
 }
   
diff --git a/extra/dvdauthor/dvdauthor-0.7.0-libpng-1.5.patch b/extra/dvdauthor/dvdauthor-0.7.0-libpng-1.5.patch
new file mode 100644
index 000000000..b0b112ff0
--- /dev/null
+++ b/extra/dvdauthor/dvdauthor-0.7.0-libpng-1.5.patch
@@ -0,0 +1,25 @@
+D: patch-ab,v 1.4 2011/01/27 00:00:58 wiz Exp $
+
+Fix build with png-1.5.
+Accepted upstream in
+https://github.com/ldo/dvdauthor/commit/c82aaa4eb1a1c36bf7e2b7ae3c9140d0bf8000b5
+
+--- src/spuunmux.c.orig	2010-03-05 06:37:06.000000000 +0000
++++ 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);
-- 
cgit v1.2.3-70-g09d2