diff --git a/multimedia/editor/dvdauthor/actions.py b/multimedia/editor/dvdauthor/actions.py index 214150a4bf..8d993972a6 100644 --- a/multimedia/editor/dvdauthor/actions.py +++ b/multimedia/editor/dvdauthor/actions.py @@ -4,7 +4,7 @@ # Licensed under the GNU General Public License, version 3. # See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import shelltools +#from pisi.actionsapi import shelltools from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import get @@ -14,7 +14,7 @@ WorkDir = "dvdauthor" def setup(): # disable ImageMagick, use GraphicsMagick #shelltools.export("MAGICKCONFIG", "/bin/true") - shelltools.system("./bootstrap") + autotools.autoreconf("-fiv") autotools.configure("--disable-rpath \ --with-graphicsmagick \ --enable-default-video-format=NTSC") diff --git a/multimedia/editor/dvdauthor/files/arch/imagemagick7.patch b/multimedia/editor/dvdauthor/files/arch/imagemagick7.patch new file mode 100644 index 0000000000..5e0f2e2f27 --- /dev/null +++ b/multimedia/editor/dvdauthor/files/arch/imagemagick7.patch @@ -0,0 +1,74 @@ +--- a/src/subgen-image.c 2014-01-21 00:12:37.000000000 +0100 ++++ b/src/subgen-image.c 2017-11-27 20:26:53.682914041 +0100 +@@ -30,7 +30,7 @@ + + #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK) + #include +-#include ++#include + #else + #include + #endif +@@ -176,18 +176,18 @@ + { + 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 @@ + for( y=0; yrows; 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 @@ + } + } + 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 @@ + 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 + } diff --git a/multimedia/editor/dvdauthor/pspec.xml b/multimedia/editor/dvdauthor/pspec.xml index 63a93efd74..217a978848 100644 --- a/multimedia/editor/dvdauthor/pspec.xml +++ b/multimedia/editor/dvdauthor/pspec.xml @@ -24,6 +24,7 @@ GraphicsMagick-devel + backport_from_git.patch