libheif: Update to 1.9.1

Changelog:
1.9.1
    fixed missing inline definition in C++ wrapper

1.9.0
    add dav1d decoder plugin for faster decoding of AVIF images
    support for images having both ICC and NCLX profiles
    save NCLX profiles to AV1/HEVC bitstreams and also read them from the bitstream
    add color profile API to C++ wrapper
    improve rounding in color conversions
    conformant encoding of AVIF images <16 pixels
    many fixes and small improvements

8 files changed, 17 insertions, 141 deletions

diff --git a/graphics/libheif/Makefile b/graphics/libheif/Makefile
index 7746eb20f31..657cb74e651 100644
--- a/graphics/libheif/Makefile
+++ b/graphics/libheif/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2020/09/03 19:07:59 otis Exp $
+# $NetBSD: Makefile,v 1.4 2020/09/28 13:38:13 ryoon Exp $
 
-DISTNAME=	libheif-1.8.0
+DISTNAME=	libheif-1.9.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=strukturag/}
 GITHUB_PROJECT=	libheif
diff --git a/graphics/libheif/distinfo b/graphics/libheif/distinfo
index 548f8037ea2..bc0a604e6c4 100644
--- a/graphics/libheif/distinfo
+++ b/graphics/libheif/distinfo
@@ -1,13 +1,8 @@
-$NetBSD: distinfo,v 1.3 2020/09/06 07:18:31 tnn Exp $
+$NetBSD: distinfo,v 1.4 2020/09/28 13:38:13 ryoon Exp $
 
-SHA1 (libheif-1.8.0.tar.gz) = 22476e2697faebee6802169ee1746cdcdd7953fa
-RMD160 (libheif-1.8.0.tar.gz) = 68d53be124be293348023946ada37acee7432ea2
-SHA512 (libheif-1.8.0.tar.gz) = e6edf03c0baf7d55ace57b8de1cf05d3b6708a0bd58d4191599960ad3924509dd7e9528a021586012b768a5a5b253e5bab470b944a2ead45f85274842da4913a
-Size (libheif-1.8.0.tar.gz) = 1544438 bytes
+SHA1 (libheif-1.9.1.tar.gz) = 4fd8929b68af2b8f8870f5f7e5ce6918b35460c6
+RMD160 (libheif-1.9.1.tar.gz) = 92a6ff1b051c53da86643ef87c4d6c252772306b
+SHA512 (libheif-1.9.1.tar.gz) = a41ff9666877904da095c72af743b56196c75ce90deaeb1998be7eba9729a62282827e7e916e2a067489cc78e558c55fbb6d70da6a5b5281f6d2efcccbe6dbbe
+Size (libheif-1.9.1.tar.gz) = 1556450 bytes
 SHA1 (patch-configure) = 859f4ae06e77a79a723f2760d426c88787916a9c
-SHA1 (patch-examples_encoder__png.cc) = ea9367502a07b150266951c843e14890f7eaa992
-SHA1 (patch-examples_heif__convert.cc) = bb7836d7ffdb18bb74f35c580b57df61d1533789
-SHA1 (patch-examples_heif__enc.cc) = 1c7dc8a1ed822727942d675d9ff6087b27d289e7
-SHA1 (patch-examples_heif__info.cc) = d0cd58c340d777a1bee63b7f0654ba5e193e7a62
-SHA1 (patch-examples_heif__test.cc) = ae4c07a340123da7b0f4f80b7c5b5de57d0b3cc1
-SHA1 (patch-libheif_heif__encoder__aom.cc) = 6554c39a76f853b0c46b63d6497d5d171e035f3e
+SHA1 (patch-examples_heif__convert.cc) = b4b6b16d40ad87ca20730c4decf337e7bf123ce4
diff --git a/graphics/libheif/patches/patch-examples_encoder__png.cc b/graphics/libheif/patches/patch-examples_encoder__png.cc
deleted file mode 100644
index 3730479f6a0..00000000000
--- a/graphics/libheif/patches/patch-examples_encoder__png.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-examples_encoder__png.cc,v 1.1 2020/09/06 07:18:32 tnn Exp $
-
-stdlib.h for malloc/free
-
---- examples/encoder_png.cc.orig	2020-08-13 16:57:45.000000000 +0000
-+++ examples/encoder_png.cc
-@@ -28,6 +28,7 @@
- #include <math.h>
- #include <png.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #include "encoder_png.h"
- 
diff --git a/graphics/libheif/patches/patch-examples_heif__convert.cc b/graphics/libheif/patches/patch-examples_heif__convert.cc
index 597a72816af..a3f1b5194b2 100644
--- a/graphics/libheif/patches/patch-examples_heif__convert.cc
+++ b/graphics/libheif/patches/patch-examples_heif__convert.cc
@@ -1,17 +1,15 @@
-$NetBSD: patch-examples_heif__convert.cc,v 1.1 2020/09/03 19:07:19 otis Exp $
+$NetBSD: patch-examples_heif__convert.cc,v 1.2 2020/09/28 13:38:13 ryoon Exp $
 
 Include alloca.h on SunOS
 
