diff --git a/graphics/libheif/Makefile b/graphics/libheif/Makefile index d38a297862cf..4cb4723a5a1c 100644 --- a/graphics/libheif/Makefile +++ b/graphics/libheif/Makefile @@ -1,71 +1,71 @@ PORTNAME= libheif -DISTVERSION= 1.17.6 -PORTREVISION= 2 +DISTVERSION= 1.18.1 CATEGORIES= graphics MASTER_SITES= https://github.com/strukturag/${PORTNAME}/releases/download/v${DISTVERSION}/ MAINTAINER= makc@FreeBSD.org COMMENT= ISO/IEC 23008-12:2017 HEIF file format de- and encoder WWW= https://github.com/strukturag/libheif LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libsharpyuv.so:graphics/webp USES= cmake:testing compiler:c++11-lang cpe gettext-runtime gnome \ localbase:ldflags pathfix pkgconfig CPE_VENDOR= struktur USE_GNOME= gdkpixbuf2 glib20 USE_LDCONFIG= yes PLIST_SUB= LIB_VER=${DISTVERSION} CMAKE_OFF= BUILD_TESTING \ WITH_KVAZAAR CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Doxygen OPTIONS_DEFINE= AOM DAV1D EXAMPLES FFMPEG JPEG LIBDE265 \ OPENJPEG SVTAV1 RAV1E X265 OPTIONS_DEFAULT=AOM DAV1D FFMPEG JPEG OPENJPEG SVTAV1 X265 OPTIONS_SUB= yes AOM_DESC= AV1 encoding/decoding via libaom FFMPEG_DESC= Use FFmpeg (support for HEVC decoding) DAV1D_DESC= Build dav1e decoder LIBDE265_DESC= Use libde265 (support for HEVC decoding) SVTAV1_DESC= Build svt-av1 encoder 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_ENCODER WITH_AOM_DECODER DAV1D_LIB_DEPENDS= libdav1d.so:multimedia/dav1d DAV1D_CMAKE_BOOL= WITH_DAV1D -EXAMPLES_LIB_DEPENDS= libpng16.so:graphics/png +EXAMPLES_LIB_DEPENDS= libpng16.so:graphics/png \ + libtiff.so:graphics/tiff EXAMPLES_CMAKE_BOOL= WITH_EXAMPLES EXAMPLE_IMPLIES= JPEG FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CMAKE_BOOL= WITH_FFMPEG_DECODER JPEG_USES= jpeg JPEG_CMAKE_BOOL= WITH_JPEG_ENCODER WITH_JPEG_DECODER LIBDE265_LIB_DEPENDS= libde265.so:multimedia/libde265 LIBDE265_CMAKE_BOOL= WITH_LIBDE265 OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg OPENJPEG_CMAKE_BOOL= WITH_OpenJPEG_ENCODER WITH_OpenJPEG_DECODER SVTAV1_LIB_DEPENDS= libSvtAv1Enc.so:multimedia/svt-av1 SVTAV1_CMAKE_BOOL= WITH_SvtEnc RAV1E_LIB_DEPENDS= librav1e.so:multimedia/librav1e RAV1E_CMAKE_BOOL= WITH_RAV1E X265_LIB_DEPENDS= libx265.so:multimedia/x265 X265_CMAKE_BOOL= WITH_X265 .include diff --git a/graphics/libheif/distinfo b/graphics/libheif/distinfo index 123ae9bcf3d7..ba5dac8cf792 100644 --- a/graphics/libheif/distinfo +++ b/graphics/libheif/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1703123477 -SHA256 (libheif-1.17.6.tar.gz) = 8390baf4913eda0a183e132cec62b875fb2ef507ced5ddddc98dfd2f17780aee -SIZE (libheif-1.17.6.tar.gz) = 1433302 +TIMESTAMP = 1721761068 +SHA256 (libheif-1.18.1.tar.gz) = 8702564b0f288707ea72b260b3bf4ba9bf7abfa7dac01353def3a86acd6bbb76 +SIZE (libheif-1.18.1.tar.gz) = 1524386 diff --git a/graphics/libheif/files/patch-libheif_plugins_encoder__svt.cc b/graphics/libheif/files/patch-libheif_plugins_encoder__svt.cc deleted file mode 100644 index a91ed507cccd..000000000000 --- a/graphics/libheif/files/patch-libheif_plugins_encoder__svt.cc +++ /dev/null @@ -1,24 +0,0 @@ -libheif/plugins/encoder_svt.cc:654:34: error: assigning to 'EbColorPrimaries' from incompatible type 'uint8_t' (aka 'unsigned char') - svt_config.color_primaries = static_cast(nclx->color_primaries); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -libheif/plugins/encoder_svt.cc:655:43: error: assigning to 'EbTransferCharacteristics' from incompatible type 'uint8_t' (aka 'unsigned char') - svt_config.transfer_characteristics = static_cast(nclx->transfer_characteristics); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -libheif/plugins/encoder_svt.cc:656:38: error: assigning to 'EbMatrixCoefficients' from incompatible type 'uint8_t' (aka 'unsigned char') - svt_config.matrix_coefficients = static_cast(nclx->matrix_coefficients); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -libheif/plugins/encoder_svt.cc:657:30: error: assigning to 'EbColorRange' from incompatible type 'int' - svt_config.color_range = nclx->full_range_flag ? 1 : 0; - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ---- libheif/plugins/encoder_svt.cc.orig 2023-12-20 10:31:30 UTC -+++ libheif/plugins/encoder_svt.cc -@@ -645,7 +645,7 @@ struct heif_error svt_encode_image(void* encoder_raw, - - if (nclx) { - svt_config.color_description_present_flag = true; --#if SVT_AV1_VERSION_MAJOR == 1 -+#if SVT_AV1_VERSION_MAJOR >= 1 - svt_config.color_primaries = static_cast(nclx->color_primaries); - svt_config.transfer_characteristics = static_cast(nclx->transfer_characteristics); - svt_config.matrix_coefficients = static_cast(nclx->matrix_coefficients); diff --git a/graphics/libheif/pkg-plist b/graphics/libheif/pkg-plist index 4259bad19db2..c7bf3204831a 100644 --- a/graphics/libheif/pkg-plist +++ b/graphics/libheif/pkg-plist @@ -1,29 +1,30 @@ -%%PORTEXAMPLES%%bin/heif-convert +%%PORTEXAMPLES%%bin/heif-dec %%PORTEXAMPLES%%bin/heif-enc %%PORTEXAMPLES%%bin/heif-info %%PORTEXAMPLES%%bin/heif-thumbnailer include/libheif/heif.h include/libheif/heif_cxx.h +include/libheif/heif_items.h include/libheif/heif_plugin.h include/libheif/heif_properties.h include/libheif/heif_regions.h include/libheif/heif_version.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.%%LIB_VER%% %%DAV1D%%lib/libheif/libheif-dav1d.so %%OPENJPEG%%lib/libheif/libheif-j2kdec.so %%OPENJPEG%%lib/libheif/libheif-j2kenc.so %%RAV1E%%lib/libheif/libheif-rav1e.so %%SVTAV1%%lib/libheif/libheif-svtenc.so libdata/pkgconfig/libheif.pc -%%PORTEXAMPLES%%share/man/man1/heif-convert.1.gz +%%PORTEXAMPLES%%share/man/man1/heif-dec.1.gz %%PORTEXAMPLES%%share/man/man1/heif-enc.1.gz %%PORTEXAMPLES%%share/man/man1/heif-info.1.gz %%PORTEXAMPLES%%share/man/man1/heif-thumbnailer.1.gz %%PORTEXAMPLES%%share/thumbnailers/heif.thumbnailer @dir lib/libheif