dvdauthor: upgrade to 0.7.1

2 files changed, 8 insertions, 37 deletions

diff --git a/pkgs/applications/video/dvdauthor/build-against-libpng15.patch b/pkgs/applications/video/dvdauthor/build-against-libpng15.patch
deleted file mode 100644
index 8e62cef35af0..000000000000
--- a/pkgs/applications/video/dvdauthor/build-against-libpng15.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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 c72e9b892dba..2e115806315c 100644
--- a/pkgs/applications/video/dvdauthor/default.nix
+++ b/pkgs/applications/video/dvdauthor/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib }:
+{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkgconfig }:
 
-stdenv.mkDerivation {
-  name = "dvdauthor-0.7.0";
+stdenv.mkDerivation rec{
+  name = "dvdauthor-0.7.1";
 
   src = fetchurl {
-    url = mirror://sourceforge/dvdauthor/dvdauthor-0.7.0.tar.gz;
-    sha256 = "1l1l5zya7lirwa1783pa7h22wrfcq8hibbf5kpx8z8zbk5xsz9mf";
+    url = "mirror://sourceforge/dvdauthor/${name}.tar.gz";
+    sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh";
   };
 
-  buildInputs = [ imagemagick libdvdread libxml2 freetype fribidi libpng zlib ];
+  buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick ];
+  buildNativeInputs = [ pkgconfig ];
 
-  # Does not build against recent versions of libpng without patch.
-  patches = [ ./build-against-libpng15.patch ];
-
-  meta = { 
+  meta = {
     description = "Tools for generating DVD files to be played on standalone DVD players";
     homepage = http://dvdauthor.sourceforge.net/;
     license = ["GPLv2"];