Fix build of dvdauthor; also advance version to 0.7.0

svn path=/nixpkgs/trunk/; revision=33873

2 files changed, 35 insertions, 5 deletions

diff --git a/pkgs/applications/video/dvdauthor/build-against-libpng15.patch b/pkgs/applications/video/dvdauthor/build-against-libpng15.patch
new file mode 100644
index 0000000000000..8e62cef35af09
--- /dev/null
+++ b/pkgs/applications/video/dvdauthor/build-against-libpng15.patch
@@ -0,0 +1,27 @@
+commit c82aaa4eb1a1c36bf7e2b7ae3c9140d0bf8000b5
+Author: Lawrence D'Oliveiro <ldo@geek-central.gen.nz>
+Date:   Wed Jan 26 00:48:37 2011 +0000
+
+    fix to build against png-1.5 (thanks to Thomas Klausner)
+
+diff --git a/src/spuunmux.c b/src/spuunmux.c
+index 5e565d1..9ad2371 100644
+--- a/src/spuunmux.c
++++ b/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 @@ static int write_png
+         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);
diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix
index 8c64721bc7e5e..c72e9b892dba9 100644
--- a/pkgs/applications/video/dvdauthor/default.nix
+++ b/pkgs/applications/video/dvdauthor/default.nix
@@ -1,14 +1,17 @@
-{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng }:
+{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib }:
 
 stdenv.mkDerivation {
-  name = "dvdauthor-0.6.14";
+  name = "dvdauthor-0.7.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/dvdauthor/dvdauthor-0.6.14.tar.gz;
-    sha256 = "1x4flj3ja7m8rbc956a6ha3qk0k6zxd1y6sl826r6r7dyc91a6yx";
+    url = mirror://sourceforge/dvdauthor/dvdauthor-0.7.0.tar.gz;
+    sha256 = "1l1l5zya7lirwa1783pa7h22wrfcq8hibbf5kpx8z8zbk5xsz9mf";
   };
 
-  buildInputs = [ imagemagick libdvdread libxml2 freetype fribidi libpng ];
+  buildInputs = [ imagemagick libdvdread libxml2 freetype fribidi libpng zlib ];
+
+  # Does not build against recent versions of libpng without patch.
+  patches = [ ./build-against-libpng15.patch ];
 
   meta = { 
     description = "Tools for generating DVD files to be played on standalone DVD players";