---- examples/heif_convert.cc.orig	2020-08-13 16:57:45.000000000 +0000
+--- examples/heif_convert.cc.orig	2020-09-23 14:02:39.000000000 +0000
 +++ examples/heif_convert.cc
-@@ -35,6 +35,10 @@
- 
+@@ -27,7 +27,7 @@
+ #include "config.h"
  #endif
  
-+#if defined(sun) || defined(__sun)
-+#include <alloca.h>
-+#endif
-+
- #include <fstream>
- #include <iostream>
- #include <sstream>
+-#if defined(_MSC_VER) || defined(__MINGW32__)
++#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__NetBSD__)
+ # include <malloc.h>
+ #else
+ # include <alloca.h>
diff --git a/graphics/libheif/patches/patch-examples_heif__enc.cc b/graphics/libheif/patches/patch-examples_heif__enc.cc
deleted file mode 100644
index 17acb12beea..00000000000
--- a/graphics/libheif/patches/patch-examples_heif__enc.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-examples_heif__enc.cc,v 1.1 2020/09/03 19:07:19 otis Exp $
-
-Excplicitly cast types to make ISO C++ happy
-
---- examples/heif_enc.cc.orig	2020-08-14 15:28:08.000000000 +0000
-+++ examples/heif_enc.cc
-@@ -71,21 +71,21 @@ int nclx_transfer_characteristic = 2;
- int nclx_full_range = true;
- 
- static struct option long_options[] = {
--    {"help",                    no_argument,       0,                             'h'},
--    {"quality",                 required_argument, 0,                             'q'},
--    {"output",                  required_argument, 0,                             'o'},
--    {"lossless",                no_argument,       0,                             'L'},
--    {"thumb",                   required_argument, 0,                             't'},
--    {"verbose",                 no_argument,       0,                             'v'},
--    {"params",                  no_argument,       0,                             'P'},
--    {"no-alpha",                no_argument,       &master_alpha,                 0},
--    {"no-thumb-alpha",          no_argument,       &thumb_alpha,                  0},
--    {"bit-depth",               required_argument, 0,                             'b'},
--    {"avif",                    no_argument,       0,                             'A'},
--    {"matrix_coefficients",     required_argument, &nclx_matrix_coefficients,     0},
--    {"colour_primaries",        required_argument, &nclx_colour_primaries,        0},
--    {"transfer_characteristic", required_argument, &nclx_transfer_characteristic, 0},
--    {"full_range_flag",         required_argument, &nclx_full_range,              0},
-+    {(char * const)"help",                    no_argument,       0,                             'h'},
-+    {(char * const)"quality",                 required_argument, 0,                             'q'},
-+    {(char * const)"output",                  required_argument, 0,                             'o'},
-+    {(char * const)"lossless",                no_argument,       0,                             'L'},
-+    {(char * const)"thumb",                   required_argument, 0,                             't'},
-+    {(char * const)"verbose",                 no_argument,       0,                             'v'},
-+    {(char * const)"params",                  no_argument,       0,                             'P'},
-+    {(char * const)"no-alpha",                no_argument,       &master_alpha,                 0},
-+    {(char * const)"no-thumb-alpha",          no_argument,       &thumb_alpha,                  0},
-+    {(char * const)"bit-depth",               required_argument, 0,                             'b'},
-+    {(char * const)"avif",                    no_argument,       0,                             'A'},
-+    {(char * const)"matrix_coefficients",     required_argument, &nclx_matrix_coefficients,     0},
-+    {(char * const)"colour_primaries",        required_argument, &nclx_colour_primaries,        0},
-+    {(char * const)"transfer_characteristic", required_argument, &nclx_transfer_characteristic, 0},
-+    {(char * const)"full_range_flag",         required_argument, &nclx_full_range,              0},
-     {0, 0,                                         0,                             0}
- };
- 
diff --git a/graphics/libheif/patches/patch-examples_heif__info.cc b/graphics/libheif/patches/patch-examples_heif__info.cc
deleted file mode 100644
index 60f08dfc6df..00000000000
--- a/graphics/libheif/patches/patch-examples_heif__info.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-examples_heif__info.cc,v 1.1 2020/09/03 19:07:19 otis Exp $
-
-Excplicitly cast types to make ISO C++ happy
-
---- examples/heif_info.cc.orig	2020-08-13 16:57:45.000000000 +0000
-+++ examples/heif_info.cc
-@@ -38,6 +38,10 @@
- #define STDOUT_FILENO 1
- #endif
- 
-+#if defined(sun) || defined(__sun)
-+#include <alloca.h>
-+#endif
-+
- #include <libheif/heif.h>
- 
- #include <fstream>
-@@ -65,8 +69,8 @@ info -d // dump
- static struct option long_options[] = {
-     //{"write-raw", required_argument, 0, 'w' },
-     //{"output",    required_argument, 0, 'o' },
--    {"dump-boxes", no_argument, 0, 'd'},
--    {"help",       no_argument, 0, 'h'},
-+    {(char * const)"dump-boxes", no_argument, 0, 'd'},
-+    {(char * const)"help",       no_argument, 0, 'h'},
-     {0, 0,                      0, 0}
- };
- 
diff --git a/graphics/libheif/patches/patch-examples_heif__test.cc b/graphics/libheif/patches/patch-examples_heif__test.cc
deleted file mode 100644
index 648adac7e78..00000000000
--- a/graphics/libheif/patches/patch-examples_heif__test.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-examples_heif__test.cc,v 1.1 2020/09/03 19:07:19 otis Exp $
-
-Excplicitly cast types to make ISO C++ happy
-
---- examples/heif_test.cc.orig	2020-08-13 16:57:45.000000000 +0000
-+++ examples/heif_test.cc
-@@ -50,8 +50,8 @@
- static struct option long_options[] = {
-     //{"write-raw", required_argument, 0, 'w' },
-     //{"output",    required_argument, 0, 'o' },
--    {"decode-img", required_argument, 0, 'd'},
--    {"metadata",   required_argument, 0, 'm'},
-+    {(char * const)"decode-img", required_argument, 0, 'd'},
-+    {(char * const)"metadata",   required_argument, 0, 'm'},
-     {0, 0,                            0, 0}
- };
- 
diff --git a/graphics/libheif/patches/patch-libheif_heif__encoder__aom.cc b/graphics/libheif/patches/patch-libheif_heif__encoder__aom.cc
deleted file mode 100644
index 1d958c01150..00000000000
--- a/graphics/libheif/patches/patch-libheif_heif__encoder__aom.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-libheif_heif__encoder__aom.cc,v 1.1 2020/09/03 19:07:19 otis Exp $
-
-Initialize variable to silence -Werror
-
---- libheif/heif_encoder_aom.cc.orig	2020-08-26 13:47:18.000000000 +0000
-+++ libheif/heif_encoder_aom.cc
-@@ -510,7 +510,7 @@ struct heif_error aom_encode_image(void*
- 
-   aom_image_t input_image;
- 
--  aom_img_fmt_t img_format;
-+  aom_img_fmt_t img_format = AOM_IMG_FMT_NONE;
- 
-   switch (chroma) {
-     case heif_chroma_420: