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

Merge pull request #268421 from panicgh/dvdauthor

Browse Source 
dvdauthor: 0.7.1 -> 0.7.2
This commit is contained in:
Peder Bergebakken Sundt 2023-12-18 00:21:57 +01:00 committed by GitHub
commit 3a16c64474
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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"