diff --git a/graphics/libheif/Makefile b/graphics/libheif/Makefile index 0e566fa51ff4..6b0225d7dddf 100644 --- a/graphics/libheif/Makefile +++ b/graphics/libheif/Makefile @@ -1,90 +1,85 @@ PORTNAME= libheif -DISTVERSION= 1.21.2 -PORTREVISION= 3 +DISTVERSION= 1.22.2 CATEGORIES= graphics MASTER_SITES= https://github.com/strukturag/${PORTNAME}/releases/download/v${DISTVERSION}/ -PATCH_SITES= https://github.com/strukturag/${PORTNAME}/commit/ -PATCHFILES+= 61923302d12f.patch:-p1 # https://github.com/strukturag/libheif/pull/1680 -PATCHFILES+= f9919e348689.patch:-p1 # https://github.com/strukturag/libheif/pull/1680 - 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++20-lang cpe gettext-runtime gnome \ localbase:ldflags pathfix pkgconfig CPE_VENDOR= struktur USE_GNOME= gdkpixbuf glib20 USE_LDCONFIG= yes PLIST_SUB= LIB_VER=${DISTVERSION} CMAKE_OFF= BUILD_TESTING \ WITH_KVAZAAR \ WITH_UVG266 \ WITH_VVDEC \ WITH_VVENC \ CMAKE_COMPILE_WARNING_AS_ERROR CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Doxygen OPTIONS_DEFINE= AOM DAV1D EXAMPLES FFMPEG JPEG LIBDE265 OPENH264 \ OPENJPEG OPENJPH SVTAV1 RAV1E X265 OPTIONS_DEFAULT=AOM DAV1D FFMPEG JPEG OPENH264 OPENJPEG OPENJPH 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) OPENH264_DESC= AVC decoding via OpenH264 OPENJPH_DESC= HT-J2K encoding via OpenJPH 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 \ libtiff.so:graphics/tiff EXAMPLES_USES= sdl EXAMPLES_USE= SDL=sdl2 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 OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264 OPENH264_CMAKE_BOOL= WITH_OpenH264_DECODER OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg OPENJPEG_CMAKE_BOOL= WITH_OpenJPEG_ENCODER WITH_OpenJPEG_DECODER OPENJPH_LIB_DEPENDS= libopenjph.so:graphics/openjph OPENJPH_CMAKE_BOOL= WITH_OPENJPH_ENCODER WITH_OPENJPH_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 48c0aea46dd7..a0b954d9705a 100644 --- a/graphics/libheif/distinfo +++ b/graphics/libheif/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1769288759 -SHA256 (libheif-1.21.2.tar.gz) = 75f530b7154bc93e7ecf846edfc0416bf5f490612de8c45983c36385aa742b42 -SIZE (libheif-1.21.2.tar.gz) = 1859435 -SHA256 (61923302d12f.patch) = 1a45ec9118a0132650324f79f2163281da9072fad28d506a5771938300aa261d -SIZE (61923302d12f.patch) = 991 -SHA256 (f9919e348689.patch) = ea5c62cf3cbd75faab729458d26899f7ed1b5dc8f48b71093c69c0c9a97c71eb -SIZE (f9919e348689.patch) = 2340 +TIMESTAMP = 1780140012 +SHA256 (libheif-1.22.2.tar.gz) = eea48e4841f83fbe51d029337ffd2d14512d0203015dad40b90213d872958af3 +SIZE (libheif-1.22.2.tar.gz) = 2049684 diff --git a/graphics/libheif/files/patch-svt-av1-4.1 b/graphics/libheif/files/patch-svt-av1-4.1 deleted file mode 100644 index 62f15cbe3e51..000000000000 --- a/graphics/libheif/files/patch-svt-av1-4.1 +++ /dev/null @@ -1,25 +0,0 @@ -https://github.com/strukturag/libheif/pull/1680#issuecomment-4117142244 - ---- libheif/plugins/encoder_svt.cc.orig 2026-01-16 08:03:07 UTC -+++ libheif/plugins/encoder_svt.cc -@@ -838,7 +838,19 @@ static heif_error svt_start_sequence_encoding_intern(v - // svt_config.force_key_frames = true; TODO: this does not seem to work (see all [1]) - - #if 1 --#if SVT_AV1_CHECK_VERSION(4, 0, 0) -+#if SVT_AV1_CHECK_VERSION(4, 1, 0) -+ switch (options->gop_structure) { -+ case heif_sequence_gop_structure_intra_only: -+ //svt_config.pred_structure = PredStructure::LOW_DELAY; -+ break; -+ case heif_sequence_gop_structure_lowdelay: -+ //svt_config.pred_structure = PredStructure::LOW_DELAY; -+ break; -+ case heif_sequence_gop_structure_unrestricted: -+ svt_config.pred_structure = PredStructure::RANDOM_ACCESS; -+ break; -+ } -+#elif SVT_AV1_CHECK_VERSION(4, 0, 0) - switch (options->gop_structure) { - case heif_sequence_gop_structure_intra_only: - //svt_config.pred_structure = 1; // LOW_DELAY diff --git a/graphics/libheif/pkg-plist b/graphics/libheif/pkg-plist index 099dc7f787a2..92a937552353 100644 --- a/graphics/libheif/pkg-plist +++ b/graphics/libheif/pkg-plist @@ -1,50 +1,52 @@ %%PORTEXAMPLES%%bin/heif-dec %%PORTEXAMPLES%%bin/heif-enc %%PORTEXAMPLES%%bin/heif-info %%PORTEXAMPLES%%bin/heif-thumbnailer %%PORTEXAMPLES%%bin/heif-view include/libheif/heif.h include/libheif/heif_aux_images.h include/libheif/heif_brands.h include/libheif/heif_color.h +include/libheif/heif_components.h include/libheif/heif_context.h include/libheif/heif_cxx.h include/libheif/heif_decoding.h include/libheif/heif_encoding.h include/libheif/heif_entity_groups.h include/libheif/heif_error.h include/libheif/heif_image.h include/libheif/heif_image_handle.h include/libheif/heif_items.h include/libheif/heif_library.h include/libheif/heif_metadata.h +include/libheif/heif_omaf.h include/libheif/heif_plugin.h include/libheif/heif_properties.h include/libheif/heif_regions.h include/libheif/heif_security.h include/libheif/heif_sequences.h include/libheif/heif_tai_timestamps.h include/libheif/heif_text.h include/libheif/heif_tiling.h include/libheif/heif_uncompressed.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 %%OPENJPH%%lib/libheif/libheif-jphenc.so %%SVTAV1%%lib/libheif/libheif-svtenc.so libdata/pkgconfig/libheif.pc %%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