Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Nov 2024 03:25:50 +0800
From:      Po-Chuan Hsieh <sunpoet@freebsd.org>
To:        Max Brazhnikov <makc@freebsd.org>
Cc:        ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org,  dev-commits-ports-main@freebsd.org
Subject:   Re: git: 61a70ba8b94b - main - graphics/libheif: update to 1.19.1
Message-ID:  <CAMHz58R0%2BK7cSkGg6opNzcEVWYh7pR0zyw%2BKZ5yX9Rj3q-g1ew@mail.gmail.com>
In-Reply-To: <202411022034.4A2KYVxk044408@gitrepo.freebsd.org>

index | next in thread | previous in thread | raw e-mail

[-- Attachment #1 --]
Hello,

On Sun, Nov 3, 2024 at 4:34 AM Max Brazhnikov <makc@freebsd.org> wrote:

> The branch main has been updated by makc:
>
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=61a70ba8b94be3288962a5827de156f7777f07e9
>
> commit 61a70ba8b94be3288962a5827de156f7777f07e9
> Author:     Max Brazhnikov <makc@FreeBSD.org>
> AuthorDate: 2024-11-02 20:34:10 +0000
> Commit:     Max Brazhnikov <makc@FreeBSD.org>
> CommitDate: 2024-11-02 20:34:10 +0000
>
>     graphics/libheif: update to 1.19.1
>

It breaks graphics/py-pillow-heif. Would you please provide a fix for this?
Thanks.


>     Drop stale patch.
>     Add new options and enable them by default:
>      - OPENH264 for AVC decoding,
>      - OPENJPH for HT-J2K encoding.
>
>     Release notes:
> https://github.com/strukturag/libheif/releases/tag/v1.19.0
>
> https://github.com/strukturag/libheif/releases/tag/v1.19.1
> ---
>  graphics/libheif/Makefile                   | 23 +++++++++++++++++------
>  graphics/libheif/distinfo                   |  6 +++---
>  graphics/libheif/files/patch-CMakeLists.txt | 10 ----------
>  graphics/libheif/pkg-plist                  |  1 +
>  4 files changed, 21 insertions(+), 19 deletions(-)
>
> diff --git a/graphics/libheif/Makefile b/graphics/libheif/Makefile
> index 5cda6f3254ec..7bd812b0b51d 100644
> --- a/graphics/libheif/Makefile
> +++ b/graphics/libheif/Makefile
> @@ -1,6 +1,5 @@
>  PORTNAME=      libheif
> -DISTVERSION=   1.18.2
> -PORTREVISION=  1
> +DISTVERSION=   1.19.1
>  CATEGORIES=    graphics
>  MASTER_SITES=
> https://github.com/strukturag/${PORTNAME}/releases/download/v${DISTVERSION}/
>
> @@ -21,18 +20,24 @@ USE_LDCONFIG=       yes
>  PLIST_SUB=     LIB_VER=${DISTVERSION}
>
>  CMAKE_OFF=     BUILD_TESTING \
> -               WITH_KVAZAAR
> +               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 \
> -               OPENJPEG SVTAV1 RAV1E X265
> -OPTIONS_DEFAULT=AOM DAV1D FFMPEG JPEG OPENJPEG SVTAV1 X265
> +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)
> @@ -57,9 +62,15 @@ 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
>
> diff --git a/graphics/libheif/distinfo b/graphics/libheif/distinfo
> index 9357a480d72a..dcfeae3ad8fc 100644
> --- a/graphics/libheif/distinfo
> +++ b/graphics/libheif/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1724245714
> -SHA256 (libheif-1.18.2.tar.gz) =
> c4002a622bec9f519f29d84bfdc6024e33fd67953a5fb4dc2c2f11f67d5e45bf
> -SIZE (libheif-1.18.2.tar.gz) = 1525096
> +TIMESTAMP = 1730562330
> +SHA256 (libheif-1.19.1.tar.gz) =
> 994913eb2a29c00c146d6f3d61e07d9ff0d8e9eccb0624d87e4be8b108c74e4b
> +SIZE (libheif-1.19.1.tar.gz) = 1649119
> diff --git a/graphics/libheif/files/patch-CMakeLists.txt
> b/graphics/libheif/files/patch-CMakeLists.txt
> deleted file mode 100644
> index fed1d8aeefde..000000000000
> --- a/graphics/libheif/files/patch-CMakeLists.txt
> +++ /dev/null
> @@ -1,10 +0,0 @@
> ---- 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)
> diff --git a/graphics/libheif/pkg-plist b/graphics/libheif/pkg-plist
> index c7bf3204831a..0df90c604400 100644
> --- a/graphics/libheif/pkg-plist
> +++ b/graphics/libheif/pkg-plist
> @@ -20,6 +20,7 @@ lib/libheif.so.%%LIB_VER%%
>  %%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
>
>

