[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/, media-libs/xine-lib/files/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     99dc1b4f413426dfde42805f427c1603839986ed
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 08:54:30 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May 23 08:54:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99dc1b4f

media-libs/xine-lib: Fixed build with imagemagick-7 (bug #581820).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch | 13 +++++++++++++
 media-libs/xine-lib/xine-lib-1.2.8.ebuild                   |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch b/media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch
new file mode 100644
index 00000000000..34062222e32
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch
@@ -0,0 +1,13 @@
+http://git.pld-linux.org/?p=packages/xine-lib.git;a=blob;f=imagemagick7.patch;h=d050323cdf509c9bb5f8edbad90084e8ce5c1b38;hb=HEAD
+
+--- xine-lib-1.2.6/src/video_dec/image.c
++++ xine-lib-1.2.6/src/video_dec/image.c
+@@ -39,7 +39,7 @@
+ #define LOG
+ */
+ 
+-#include <wand/magick_wand.h>
++#include <MagickWand/MagickWand.h>
+ #ifdef PACKAGE_NAME
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME

diff --git a/media-libs/xine-lib/xine-lib-1.2.8.ebuild b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
index 84c471c4b36..c2642d2f5c1 100644
--- a/media-libs/xine-lib/xine-lib-1.2.8.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
@@ -118,6 +118,10 @@ REQUIRED_USE="vidix? ( || ( X fbcon ) )
 src_prepare() {
 	default
 
+	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+		eapply "${FILESDIR}/${PN}-1.2.6-imagemagick7.patch"
+	fi
+
 	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
 
 	eautoreconf