Fixes for ImageMagick v7.

11 files changed, 284 insertions, 7 deletions

diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 83c63364168..e78fea43f4f 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2016/03/05 11:29:02 jperkin Exp $
+# $NetBSD: Makefile,v 1.101 2016/05/16 19:41:17 adam Exp $
 
 DISTNAME=	transcode-1.1.7
-PKGREVISION=	19
+PKGREVISION=	20
 CATEGORIES=	multimedia
 MASTER_SITES=	http://bitbucket.org/france/transcode-tcforge/downloads/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/transcode/PLIST b/multimedia/transcode/PLIST
index 3b1776e12fd..6dabe37b8cb 100644
--- a/multimedia/transcode/PLIST
+++ b/multimedia/transcode/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2015/11/21 17:14:26 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2016/05/16 19:41:17 adam Exp $
 bin/avifix
 bin/aviindex
 bin/avimerge
@@ -25,6 +25,7 @@ lib/transcode/export_ffmpeg.la
 ${PLIST.imagemagick}lib/transcode/export_im.la
 lib/transcode/export_jpg.la
 lib/transcode/export_lame.la
+${PLIST.lzo}lib/transcode/export_lzo.la
 lib/transcode/export_mp2.la
 ${PLIST.mjpegtools}lib/transcode/export_mp2enc.la
 ${PLIST.mjpegtools}lib/transcode/export_mpeg2enc.la
@@ -40,7 +41,6 @@ lib/transcode/export_wav.la
 lib/transcode/export_xvid.so
 lib/transcode/export_xvid4.la
 ${PLIST.mjpegtools}lib/transcode/export_yuv4mpeg.la
-${PLIST.lzo}lib/transcode/export_lzo.la
 lib/transcode/filter_29to23.la
 lib/transcode/filter_32detect.la
 lib/transcode/filter_32drop.la
diff --git a/multimedia/transcode/distinfo b/multimedia/transcode/distinfo
index d1f84b12bc2..417abf3f66d 100644
--- a/multimedia/transcode/distinfo
+++ b/multimedia/transcode/distinfo
@@ -1,20 +1,27 @@
-$NetBSD: distinfo,v 1.25 2015/11/21 17:14:26 adam Exp $
+$NetBSD: distinfo,v 1.26 2016/05/16 19:41:17 adam Exp $
 
 SHA1 (transcode-1.1.7.tar.bz2) = e35df68b960eb56ef0a59a4cdbed1491be56aee6
 RMD160 (transcode-1.1.7.tar.bz2) = faa854acbbfd52faaa216505176f94d756d77841
 SHA512 (transcode-1.1.7.tar.bz2) = d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f
 Size (transcode-1.1.7.tar.bz2) = 2183627 bytes
 SHA1 (patch-avilib_avidump.c) = 640aac6fc274a685b1847b48870b37b2c2ab1e88
-SHA1 (patch-configure) = 43010b1f4679be42fd3d7e6ac0948a0e08988b44
+SHA1 (patch-configure) = 38418cd91750f55828124b5895d42d3af5c2d56a
 SHA1 (patch-encode_encode_lavc.c) = c33f40dab212b601e5d808d972d132db4eee2d2e
 SHA1 (patch-export_aud__aux.c) = 84b774d13e363721db692b1edc53589e165b094e
+SHA1 (patch-export_export__im.c) = 3a4f08d548cdebdfa618aeff2df398bd61002120
 SHA1 (patch-export_export_ffmpeg.c) = 4367d16ba83ccc5c868f0dc470dcd0b64770b185
 SHA1 (patch-export_ffmpeg_cfg.c) = 216f7970f3885a3f7fc8c229e4d1950cd6430cff
 SHA1 (patch-export_ffmpeg_cfg.h) = 7cf230de948de004cc0500f0ae2511561081e952
+SHA1 (patch-filter_filter__compare.c) = b866aa3f36607bee87aad4eb7023b0e5087b1c25
+SHA1 (patch-filter_filter__logo.c) = 4cff9a4123797d3a25df17b22f3922260ed3a7d4
+SHA1 (patch-filter_filter__logoaway.c) = 252986a1e3ce9969e97bfeedd63bec6e3cf6273c
 SHA1 (patch-filter_filter__pp.c) = a7a3f9c49e65e87bed343dd2d045457341e42114
 SHA1 (patch-filter_subtitler_load_font.c) = 2c496c63f4fe27190761d170cc825633eb63c11f
 SHA1 (patch-import_decode_lavc.c) = adf9274c5085012adcfeeb2f2366600155f0994c
