From 2c982f24e15db950e2df67c3163ced80a457e7e2 Mon Sep 17 00:00:00 2001
From: Martin Pulec <pulec@cesnet.cz>
Date: Tue, 6 Dec 2016 18:11:25 +0100
Subject: [PATCH] text: MagickWand 7 compat

---
 configure.ac                | 2 ++
 src/vo_postprocess/text.cpp | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/configure.ac b/configure.ac
index a3310375f..9c94fa521 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2341,8 +2341,10 @@ then
         COMMON_FLAGS="$COMMON_FLAGS $TEXT_CFLAGS"
         TEXT_LIB="$TEXT_LIBS"
         TEXT_OBJ="$TEXT_OBJ src/vo_postprocess/text.o"
+        CFLAGS="$CFLAGS $MAGICKWAND_CFLAGS"
         ADD_MODULE("vo_pp_text", "$TEXT_OBJ", "$TEXT_LIB")
         AC_DEFINE([HAVE_TEXT], [1], [Build text postprocessor])
+        PKG_CHECK_MODULES([WAND7], [MagickWand > 7], AC_DEFINE([WAND7], [1], [MagickWand is v7 or later]))
 fi
 
 if test $text_req = yes -a $text = no; then
diff --git a/src/vo_postprocess/text.cpp b/src/vo_postprocess/text.cpp
index 61ef45fd6..b3e6a59c7 100644
--- a/src/vo_postprocess/text.cpp
+++ b/src/vo_postprocess/text.cpp
@@ -47,7 +47,12 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <memory>
+
+#ifdef WAND7
+#include <MagickWand/MagickWand.h>
+#else
 #include <wand/magick_wand.h>
+#endif
 
 #include "capture_filter.h"
 #include "debug.h"