Origin: upstream, other, *
Description: Applied patches. See Vcs-* headers in debian/control.

--- xine-lib-1.1.19.orig/configure
+++ xine-lib-1.1.19/configure
@@ -899,6 +899,12 @@ FT2_LIBS
 FT2_CFLAGS
 HAVE_WAND_FALSE
 HAVE_WAND_TRUE
+GRAPHICSMAGICKWAND_LIBS
+GRAPHICSMAGICKWAND_CFLAGS
+GRAPHICSMAGICK_LIBS
+GRAPHICSMAGICK_CFLAGS
+MAGICKWAND_LIBS
+MAGICKWAND_CFLAGS
 WAND_LIBS
 WAND_CFLAGS
 HAVE_LIBMNG_FALSE
@@ -1405,6 +1411,12 @@ LIBMAD_CFLAGS
 LIBMAD_LIBS
 WAND_CFLAGS
 WAND_LIBS
+MAGICKWAND_CFLAGS
+MAGICKWAND_LIBS
+GRAPHICSMAGICK_CFLAGS
+GRAPHICSMAGICK_LIBS
+GRAPHICSMAGICKWAND_CFLAGS
+GRAPHICSMAGICKWAND_LIBS
 FT2_CFLAGS
 FT2_LIBS
 FONTCONFIG_CFLAGS
@@ -2173,7 +2185,8 @@ Optional Packages:
   --with-external-libmad  use external libmad library (not recommended)
   --with-external-libmpcdec
                           Use external libmpc library
-  --without-imagemagick   Build without ImageMagick image decoder
+  --without-imagemagick   Build without ImageMagick image decoder (or
+                          GraphicsMagick's compat layer)
   --with-freetype         Build with FreeType2 library
   --with-fontconfig       Build with fontconfig library
   --without-alsa          Build without ALSA audio output
@@ -2274,6 +2287,18 @@ Some influential environment variables:
   LIBMAD_LIBS linker flags for LIBMAD, overriding pkg-config
   WAND_CFLAGS C compiler flags for WAND, overriding pkg-config
   WAND_LIBS   linker flags for WAND, overriding pkg-config
+  MAGICKWAND_CFLAGS
+              C compiler flags for MAGICKWAND, overriding pkg-config
+  MAGICKWAND_LIBS
+              linker flags for MAGICKWAND, overriding pkg-config
+  GRAPHICSMAGICK_CFLAGS
+              C compiler flags for GRAPHICSMAGICK, overriding pkg-config
+  GRAPHICSMAGICK_LIBS
+              linker flags for GRAPHICSMAGICK, overriding pkg-config
+  GRAPHICSMAGICKWAND_CFLAGS
+              C compiler flags for GRAPHICSMAGICKWAND, overriding pkg-config
+  GRAPHICSMAGICKWAND_LIBS
+              linker flags for GRAPHICSMAGICKWAND, overriding pkg-config
   FT2_CFLAGS  C compiler flags for FT2, overriding pkg-config
   FT2_LIBS    linker flags for FT2, overriding pkg-config
   FONTCONFIG_CFLAGS
@@ -7397,13 +7422,13 @@ if test "${lt_cv_nm_interface+set}" = se
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:7400: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:7425: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7403: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:7428: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7406: output\"" >&5)
+  (eval echo "\"\$as_me:7431: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -8594,7 +8619,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8597 "configure"' > conftest.$ac_ext
+  echo '#line 8622 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9822,11 +9847,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9825: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9850: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9829: \$? = $ac_status" >&5
+   echo "$as_me:9854: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10161,11 +10186,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10164: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10189: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10168: \$? = $ac_status" >&5
+   echo "$as_me:10193: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10266,11 +10291,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10269: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10294: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10273: \$? = $ac_status" >&5
+   echo "$as_me:10298: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10321,11 +10346,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10324: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10349: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10328: \$? = $ac_status" >&5
+   echo "$as_me:10353: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12705,7 +12730,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12708 "configure"
+#line 12733 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12801,7 +12826,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12804 "configure"
+#line 12829 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -23860,9 +23885,11 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$WAND_PKG_ERRORS" >&5
 
-	have_imagemagick=no
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; have_imagemagick=no
 elif test $pkg_failed = untried; then
-	have_imagemagick=no
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; have_imagemagick=no
 else
 	WAND_CFLAGS=$pkg_cv_WAND_CFLAGS
 	WAND_LIBS=$pkg_cv_WAND_LIBS
@@ -23870,15 +23897,15 @@ else
 $as_echo "yes" >&6; }
 	have_imagemagick=yes
 fi
