git: e8b1e40f02c3 - main - multimedia/vvdec: update 2.1.1 → 2.2.0

From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Wed, 13 Mar 2024 17:52:13 UTC
The branch main has been updated by yuri:

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

commit e8b1e40f02c3d6bda7f3503047b29cee1aa6faa5
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-03-13 14:45:02 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-03-13 17:52:02 +0000

    multimedia/vvdec: update 2.1.1 → 2.2.0
    
    Reported by:    portscout
---
 multimedia/vvdec/Makefile                                 |  2 +-
 multimedia/vvdec/distinfo                                 |  6 +++---
 multimedia/vvdec/files/patch-source_Lib_vvdec_vvdecimpl.h | 13 +++++++++++++
 multimedia/vvdec/pkg-plist                                |  2 +-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/multimedia/vvdec/Makefile b/multimedia/vvdec/Makefile
index e8c2cc60d330..e7355ed4fe54 100644
--- a/multimedia/vvdec/Makefile
+++ b/multimedia/vvdec/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vvdec
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.1.1
+DISTVERSION=	2.2.0
 CATEGORIES=	multimedia python
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/multimedia/vvdec/distinfo b/multimedia/vvdec/distinfo
index c3fec7b3945d..fe136ee45feb 100644
--- a/multimedia/vvdec/distinfo
+++ b/multimedia/vvdec/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1691730828
-SHA256 (fraunhoferhhi-vvdec-v2.1.1_GH0.tar.gz) = 82339389e8656b1e3923a42b5a99f960337906bc61473ce53b9b602fe7964cdf
-SIZE (fraunhoferhhi-vvdec-v2.1.1_GH0.tar.gz) = 1269073
+TIMESTAMP = 1710351508
+SHA256 (fraunhoferhhi-vvdec-v2.2.0_GH0.tar.gz) = 7a839f9d8c32abb3f0c33c5242d8b2ac7ff0842b160421332cc8c291b32547bc
+SIZE (fraunhoferhhi-vvdec-v2.2.0_GH0.tar.gz) = 1339562
diff --git a/multimedia/vvdec/files/patch-source_Lib_vvdec_vvdecimpl.h b/multimedia/vvdec/files/patch-source_Lib_vvdec_vvdecimpl.h
new file mode 100644
index 000000000000..1e05d99dc070
--- /dev/null
+++ b/multimedia/vvdec/files/patch-source_Lib_vvdec_vvdecimpl.h
@@ -0,0 +1,13 @@
+- workaround for https://github.com/fraunhoferhhi/vvdec/issues/170
+
+--- source/Lib/vvdec/vvdecimpl.h.orig	2024-03-13 17:45:41 UTC
++++ source/Lib/vvdec/vvdecimpl.h
+@@ -225,7 +225,7 @@ inline auto VVDecImpl::catchExceptions( MembFunc fn, A
+   static auto returnErrOrNullptr = []( intptr_t err )
+   {
+     if( std::is_pointer<TRet>() )
+-      return (TRet) NULL;
++      return (TRet) 0;
+     return (TRet) err;
+   };
+ 
diff --git a/multimedia/vvdec/pkg-plist b/multimedia/vvdec/pkg-plist
index d510acafbf7c..a89847a43a33 100644
--- a/multimedia/vvdec/pkg-plist
+++ b/multimedia/vvdec/pkg-plist
@@ -9,5 +9,5 @@ lib/cmake/vvdec/vvdecTargets-shared-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/vvdec/vvdecTargets-shared.cmake
 lib/libvvdec.so
 lib/libvvdec.so.2
-lib/libvvdec.so.2.1.1
+lib/libvvdec.so.2.2.0
 libdata/pkgconfig/libvvdec.pc