media-video/dcpomatic: Fix for ImageMagick-7.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

diff --git a/media-video/dcpomatic/dcpomatic-2.10.2.ebuild b/media-video/dcpomatic/dcpomatic-2.10.2.ebuild
index 637661d1af0b7d20327b4cd4ce1bf6b766a406e5..9cd6b2365fe3bca027de3d520fa118a59dd8dfe0 100644 (file)
--- a/media-video/dcpomatic/dcpomatic-2.10.2.ebuild
+++ b/media-video/dcpomatic/dcpomatic-2.10.2.ebuild
@@ -85,6 +85,10 @@ src_prepare() {
         -e '/film_metadata_test.cc/d' \
                -i test/wscript || die
 
+       if has_version ">media-gfx/imagemagick-7" ; then
+               epatch "${FILESDIR}"/${PN}-2.10.2-imagemagick-7.patch
+       fi
+
        default
 }
 

diff --git a/media-video/dcpomatic/files/dcpomatic-2.10.2-imagemagick-7.patch b/media-video/dcpomatic/files/dcpomatic-2.10.2-imagemagick-7.patch
new file mode 100644 (file)
index 0000000..2e4e9e8
--- /dev/null
+++ b/media-video/dcpomatic/files/dcpomatic-2.10.2-imagemagick-7.patch
@@ -0,0 +1,18 @@
+--- dcpomatic-2.10.2/src/lib/environment_info.cc
++++ dcpomatic-2.10.2/src/lib/environment_info.cc
+@@ -25,12 +25,13 @@
+ #include <dcp/version.h>
+ #include <libssh/libssh.h>
+ #ifdef DCPOMATIC_IMAGE_MAGICK
+-#include <magick/MagickCore.h>
++#include <MagickCore/MagickCore.h>
++#include <MagickCore/version.h>
+ #else
+ #include <magick/common.h>
+ #include <magick/magick_config.h>
+-#endif
+ #include <magick/version.h>
++#endif
+ extern "C" {
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>