openh264: update to 2.6.0 (CVE-2025-27091)

macports · Feb 23, 2025 · df1dae0 · df1dae0
1 parent c427bb1
commit df1dae0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 118 deletions.
diff --git a/multimedia/openh264/Portfile b/multimedia/openh264/Portfile
@@ -4,7 +4,7 @@ PortSystem              1.0
 PortGroup               github 1.0
 PortGroup               meson 1.0
 
-github.setup            cisco openh264 2.5.0 v
+github.setup            cisco openh264 2.6.0 v
 revision                0
 categories              multimedia
 license                 BSD
@@ -14,9 +14,9 @@ description             Open-source H.264 codec
 long_description        OpenH264 is a codec library which supports \
                         H.264 encoding and decoding.
 
-checksums               rmd160  43787b53cb9528ff95ccb1c11959b7e20a6eb720 \
-                        sha256  94c8ca364db990047ec4ec3481b04ce0d791e62561ef5601443011bdc00825e3 \
-                        size    60301431
+checksums               rmd160  81968c7f3848b6432d320bdc178d7411bff14881 \
+                        sha256  558544ad358283a7ab2930d69a9ceddf913f4a51ee9bf1bfb9e377322af81a69 \
+                        size    60302243
 github.tarball_from     archive
 
 depends_build-append    port:gtest
@@ -26,13 +26,8 @@ if {${configure.build_arch} in [list i386 x86_64]} {
                         port:nasm
 }
 
-# https://github.com/cisco/openh264/pull/3806
-patchfiles-append       0001-meson.build-add-powerpc-arch.patch
-
 # https://github.com/cisco/openh264/issues/3805
-patchfiles-append       0002-meson.build-do-not-hardcode-libc-on-darwin.patch
-
-patchfiles-append       no-Werror.patch
+patchfiles-append       meson-build-do-not-hardcode-libc-on-darwin.diff
 
 # Undefined symbols:
 #  "__ZN7testing8internal23MakeAndRegisterTestInfoENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKcS8_S8_NS0_12CodeLocationEPKvPFvvESD_PNS0_15TestFactoryBaseE"

diff --git a/multimedia/openh264/files/0001-meson.build-add-powerpc-arch.patch b/multimedia/openh264/files/0001-meson.build-add-powerpc-arch.patch
diff --git a/...uild-do-not-hardcode-libc-on-darwin.patch → ...build-do-not-hardcode-libc-on-darwin.diff b/...uild-do-not-hardcode-libc-on-darwin.patch → ...build-do-not-hardcode-libc-on-darwin.diff
@@ -2,13 +2,6 @@ From cb90ec4d5e519f00a44e48eb4d5144bb054926ee Mon Sep 17 00:00:00 2001
 From: Sergey Fedorov <[email protected]>
 Date: Sun, 17 Nov 2024 13:35:57 +0800
 Subject: [PATCH] meson.build: do not hardcode libc++ on darwin
-
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git meson.build meson.build
-index 5dbefa43..1790cdfd 100644
 --- meson.build
 +++ meson.build
 @@ -105,7 +105,7 @@ if ['linux', 'android', 'ios', 'darwin'].contains(system)

diff --git a/multimedia/openh264/files/no-Werror.patch b/multimedia/openh264/files/no-Werror.patch