+SHA1 (patch-import_import__im.c) = 30fdb4ce905c0bdd959964b1455f31823b681e9e
+SHA1 (patch-import_import__imlist.c) = 677ffc2c4ed48ab1e9f4f3f4a28f53b368ae7651
 SHA1 (patch-import_import_ffmpeg.c) = bbbbdec6a1c20a9c02a1e2ef4cca10919eb2854c
 SHA1 (patch-import_nuv_import__nuv.c) = e4a57c29b97b23aed068c06a2ed29dd9e29a9919
 SHA1 (patch-import_probe_ffmpeg.c) = 6bbf65b513e999ac770bafc6aa9b508bfdb5ae15
+SHA1 (patch-import_probe_im.c) = 27bce069c78e5eee94c14d3f5f03cc14145f85ac
 SHA1 (patch-libtc_tcavcodec.h) = 6fcef1e338e53c974b295b1a10b2cb06e6fcfbd3
diff --git a/multimedia/transcode/patches/patch-configure b/multimedia/transcode/patches/patch-configure
index bc03bf30386..0b50024410b 100644
--- a/multimedia/transcode/patches/patch-configure
+++ b/multimedia/transcode/patches/patch-configure
@@ -1,11 +1,21 @@
-$NetBSD: patch-configure,v 1.1 2015/11/21 17:14:26 adam Exp $
+$NetBSD: patch-configure,v 1.2 2016/05/16 19:41:17 adam Exp $
 
+Fix for ImageMagic v7.
 Add DragonFly support.
 Make use of PTHREAD_LDFLAGS.
 Portability fix.
 
 --- configure.orig	2011-11-19 16:50:37.000000000 +0000
 +++ configure
+@@ -1868,7 +1868,7 @@ Optional Packages:
+   --with-imagemagick-prefix=PFX
+                           prefix where imagemagick is installed (/usr)
+   --with-imagemagick-includes=DIR
+-                          directory where imagemagick headers (magick/api.h)
++                          directory where imagemagick headers (MagickCore/MagickCore.h)
+                           are installed (/usr/include)
+   --with-imagemagick-libs=DIR
+                           directory where imagemagick libraries (libnone.so)
 @@ -5096,7 +5096,7 @@ case "${target_os}" in
  $as_echo "#define OS_LINUX 1" >>confdefs.h
  
@@ -24,6 +34,75 @@ Portability fix.
  fi
  if test -n "$PTHREAD_CFLAGS" ; then
    pthread_cflags="$PTHREAD_CFLAGS"
