Merge from 1.1.

5 files changed, 31 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index aff2c344c..823f119c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -70,6 +70,11 @@ xine-lib (1.1.90) (Unreleased)
   * Report more video output capabilities via (port)->get_capabilities():
     colour controls, zooming, colour keying.
 
+xine-lib (1.1.??) 2010-??-??
+  * Fix build-time check for dvdnav.
+  * Allow use of GraphicsMagick instead of ImageMagick.
+  * Fix build on Debian GNU/kFreeBSD (broken in 1.1.19).
+
 xine-lib (1.1.19) 2010-07-25
   * Handle odd widths properly (for ffmpeg-decoded video).
   * Make buildable with current (external) libdvdnav & libdvdread.
diff --git a/debian/changelog b/debian/changelog
index c08d6194b..2fb49aeb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,13 +3,13 @@ xine-lib-1.2 (1.2.0~hg-0) experimental; urgency=low
   * Hg snapshot.
   * Adjust for libxine2.
 
- -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Tue, 17 Apr 2007 16:50:37 +0100
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Thu, 29 Jul 2010 18:57:56 +0100
 
-xine-lib (1.1.19~hg-0) unstable; urgency=low
+xine-lib (1.1.19+hg-0) unstable; urgency=low
 
   * Hg snapshot (dev build). Changelog is irrelevant :-)
 
- -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Tue, 23 Feb 2010 22:49:45 +0000
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Tue, 27 Jul 2010 17:55:16 +0100
 
 xine-lib (1.1.5~cvs-0) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c9c57183c..7a7b0869c 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config,
 	libcam-dev [kfreebsd-i386 kfreebsd-amd64],
 	libaa1-dev, libcaca-dev, libmodplug-dev,
 	libjack-dev, libpulse-dev, libartsc0-dev,
-	libmagick9-dev | libmagick-dev |libmagickwand-dev,
+	graphicsmagick-libmagick-dev-compat | libmagick9-dev | libmagick-dev | libmagickwand-dev,
 	libpng12-dev, libfreetype6-dev,
 	libogg-dev, libvorbis-dev, libtheora-dev,
 	libesd0-dev, libgnomevfs2-dev,
diff --git a/m4/decoders.m4 b/m4/decoders.m4
index ac5b6a1c4..ea3bf98d2 100644
--- a/m4/decoders.m4
+++ b/m4/decoders.m4
@@ -116,12 +116,23 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
                 [AS_HELP_STRING([--with-imagemagick], [Enable ImageMagick image decoder support (default: enabled)])],
                 [test x"$withval" != x"no" && with_imagemagick="yes"])
     if test x"$with_imagemagick" != x"no"; 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" = x"yes" && test x"$have_imagemagick" = x"no"; then
-            AC_MSG_ERROR([ImageMagick support requested, but ImageMagick not found])
+            AC_MSG_ERROR([ImageMagick support requested, but neither Wand, MagickWand, nor GraphicsMagick were found])
         fi
     fi
     AM_CONDITIONAL([ENABLE_IMAGEMAGICK], [test x"$have_imagemagick" = x"yes"])
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index c1d2d0ece..4f9c75cd2 100644
--- a/src/input/input_vcd.c
+++ b/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_class_t *this, int fd) {
 
   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;
@@ -395,7 +395,7 @@ static off_t vcd_plugin_read (input_plugin_t *this_gen,
   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,
 			      void *buf_gen, off_t nlen) {
   vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen;
@@ -535,7 +535,7 @@ static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen,
   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) {
 
@@ -694,7 +694,7 @@ static off_t vcd_plugin_seek (input_plugin_t *this_gen,
 
   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) {
 
@@ -768,7 +768,7 @@ static off_t vcd_plugin_get_length (input_plugin_t *this_gen) {
 
   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 ;