Re: git: 1482f46205ce - main - graphics/libheif: Update to 1.14.0
Date: Tue, 29 Nov 2022 20:52:37 UTC
> On Nov 29, 2022, at 9:02 PM, Max Brazhnikov <makc@freebsd.org> wrote:
>
> The branch main has been updated by makc:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=1482f46205ceb8724488d75059a39b8070b010ba
>
> commit 1482f46205ceb8724488d75059a39b8070b010ba
> Author: Max Brazhnikov <makc@FreeBSD.org>
> AuthorDate: 2022-11-29 20:00:35 +0000
> Commit: Max Brazhnikov <makc@FreeBSD.org>
> CommitDate: 2022-11-29 20:00:35 +0000
>
> graphics/libheif: Update to 1.14.0
>
> Release notes: https://github.com/strukturag/libheif/releases/tag/v1.14.0
> ---
> graphics/libheif/Makefile | 19 ++++++++++---------
> graphics/libheif/distinfo | 10 +++-------
> graphics/libheif/files/patch-CMakeLists.txt | 19 +++++++++++++++++++
> graphics/libheif/pkg-plist | 4 +++-
> 4 files changed, 35 insertions(+), 17 deletions(-)
>
> diff --git a/graphics/libheif/Makefile b/graphics/libheif/Makefile
> index 56db9b93e820..53bf8d1a724f 100644
> --- a/graphics/libheif/Makefile
> +++ b/graphics/libheif/Makefile
> @@ -1,13 +1,8 @@
> PORTNAME= libheif
> -DISTVERSION= 1.13.0
> -PORTREVISION= 1
> +DISTVERSION= 1.14.0
> CATEGORIES= graphics
> MASTER_SITES= https://github.com/strukturag/${PORTNAME}/releases/download/v${DISTVERSION}/
>
> -PATCH_SITES= https://github.com/strukturag/${PORTNAME}/commit/
> -PATCHFILES= a01baccaf40bafcabddba47846f5e914ca0724f6.patch:-p1 \
> - d506bccdcecd7133ab12daa4ebcfbbb75d40641f.patch:-p1
> -
> MAINTAINER= makc@FreeBSD.org
> COMMENT= ISO/IEC 23008-12:2017 HEIF file format de- and encoder
> WWW= https://github.com/strukturag/libheif
> @@ -20,18 +15,21 @@ USES= cmake compiler:c++11-lang cpe gettext-runtime gnome \
> CPE_VENDOR= struktur
> USE_GNOME= gdkpixbuf2 glib20
> USE_LDCONFIG= yes
> +PLIST_SUB= LIB_VER=${DISTVERSION}.0
>
> -OPTIONS_DEFINE= AOM DAV1D EXAMPLES LIBDE265 RAV1E X265
> -OPTIONS_DEFAULT= AOM DAV1D LIBDE265 X265
> +OPTIONS_DEFINE= AOM DAV1D EXAMPLES LIBDE265 SVT RAV1E X265
> +OPTIONS_DEFAULT= AOM DAV1D LIBDE265 SVT X265
> +OPTIONS_SUB= yes
>
> AOM_DESC= AV1 encoding/decoding via libaom
> DAV1D_DESC= Build dav1e decoder
> LIBDE265_DESC= Use libde265 (support for HEVC decoding)
> +SVT_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
> +AOM_CMAKE_BOOL= WITH_AOM_ENCODER WITH_AOM_DECODER
>
> DAV1D_LIB_DEPENDS= libdav1d.so:multimedia/dav1d
> DAV1D_CMAKE_BOOL= WITH_DAV1D
> @@ -43,6 +41,9 @@ EXAMPLES_CMAKE_BOOL= WITH_EXAMPLES
> LIBDE265_LIB_DEPENDS= libde265.so:multimedia/libde265
> LIBDE265_CMAKE_BOOL= WITH_LIBDE265
>
> +SVT_LIB_DEPENDS= libSvtAv1Enc.so:multimedia/svt-av1
> +SVT_CMAKE_BOOL= WITH_SvtEnc
> +
> RAV1E_LIB_DEPENDS= librav1e.so:multimedia/librav1e
> RAV1E_CMAKE_BOOL= WITH_RAV1E
>
> diff --git a/graphics/libheif/distinfo b/graphics/libheif/distinfo
> index 88674da0c28b..6572f8b6ce34 100644
> --- a/graphics/libheif/distinfo
> +++ b/graphics/libheif/distinfo
> @@ -1,7 +1,3 @@
> -TIMESTAMP = 1662837293
> -SHA256 (libheif-1.13.0.tar.gz) = c20ae01bace39e89298f6352f1ff4a54b415b33b9743902da798e8a1e51d7ca1
> -SIZE (libheif-1.13.0.tar.gz) = 1703950
> -SHA256 (a01baccaf40bafcabddba47846f5e914ca0724f6.patch) = 0f910768a2e031b2171c477bcfb9e82d03d970abcd1bbd6dc0ec3ce06fa2ec2c
> -SIZE (a01baccaf40bafcabddba47846f5e914ca0724f6.patch) = 1484
> -SHA256 (d506bccdcecd7133ab12daa4ebcfbbb75d40641f.patch) = aa6d600969f624bb69e1f4516bfb618998e74fbff96a414322f2e7cfc5e0a4f7
> -SIZE (d506bccdcecd7133ab12daa4ebcfbbb75d40641f.patch) = 2138
> +TIMESTAMP = 1669740310
> +SHA256 (libheif-1.14.0.tar.gz) = 9a2b969d827e162fa9eba582ebd0c9f6891f16e426ef608d089b1f24962295b5
> +SIZE (libheif-1.14.0.tar.gz) = 1737874
> diff --git a/graphics/libheif/files/patch-CMakeLists.txt b/graphics/libheif/files/patch-CMakeLists.txt
> new file mode 100644
> index 000000000000..3d96cba1347b
> --- /dev/null
> +++ b/graphics/libheif/files/patch-CMakeLists.txt
> @@ -0,0 +1,19 @@
> +--- CMakeLists.txt.orig 2022-11-15 13:24:59 UTC
> ++++ CMakeLists.txt
> +@@ -22,7 +22,6 @@ endif()
> +
> + if(NOT MSVC)
> + add_definitions(-Wall)
> +- add_definitions(-Werror)
> + add_definitions(-Wsign-compare)
> + add_definitions(-Wconversion)
> + add_definitions(-Wno-sign-conversion)
> +@@ -58,7 +57,7 @@ endif()
> + LIST (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules")
> +
> + option(ENABLE_PLUGIN_LOADING "Support loading of plugins" ON)
> +-set(PLUGIN_DIRECTORY "/usr/local/lib/libheif" CACHE STRING "Plugin install directory")
> ++set(PLUGIN_DIRECTORY "${CMAKE_INSTALL_LIBDIR}/libheif" CACHE STRING "Plugin install directory")
> +
> + macro(plugin_option variableName packageName displayName displayType defaultPlugin)
> + option(WITH_${variableName} "Build ${displayName} ${displayType}" ON)
> diff --git a/graphics/libheif/pkg-plist b/graphics/libheif/pkg-plist
> index 1c96d53548b1..a397c9f6cc28 100644
> --- a/graphics/libheif/pkg-plist
> +++ b/graphics/libheif/pkg-plist
> @@ -12,7 +12,9 @@ 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.13.0.0
> +lib/libheif.so.%%LIB_VER%%
> +%%SVT%%lib/libheif/libheif-svtenc.so
> +%%RAV1E%%lib/libheif/libheif-rav1e.so
> libdata/pkgconfig/libheif.pc
> %%PORTEXAMPLES%%share/man/man1/heif-convert.1.gz
> %%PORTEXAMPLES%%share/man/man1/heif-enc.1.gz
I think this breaks some ImageMagick magically.