From: Klemens Nanni <kn@openbsd.org>
Subject: Re: multimedia/openh264: update to 2.5.0
To: ports <ports@openbsd.org>
Date: Sat, 16 Nov 2024 19:23:10 +0000

16.11.2024 20:34, Klemens Nanni пишет:
> https://github.com/cisco/openh264/releases/tag/v2.5.0
> 
>     Fix some multi-thread decoding issues
>     Remove unused pSpatialLayer variable in DetermineTemporalSettings
>     Change picOrderCnt to 2
>     Fix cross compile from darwin arm64 to x86_64
>     Fix deadlock at the end of decoding
>     Fix frame-decode errors
>     Fix build with meson on riscv64
>     Enable pac bti support
>     Fix a bug in decoding H.264 streams encoded by Apple HWA encoder
> 
> 
> The arm64 BTI patch no longer applies as there's now a macro in place.
> 
> No need to crank, but changing the major would mess up PLIST, so I went
> ahead and fixed that now already.
> 
> amd64 tests:
> 
> [==========] 631 tests from 62 test suites ran. (83941 ms total)
> [  PASSED  ] 631 tests.
> 
>   YOU HAVE 39 DISABLED TESTS
> 
> 
> Feedback? arm64 tests? OK?

right diff.

Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/openh264/Makefile,v
diff -u -p -r1.11 Makefile
--- Makefile	5 Mar 2024 18:34:19 -0000	1.11
+++ Makefile	16 Nov 2024 17:19:49 -0000
@@ -1,9 +1,6 @@
 COMMENT =		Cisco implementation of H.264 codec
-GH_ACCOUNT =		cisco
-GH_PROJECT =		openh264
-GH_TAGNAME =		v2.4.1
+DIST_TUPLE =		github	cisco	openh264	v2.5.0	.
 CATEGORIES =		multimedia
-REVISION =		1
 
 SHARED_LIBS =		openh264	1.0	# 7.0
 
@@ -37,7 +34,8 @@ MAKE_FLAGS +=		ARCH=${MACHINE_ARCH:amd64
 MAKE_FLAGS +=		HAVE_GMP_API=No
 
 # pass our .so version and ensure full SONAME, see ${WRKSRC}/build-bsd.mk
-MAKE_FLAGS +=		SHAREDLIB_MAJORVERSION=${LIBopenh264_VERSION:R} \
+MAJORVER =		${LIBopenh264_VERSION:R}
+MAKE_FLAGS +=		SHAREDLIB_MAJORVERSION=${MAJORVER} \
 			SHAREDLIBSUFFIXFULLVER=so.${LIBopenh264_VERSION} \
 			SHLDFLAGS=-Wl,-soname,libopenh264.so.${LIBopenh264_VERSION}
 
@@ -55,5 +53,6 @@ TEST_FLAGS +=	CODEC_UNITTEST_INCLUDES='-
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/h264{enc,dec} ${PREFIX}/bin/
+	rm ${PREFIX}/lib/libopenh264.so{.${MAJORVER},}
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/openh264/distinfo,v
diff -u -p -r1.6 distinfo
--- distinfo	2 Feb 2024 10:14:45 -0000	1.6
+++ distinfo	9 Nov 2024 20:41:26 -0000
@@ -1,2 +1,2 @@
-SHA256 (openh264-2.4.1.tar.gz) = j/vpROdAQ9DT+1PUoqFMlN5x9Y2+pqBtDckjaVQpWOo=
-SIZE (openh264-2.4.1.tar.gz) = 60297304
+SHA256 (cisco-openh264-v2.5.0.tar.gz) = lMjKNk25kAR+xOw0gbBM4NeR5iVh71YBRDARvcAIJeM=
+SIZE (cisco-openh264-v2.5.0.tar.gz) = 60301431
Index: patches/patch-codec_common_arm64_arm_arch64_common_macro_S
===================================================================
RCS file: patches/patch-codec_common_arm64_arm_arch64_common_macro_S
diff -N patches/patch-codec_common_arm64_arm_arch64_common_macro_S
--- patches/patch-codec_common_arm64_arm_arch64_common_macro_S	5 Mar 2024 18:34:19 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-Index: codec/common/arm64/arm_arch64_common_macro.S
---- codec/common/arm64/arm_arch64_common_macro.S.orig
-+++ codec/common/arm64/arm_arch64_common_macro.S
-@@ -60,6 +60,7 @@ ret
- .func \funcName
- #endif
- \funcName:
-+  bti c
- .endm
- 
- .macro WELS_ASM_AARCH64_FUNC_END
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/openh264/pkg/PLIST,v
diff -u -p -r1.3 PLIST
--- pkg/PLIST	1 Aug 2022 17:28:36 -0000	1.3
+++ pkg/PLIST	16 Nov 2024 19:22:27 -0000
@@ -6,7 +6,5 @@ include/wels/codec_app_def.h
 include/wels/codec_def.h
 include/wels/codec_ver.h
 @static-lib lib/libopenh264.a
-@comment @so lib/libopenh264.so
-@comment lib/libopenh264.so.1
 @lib lib/libopenh264.so.${LIBopenh264_VERSION}
 lib/pkgconfig/openh264.pc