git: 92593edb3e4d - main - graphics/libheif: Update to latest commit as of 2022-02-09

Reply: Alexey Dokuchaev : "Re: git: 92593edb3e4d - main - graphics/libheif: Update to latest commit as of 2022-02-09"
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Sat, 26 Feb 2022 12:19:16 UTC
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=92593edb3e4d3d1c8f976fdfd1a137338a095efc

commit 92593edb3e4d3d1c8f976fdfd1a137338a095efc
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2022-02-26 12:06:03 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2022-02-26 12:18:29 +0000

    graphics/libheif: Update to latest commit as of 2022-02-09
    
    - Update to latest upstream commit
      (0082fea96ee70a20c8906a0373bedec0c01777bc) as it contains various bug
      fixes that affects users
    - Disable RAV1E by default, this avoids libheif to pull in Rust and is
      also more inline with how other distributions packages libheif
    - Do some rearrangement of Makefile to make it follow Porters Handbook
      more closely
    
    PR:             261842
    Reviewed by:    makc
    Approved by:    Sebastian Steinmetz (maintainer timeout, 2+ weeks)
---
 graphics/libheif/Makefile  | 31 ++++++++++++++-----------------
 graphics/libheif/distinfo  | 10 +++-------
 graphics/libheif/pkg-plist | 21 ++++-----------------
 3 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/graphics/libheif/Makefile b/graphics/libheif/Makefile
index 9e9293d48242..4e2f15b42280 100644
--- a/graphics/libheif/Makefile
+++ b/graphics/libheif/Makefile
@@ -1,13 +1,9 @@
 PORTNAME=	libheif
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.10.0
-PORTREVISION=	4
+DISTVERSION=	1.12.0-62
+DISTVERSIONSUFFIX=	-g0082fea
 CATEGORIES=	graphics
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	b7caef96e012f6e516fee2e50a836b07b7c5a8fc.patch:-p1 \
-		7976e1858a857e33200cd33d01689fd040de6d3d.patch:-p1
-
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	ISO/IEC 23008-12:2017 HEIF file format de- and encoder
 
@@ -15,7 +11,7 @@ LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake compiler:c++11-lang cpe gettext-runtime gnome \
-		localbase:ldflags pkgconfig
+		localbase:ldflags pkgconfig shared-mime-info
 CPE_VENDOR=	struktur
 USE_GNOME=	gdkpixbuf2 glib20
 USE_LDCONFIG=	yes
@@ -26,27 +22,28 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	strukturag
 
 OPTIONS_DEFINE=		AOM DAV1D LIBDE265 RAV1E X265
-OPTIONS_DEFAULT=	AOM DAV1D LIBDE265 RAV1E X265
+OPTIONS_DEFAULT=	AOM DAV1D LIBDE265 X265
 OPTIONS_SUB=		yes
 
 AOM_DESC=		AV1 encoding/decoding via libaom
-AOM_CMAKE_BOOL=		WITH_AOM
+DAV1D_DESC=		Build dav1e decoder
+LIBDE265_DESC=		Use libde265 (support for HEVC decoding)
+RAV1E_DESC=		Build rav1e encoder
+X265_DESC=		Use x265 (support for HEVC encoding)
+
 AOM_LIB_DEPENDS=	libaom.so:multimedia/aom
+AOM_CMAKE_BOOL=		WITH_AOM
 
-DAV1D_DESC=		Build dav1e decoder
-DAV1D_CMAKE_BOOL=	WITH_DAV1D
 DAV1D_LIB_DEPENDS=	libdav1d.so:multimedia/dav1d
+DAV1D_CMAKE_BOOL=	WITH_DAV1D
 
-LIBDE265_DESC=		Use libde265 (support for HEVC decoding)
-LIBDE265_CMAKE_BOOL=	WITH_LIBDE265
 LIBDE265_LIB_DEPENDS=	libde265.so:multimedia/libde265
+LIBDE265_CMAKE_BOOL=	WITH_LIBDE265
 
-RAV1E_DESC=		Build rav1e encoder
-RAV1E_CMAKE_BOOL=	WITH_RAV1E
 RAV1E_LIB_DEPENDS=	librav1e.so:multimedia/librav1e
+RAV1E_CMAKE_BOOL=	WITH_RAV1E
 
-X265_DESC=		Use x265 (support for HEVC encoding)
-X265_CMAKE_BOOL=	WITH_X265
 X265_LIB_DEPENDS=	libx265.so:multimedia/x265
+X265_CMAKE_BOOL=	WITH_X265
 
 .include <bsd.port.mk>
diff --git a/graphics/libheif/distinfo b/graphics/libheif/distinfo
index 24767915bdbd..4ab15a7efccc 100644
--- a/graphics/libheif/distinfo
+++ b/graphics/libheif/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1633115707
-SHA256 (strukturag-libheif-v1.10.0_GH0.tar.gz) = 317a44bf157ba297638ab5a258040ef6ec4895d620cd58f52195f3f89c9eea28
-SIZE (strukturag-libheif-v1.10.0_GH0.tar.gz) = 1243656
-SHA256 (b7caef96e012f6e516fee2e50a836b07b7c5a8fc.patch) = f836dbbfc237205b9cadd178324f0de2321d906846bfeff5a7027f839cf0659a
-SIZE (b7caef96e012f6e516fee2e50a836b07b7c5a8fc.patch) = 1172
-SHA256 (7976e1858a857e33200cd33d01689fd040de6d3d.patch) = 659cfe0a088ca08e1a622a48f9ed79e99b0574a5c5960be9e7769192722eeb60
-SIZE (7976e1858a857e33200cd33d01689fd040de6d3d.patch) = 608
+TIMESTAMP = 1644226711
+SHA256 (strukturag-libheif-v1.12.0-62-g0082fea_GH0.tar.gz) = 54ecd408e3d19f881ee350aae157799142d710bbebfd545b49d0db843ed76434
+SIZE (strukturag-libheif-v1.12.0-62-g0082fea_GH0.tar.gz) = 1265185
diff --git a/graphics/libheif/pkg-plist b/graphics/libheif/pkg-plist
index 526de3bcb250..b23d601e35be 100644
--- a/graphics/libheif/pkg-plist
+++ b/graphics/libheif/pkg-plist
@@ -1,28 +1,15 @@
-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
-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.10.0.0
+lib/libheif.so.1.12.0.0
 libdata/pkgconfig/libheif.pc
+share/mime/packages/avif.xml
+share/mime/packages/heif.xml
+share/thumbnailers/heif.thumbnailer