public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dvdauthor: fix building against glibc 2.20 

and 2 other patches from redhat
This commit is contained in:
Mathijs Kwik 2014-12-13 19:12:10 +01:00
parent 752554cdcb
commit 9a7d425edd
4 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/video/dvdauthor/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkgconfig }:
{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkgconfig
, flex, bison }:
stdenv.mkDerivation rec{
name = "dvdauthor-0.7.1";
@ -8,9 +9,15 @@ stdenv.mkDerivation rec{
sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh";
};
buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick ];
buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison];
nativeBuildInputs = [ pkgconfig ];
patches = [
./dvdauthor-0.7.1-automake-1.13.patch
./dvdauthor-0.7.1-mga-strndup.patch
./dvdauthor-imagemagick-0.7.0.patch
];
meta = {
description = "Tools for generating DVD files to be played on standalone DVD players";
homepage = http://dvdauthor.sourceforge.net/;

10
pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch Normal file
View File

@ -0,0 +1,10 @@
--- dvdauthor/configure.ac~ 2013-01-04 08:27:40.713197029 +0800
+++ dvdauthor/configure.ac 2013-01-04 08:27:53.273525273 +0800
@@ -1,6 +1,6 @@
AC_INIT(DVDAuthor,0.7.1,dvdauthor-users@lists.sourceforge.net)
-AM_CONFIG_HEADER(src/config.h)
+AC_CONFIG_HEADERS(src/config.h)
AC_CONFIG_AUX_DIR(autotools)
AM_INIT_AUTOMAKE

24
pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch Normal file
View File

@ -0,0 +1,24 @@
Index: dvdauthor/src/dvdvml.l
===================================================================
--- dvdauthor/src/dvdvml.l
+++ dvdauthor/src/dvdvml.l 2014-09-14 19:36:05.098847465 +0000
@@ -19,6 +19,7 @@
* USA
*/
+#include "config.h"
#include "compat.h" /* needed for bool */
#include "dvdvm.h"
#include "dvdvmy.h"
Index: dvdauthor/src/dvdvmy.y
===================================================================
--- dvdauthor/src/dvdvmy.y
+++ dvdauthor/src/dvdvmy.y 2014-09-14 19:36:28.251618378 +0000
@@ -19,6 +19,7 @@
* USA
*/
+#include "config.h"
#include "compat.h" /* needed for bool */
#include "dvdvm.h"

11
pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch Normal file
View File

@ -0,0 +1,11 @@
--- dvdauthor/configure.ac.orig 2010-10-23 04:26:49.000000000 +0200
+++ dvdauthor/configure.ac 2010-10-24 14:37:45.489064778 +0200
@@ -31,7 +31,7 @@
usemagick=0
-AC_CHECK_PROGS(MAGICKCONFIG, [Magick-config])
+AC_CHECK_PROGS(MAGICKCONFIG, [MagickCore-config])
if test -n "$MAGICKCONFIG"; then
ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_LIBS="$LIBS"