-   if test "x$with_imagemagick" = 'xno'; then
+   if test "x$have_imagemagick" = 'xno'; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAND" >&5
-$as_echo_n "checking for WAND... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAGICKWAND" >&5
+$as_echo_n "checking for MAGICKWAND... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
-    if test -n "$WAND_CFLAGS"; then
-        pkg_cv_WAND_CFLAGS="$WAND_CFLAGS"
+    if test -n "$MAGICKWAND_CFLAGS"; then
+        pkg_cv_MAGICKWAND_CFLAGS="$MAGICKWAND_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"MagickWand\""; } >&5
@@ -23886,7 +23913,7 @@ if test -n "$PKG_CONFIG"; then
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WAND_CFLAGS=`$PKG_CONFIG --cflags "MagickWand" 2>/dev/null`
+  pkg_cv_MAGICKWAND_CFLAGS=`$PKG_CONFIG --cflags "MagickWand" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -23895,8 +23922,8 @@ else
 	pkg_failed=untried
 fi
 if test -n "$PKG_CONFIG"; then
-    if test -n "$WAND_LIBS"; then
-        pkg_cv_WAND_LIBS="$WAND_LIBS"
+    if test -n "$MAGICKWAND_LIBS"; then
+        pkg_cv_MAGICKWAND_LIBS="$MAGICKWAND_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"MagickWand\""; } >&5
@@ -23904,7 +23931,7 @@ if test -n "$PKG_CONFIG"; then
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WAND_LIBS=`$PKG_CONFIG --libs "MagickWand" 2>/dev/null`
+  pkg_cv_MAGICKWAND_LIBS=`$PKG_CONFIG --libs "MagickWand" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -23923,26 +23950,176 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        WAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "MagickWand"`
+	        MAGICKWAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "MagickWand"`
         else
-	        WAND_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "MagickWand"`
+	        MAGICKWAND_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "MagickWand"`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$WAND_PKG_ERRORS" >&5
+	echo "$MAGICKWAND_PKG_ERRORS" >&5
 
-	have_imagemagick=no
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; have_imagemagick=no
 elif test $pkg_failed = untried; then
-	have_imagemagick=no
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; have_imagemagick=no
 else
