pyrox.dev / nixpkgs
lol
fork atom

dvdauthor: 0.7.1 -> 0.7.2

dvdauthor optionally depends on imagemagick6, which is marked insecure.
imagemagick7 could be supported with patches, but since upstream
disabled the feature by default, it seems easier to remove it.
(see https://github.com/ldo/dvdauthor/issues/24)

In addition, the previous release's Nix package listed imagemagick(7) as
dependence, but it was not recognised and not used due to an error in
the dvdauthor build script.

Nicolas Benes 565d7dce 6dfcd5ea

+7 -54
unified split
+7 -9
pkgs/applications/video/dvdauthor/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchurl 4 - , imagemagick 4 + , autoreconfHook 5 5 , libdvdread 6 6 , libxml2 7 7 , freetype ··· 15 15 16 16 stdenv.mkDerivation rec { 17 17 pname = "dvdauthor"; 18 - version = "0.7.1"; 18 + version = "0.7.2"; 19 19 20 20 src = fetchurl { 21 21 url = "mirror://sourceforge/dvdauthor/dvdauthor-${version}.tar.gz"; 22 - sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh"; 22 + hash = "sha256-MCCpLen3jrNvSLbyLVoAHEcQeCZjSnhaYt/NCA9hLrc="; 23 23 }; 24 24 25 - buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison ]; 26 - nativeBuildInputs = [ pkg-config ]; 25 + buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi flex bison ]; 27 26 28 - patches = [ 29 - ./dvdauthor-0.7.1-automake-1.13.patch 30 - ./dvdauthor-0.7.1-mga-strndup.patch 31 - ./dvdauthor-imagemagick-0.7.0.patch 27 + nativeBuildInputs = [ 28 + pkg-config 29 + autoreconfHook 32 30 ]; 33 31 34 32 meta = with lib; {
-10
pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch
··· 1 - --- dvdauthor/configure.ac~ 2013-01-04 08:27:40.713197029 +0800 2 - +++ dvdauthor/configure.ac 2013-01-04 08:27:53.273525273 +0800 3 - @@ -1,6 +1,6 @@ 4 - AC_INIT(DVDAuthor,0.7.1,dvdauthor-users@lists.sourceforge.net) 5 - 6 - -AM_CONFIG_HEADER(src/config.h) 7 - +AC_CONFIG_HEADERS(src/config.h) 8 - AC_CONFIG_AUX_DIR(autotools) 9 - 10 - AM_INIT_AUTOMAKE
-24
pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch
··· 1 - Index: dvdauthor/src/dvdvml.l 2 - =================================================================== 3 - --- dvdauthor/src/dvdvml.l 4 - +++ dvdauthor/src/dvdvml.l 2014-09-14 19:36:05.098847465 +0000 5 - @@ -19,6 +19,7 @@ 6 - * USA 7 - */ 8 - 9 - +#include "config.h" 10 - #include "compat.h" /* needed for bool */ 11 - #include "dvdvm.h" 12 - #include "dvdvmy.h" 13 - Index: dvdauthor/src/dvdvmy.y 14 - =================================================================== 15 - --- dvdauthor/src/dvdvmy.y 16 - +++ dvdauthor/src/dvdvmy.y 2014-09-14 19:36:28.251618378 +0000 17 - @@ -19,6 +19,7 @@ 18 - * USA 19 - */ 20 - 21 - +#include "config.h" 22 - #include "compat.h" /* needed for bool */ 23 - #include "dvdvm.h" 24 -
-11
pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch
··· 1 - --- dvdauthor/configure.ac.orig 2010-10-23 04:26:49.000000000 +0200 2 - +++ dvdauthor/configure.ac 2010-10-24 14:37:45.489064778 +0200 3 - @@ -31,7 +31,7 @@ 4 - 5 - usemagick=0 6 - 7 - -AC_CHECK_PROGS(MAGICKCONFIG, [Magick-config]) 8 - +AC_CHECK_PROGS(MAGICKCONFIG, [MagickCore-config]) 9 - if test -n "$MAGICKCONFIG"; then 10 - ac_save_CPPFLAGS="$CPPFLAGS" 11 - ac_save_LIBS="$LIBS"