git: 9253060fd17e - main - multimedia/svt-av1: update to 3.0.0

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Fri, 28 Feb 2025 00:33:55 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9253060fd17e65b9f3baca0b33547ce215d93427

commit 9253060fd17e65b9f3baca0b33547ce215d93427
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2025-02-20 14:51:11 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2025-02-28 00:27:33 +0000

    multimedia/svt-av1: update to 3.0.0
    
    Changes:        https://gitlab.com/AOMediaCodec/SVT-AV1/-/releases/v3.0.0
    Reported by:    /r/AV1
---
 graphics/libavif/Makefile                                |  4 ++++
 graphics/libavif/distinfo                                |  2 ++
 graphics/libheif/Makefile                                |  5 ++++-
 graphics/libheif/distinfo                                |  2 ++
 multimedia/ffmpeg/Makefile                               |  2 +-
 multimedia/ffmpeg/files/patch-libavcodec_libsvtav1.c     | 16 ++++++++++++++++
 multimedia/ffmpeg4/Makefile                              |  2 +-
 multimedia/ffmpeg4/files/patch-libavcodec_libsvtav1.c    | 16 ++++++++++++++++
 multimedia/gstreamer1-plugins-svt-av1/Makefile           |  2 +-
 multimedia/gstreamer1-plugins-svt-av1/distinfo           |  8 +++++---
 .../files/patch-gstsvtav1enc.c                           | 15 +++++++++++++++
 multimedia/svt-av1/Makefile                              |  4 +++-
 multimedia/svt-av1/distinfo                              |  8 +++++---
 multimedia/svt-av1/pkg-plist                             |  3 +--
 14 files changed, 76 insertions(+), 13 deletions(-)

diff --git a/graphics/libavif/Makefile b/graphics/libavif/Makefile
index 024962bb3fbc..fa7119b17dc8 100644
--- a/graphics/libavif/Makefile
+++ b/graphics/libavif/Makefile
@@ -1,8 +1,12 @@
 PORTNAME=	libavif
 PORTVERSION=	1.1.1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	graphics
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	e649830525d3.patch:-p1 # https://github.com/AOMediaCodec/libavif/pull/2607
+
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library for encoding and decoding .avif files
 WWW=		https://github.com/AOMediaCodec/libavif
diff --git a/graphics/libavif/distinfo b/graphics/libavif/distinfo
index f276b4620dac..85aa38128fea 100644
--- a/graphics/libavif/distinfo
+++ b/graphics/libavif/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1722711161
 SHA256 (AOMediaCodec-libavif-v1.1.1_GH0.tar.gz) = 914662e16245e062ed73f90112fbb4548241300843a7772d8d441bb6859de45b
 SIZE (AOMediaCodec-libavif-v1.1.1_GH0.tar.gz) = 13644189
+SHA256 (e649830525d3.patch) = 27bb6a863a4749137c5f5a0a9a0866a658d903f9e7b27ec99b0425662cf7caad
+SIZE (e649830525d3.patch) = 3252
diff --git a/graphics/libheif/Makefile b/graphics/libheif/Makefile
index 1bd1d188241e..03e6346e73c7 100644
--- a/graphics/libheif/Makefile
+++ b/graphics/libheif/Makefile
@@ -1,9 +1,12 @@
 PORTNAME=	libheif
 DISTVERSION=	1.19.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/strukturag/${PORTNAME}/releases/download/v${DISTVERSION}/
 
+PATCH_SITES=	https://github.com/strukturag/${PORTNAME}/commit/
+PATCHFILES+=	4bc4cfb66055.patch:-p1 # https://github.com/strukturag/libheif/pull/1475
+
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	ISO/IEC 23008-12:2017 HEIF file format de- and encoder
 WWW=		https://github.com/strukturag/libheif
diff --git a/graphics/libheif/distinfo b/graphics/libheif/distinfo
index da1490870e8b..192999d2c369 100644
--- a/graphics/libheif/distinfo
+++ b/graphics/libheif/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1733234194
 SHA256 (libheif-1.19.5.tar.gz) = d3cf0a76076115a070f9bc87cf5259b333a1f05806500045338798486d0afbaf
 SIZE (libheif-1.19.5.tar.gz) = 1716856
+SHA256 (4bc4cfb66055.patch) = e5f7eaee94aebeef387e10be6d515d2ba25b250fb15829d160a0c1a3cebe5e24
+SIZE (4bc4cfb66055.patch) = 2755
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index c4d967ca3f0a..6b3f4e6c4845 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ffmpeg
 PORTVERSION=	6.1.2
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio net
 MASTER_SITES=	https://ffmpeg.org/releases/
