[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/, media-video/dvdauthor/files/

[Lars Wendler]

commit:     3fc97f728cf9805bf2845d4c7633c0c063d77692
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 09:09:07 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May 23 09:09:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc97f72

media-video/dvdauthor: Fixed build with imagemagick-7 (bug #610574).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild    |  5 +++
 .../files/dvdauthor-0.7.2-imagemagick7.patch       | 37 ++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
index 035baec1312..b279738dca1 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
@@ -30,6 +30,11 @@ DOCS=( AUTHORS ChangeLog README TODO )
 
 src_prepare() {
        default
+
+       if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+               eapply "${FILESDIR}/${PN}-0.7.2-imagemagick7.patch"
+       fi
+
        if use graphicsmagick ; then
                sed -i -e 's:ExportImagePixels:dIsAbLeAuToMaGiC&:' configure \
                        || die

diff --git a/media-video/dvdauthor/files/dvdauthor-0.7.2-imagemagick7.patch 
b/media-video/dvdauthor/files/dvdauthor-0.7.2-imagemagick7.patch
new file mode 100644
index 00000000000..9f9e3a0b301
--- /dev/null
+++ b/media-video/dvdauthor/files/dvdauthor-0.7.2-imagemagick7.patch
@@ -0,0 +1,37 @@
+--- dvdauthor/src/subgen-image.c
++++ dvdauthor/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
+@@ -181,7 +181,8 @@
+     unsigned long magickver;
+     unsigned char amask;
+ 
+-    GetExceptionInfo(&ei);
++    ExceptionInfo *exception_info;
++    exception_info = AcquireExceptionInfo();
+     ii=CloneImageInfo(NULL);
+     strcpy(ii->filename,s->fname);
+     im=ReadImage(ii,&ei);
+@@ -1098,13 +1099,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
+ }