+@@ -27651,7 +27651,7 @@ if test x"$enable_imagemagick" = x"yes" 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkgconfig support for imagemagick" >&5
+ $as_echo_n "checking for pkgconfig support for imagemagick... " >&6; }
+   if test x"$PKG_CONFIG" != x"no" ; then
+-    if $PKG_CONFIG Wand --exists ; then
++    if $PKG_CONFIG MagickWand --exists ; then
+       pkg_config_imagemagick="yes"
+     fi
+   fi
+@@ -27720,7 +27720,7 @@ $as_echo_n "checking how to determine IM
+ $as_echo "user" >&6; }
+   else
+     if test x"$pkg_config_imagemagick" != x"no" ; then
+-      imagemagick_ii="`$PKG_CONFIG Wand --cflags`"
++      imagemagick_ii="`$PKG_CONFIG MagickWand --cflags`"
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: pkg-config" >&5
+ $as_echo "pkg-config" >&6; }
+     else
+@@ -27753,10 +27753,10 @@ $as_echo "default" >&6; }
+   IMAGEMAGICK_EXTRA_CFLAGS="$IMAGEMAGICK_EXTRA_CFLAGS $xi"
+   IMAGEMAGICK_EXTRA_CFLAGS="`echo $IMAGEMAGICK_EXTRA_CFLAGS | sed -e 's/  */ /g'`"
+ 
+-  if test x"magick/api.h" != x"none" ; then
++  if test x"MagickCore/MagickCore.h" != x"none" ; then
+     save_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$CPPFLAGS $imagemagick_ii"
+-    ac_fn_c_check_header_mongrel "$LINENO" "magick/api.h" "ac_cv_header_magick_api_h" "$ac_includes_default"
++    ac_fn_c_check_header_mongrel "$LINENO" "MagickCore/MagickCore.h" "ac_cv_header_magick_api_h" "$ac_includes_default"
+ if test "x$ac_cv_header_magick_api_h" = xyes; then :
+   IMAGEMAGICK_CFLAGS="$imagemagick_ii"
+ else
+@@ -27771,8 +27771,8 @@ if test x"no" != x"optional" ; then
+   else
+     prob="option '--enable-imagemagick' failed"
+   fi
+-  msg="ERROR: $prob: cannot compile magick/api.h
+-magick/api.h can be found in the following packages:
++  msg="ERROR: $prob: cannot compile MagickCore/MagickCore.h
++MagickCore/MagickCore.h can be found in the following packages:
+   Wand  http://www.imagemagick.org/
+ 
+ "
+@@ -27784,7 +27784,7 @@ fi
+ 
+     CPPFLAGS="$save_CPPFLAGS"
+   elif test x"$pkg_config_imagemagick" != x"no" ; then
+-     IMAGEMAGICK_CFLAGS="`$PKG_CONFIG Wand --cflags`"
++     IMAGEMAGICK_CFLAGS="`$PKG_CONFIG MagickWand --cflags`"
+   fi
+ 
+   # get and test the _LIBS
+@@ -27797,7 +27797,7 @@ $as_echo_n "checking how to determine IM
+ $as_echo "user" >&6; }
+   else
+     if test x"$pkg_config_imagemagick" != x"no" ; then
+-      imagemagick_ll="`$PKG_CONFIG Wand --libs`"
++      imagemagick_ll="`$PKG_CONFIG MagickWand --libs`"
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: pkg-config" >&5
+ $as_echo "pkg-config" >&6; }
+     else
+@@ -27900,7 +27900,7 @@ fi
+ 
+     LDFLAGS="$save_LDFLAGS"
+   elif test x"$pkg_config_imagemagick" != x"no" ; then
+-     IMAGEMAGICK_LIBS="`$PKG_CONFIG Wand --libs`"
++     IMAGEMAGICK_LIBS="`$PKG_CONFIG MagickWand --libs`"
+   fi
+ 
+   if test x"$this_pkg_err" = x"no" ; then
 @@ -29507,7 +29507,7 @@ if test "${enable_nuv+set}" = set; then 
      yes) if test yes != "$have_lzo"; then
             as_fn_error $? "liblzo2 is required for NuppelVideo support, try --enable-lzo" "$LINENO" 5