[-- Attachment #2 --]
<div dir="ltr"><div>Hello, </div><div><br></div><div dir="ltr">On Sun, Nov 3, 2024 at 4:34 AM Max Brazhnikov &lt;<a href="mailto:makc@freebsd.org">makc@freebsd.org</a>&gt; wrote:</div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch main has been updated by makc:<br>
<br>
URL: <a href="https://cgit.FreeBSD.org/ports/commit/?id=61a70ba8b94be3288962a5827de156f7777f07e9" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=61a70ba8b94be3288962a5827de156f7777f07e9</a><br>;
<br>
commit 61a70ba8b94be3288962a5827de156f7777f07e9<br>
Author:     Max Brazhnikov &lt;makc@FreeBSD.org&gt;<br>
AuthorDate: 2024-11-02 20:34:10 +0000<br>
Commit:     Max Brazhnikov &lt;makc@FreeBSD.org&gt;<br>
CommitDate: 2024-11-02 20:34:10 +0000<br>
<br>
    graphics/libheif: update to 1.19.1<br></blockquote><div><br></div><div>It breaks graphics/py-pillow-heif. Would you please provide a fix for this?</div><div>Thanks.</div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
    Drop stale patch.<br>
    Add new options and enable them by default:<br>
     - OPENH264 for AVC decoding,<br>
     - OPENJPH for HT-J2K encoding.<br>
<br>
    Release notes: <a href="https://github.com/strukturag/libheif/releases/tag/v1.19.0" rel="noreferrer" target="_blank">https://github.com/strukturag/libheif/releases/tag/v1.19.0</a><br>;
                   <a href="https://github.com/strukturag/libheif/releases/tag/v1.19.1" rel="noreferrer" target="_blank">https://github.com/strukturag/libheif/releases/tag/v1.19.1</a><br>;
---<br>
 graphics/libheif/Makefile                   | 23 +++++++++++++++++------<br>
 graphics/libheif/distinfo                   |  6 +++---<br>
 graphics/libheif/files/patch-CMakeLists.txt | 10 ----------<br>
 graphics/libheif/pkg-plist                  |  1 +<br>
 4 files changed, 21 insertions(+), 19 deletions(-)<br>
<br>
diff --git a/graphics/libheif/Makefile b/graphics/libheif/Makefile<br>
index 5cda6f3254ec..7bd812b0b51d 100644<br>
--- a/graphics/libheif/Makefile<br>
+++ b/graphics/libheif/Makefile<br>
@@ -1,6 +1,5 @@<br>
 PORTNAME=      libheif<br>
-DISTVERSION=   1.18.2<br>
-PORTREVISION=  1<br>
+DISTVERSION=   1.19.1<br>
 CATEGORIES=    graphics<br>
 MASTER_SITES=  <a href="https://github.com/strukturag/$%7BPORTNAME%7D/releases/download/v$%7BDISTVERSION%7D/" rel="noreferrer" target="_blank">https://github.com/strukturag/${PORTNAME}/releases/download/v${DISTVERSION}/</a><br>;
<br>
@@ -21,18 +20,24 @@ USE_LDCONFIG=       yes<br>
 PLIST_SUB=     LIB_VER=${DISTVERSION}<br>
<br>
 CMAKE_OFF=     BUILD_TESTING \<br>
-               WITH_KVAZAAR<br>
+               WITH_KVAZAAR \<br>
+               WITH_UVG266 \<br>
+               WITH_VVDEC \<br>
+               WITH_VVENC \<br>
+               CMAKE_COMPILE_WARNING_AS_ERROR<br>
 CMAKE_ON=      CMAKE_DISABLE_FIND_PACKAGE_Doxygen<br>
<br>
-OPTIONS_DEFINE=        AOM DAV1D EXAMPLES FFMPEG JPEG LIBDE265 \<br>
-               OPENJPEG SVTAV1 RAV1E X265<br>
-OPTIONS_DEFAULT=AOM DAV1D FFMPEG JPEG OPENJPEG SVTAV1 X265<br>
+OPTIONS_DEFINE=        AOM DAV1D EXAMPLES FFMPEG JPEG LIBDE265 OPENH264 \<br>
+               OPENJPEG OPENJPH SVTAV1 RAV1E X265<br>
+OPTIONS_DEFAULT=AOM DAV1D FFMPEG JPEG OPENH264 OPENJPEG OPENJPH SVTAV1 X265<br>
 OPTIONS_SUB=   yes<br>
<br>
 AOM_DESC=              AV1 encoding/decoding via libaom<br>
 FFMPEG_DESC=           Use FFmpeg (support for HEVC decoding)<br>
 DAV1D_DESC=            Build dav1e decoder<br>
 LIBDE265_DESC=         Use libde265 (support for HEVC decoding)<br>
+OPENH264_DESC=         AVC decoding via OpenH264<br>
+OPENJPH_DESC=          HT-J2K encoding via OpenJPH<br>
 SVTAV1_DESC=           Build svt-av1 encoder<br>
 RAV1E_DESC=            Build rav1e encoder<br>
 X265_DESC=             Use x265 (support for HEVC encoding)<br>
@@ -57,9 +62,15 @@ JPEG_CMAKE_BOOL=     WITH_JPEG_ENCODER WITH_JPEG_DECODER<br>
 LIBDE265_LIB_DEPENDS=  libde265.so:multimedia/libde265<br>
 LIBDE265_CMAKE_BOOL=   WITH_LIBDE265<br>
<br>
+OPENH264_LIB_DEPENDS=  libopenh264.so:multimedia/openh264<br>
+OPENH264_CMAKE_BOOL=   WITH_OpenH264_DECODER<br>
+<br>
 OPENJPEG_LIB_DEPENDS=  libopenjp2.so:graphics/openjpeg<br>
 OPENJPEG_CMAKE_BOOL=   WITH_OpenJPEG_ENCODER WITH_OpenJPEG_DECODER<br>
<br>
+OPENJPH_LIB_DEPENDS=   libopenjph.so:graphics/openjph<br>
+OPENJPH_CMAKE_BOOL=    WITH_OPENJPH_ENCODER WITH_OPENJPH_DECODER<br>
+<br>
 SVTAV1_LIB_DEPENDS=    libSvtAv1Enc.so:multimedia/svt-av1<br>
 SVTAV1_CMAKE_BOOL=     WITH_SvtEnc<br>
<br>
diff --git a/graphics/libheif/distinfo b/graphics/libheif/distinfo<br>
index 9357a480d72a..dcfeae3ad8fc 100644<br>
--- a/graphics/libheif/distinfo<br>
+++ b/graphics/libheif/distinfo<br>
@@ -1,3 +1,3 @@<br>
-TIMESTAMP = 1724245714<br>
-SHA256 (libheif-1.18.2.tar.gz) = c4002a622bec9f519f29d84bfdc6024e33fd67953a5fb4dc2c2f11f67d5e45bf<br>
-SIZE (libheif-1.18.2.tar.gz) = 1525096<br>
+TIMESTAMP = 1730562330<br>
+SHA256 (libheif-1.19.1.tar.gz) = 994913eb2a29c00c146d6f3d61e07d9ff0d8e9eccb0624d87e4be8b108c74e4b<br>
+SIZE (libheif-1.19.1.tar.gz) = 1649119<br>
diff --git a/graphics/libheif/files/patch-CMakeLists.txt b/graphics/libheif/files/patch-CMakeLists.txt<br>
deleted file mode 100644<br>
index fed1d8aeefde..000000000000<br>
--- a/graphics/libheif/files/patch-CMakeLists.txt<br>
+++ /dev/null<br>
@@ -1,10 +0,0 @@<br>
---- CMakeLists.txt.orig        2022-11-15 13:24:59 UTC<br>
-+++ CMakeLists.txt<br>
-@@ -22,7 +22,6 @@ endif()<br>
- <br>
- if(NOT MSVC)<br>
-   add_definitions(-Wall)<br>
--  add_definitions(-Werror)<br>
-   add_definitions(-Wsign-compare)<br>
-   add_definitions(-Wconversion)<br>
-   add_definitions(-Wno-sign-conversion)<br>
diff --git a/graphics/libheif/pkg-plist b/graphics/libheif/pkg-plist<br>
index c7bf3204831a..0df90c604400 100644<br>
--- a/graphics/libheif/pkg-plist<br>
+++ b/graphics/libheif/pkg-plist<br>
@@ -20,6 +20,7 @@ lib/libheif.so.%%LIB_VER%%<br>
 %%OPENJPEG%%lib/libheif/libheif-j2kdec.so<br>
 %%OPENJPEG%%lib/libheif/libheif-j2kenc.so<br>
 %%RAV1E%%lib/libheif/libheif-rav1e.so<br>
+%%OPENJPH%%lib/libheif/libheif-jphenc.so<br>
 %%SVTAV1%%lib/libheif/libheif-svtenc.so<br>
 libdata/pkgconfig/libheif.pc<br>
 %%PORTEXAMPLES%%share/man/man1/heif-dec.1.gz<br>
<br>
</blockquote></div></div>
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58R0%2BK7cSkGg6opNzcEVWYh7pR0zyw%2BKZ5yX9Rj3q-g1ew>