commit: fb5c529a39bb80573cbd2c71e5ec5cb4c73a9b98
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Thu May 25 19:43:09 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Thu May 25 19:43:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb5c529a
media-video/dcpomatic: Fix for ImageMagick-7.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-video/dcpomatic/dcpomatic-2.10.2.ebuild | 4 ++++
.../files/dcpomatic-2.10.2-imagemagick-7.patch | 18 ++++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/media-video/dcpomatic/dcpomatic-2.10.2.ebuild
b/media-video/dcpomatic/dcpomatic-2.10.2.ebuild
index 637661d1af0..9cd6b2365fe 100644
--- 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
index 00000000000..2e4e9e8838e
--- /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>