diff --git a/multimedia/ffmpeg/files/patch-libavcodec_libsvtav1.c b/multimedia/ffmpeg/files/patch-libavcodec_libsvtav1.c
new file mode 100644
index 000000000000..36eb954b63e1
--- /dev/null
+++ b/multimedia/ffmpeg/files/patch-libavcodec_libsvtav1.c
@@ -0,0 +1,16 @@
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/d1ed5c06e3ed
+
+--- libavcodec/libsvtav1.c.orig	2024-08-01 23:22:48 UTC
++++ libavcodec/libsvtav1.c
+@@ -389,7 +389,11 @@ static av_cold int eb_enc_init(AVCodecContext *avctx)
+ 
+     svt_enc->eos_flag = EOS_NOT_REACHED;
+ 
++#if SVT_AV1_CHECK_VERSION(3, 0, 0)
++    svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, &svt_enc->enc_params);
++#else
+     svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params);
++#endif
+     if (svt_ret != EB_ErrorNone) {
+         return svt_print_error(avctx, svt_ret, "Error initializing encoder handle");
+     }
diff --git a/multimedia/ffmpeg4/Makefile b/multimedia/ffmpeg4/Makefile
index 5cc259015f4d..07850623ec3b 100644
--- a/multimedia/ffmpeg4/Makefile
+++ b/multimedia/ffmpeg4/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ffmpeg
 PORTVERSION=	4.4.4
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	multimedia audio net
 MASTER_SITES=	https://ffmpeg.org/releases/
 PKGNAMESUFFIX=	4
diff --git a/multimedia/ffmpeg4/files/patch-libavcodec_libsvtav1.c b/multimedia/ffmpeg4/files/patch-libavcodec_libsvtav1.c
new file mode 100644
index 000000000000..36eb954b63e1
--- /dev/null
+++ b/multimedia/ffmpeg4/files/patch-libavcodec_libsvtav1.c
@@ -0,0 +1,16 @@
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/d1ed5c06e3ed
+
+--- libavcodec/libsvtav1.c.orig	2024-08-01 23:22:48 UTC
++++ libavcodec/libsvtav1.c
+@@ -389,7 +389,11 @@ static av_cold int eb_enc_init(AVCodecContext *avctx)
+ 
+     svt_enc->eos_flag = EOS_NOT_REACHED;
+ 
++#if SVT_AV1_CHECK_VERSION(3, 0, 0)
++    svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, &svt_enc->enc_params);
++#else
+     svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params);
++#endif
+     if (svt_ret != EB_ErrorNone) {
+         return svt_print_error(avctx, svt_ret, "Error initializing encoder handle");
+     }
diff --git a/multimedia/gstreamer1-plugins-svt-av1/Makefile b/multimedia/gstreamer1-plugins-svt-av1/Makefile
index 3e1a5fb25f08..ee37b3dbb357 100644
--- a/multimedia/gstreamer1-plugins-svt-av1/Makefile
+++ b/multimedia/gstreamer1-plugins-svt-av1/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	svt-av1
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.0
+DISTVERSION=	3.0.0
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	gstreamer1-plugins-
 
