[packages/xine-lib] - fix building with ImageMagick 7 - rel 6

[baggins]

commit dc2b215a7ec00d105665fdc9477a3b1d555e7f45
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Dec 20 09:30:26 2016 +0100

    - fix building with ImageMagick 7
    - rel 6

 imagemagick7.patch | 11 +++++++++++
 xine-lib.spec      |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index e81f707..513bfe3 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -40,7 +40,7 @@ Summary(pl.UTF-8):	Odtwarzacz filmów
 Summary(pt_BR.UTF-8):	Xine, um player de video
 Name:		xine-lib
 Version:	1.2.6
-Release:	5
+Release:	6
 Epoch:		2
 License:	GPL v2+
 Group:		Libraries
@@ -55,6 +55,7 @@ Patch4:		%{name}-vdpau-hooks.patch
 Patch5:		x32.patch
 Patch6:		ffmpeg3.patch
 Patch7:		xcb-link.patch
+Patch8:		imagemagick7.patch
 URL:		http://xine.sourceforge.net/
 %{?with_directfb:BuildRequires:	DirectFB-devel >= 0.9.22}
 %{?with_fusionsound:BuildRequires:	FusionSound-devel >= 0.9.23}
@@ -972,6 +973,7 @@ XINE - wtyczka postprocessingu oparta na libpostproc z pakietu FFmpeg.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 %{__gettextize}
diff --git a/imagemagick7.patch b/imagemagick7.patch
new file mode 100644
index 0000000..d050323
--- /dev/null
+++ b/imagemagick7.patch
@@ -0,0 +1,11 @@
+--- xine-lib-1.2.6/src/video_dec/image.c.orig	2016-12-20 09:28:28.640838595 +0100
++++ xine-lib-1.2.6/src/video_dec/image.c	2016-12-20 09:28:39.754382554 +0100
+@@ -39,7 +39,7 @@
+ #define LOG
+ */
+ 
+-#include <wand/magick_wand.h>
++#include <MagickWand/MagickWand.h>
+ #ifdef PACKAGE_NAME
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xine-lib.git/commitdiff/dc2b215a7ec00d105665fdc9477a3b1d555e7f45