-	WAND_CFLAGS=$pkg_cv_WAND_CFLAGS
-	WAND_LIBS=$pkg_cv_WAND_LIBS
+	MAGICKWAND_CFLAGS=$pkg_cv_MAGICKWAND_CFLAGS
+	MAGICKWAND_LIBS=$pkg_cv_MAGICKWAND_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_imagemagick=yes
+fi
+            WAND_CFLAGS="$MAGICKWAND_CFLAGS"
+      WAND_LIBS="$MAGICKWAND_LIBS"
+   fi
+   if test "x$have_imagemagick" = 'xno'; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GRAPHICSMAGICK" >&5
+$as_echo_n "checking for GRAPHICSMAGICK... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GRAPHICSMAGICK_CFLAGS"; then
+        pkg_cv_GRAPHICSMAGICK_CFLAGS="$GRAPHICSMAGICK_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ImageMagick\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ImageMagick") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GRAPHICSMAGICK_CFLAGS=`$PKG_CONFIG --cflags "ImageMagick" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GRAPHICSMAGICK_LIBS"; then
+        pkg_cv_GRAPHICSMAGICK_LIBS="$GRAPHICSMAGICK_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ImageMagick\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ImageMagick") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GRAPHICSMAGICK_LIBS=`$PKG_CONFIG --libs "ImageMagick" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GRAPHICSMAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ImageMagick"`
+        else
+	        GRAPHICSMAGICK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ImageMagick"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GRAPHICSMAGICK_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; have_imagemagick=no
+elif test $pkg_failed = untried; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; have_imagemagick=no
+else
+	GRAPHICSMAGICK_CFLAGS=$pkg_cv_GRAPHICSMAGICK_CFLAGS
+	GRAPHICSMAGICK_LIBS=$pkg_cv_GRAPHICSMAGICK_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_imagemagick=yes
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GRAPHICSMAGICKWAND" >&5
+$as_echo_n "checking for GRAPHICSMAGICKWAND... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GRAPHICSMAGICKWAND_CFLAGS"; then
+        pkg_cv_GRAPHICSMAGICKWAND_CFLAGS="$GRAPHICSMAGICKWAND_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"GraphicsMagickWand\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "GraphicsMagickWand") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GRAPHICSMAGICKWAND_CFLAGS=`$PKG_CONFIG --cflags "GraphicsMagickWand" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GRAPHICSMAGICKWAND_LIBS"; then
+        pkg_cv_GRAPHICSMAGICKWAND_LIBS="$GRAPHICSMAGICKWAND_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"GraphicsMagickWand\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "GraphicsMagickWand") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GRAPHICSMAGICKWAND_LIBS=`$PKG_CONFIG --libs "GraphicsMagickWand" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GRAPHICSMAGICKWAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "GraphicsMagickWand"`
+        else
+	        GRAPHICSMAGICKWAND_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "GraphicsMagickWand"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GRAPHICSMAGICKWAND_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; have_imagemagick=no
+elif test $pkg_failed = untried; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; have_imagemagick=no
+else
+	GRAPHICSMAGICKWAND_CFLAGS=$pkg_cv_GRAPHICSMAGICKWAND_CFLAGS
+	GRAPHICSMAGICKWAND_LIBS=$pkg_cv_GRAPHICSMAGICKWAND_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	have_imagemagick=yes
 fi
+                  WAND_CFLAGS="$GRAPHICSMAGICKWAND_CFLAGS"
+      WAND_LIBS="$GRAPHICSMAGICKWAND_LIBS"
    fi
    if test "x$with_imagemagick" = "xyes" && test "x$have_imagemagick" = "xno"; then
-      as_fn_error "ImageMagick support requested, but neither Wand nor MagickWand were found" "$LINENO" 5
+      as_fn_error "ImageMagick support requested, but neither Wand, MagickWand, nor GraphicsMagick were found" "$LINENO" 5
    elif test "x$have_imagemagick" = "xyes"; then
 
 $as_echo "#define HAVE_WAND 1" >>confdefs.h
--- xine-lib-1.1.19.orig/configure.ac
+++ xine-lib-1.1.19/configure.ac
@@ -1416,15 +1416,26 @@ dnl MagickWand API of Imagemagick.
 dnl ---------------------------------------------
 
 AC_ARG_WITH([imagemagick],
-	AS_HELP_STRING([--without-imagemagick], [Build without ImageMagick image decoder]))
+	AS_HELP_STRING([--without-imagemagick], [Build without ImageMagick image decoder (or GraphicsMagick's compat layer)]))
 
 if test "x$with_imagemagick" != "xno"; then
-   PKG_CHECK_MODULES([WAND], [Wand], [have_imagemagick=yes], [have_imagemagick=no])
-   if test "x$with_imagemagick" = 'xno'; then
-      PKG_CHECK_MODULES([WAND], [MagickWand], [have_imagemagick=yes], [have_imagemagick=no])
+   PKG_CHECK_MODULES([WAND], [Wand], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
+   if test "x$have_imagemagick" = 'xno'; then
+      PKG_CHECK_MODULES([MAGICKWAND], [MagickWand], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
+      dnl Avoid $(WAND_FLAGS) $(MAGICKWAND_FLAGS) ...
+      WAND_CFLAGS="$MAGICKWAND_CFLAGS"
+      WAND_LIBS="$MAGICKWAND_LIBS"
+   fi
+   if test "x$have_imagemagick" = 'xno'; then
+      PKG_CHECK_MODULES([GRAPHICSMAGICK], [ImageMagick], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
+      PKG_CHECK_MODULES([GRAPHICSMAGICKWAND], [GraphicsMagickWand], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
+      dnl The following assignments are safe, since they include
+      dnl the flags for plain GraphicsMagick
+      WAND_CFLAGS="$GRAPHICSMAGICKWAND_CFLAGS"
+      WAND_LIBS="$GRAPHICSMAGICKWAND_LIBS"
    fi
    if test "x$with_imagemagick" = "xyes" && test "x$have_imagemagick" = "xno"; then
-      AC_MSG_ERROR([ImageMagick support requested, but neither Wand nor MagickWand were found])
+      AC_MSG_ERROR([ImageMagick support requested, but neither Wand, MagickWand, nor GraphicsMagick were found])
    elif test "x$have_imagemagick" = "xyes"; then
       AC_DEFINE([HAVE_WAND], [1], [Define this if you have ImageMagick installed])
    fi
--- xine-lib-1.1.19.orig/Makefile.in
+++ xine-lib-1.1.19/Makefile.in
@@ -223,6 +223,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -287,6 +291,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/m4/Makefile.in
+++ xine-lib-1.1.19/m4/Makefile.in
@@ -167,6 +167,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -231,6 +235,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/doc/Makefile.in
+++ xine-lib-1.1.19/doc/Makefile.in
@@ -207,6 +207,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -271,6 +275,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/doc/faq/Makefile.in
+++ xine-lib-1.1.19/doc/faq/Makefile.in
@@ -167,6 +167,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -231,6 +235,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/doc/hackersguide/Makefile.in
+++ xine-lib-1.1.19/doc/hackersguide/Makefile.in
@@ -167,6 +167,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -231,6 +235,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/doc/man/Makefile.in
+++ xine-lib-1.1.19/doc/man/Makefile.in
@@ -183,6 +183,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -247,6 +251,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/doc/man/en/Makefile.in
+++ xine-lib-1.1.19/doc/man/en/Makefile.in
@@ -169,6 +169,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -233,6 +237,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/lib/Makefile.in
+++ xine-lib-1.1.19/lib/Makefile.in
@@ -190,6 +190,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -254,6 +258,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/include/Makefile.in
+++ xine-lib-1.1.19/include/Makefile.in
@@ -170,6 +170,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -234,6 +238,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/win32/Makefile.in
+++ xine-lib-1.1.19/win32/Makefile.in
@@ -183,6 +183,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -247,6 +251,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/win32/include/Makefile.in
+++ xine-lib-1.1.19/win32/include/Makefile.in
@@ -143,6 +143,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -207,6 +211,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/Makefile.in
+++ xine-lib-1.1.19/src/Makefile.in
@@ -183,6 +183,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -247,6 +251,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libffmpeg/Makefile.in
+++ xine-lib-1.1.19/src/libffmpeg/Makefile.in
@@ -183,6 +183,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -247,6 +251,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libffmpeg/libavcodec/Makefile.in
+++ xine-lib-1.1.19/src/libffmpeg/libavcodec/Makefile.in
@@ -224,6 +224,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -288,6 +292,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libffmpeg/libavcodec/alpha/Makefile.in
+++ xine-lib-1.1.19/src/libffmpeg/libavcodec/alpha/Makefile.in
@@ -143,6 +143,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -207,6 +211,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libffmpeg/libavcodec/sparc/Makefile.in
+++ xine-lib-1.1.19/src/libffmpeg/libavcodec/sparc/Makefile.in
@@ -168,6 +168,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -232,6 +236,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libffmpeg/libavcodec/i386/Makefile.in
+++ xine-lib-1.1.19/src/libffmpeg/libavcodec/i386/Makefile.in
@@ -178,6 +178,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -242,6 +246,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libffmpeg/libavcodec/ppc/Makefile.in
+++ xine-lib-1.1.19/src/libffmpeg/libavcodec/ppc/Makefile.in
@@ -168,6 +168,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -232,6 +236,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libffmpeg/libavcodec/armv4l/Makefile.in
+++ xine-lib-1.1.19/src/libffmpeg/libavcodec/armv4l/Makefile.in
@@ -167,6 +167,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -231,6 +235,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libffmpeg/libavcodec/libpostproc/Makefile.in
+++ xine-lib-1.1.19/src/libffmpeg/libavcodec/libpostproc/Makefile.in
@@ -165,6 +165,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -229,6 +233,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libffmpeg/libavcodec/mlib/Makefile.in
+++ xine-lib-1.1.19/src/libffmpeg/libavcodec/mlib/Makefile.in
@@ -168,6 +168,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -232,6 +236,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libffmpeg/libavutil/Makefile.in
+++ xine-lib-1.1.19/src/libffmpeg/libavutil/Makefile.in
@@ -169,6 +169,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -233,6 +237,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libdts/Makefile.in
+++ xine-lib-1.1.19/src/libdts/Makefile.in
@@ -204,6 +204,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -268,6 +272,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libspucc/Makefile.in
+++ xine-lib-1.1.19/src/libspucc/Makefile.in
@@ -196,6 +196,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -260,6 +264,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libspuhdmv/Makefile.in
+++ xine-lib-1.1.19/src/libspuhdmv/Makefile.in
@@ -193,6 +193,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -257,6 +261,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libmad/Makefile.in
+++ xine-lib-1.1.19/src/libmad/Makefile.in
@@ -210,6 +210,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -274,6 +278,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/demuxers/Makefile.in
+++ xine-lib-1.1.19/src/demuxers/Makefile.in
@@ -371,6 +371,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -435,6 +439,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/combined/Makefile.in
+++ xine-lib-1.1.19/src/combined/Makefile.in
@@ -241,6 +241,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -305,6 +309,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/combined/ffmpeg/Makefile.in
+++ xine-lib-1.1.19/src/combined/ffmpeg/Makefile.in
@@ -221,6 +221,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -285,6 +289,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/xine-utils/Makefile.in
+++ xine-lib-1.1.19/src/xine-utils/Makefile.in
@@ -201,6 +201,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -265,6 +269,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/xine-engine/Makefile.in
+++ xine-lib-1.1.19/src/xine-engine/Makefile.in
@@ -197,6 +197,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -261,6 +265,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/liba52/Makefile.in
+++ xine-lib-1.1.19/src/liba52/Makefile.in
@@ -205,6 +205,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -269,6 +273,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libsputext/Makefile.in
+++ xine-lib-1.1.19/src/libsputext/Makefile.in
@@ -205,6 +205,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -269,6 +273,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libspucmml/Makefile.in
+++ xine-lib-1.1.19/src/libspucmml/Makefile.in
@@ -193,6 +193,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -257,6 +261,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libxinevdec/Makefile.in
+++ xine-lib-1.1.19/src/libxinevdec/Makefile.in
@@ -240,6 +240,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -304,6 +308,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libw32dll/Makefile.in
+++ xine-lib-1.1.19/src/libw32dll/Makefile.in
@@ -249,6 +249,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -313,6 +317,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libw32dll/qtx/Makefile.in
+++ xine-lib-1.1.19/src/libw32dll/qtx/Makefile.in
@@ -183,6 +183,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -247,6 +251,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libw32dll/qtx/qtxsdk/Makefile.in
+++ xine-lib-1.1.19/src/libw32dll/qtx/qtxsdk/Makefile.in
@@ -147,6 +147,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -211,6 +215,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libw32dll/DirectShow/Makefile.in
+++ xine-lib-1.1.19/src/libw32dll/DirectShow/Makefile.in
@@ -168,6 +168,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -232,6 +236,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libw32dll/wine/Makefile.in
+++ xine-lib-1.1.19/src/libw32dll/wine/Makefile.in
@@ -180,6 +180,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -244,6 +248,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libw32dll/dmo/Makefile.in
+++ xine-lib-1.1.19/src/libw32dll/dmo/Makefile.in
@@ -167,6 +167,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -231,6 +235,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/video_out/xxmc.h
+++ xine-lib-1.1.19/src/video_out/xxmc.h
@@ -79,6 +79,7 @@
 #include <X11/extensions/Xvlib.h>
 #ifdef HAVE_VLDXVMC
   #include <X11/extensions/vldXvMC.h>
+  #include <X11/extensions/XvMClib.h>
 #else
   #include <X11/extensions/XvMClib.h>
   #include <X11/extensions/XvMC.h>
--- xine-lib-1.1.19.orig/src/video_out/Makefile.in
+++ xine-lib-1.1.19/src/video_out/Makefile.in
@@ -587,6 +587,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -651,6 +655,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/video_out/macosx/Makefile.in
+++ xine-lib-1.1.19/src/video_out/macosx/Makefile.in
@@ -197,6 +197,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -261,6 +265,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/video_out/libdha/Makefile.in
+++ xine-lib-1.1.19/src/video_out/libdha/Makefile.in
@@ -212,6 +212,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -276,6 +280,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/video_out/libdha/oth/Makefile.in
+++ xine-lib-1.1.19/src/video_out/libdha/oth/Makefile.in
@@ -143,6 +143,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -207,6 +211,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/video_out/libdha/bin/Makefile.in
+++ xine-lib-1.1.19/src/video_out/libdha/bin/Makefile.in
@@ -143,6 +143,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -207,6 +211,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/video_out/libdha/kernelhelper/Makefile.in
+++ xine-lib-1.1.19/src/video_out/libdha/kernelhelper/Makefile.in
@@ -164,6 +164,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -228,6 +232,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/video_out/libdha/sysdep/Makefile.in
+++ xine-lib-1.1.19/src/video_out/libdha/sysdep/Makefile.in
@@ -147,6 +147,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -211,6 +215,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/video_out/vidix/Makefile.in
+++ xine-lib-1.1.19/src/video_out/vidix/Makefile.in
@@ -206,6 +206,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -270,6 +274,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/video_out/vidix/drivers/Makefile.in
+++ xine-lib-1.1.19/src/video_out/vidix/drivers/Makefile.in
@@ -278,6 +278,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -342,6 +346,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libmpeg2new/Makefile.in
+++ xine-lib-1.1.19/src/libmpeg2new/Makefile.in
@@ -232,6 +232,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -296,6 +300,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libmpeg2new/include/Makefile.in
+++ xine-lib-1.1.19/src/libmpeg2new/include/Makefile.in
@@ -143,6 +143,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -207,6 +211,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libmpeg2new/libmpeg2/Makefile.in
+++ xine-lib-1.1.19/src/libmpeg2new/libmpeg2/Makefile.in
@@ -171,6 +171,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -235,6 +239,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/dxr3/Makefile.in
+++ xine-lib-1.1.19/src/dxr3/Makefile.in
@@ -238,6 +238,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -302,6 +306,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/audio_out/Makefile.in
+++ xine-lib-1.1.19/src/audio_out/Makefile.in
@@ -368,6 +368,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -432,6 +436,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libmpeg2/Makefile.in
+++ xine-lib-1.1.19/src/libmpeg2/Makefile.in
@@ -212,6 +212,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -276,6 +280,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libspudvb/Makefile.in
+++ xine-lib-1.1.19/src/libspudvb/Makefile.in
@@ -193,6 +193,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -257,6 +261,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/input/Makefile.in
+++ xine-lib-1.1.19/src/input/Makefile.in
@@ -412,6 +412,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -476,6 +480,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/input/input_vcd.c
+++ xine-lib-1.1.19/src/input/input_vcd.c
@@ -93,7 +93,7 @@ typedef struct {
 #if defined (__linux__) || defined(__sun)
   struct cdrom_tochdr    tochdr;
   struct cdrom_tocentry  tocent[100];
-#elif (defined(BSD) && BSD >= 199306)
+#elif defined (__FreeBSD_kernel__) || (defined(BSD) && BSD >= 199306)
   struct ioc_toc_header  tochdr;
   struct cd_toc_entry    *tocent;
   off_t                  cur_sec;
@@ -118,7 +118,7 @@ typedef struct {
 
   int                    cur_track;
 
-#if defined (__linux__) || defined(__sun) || (defined(BSD) && BSD >= 199306)
+#if defined (__linux__) || defined(__sun) || defined (__FreeBSD_kernel__) || (defined(BSD) && BSD >= 199306)
   uint8_t                cur_min, cur_sec, cur_frame;
 #endif
 
@@ -178,7 +178,7 @@ static int input_vcd_read_toc (vcd_input
 
   return 0;
 }
-#elif (defined(BSD) && BSD >= 199306)
+#elif defined (__FreeBSD_kernel__) || (defined(BSD) && BSD >= 199306)
 static int input_vcd_read_toc (vcd_input_class_t *this, int fd) {
 
   struct ioc_read_toc_entry te;
@@ -394,7 +394,7 @@ static off_t vcd_plugin_read (input_plug
   memcpy (buf, data.data, VCDSECTORSIZE); /* FIXME */
   return VCDSECTORSIZE;
 }
-#elif (defined(BSD) && BSD >= 199306)
+#elif defined (__FreeBSD_kernel__) || (defined(BSD) && BSD >= 199306)
 static off_t vcd_plugin_read (input_plugin_t *this_gen,
 				char *buf, off_t nlen) {
   vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen;
@@ -532,7 +532,7 @@ static buf_element_t *vcd_plugin_read_bl
   memcpy (buf->mem, data.data, VCDSECTORSIZE); /* FIXME */
   return buf;
 }
-#elif (defined(BSD) && BSD >= 199306)
+#elif defined (__FreeBSD_kernel__) || (defined(BSD) && BSD >= 199306)
 static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen,
 					     fifo_buffer_t *fifo, off_t nlen) {
 
@@ -691,7 +691,7 @@ static off_t vcd_plugin_seek (input_plug
 
   return offset ; /* FIXME */
 }
-#elif (defined(BSD) && BSD >= 199306)
+#elif defined (__FreeBSD_kernel__) || (defined(BSD) && BSD >= 199306)
 static off_t vcd_plugin_seek (input_plugin_t *this_gen,
 				off_t offset, int origin) {
 
@@ -765,7 +765,7 @@ static off_t vcd_plugin_get_length (inpu
 
   return (off_t) 0;
 }
-#elif (defined(BSD) && BSD >= 199306)
+#elif defined (__FreeBSD_kernel__) || (defined(BSD) && BSD >= 199306)
 static off_t vcd_plugin_get_length (input_plugin_t *this_gen) {
   vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen;
   off_t len ;
--- xine-lib-1.1.19.orig/src/input/libdvdnav/Makefile.in
+++ xine-lib-1.1.19/src/input/libdvdnav/Makefile.in
@@ -177,6 +177,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -241,6 +245,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/input/dvb/Makefile.in
+++ xine-lib-1.1.19/src/input/dvb/Makefile.in
@@ -147,6 +147,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -211,6 +215,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/input/librtsp/Makefile.in
+++ xine-lib-1.1.19/src/input/librtsp/Makefile.in
@@ -168,6 +168,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -232,6 +236,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/input/vcd/Makefile.in
+++ xine-lib-1.1.19/src/input/vcd/Makefile.in
@@ -242,6 +242,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -306,6 +310,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/input/vcd/libvcd/Makefile.in
+++ xine-lib-1.1.19/src/input/vcd/libvcd/Makefile.in
@@ -231,6 +231,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -295,6 +299,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/input/vcd/libvcd/libvcd/Makefile.in
+++ xine-lib-1.1.19/src/input/vcd/libvcd/libvcd/Makefile.in
@@ -147,6 +147,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -211,6 +215,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/input/vcd/libcdio/Makefile.in
+++ xine-lib-1.1.19/src/input/vcd/libcdio/Makefile.in
@@ -236,6 +236,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -300,6 +304,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/input/vcd/libcdio/MSWindows/Makefile.in
+++ xine-lib-1.1.19/src/input/vcd/libcdio/MSWindows/Makefile.in
@@ -143,6 +143,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -207,6 +211,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/input/vcd/libcdio/image/Makefile.in
+++ xine-lib-1.1.19/src/input/vcd/libcdio/image/Makefile.in
@@ -143,6 +143,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -207,6 +211,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/input/vcd/libcdio/cdio/Makefile.in
+++ xine-lib-1.1.19/src/input/vcd/libcdio/cdio/Makefile.in
@@ -147,6 +147,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -211,6 +215,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/input/libreal/Makefile.in
+++ xine-lib-1.1.19/src/input/libreal/Makefile.in
@@ -169,6 +169,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -233,6 +237,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/post/Makefile.in
+++ xine-lib-1.1.19/src/post/Makefile.in
@@ -183,6 +183,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -247,6 +251,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/post/visualizations/Makefile.in
+++ xine-lib-1.1.19/src/post/visualizations/Makefile.in
@@ -199,6 +199,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -263,6 +267,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/post/goom/Makefile.in
+++ xine-lib-1.1.19/src/post/goom/Makefile.in
@@ -225,6 +225,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -289,6 +293,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/post/planar/Makefile.in
+++ xine-lib-1.1.19/src/post/planar/Makefile.in
@@ -201,6 +201,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -265,6 +269,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/post/audio/Makefile.in
+++ xine-lib-1.1.19/src/post/audio/Makefile.in
@@ -201,6 +201,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -265,6 +269,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/post/mosaico/Makefile.in
+++ xine-lib-1.1.19/src/post/mosaico/Makefile.in
@@ -205,6 +205,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -269,6 +273,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/post/deinterlace/Makefile.in
+++ xine-lib-1.1.19/src/post/deinterlace/Makefile.in
@@ -238,6 +238,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -302,6 +306,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/post/deinterlace/plugins/Makefile.in
+++ xine-lib-1.1.19/src/post/deinterlace/plugins/Makefile.in
@@ -180,6 +180,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -244,6 +248,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libspudec/Makefile.in
+++ xine-lib-1.1.19/src/libspudec/Makefile.in
@@ -204,6 +204,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -268,6 +272,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libreal/Makefile.in
+++ xine-lib-1.1.19/src/libreal/Makefile.in
@@ -199,6 +199,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -263,6 +267,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libfaad/Makefile.in
+++ xine-lib-1.1.19/src/libfaad/Makefile.in
@@ -283,6 +283,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -347,6 +351,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libfaad/codebook/Makefile.in
+++ xine-lib-1.1.19/src/libfaad/codebook/Makefile.in
@@ -143,6 +143,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -207,6 +211,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libmusepack/Makefile.in
+++ xine-lib-1.1.19/src/libmusepack/Makefile.in
@@ -245,6 +245,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -309,6 +313,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libmusepack/musepack/Makefile.in
+++ xine-lib-1.1.19/src/libmusepack/musepack/Makefile.in
@@ -147,6 +147,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -211,6 +215,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libxineadec/Makefile.in
+++ xine-lib-1.1.19/src/libxineadec/Makefile.in
@@ -282,6 +282,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -346,6 +350,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libxineadec/nosefart/Makefile.in
+++ xine-lib-1.1.19/src/libxineadec/nosefart/Makefile.in
@@ -173,6 +173,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -237,6 +241,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/src/libxineadec/gsm610/Makefile.in
+++ xine-lib-1.1.19/src/libxineadec/gsm610/Makefile.in
@@ -172,6 +172,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -236,6 +240,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/misc/Makefile.in
+++ xine-lib-1.1.19/misc/Makefile.in
@@ -234,6 +234,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -298,6 +302,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- xine-lib-1.1.19.orig/misc/fonts/Makefile.in
+++ xine-lib-1.1.19/misc/fonts/Makefile.in
@@ -167,6 +167,10 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
 GOOM_LIBS = @GOOM_LIBS@
+GRAPHICSMAGICKWAND_CFLAGS = @GRAPHICSMAGICKWAND_CFLAGS@
+GRAPHICSMAGICKWAND_LIBS = @GRAPHICSMAGICKWAND_LIBS@
+GRAPHICSMAGICK_CFLAGS = @GRAPHICSMAGICK_CFLAGS@
+GRAPHICSMAGICK_LIBS = @GRAPHICSMAGICK_LIBS@
 GREP = @GREP@
 HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
 HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
@@ -231,6 +235,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAGICKWAND_CFLAGS = @MAGICKWAND_CFLAGS@
+MAGICKWAND_LIBS = @MAGICKWAND_LIBS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
