or --with-imagemagick, no bootstrap.

2020-09-27 18:11:12 +03:00
parent 8ae04f6860
commit 4013641c93
3 changed files with 77 additions and 2 deletions
@@ -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")
@@ -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 <stdarg.h>
+-#include <magick/api.h>
+#include <MagickWand/MagickWand.h>
+ #else
+ #include <png.h>
+ #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; 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 @@
+         }
+     }
+     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
+ }
@@ -24,6 +24,7 @@
            <Dependency>GraphicsMagick-devel</Dependency>
        </BuildDependencies>
        <Patches>
+            <!-- <Patch level="1">arch/imagemagick7.patch</Patch> -->
            <Patch level="1">backport_from_git.patch</Patch>
        </Patches>
    </Source>