diff --git a/multimedia/transcode/patches/patch-export_export__im.c b/multimedia/transcode/patches/patch-export_export__im.c
new file mode 100644
index 00000000000..1e46418c3b1
--- /dev/null
+++ b/multimedia/transcode/patches/patch-export_export__im.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-export_export__im.c,v 1.1 2016/05/16 19:41:17 adam Exp $
+
+Fix for ImageMagick v7.
+
+--- export/export_im.c.orig	2016-05-15 12:41:44.000000000 +0000
++++ export/export_im.c
+@@ -23,7 +23,7 @@
+ 
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+  * we can undefine the PACKAGE_* symbols it splats into our namespace */
+-#include <magick/api.h>
++#include <MagickCore/MagickCore.h>
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
+ #undef PACKAGE_STRING
+@@ -197,7 +197,7 @@ MOD_encode
+ 
+     strlcpy(image->filename, buf2, MaxTextExtent);
+ 
+-    WriteImage(image_info, image);
++    WriteImage(image_info, image, &exception_info);
+     DestroyImage(image);
+ 
+     return(0);
diff --git a/multimedia/transcode/patches/patch-filter_filter__compare.c b/multimedia/transcode/patches/patch-filter_filter__compare.c
new file mode 100644
index 00000000000..a8c45efb2ae
--- /dev/null
+++ b/multimedia/transcode/patches/patch-filter_filter__compare.c
@@ -0,0 +1,32 @@
+$NetBSD: patch-filter_filter__compare.c,v 1.1 2016/05/16 19:41:17 adam Exp $
+
+Fix for ImageMagick v7.
+
+--- filter/filter_compare.c.orig	2016-05-15 12:50:52.000000000 +0000
++++ filter/filter_compare.c
+@@ -24,7 +24,7 @@
+ 
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+  * we can undefine the PACKAGE_* symbols it splats into our namespace */
+-#include <magick/api.h>
++#include <MagickCore/MagickCore.h>
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
+ #undef PACKAGE_STRING
+@@ -234,7 +234,6 @@ int tc_filter(frame_list_t *ptr_, char *
+ 					      compare[instance]->width,
+ 					      compare[instance]->height,
+ 					      GaussianFilter,
+-					      1,
+ 					      &exception_info);
+ 			if (verbose > 1)
+ 				tc_log_info(MOD_NAME, "Flipping the Image");
+@@ -257,7 +256,7 @@ int tc_filter(frame_list_t *ptr_, char *
+ 			for (t = 0; t < pattern->rows; t++)
+ 				for (r = 0; r < pattern->columns; r++){
+ 					index = t*pattern->columns + r;
+-					if (pixel_packet[index].opacity == 0){
++					if (pixel_packet[index].alpha == 0){
+ 						temp=tc_malloc(sizeof(struct pixelsMask));
+ 						temp->row=t;
+ 						temp->col=r;
diff --git a/multimedia/transcode/patches/patch-filter_filter__logo.c b/multimedia/transcode/patches/patch-filter_filter__logo.c
new file mode 100644
index 00000000000..401afea6b93
--- /dev/null
+++ b/multimedia/transcode/patches/patch-filter_filter__logo.c
@@ -0,0 +1,66 @@
+$NetBSD: patch-filter_filter__logo.c,v 1.1 2016/05/16 19:41:17 adam Exp $
+
+Fix for ImageMagick v7.
+
+--- filter/filter_logo.c.orig	2016-05-15 12:53:50.000000000 +0000
++++ filter/filter_logo.c
+@@ -36,7 +36,7 @@
+ 
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+  * we can undefine the PACKAGE_* symbols it splats into our namespace */
+-#include <magick/api.h>
++#include <MagickCore/MagickCore.h>
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
+ #undef PACKAGE_STRING
+@@ -573,7 +573,7 @@ int tc_filter(frame_list_t *ptr_, char *
+         /* Set up image/video coefficient lookup tables */
+         if (img_coeff_lookup[0] < 0) {
+             int i;
+-            float maxrgbval = (float)MaxRGB; // from ImageMagick
++            float maxrgbval = 255.0f;
+ 
+             for (i = 0; i <= MAX_UINT8_VAL; i++) {
+                 float x = (float)ScaleCharToQuantum(i);
+@@ -702,16 +702,16 @@ int tc_filter(frame_list_t *ptr_, char *
+                 video_buf = ptr->video_buf + 3 * ((row + mfd->posy) * vob->ex_v_width + mfd->posx);
+ 
+                 for (col = 0; col < mfd->image->columns; col++) {
+-                    opacity = pixel_packet->opacity;
++                    opacity = pixel_packet->alpha;
+ 
+                     if (do_fade)
+-                        opacity += (Quantum)((MaxRGB - opacity) * fade_coeff);
++                        opacity += (Quantum)((255 - opacity) * fade_coeff);
+ 
+                     if (opacity == 0) {
+                         *(video_buf + r_off) = ScaleQuantumToChar(pixel_packet->red);
+                         *(video_buf + g_off) = ScaleQuantumToChar(pixel_packet->green);
+                         *(video_buf + b_off) = ScaleQuantumToChar(pixel_packet->blue);
+-                    } else if (opacity < MaxRGB) {
++                    } else if (opacity < 255) {
+                         unsigned char opacity_uchar = ScaleQuantumToChar(opacity);
+                         img_coeff = img_coeff_lookup[opacity_uchar];
+                         vid_coeff = vid_coeff_lookup[opacity_uchar];
+@@ -745,10 +745,10 @@ int tc_filter(frame_list_t *ptr_, char *
+                 vid_pixel_V = vid_pixel_U + vid_size/4;
+                 for (col = 0; col < mfd->images->columns; col++) {
+                     int do_UV_pixels = (mfd->grayout == 0 && !(row % 2) && !(col % 2)) ? 1 : 0;
+-                    opacity = pixel_packet->opacity;
++                    opacity = pixel_packet->alpha;
+ 
+                     if (do_fade)
+-                        opacity += (Quantum)((MaxRGB - opacity) * fade_coeff);
++                        opacity += (Quantum)((255 - opacity) * fade_coeff);
+ 
+                     if (opacity == 0) {
+                         *vid_pixel_Y = *img_pixel_Y;
+@@ -756,7 +756,7 @@ int tc_filter(frame_list_t *ptr_, char *
+                                 *vid_pixel_U = *img_pixel_U;
+                                 *vid_pixel_V = *img_pixel_V;
+                         }
+-                    } else if (opacity < MaxRGB) {
++                    } else if (opacity < 255) {
+                         unsigned char opacity_uchar = ScaleQuantumToChar(opacity);
+                         img_coeff = img_coeff_lookup[opacity_uchar];
+                         vid_coeff = vid_coeff_lookup[opacity_uchar];
diff --git a/multimedia/transcode/patches/patch-filter_filter__logoaway.c b/multimedia/transcode/patches/patch-filter_filter__logoaway.c
new file mode 100644
index 00000000000..e9fe22c602a
--- /dev/null
+++ b/multimedia/transcode/patches/patch-filter_filter__logoaway.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-filter_filter__logoaway.c,v 1.1 2016/05/16 19:41:17 adam Exp $
+
+Fix for ImageMagick v7.
+
+--- filter/filter_logoaway.c.orig	2016-05-15 13:00:44.000000000 +0000
++++ filter/filter_logoaway.c
+@@ -70,7 +70,7 @@
+ 
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+  * we can undefine the PACKAGE_* symbols it splats into our namespace */
+-#include <magick/api.h>
++#include <MagickCore/MagickCore.h>
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
+ #undef PACKAGE_STRING
+@@ -204,7 +204,7 @@ static void work_with_rgb_frame(logoaway
+     LD->dumpimage = ConstituteImage(LD->width-LD->xpos, LD->height-LD->ypos, "RGB", CharPixel, LD->dump_buf, &LD->exception_info);
+     tc_snprintf(LD->dumpimage->filename, MaxTextExtent, "dump[%d].png", LD->id);
+ 
+-    WriteImage(LD->dumpimage_info, LD->dumpimage);
++    WriteImage(LD->dumpimage_info, LD->dumpimage, &LD->exception_info);
+   }
+ 
+   switch(LD->mode) {
diff --git a/multimedia/transcode/patches/patch-import_import__im.c b/multimedia/transcode/patches/patch-import_import__im.c
new file mode 100644
index 00000000000..ad10dd8d298
--- /dev/null
+++ b/multimedia/transcode/patches/patch-import_import__im.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-import_import__im.c,v 1.1 2016/05/16 19:41:17 adam Exp $
+
+Fix for ImageMagick v7.
+
+--- import/import_im.c.orig	2016-05-15 13:02:59.000000000 +0000
++++ import/import_im.c
+@@ -36,7 +36,7 @@
+ #ifdef HAVE_BROKEN_WAND
+ #include <wand/magick-wand.h>
+ #else /* we have a SANE wand header */
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #endif /* HAVE_BROKEN_WAND */
+ 
+ #undef PACKAGE_BUGREPORT
diff --git a/multimedia/transcode/patches/patch-import_import__imlist.c b/multimedia/transcode/patches/patch-import_import__imlist.c
new file mode 100644
index 00000000000..9e6cb46805f
--- /dev/null
+++ b/multimedia/transcode/patches/patch-import_import__imlist.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-import_import__imlist.c,v 1.1 2016/05/16 19:41:17 adam Exp $
+
+Fix for ImageMagick v7.
+
+--- import/import_imlist.c.orig	2016-05-15 13:04:14.000000000 +0000
++++ import/import_imlist.c
+@@ -36,7 +36,7 @@
+ #ifdef HAVE_BROKEN_WAND
+ #include <wand/magick-wand.h>
+ #else /* we have a SANE wand header */
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #endif /* HAVE_BROKEN_WAND */
+ 
+ #undef PACKAGE_BUGREPORT
diff --git a/multimedia/transcode/patches/patch-import_probe_im.c b/multimedia/transcode/patches/patch-import_probe_im.c
new file mode 100644
index 00000000000..7dcf0848689
--- /dev/null
+++ b/multimedia/transcode/patches/patch-import_probe_im.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-import_probe_im.c,v 1.1 2016/05/16 19:41:17 adam Exp $
+
+Fix for ImageMagick v7.
+
+--- import/probe_im.c.orig	2016-05-15 13:05:12.000000000 +0000
++++ import/probe_im.c
+@@ -42,7 +42,7 @@
+ # ifdef HAVE_BROKEN_WAND
+ # include <wand/magick-wand.h>
+ # else /* we have a SANE wand header */
+-# include <wand/MagickWand.h>
++# include <MagickWand/MagickWand.h>
+ # endif /* HAVE_BROKEN_WAND */
+ 
+ # undef PACKAGE_BUGREPORT