- fix building with ImageMagick 7

- rel 6

diff --git a/imagemagick7.patch b/imagemagick7.patch
new file mode 100644 (file)
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

diff --git a/xine-lib.spec b/xine-lib.spec
index e81f707c6559a8b0d53f49cd2654219a1940326c..513bfe38f2d7085b7d7c157d52ed8ac58f0ab596 100644 (file)
--- 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}