From 9bd0fa6ba63856698a88c95debb65f2a04ab93d9 Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Sun, 25 Jul 2010 19:37:42 +0000 Subject: Fix DVDNAV autoconf tests The DVDNAV autoconf test is broken due to a missing header. DVDNAV's dvdnav.h header due to the inclusion of dvdread/ifo_types.h requires stdint.h be included before dvdnav.h. --- m4/dvdnav.m4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/m4/dvdnav.m4 b/m4/dvdnav.m4 index a7f354b63..d82fc02db 100644 --- a/m4/dvdnav.m4 +++ b/m4/dvdnav.m4 @@ -84,6 +84,7 @@ dnl checks the results of dvdnav-config to some extent dnl rm -f conf.dvdnavtest AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include #include #include #include @@ -129,6 +130,7 @@ main () ]])],[],[no_dvdnav=yes],[no_dvdnav=cc]) if test "x$no_dvdnav" = xcc; then AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +#include #include #include ]], [[ return 0; ]])],[no_dvdnav=''],[no_dvdnav=yes]) @@ -141,7 +143,9 @@ main () AC_MSG_RESULT(yes) ifelse([$2], , :, [$2]) dnl nav_*.h seem to have been moved from dvdnav at some point? - AC_CHECK_HEADERS([dvdread/nav_types.h]) + AC_CHECK_HEADERS([dvdread/nav_types.h],,, +[#include +]) else AC_MSG_RESULT(no) if test "$DVDNAV_CONFIG" = "no" ; then @@ -157,6 +161,7 @@ main () CFLAGS="$CFLAGS $DVDNAV_CFLAGS" LIBS="$LIBS $DVDNAV_LIBS" AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +#include #include #include ]], [[ return 0; ]])], -- cgit v1.2.3 From d28c6200f668f7631a396af199dd6bc04b27900c Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 27 Jul 2010 17:56:05 +0100 Subject: Changelog updates (version bump). --HG-- extra : rebase_source : e6fae061a84a475065cd5e8869d02c4d9c5084c7 --- ChangeLog | 2 ++ debian/changelog | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2208189b..c741315ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +xine-lib (1.1.??) 2010-??-?? + 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 2a6e610f0..5d5bcc1aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -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 Tue, 23 Feb 2010 22:49:45 +0000 + -- Darren Salt Tue, 27 Jul 2010 17:55:16 +0100 xine-lib (1.1.5~cvs-0) unstable; urgency=low -- cgit v1.2.3 From 909a16537e3bc305ddb8a77bd7df163269ac1803 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 28 Jul 2010 21:51:30 +0100 Subject: Allow GraphicsMagick (compat layer) to be used instead of ImageMagick. Debian build deps are adjusted accordingly. --- configure.ac | 21 ++++++++++++++++----- debian/control | 2 +- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index dc53a73a5..52ea29b0b 100644 --- a/configure.ac +++ b/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 diff --git a/debian/control b/debian/control index 175db7225..7ce52370e 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,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, -- cgit v1.2.3 From 32f46161d50188f28b56b35518b5b2d8c6165c9c Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 28 Jul 2010 21:58:41 +0100 Subject: Re-add tests for __FreeBSD_kernel__ (should fix Debian GNU/kFreeBSD builds). --- src/input/input_vcd.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index 3e65f7203..7000778b7 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; @@ -394,7 +394,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, 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_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) { @@ -691,7 +691,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) { @@ -765,7 +765,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 ; -- cgit v1.2.3 From 3b96883dbcac9ff84c351786065a6773066a7514 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 28 Jul 2010 23:58:07 +0100 Subject: Changelog update. --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index c741315ce..171f5911c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ xine-lib (1.1.??) 2010-??-?? + * 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). -- cgit v1.2.3 From c41975a7b4ca8e473979bfa13229f6077b951697 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 29 Jul 2010 18:56:22 +0100 Subject: Another changelog update. --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 171f5911c..a5d19e930 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ 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). -- cgit v1.2.3