diff --git a/multimedia/gstreamer1-plugins-svt-av1/distinfo b/multimedia/gstreamer1-plugins-svt-av1/distinfo
index f48205f2a481..27ac76d0d207 100644
--- a/multimedia/gstreamer1-plugins-svt-av1/distinfo
+++ b/multimedia/gstreamer1-plugins-svt-av1/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1730216648
-SHA256 (SVT-AV1-v2.3.0.tar.bz2) = f65358499f572a47d6b076dda73681a8162b02c0b619a551bc2d62ead8ee719a
-SIZE (SVT-AV1-v2.3.0.tar.bz2) = 10168419
+TIMESTAMP = 1740063071
+SHA256 (1480c1-cpuinfo-e649baa_GH0.tar.gz) = 32ab977a4344944beaa18058e6223fdc2740b2849c7c8b46d4361dbfb4550f11
+SIZE (1480c1-cpuinfo-e649baa_GH0.tar.gz) = 3542464
+SHA256 (SVT-AV1-v3.0.0.tar.bz2) = 852d3be2cea244dc76747a948dfcffb82d42dc42e1bd86830e591ea29b91c4fd
+SIZE (SVT-AV1-v3.0.0.tar.bz2) = 10177183
diff --git a/multimedia/gstreamer1-plugins-svt-av1/files/patch-gstsvtav1enc.c b/multimedia/gstreamer1-plugins-svt-av1/files/patch-gstsvtav1enc.c
new file mode 100644
index 000000000000..a7f88b9b8a4d
--- /dev/null
+++ b/multimedia/gstreamer1-plugins-svt-av1/files/patch-gstsvtav1enc.c
@@ -0,0 +1,15 @@
+https://gitlab.com/AOMediaCodec/SVT-AV1/-/issues/2252
+
+--- gstsvtav1enc.c.orig	2025-02-20 14:51:11 UTC
++++ gstsvtav1enc.c
+@@ -535,10 +535,8 @@ static gboolean gst_svtav1enc_configure_svt(GstSvtAv1E
+         svtav1enc->svt_config->mastering_display.white_point.y = master_display_info.white_point.y;
+         svtav1enc->svt_config->mastering_display.max_luma      = master_display_info.max_display_mastering_luminance;
+         svtav1enc->svt_config->mastering_display.min_luma      = master_display_info.min_display_mastering_luminance;
+-        svtav1enc->svt_config->high_dynamic_range_input        = true;
+     } else {
+         memset(&svtav1enc->svt_config->mastering_display, 0, sizeof(svtav1enc->svt_config->mastering_display));
+-        svtav1enc->svt_config->high_dynamic_range_input = false;
+     }
+ 
+     GstVideoContentLightLevel content_light_level;
diff --git a/multimedia/svt-av1/Makefile b/multimedia/svt-av1/Makefile
index 6f9be30df5f2..fe3220417473 100644
--- a/multimedia/svt-av1/Makefile
+++ b/multimedia/svt-av1/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	svt-av1
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.0
+DISTVERSION=	3.0.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -17,8 +17,10 @@ BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_amd64=	nasm:devel/nasm
 
 USES=		cmake compiler:c11
+USE_GITHUB=	nodefault
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
+GH_TUPLE=	1480c1:cpuinfo:e649baa:cpuinfo/third_party/cpuinfo
 GL_ACCOUNT=	AOMediaCodec
 GL_PROJECT=	SVT-AV1
 CMAKE_OFF=	NATIVE
diff --git a/multimedia/svt-av1/distinfo b/multimedia/svt-av1/distinfo
index f48205f2a481..27ac76d0d207 100644
--- a/multimedia/svt-av1/distinfo
+++ b/multimedia/svt-av1/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1730216648
-SHA256 (SVT-AV1-v2.3.0.tar.bz2) = f65358499f572a47d6b076dda73681a8162b02c0b619a551bc2d62ead8ee719a
-SIZE (SVT-AV1-v2.3.0.tar.bz2) = 10168419
+TIMESTAMP = 1740063071
+SHA256 (1480c1-cpuinfo-e649baa_GH0.tar.gz) = 32ab977a4344944beaa18058e6223fdc2740b2849c7c8b46d4361dbfb4550f11
+SIZE (1480c1-cpuinfo-e649baa_GH0.tar.gz) = 3542464
+SHA256 (SVT-AV1-v3.0.0.tar.bz2) = 852d3be2cea244dc76747a948dfcffb82d42dc42e1bd86830e591ea29b91c4fd
+SIZE (SVT-AV1-v3.0.0.tar.bz2) = 10177183
diff --git a/multimedia/svt-av1/pkg-plist b/multimedia/svt-av1/pkg-plist
index 9b0de4c721bb..af678947c8eb 100644
--- a/multimedia/svt-av1/pkg-plist
+++ b/multimedia/svt-av1/pkg-plist
@@ -3,10 +3,9 @@ include/svt-av1/EbDebugMacros.h
 include/svt-av1/EbSvtAv1.h
 include/svt-av1/EbSvtAv1Enc.h
 include/svt-av1/EbSvtAv1ErrorCodes.h
-include/svt-av1/EbSvtAv1ExtFrameBuf.h
 include/svt-av1/EbSvtAv1Formats.h
 include/svt-av1/EbSvtAv1Metadata.h
 lib/libSvtAv1Enc.so
-lib/libSvtAv1Enc.so.2
+lib/libSvtAv1Enc.so.3
 lib/libSvtAv1Enc.so.%%VERSION%%
 libdata/pkgconfig/SvtAv1Enc.pc