graphics/libheif: Update 1.6.2 -> 1.10.0

PR:		249291
Approved by:	freebsd@sebastiansteinmetz.ch (maintainer's timeout 130 days)

3 files changed, 45 insertions, 55 deletions

diff --git a/graphics/libheif/Makefile b/graphics/libheif/Makefile
index 9400a0eb993b..717e7a085d0d 100644
--- a/graphics/libheif/Makefile
+++ b/graphics/libheif/Makefile
@@ -2,61 +2,42 @@
 
 PORTNAME=		libheif
 DISTVERSIONPREFIX=	v
-DISTVERSION=		1.6.2
-PORTREVISION=		2
+DISTVERSION=		1.10.0
 CATEGORIES=		graphics
 
 MAINTAINER=		freebsd@sebastiansteinmetz.ch
 COMMENT=		Libheif is an ISO/IEC 23008-12:2017 HEIF file format de- and encoder
 
-# N.B., subsequent revisions in Git relicense examples from GPL3+ to MIT.
 LICENSE=		LGPL3+
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/COPYING
 
-USES=			autoreconf compiler:c++11-lang libtool localbase pkgconfig \
-			shebangfix
-USE_GITHUB=		yes
-GH_ACCOUNT=		strukturag
-GH_PROJECT=		libheif
+LIB_DEPENDS=	libdav1d.so:multimedia/dav1d
+# Fails to find rav1e: https://github.com/strukturag/libheif/issues/429
+
+USES=			cmake compiler:c++11-lang gettext-runtime gnome localbase:ldflags pkgconfig
+USE_GNOME=		gdkpixbuf2 glib20
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--disable-go
 USE_LDCONFIG=		yes
-SHEBANG_GLOB=		*.sh
-INSTALL_TARGET=		install-strip
-
-OPTIONS_DEFINE=	EXAMPLES JPEG LIBDE265 PNG THREADS X265
-OPTIONS_DEFAULT=EXAMPLES JPEG LIBDE265 PNG THREADS X265
-OPTIONS_SUB=	yes
 
-EXAMPLES_DESC=	Install example programs (heif-convert, heif-enc, heif-info, heif-thumbnailer)
-LIBDE265_DESC=	Use libde265 (support for HEVC decoding)
-X265_DESC=	Use x265 (support for HEVC encoding)
+CMAKE_OFF=		WITH_EXAMPLES
 
-JPEG_USES=		jpeg
-LIBDE265_LIB_DEPENDS=	libde265.so:multimedia/libde265
-PNG_LIB_DEPENDS=	libpng.so:graphics/png
-THREADS_CONFIGURE_OFF=	--disable-multithreading
-X265_LIB_DEPENDS=	libx265.so:multimedia/x265
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MEXAMPLES}
-LICENSE+=		GPLv3+
-LICENSE_COMB=		multi
-LICENSE_FILE_GPLv3+ =	${WRKSRC}/examples/COPYING
-USES+=			shared-mime-info
-.endif
+USE_GITHUB=		yes
+GH_ACCOUNT=		strukturag
 
-post-patch-JPEG-off:
-	@${REINPLACE_CMD} -e '/AC_CHECK_/ s|jpeg|ignore&|g' ${WRKSRC}/configure.ac
+OPTIONS_DEFINE=			AOM LIBDE265 X265
+OPTIONS_DEFAULT=		AOM LIBDE265 X265
+OPTIONS_SUB=			yes
 
-post-patch-LIBDE265-off:
-	@${REINPLACE_CMD} -e '/PKG_CHECK_MODULES/ s|libde265|ignore&|g' ${WRKSRC}/configure.ac
+AOM_DESC=			AV1 encoding/decoding via libaom
+AOM_CMAKE_BOOL=			WITH_AOM
+AOM_LIB_DEPENDS=		libaom.so:multimedia/aom
 
-post-patch-PNG-off:
-	@${REINPLACE_CMD} -e '/PKG_CHECK_MODULES/ s|png|ignore&|g' ${WRKSRC}/configure.ac
+LIBDE265_DESC=			Use libde265 (support for HEVC decoding)
+LIBDE265_CMAKE_BOOL=		WITH_LIBDE265
+LIBDE265_LIB_DEPENDS=		libde265.so:multimedia/libde265
 
-post-patch-X265-off:
-	@${REINPLACE_CMD} -e '/PKG_CHECK_MODULES/ s|x265|ignore&|g' ${WRKSRC}/configure.ac
+X265_DESC=			Use x265 (support for HEVC encoding)
+X265_CMAKE_BOOL=		WITH_X265
+X265_LIB_DEPENDS=		libx265.so:multimedia/x265
 
 .include <bsd.port.mk>
diff --git a/graphics/libheif/distinfo b/graphics/libheif/distinfo
index 1f59ec6daf5a..0ab00ccd428d 100644
--- a/graphics/libheif/distinfo
+++ b/graphics/libheif/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591044315
-SHA256 (strukturag-libheif-v1.6.2_GH0.tar.gz) = 8bc0e2cb3269e960b211b60600d95fa6f54a6ba8ea6eb8c8d3323d15ad66972b
-SIZE (strukturag-libheif-v1.6.2_GH0.tar.gz) = 1088921
+TIMESTAMP = 1611791342
+SHA256 (strukturag-libheif-v1.10.0_GH0.tar.gz) = 317a44bf157ba297638ab5a258040ef6ec4895d620cd58f52195f3f89c9eea28
+SIZE (strukturag-libheif-v1.10.0_GH0.tar.gz) = 1243656
diff --git a/graphics/libheif/pkg-plist b/graphics/libheif/pkg-plist
index b904823db002..526de3bcb250 100644
--- a/graphics/libheif/pkg-plist
+++ b/graphics/libheif/pkg-plist
@@ -1,19 +1,28 @@
-%%EXAMPLES%%bin/heif-convert
-%%EXAMPLES%%bin/heif-enc
-%%EXAMPLES%%bin/heif-info
-%%EXAMPLES%%%%PNG%%bin/heif-thumbnailer
+include/libheif/bitstream.h
+include/libheif/box.h
+include/libheif/error.h
 include/libheif/heif.h
+include/libheif/heif_api_structs.h
+include/libheif/heif_avif.h
+include/libheif/heif_colorconversion.h
+include/libheif/heif_context.h
 include/libheif/heif_cxx.h
+%%LIBDE265%%include/libheif/heif_decoder_libde265.h
+%%X265%%include/libheif/heif_encoder_x265.h
+include/libheif/heif_file.h
+include/libheif/heif_hevc.h
+include/libheif/heif_image.h
+include/libheif/heif_limits.h
 include/libheif/heif_plugin.h
+include/libheif/heif_plugin_registry.h
 include/libheif/heif_version.h
-lib/libheif.a
+include/libheif/logging.h
+include/libheif/nclx.h
+lib/cmake/libheif/libheif-config-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/libheif/libheif-config-version.cmake
+lib/cmake/libheif/libheif-config.cmake
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-heif.so
 lib/libheif.so
 lib/libheif.so.1
-lib/libheif.so.1.6.2
+lib/libheif.so.1.10.0.0
 libdata/pkgconfig/libheif.pc
-%%EXAMPLES%%man/man1/heif-convert.1.gz
-%%EXAMPLES%%man/man1/heif-enc.1.gz
-%%EXAMPLES%%man/man1/heif-info.1.gz
-%%EXAMPLES%%%%PNG%%man/man1/heif-thumbnailer.1.gz
-%%EXAMPLES%%share/mime/packages/heif.xml
-%%EXAMPLES%%share/thumbnailers/heif.thumbnailer