dvdauthor: fix building against glibc 2.20

and 2 other patches from redhat

+54 -2
+9 -2
pkgs/applications/video/dvdauthor/default.nix
··· 1 - { stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkgconfig }: 2 3 stdenv.mkDerivation rec{ 4 name = "dvdauthor-0.7.1"; ··· 8 sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh"; 9 }; 10 11 - buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick ]; 12 nativeBuildInputs = [ pkgconfig ]; 13 14 meta = { 15 description = "Tools for generating DVD files to be played on standalone DVD players";
··· 1 + { stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkgconfig 2 + , flex, bison }: 3 4 stdenv.mkDerivation rec{ 5 name = "dvdauthor-0.7.1"; ··· 9 sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh"; 10 }; 11 12 + buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison]; 13 nativeBuildInputs = [ pkgconfig ]; 14 + 15 + patches = [ 16 + ./dvdauthor-0.7.1-automake-1.13.patch 17 + ./dvdauthor-0.7.1-mga-strndup.patch 18 + ./dvdauthor-imagemagick-0.7.0.patch 19 + ]; 20 21 meta = { 22 description = "Tools for generating DVD files to be played on standalone DVD players";
+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"