swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

dvdauthor: 0.7.1 -> 0.7.2

Browse source 
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.
This commit is contained in:
Nicolas Benes 2023-11-19 01:32:19 +01:00
parent 6dfcd5ea1a
commit 565d7dce03
4 changed files with 7 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/applications/video/dvdauthor/default.nix
View file

@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchurl
, imagemagick
, autoreconfHook
, libdvdread
, libxml2
, freetype
@ -15,20 +15,18 @@
stdenv.mkDerivation rec {
pname = "dvdauthor";
version = "0.7.1";
version = "0.7.2";
src = fetchurl {
url = "mirror://sourceforge/dvdauthor/dvdauthor-${version}.tar.gz";
sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh";
hash = "sha256-MCCpLen3jrNvSLbyLVoAHEcQeCZjSnhaYt/NCA9hLrc=";
};
buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi flex bison ];
patches = [
./dvdauthor-0.7.1-automake-1.13.patch
./dvdauthor-0.7.1-mga-strndup.patch
./dvdauthor-imagemagick-0.7.0.patch
nativeBuildInputs = [
pkg-config
autoreconfHook
];
meta = with lib; {

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

@ -1,10 +0,0 @@
--- 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
View file

@ -1,24 +0,0 @@
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
View file

@ -1,11 +0,0 @@
--- 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"