Re: CVS commit: pkgsrc/graphics/ImageMagick

[Frederic Fauberteau <triaxx%NetBSD.org@localhost>]

Thank you for this update.

I just try to update it on FreeBSD 12.1 and I get an error according to an invalid number of parameters for the function sendfile(2) in MagickCore/cache.c. I notice that the signature of sendfile(2) 
is really different for FreeBSD and Linux.

Linux (seems acceptable for ImageMagick):
ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count);

FreeBSD (needs a patch):
int
sendfile(int fd, int s, off_t offset, size_t nbytes,
         struct sf_hdtr *hdtr, off_t *sbytes, int flags);

But more surprisingly, I notice that 'man sendfile' gives me no entry on NetBSD 9.0 even if I do not try to update yet.

Le 05/10/2020 à 13:33, Thomas Klausner a écrit :
> Module Name:  pkgsrc
> Committed By: wiz
> Date:         Mon Oct  5 11:33:43 UTC 2020
> 
> Modified Files:
>       pkgsrc/graphics/ImageMagick: Makefile Makefile.common PLIST distinfo
> 
> Log Message:
> ImageMagick: update to 7.0.10.32.
> 
> 2020-10-02  7.0.10-32  <quetzlzacatenango@image...>
>   * Release ImageMagick version 7.0.10-32 GIT revision 17670:1686dd921:20201002
> 
> 2020-09-27  7.0.10-32  <quetzlzacatenango@image...>
>   * enable WMF for module build.
>   * writing PDF requires a seekable stream.
> 
> 2020-09-27  7.0.10-31  <quetzlzacatenango@image...>
>   * Release ImageMagick version 7.0.10-31 GIT revision 17652:78ad905d9:20200926
> 
> 2020-09-20  7.0.10-31  <quetzlzacatenango@image...>
>   * Add support for APNG (specify explicitly, e.g. apng:animate.png).
>   * Add support for WEBM.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.277 -r1.278 pkgsrc/graphics/ImageMagick/Makefile
> cvs rdiff -u -r1.216 -r1.217 pkgsrc/graphics/ImageMagick/Makefile.common
> cvs rdiff -u -r1.111 -r1.112 pkgsrc/graphics/ImageMagick/PLIST
> cvs rdiff -u -r1.233 -r1.234 pkgsrc/graphics/ImageMagick/distinfo
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
> 
> 
> Modified files:
> 
> Index: pkgsrc/graphics/ImageMagick/Makefile
> diff -u pkgsrc/graphics/ImageMagick/Makefile:1.277 pkgsrc/graphics/ImageMagick/Makefile:1.278
> --- pkgsrc/graphics/ImageMagick/Makefile:1.277        Sat Oct  3 12:39:20 2020
> +++ pkgsrc/graphics/ImageMagick/Makefile      Mon Oct  5 11:33:43 2020
> @@ -1,9 +1,8 @@
> -# $NetBSD: Makefile,v 1.277 2020/10/03 12:39:20 rillig Exp $
> +# $NetBSD: Makefile,v 1.278 2020/10/05 11:33:43 wiz Exp $
>  
>  .include "Makefile.common"
>  
>  PKGNAME=     ImageMagick-${DISTVERSION}
> -PKGREVISION= 1
>  
>  MAINTAINER=  adam%NetBSD.org@localhost
>  COMMENT=     Package for display and interactive manipulation of images
> 
> Index: pkgsrc/graphics/ImageMagick/Makefile.common
> diff -u pkgsrc/graphics/ImageMagick/Makefile.common:1.216 pkgsrc/graphics/ImageMagick/Makefile.common:1.217
> --- pkgsrc/graphics/ImageMagick/Makefile.common:1.216 Sun Sep 20 08:39:06 2020
> +++ pkgsrc/graphics/ImageMagick/Makefile.common       Mon Oct  5 11:33:43 2020
> @@ -1,9 +1,9 @@
> -# $NetBSD: Makefile.common,v 1.216 2020/09/20 08:39:06 wiz Exp $
> +# $NetBSD: Makefile.common,v 1.217 2020/10/05 11:33:43 wiz Exp $
>  #
>  # used by graphics/p5-PerlMagick/Makefile
>  
>  IM_MAJOR_VER=                7.0.10
> -IM_MINOR_VER=                30
> +IM_MINOR_VER=                32
>  IM_MAJOR_LIB_VER=    7
>  
>  .if (${IM_MINOR_VER} != NONE)
> 
> Index: pkgsrc/graphics/ImageMagick/PLIST
> diff -u pkgsrc/graphics/ImageMagick/PLIST:1.111 pkgsrc/graphics/ImageMagick/PLIST:1.112
> --- pkgsrc/graphics/ImageMagick/PLIST:1.111   Wed Jul 29 11:21:57 2020
> +++ pkgsrc/graphics/ImageMagick/PLIST Mon Oct  5 11:33:43 2020
> @@ -1,4 +1,4 @@
> -@comment $NetBSD: PLIST,v 1.111 2020/07/29 11:21:57 wiz Exp $
> +@comment $NetBSD: PLIST,v 1.112 2020/10/05 11:33:43 wiz Exp $
>  bin/Magick++-config
>  bin/MagickCore-config
>  bin/MagickWand-config
> @@ -1183,6 +1183,7 @@ share/doc/ImageMagick-7/www/mirror.html
>  share/doc/ImageMagick-7/www/mogrify.html
>  share/doc/ImageMagick-7/www/montage.html
>  share/doc/ImageMagick-7/www/motion-picture.html
> +share/doc/ImageMagick-7/www/news.html
>  share/doc/ImageMagick-7/www/opencl.html
>  share/doc/ImageMagick-7/www/openmp.html
>  share/doc/ImageMagick-7/www/perl-magick.html
> 
> Index: pkgsrc/graphics/ImageMagick/distinfo
> diff -u pkgsrc/graphics/ImageMagick/distinfo:1.233 pkgsrc/graphics/ImageMagick/distinfo:1.234
> --- pkgsrc/graphics/ImageMagick/distinfo:1.233        Sun Sep 20 08:39:06 2020
> +++ pkgsrc/graphics/ImageMagick/distinfo      Mon Oct  5 11:33:43 2020
> @@ -1,7 +1,7 @@
> -$NetBSD: distinfo,v 1.233 2020/09/20 08:39:06 wiz Exp $
> +$NetBSD: distinfo,v 1.234 2020/10/05 11:33:43 wiz Exp $
>  
> -SHA1 (ImageMagick-7.0.10-30.tar.xz) = 659c54d28a34218c1fe740d7b9cd3837b8e9bce8
> -RMD160 (ImageMagick-7.0.10-30.tar.xz) = 5405d64612f2e1a607ba2a8ffc8998443e666068
> -SHA512 (ImageMagick-7.0.10-30.tar.xz) = 5e05e989c9752141c00e6329461aa1b8b11df7719473cded4ba47a0f7ee4d2e8f2c69f410fa3937920524cc0753863de796155badbce910b0a089c2af3be254d
> -Size (ImageMagick-7.0.10-30.tar.xz) = 9653020 bytes
> +SHA1 (ImageMagick-7.0.10-32.tar.xz) = 1174f39deaa71b8aaf7279c4648e172db42321ef
> +RMD160 (ImageMagick-7.0.10-32.tar.xz) = e74f301d87d24b56b615e10c099e5d11b89dd5c6
> +SHA512 (ImageMagick-7.0.10-32.tar.xz) = 90dccd74b903228a8d8b1026f684375d5dbb4e275281a460d08db3eb5d07152a492a24ad08cc20c22d5cbdcb8161d262e0b4af33a6abfd85681e558c41419444
> +Size (ImageMagick-7.0.10-32.tar.xz) = 9652884 bytes
>  SHA1 (patch-config_policy.xml) = 2c446a00fc00f85ab33eae0691d4d8989a46289f
>