From 12c7e7c0bc554781b5785f803755caa6054dc572 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Wed, 14 Jan 2009 00:35:17 +0000 Subject: Fix building against ImageMagick 6.4.5 Date: Tue Nov 18 2008 00:57:00 +0000 Upstream ImageMagick changed part of the API and did not update their deprecated support stuff, so bump us along for now to avoid having to downgrade. --- src/libxinevdec/image.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index 51e5d0309..a4d09a63c 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.c @@ -50,6 +50,15 @@ #include "xineutils.h" #include "bswap.h" +/* In 6.4.5.4 MagickGetImagePixels changed to MagickGetAuthenticPixels + * But upstream did not update their deprecated compat stuff. + * So do a fun hack to make it work. + * - 2008/11/26 Robin H. Johnson + */ +#if MagickLibVersion >= 0x645 +#define MagickGetImagePixels MagickGetAuthenticPixels +#endif + typedef struct { video_decoder_class_t decoder_class; -- cgit v1.2.3 From c3f26e9ecfbaeddbecbb49f80e7995781597fbc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sat, 29 Nov 2008 00:38:29 +0000 Subject: Use a regular int instead of MagickBoolType and assume 0 for MagickFalse. --- src/libxinevdec/image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index a4d09a63c..7592e0bb5 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.c @@ -97,7 +97,7 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { if (buf->decoder_flags & BUF_FLAG_FRAME_END) { int width, height, i; - MagickBooleanType status; + int status; MagickWand *wand; uint8_t *img_buf, *img_buf_ptr; yuv_planes_t yuv_planes; @@ -110,7 +110,7 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { status = MagickReadImageBlob(wand, this->image, this->index); this->index = 0; - if (status == MagickFalse) { + if (!status) { DestroyMagickWand(wand); lprintf("error loading image\n"); return; -- cgit v1.2.3 From b76642ecafab4e4f17c3edb6142da1ffb7d92965 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 29 Nov 2008 00:44:40 +0000 Subject: Newer ImageMagick has GraphicsMagickWand.pc, not Wand.pc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Reported by Loïc Minier.) --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3d04b2a60..41bed9e70 100644 --- a/configure.ac +++ b/configure.ac @@ -1370,8 +1370,11 @@ AC_ARG_WITH([imagemagick], 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]) + fi if test "x$with_imagemagick" = "xyes" && test "x$have_imagemagick" = "xno"; then - AC_MSG_ERROR([ImageMagick support requested, but Wand not found]) + AC_MSG_ERROR([ImageMagick support requested, but neither Wand nor MagickWand were found]) elif test "x$have_imagemagick" = "xyes"; then AC_DEFINE([HAVE_WAND], [1], [Define this if you have ImageMagick installed]) fi -- cgit v1.2.3 From 04510412a0ae08abb10ccdad72577bca689edea4 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 14 Jan 2009 00:36:45 +0000 Subject: Update changelog (ImageMagick bits). --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index b795d4b34..f5ec9da94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ xine-lib (1.1.17) 2009-??-?? + * Build fixes related to ImageMagick 6.4 & later. * Enable libmpeg2new. This is not yet production code; the old mpeg2 decoder remains the default. -- cgit v1.2.3 From 9776c5dad4e77cb84f27961a50cc24993785e54a Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 14 Jan 2009 00:37:38 +0000 Subject: Avoid printing "plugin foo found" if the filename is null. (Bug 182) --- src/xine-engine/load_plugins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 4f7492c65..30bf58e6c 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -485,7 +485,7 @@ static void _register_plugins_internal(xine_t *this, plugin_file_t *file, plugin while ( info && info->type != PLUGIN_NONE ) { - if (file) + if (file && file->filename) xine_log (this, XINE_LOG_PLUGIN, _("load_plugins: plugin %s found\n"), file->filename); else -- cgit v1.2.3