dvdauthor: switch to imagemagick7

media-video/dvdauthor/dvdauthor-0.7.2.recipe

@@ -3,10 +3,11 @@ DESCRIPTION="Tools for generating DVD files to be played on standalone DVD playe
 HOMEPAGE="http://dvdauthor.sourceforge.net/"
 COPYRIGHT="2002-2005, 2007, 2010, 2012, 2016 Scott Smith, Lawrence D'Oliveiro"
 LICENSE="GNU GPL v2"
-REVISION="6"
+REVISION="7"
 SOURCE_URI="http://downloads.sourceforge.net/dvdauthor/dvdauthor-$portVersion.tar.gz"
 CHECKSUM_SHA256="3020a92de9f78eb36f48b6f22d5a001c47107826634a785a62dfcd080f612eb7"
 SOURCE_DIR="dvdauthor"
+PATCHES="dvdauthor-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -34,7 +35,7 @@ REQUIRES="
 	lib:libfreetype$secondaryArchSuffix
 	lib:libfribidi$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
-	lib:libmagickcore_6.q16$secondaryArchSuffix
+	lib:libMagickCore_7.Q16HDRI$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -47,7 +48,7 @@ BUILD_REQUIRES="
 	devel:libfreetype$secondaryArchSuffix
 	devel:libfribidi$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
-	devel:libmagickcore_6.q16$secondaryArchSuffix
+	devel:libMagickCore_7.Q16HDRI$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix

media-video/dvdauthor/patches/dvdauthor-0.7.2.patchset

@@ -0,0 +1,85 @@
+From e158ec88b6ced0f793660bada32c6a54f1075608 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 3 May 2023 17:37:52 +0200
+Subject: imagemagick7 patch from Arch
+
+
+diff --git a/src/subgen-image.c b/src/subgen-image.c
+index 24e0dab..8f5d8d5 100644
+--- a/src/subgen-image.c
++++ b/src/subgen-image.c
+@@ -30,7 +30,7 @@
+ 
+ #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+ #include <stdarg.h>
+-#include <magick/api.h>
++#include <MagickWand/MagickWand.h>
+ #else
+ #include <png.h>
+ #endif
+@@ -176,18 +176,18 @@ static int read_magick(pict *s)
+ {
+     Image *im;
+     ImageInfo *ii;
+-    ExceptionInfo ei;
++    ExceptionInfo *ei;
+     int x,y;
+     unsigned long magickver;
+     unsigned char amask;
+ 
+-    GetExceptionInfo(&ei);
++    ei = AcquireExceptionInfo();
+     ii=CloneImageInfo(NULL);
+     strcpy(ii->filename,s->fname);
+-    im=ReadImage(ii,&ei);
++    im=ReadImage(ii,ei);
+ 
+     if( !im ) {
+-        MagickError(ei.severity,"Unable to load file",ii->filename);
++        MagickError(ei->severity,"Unable to load file",ii->filename);
+         return -1;
+     }
+ 
+@@ -202,10 +202,10 @@ static int read_magick(pict *s)
+     for( y=0; y<im->rows; y++ ) {
+         char pdata[MAXX*4];
+ 
+-        if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,&ei)) {
+-            fprintf(stderr,"ERR:  Extracting row %d from %s (%s,%s)\n",y,s->fname,ei.reason,ei.description);
+-            CatchException(&ei);
+-            MagickError(ei.severity,ei.reason,ei.description);
++        if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,ei)) {
++            fprintf(stderr,"ERR:  Extracting row %d from %s (%s,%s)\n",y,s->fname,ei->reason,ei->description);
++            CatchException(ei);
++            MagickError(ei->severity,ei->reason,ei->description);
+             DestroyImage(im);
+             return -1;
+         }
+@@ -219,7 +219,7 @@ static int read_magick(pict *s)
+         }
+     }
+     DestroyImage(im);
+-    DestroyExceptionInfo(&ei);
++    DestroyExceptionInfo(ei);
+     fprintf(stderr,"INFO: Picture %s had %d colors\n",s->fname,s->numpal);
+ 
+     return 0;
+@@ -1098,13 +1098,13 @@ bool process_subtitle(stinfo *s)
+ void image_init()
+ {
+ #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+-    InitializeMagick(NULL);
++    MagickCoreGenesis("", MagickFalse);
+ #endif
+ }
+ 
+ void image_shutdown()
+ {
+ #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+-    DestroyMagick();
++    MagickCoreTerminus();
+ #endif
+ }
+-- 
+2.37.3
+