| 1 |
commit: fb5c529a39bb80573cbd2c71e5ec5cb4c73a9b98 |
| 2 |
Author: Michael Weber <xmw <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 25 19:43:09 2017 +0000 |
| 4 |
Commit: Michael Weber <xmw <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 25 19:43:36 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb5c529a |
| 7 |
|
| 8 |
media-video/dcpomatic: Fix for ImageMagick-7. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
|
| 12 |
media-video/dcpomatic/dcpomatic-2.10.2.ebuild | 4 ++++ |
| 13 |
.../files/dcpomatic-2.10.2-imagemagick-7.patch | 18 ++++++++++++++++++ |
| 14 |
2 files changed, 22 insertions(+) |
| 15 |
|
| 16 |
diff --git a/media-video/dcpomatic/dcpomatic-2.10.2.ebuild b/media-video/dcpomatic/dcpomatic-2.10.2.ebuild |
| 17 |
index 637661d1af0..9cd6b2365fe 100644 |
| 18 |
--- a/media-video/dcpomatic/dcpomatic-2.10.2.ebuild |
| 19 |
+++ b/media-video/dcpomatic/dcpomatic-2.10.2.ebuild |
| 20 |
@@ -85,6 +85,10 @@ src_prepare() { |
| 21 |
-e '/film_metadata_test.cc/d' \ |
| 22 |
-i test/wscript || die |
| 23 |
|
| 24 |
+ if has_version ">media-gfx/imagemagick-7" ; then |
| 25 |
+ epatch "${FILESDIR}"/${PN}-2.10.2-imagemagick-7.patch |
| 26 |
+ fi |
| 27 |
+ |
| 28 |
default |
| 29 |
} |
| 30 |
|
| 31 |
|
| 32 |
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 |
| 33 |
new file mode 100644 |
| 34 |
index 00000000000..2e4e9e8838e |
| 35 |
--- /dev/null |
| 36 |
+++ b/media-video/dcpomatic/files/dcpomatic-2.10.2-imagemagick-7.patch |
| 37 |
@@ -0,0 +1,18 @@ |
| 38 |
+--- dcpomatic-2.10.2/src/lib/environment_info.cc |
| 39 |
++++ dcpomatic-2.10.2/src/lib/environment_info.cc |
| 40 |
+@@ -25,12 +25,13 @@ |
| 41 |
+ #include <dcp/version.h> |
| 42 |
+ #include <libssh/libssh.h> |
| 43 |
+ #ifdef DCPOMATIC_IMAGE_MAGICK |
| 44 |
+-#include <magick/MagickCore.h> |
| 45 |
++#include <MagickCore/MagickCore.h> |
| 46 |
++#include <MagickCore/version.h> |
| 47 |
+ #else |
| 48 |
+ #include <magick/common.h> |
| 49 |
+ #include <magick/magick_config.h> |
| 50 |
+-#endif |
| 51 |
+ #include <magick/version.h> |
| 52 |
++#endif |
| 53 |
+ extern "C" { |
| 54 |
+ #include <libavcodec/avcodec.h> |
| 55 |
+ #include <libavformat/avformat.h> |
Archives