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

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"

multimedia/openh264/files/0001-meson.build-add-powerpc-arch.patch

@@ -1,90 +0,0 @@
-From 45a23067041933110c60930ffe7e9cbd3add4c41 Mon Sep 17 00:00:00 2001
-From: Sergey Fedorov <barracuda@macos-powerpc.org>
-Date: Sun, 17 Nov 2024 13:30:16 +0800
-Subject: [PATCH] meson.build: add powerpc arch
-
----
- codec/common/meson.build     | 4 ++++
- codec/decoder/meson.build    | 4 ++++
- codec/encoder/meson.build    | 4 ++++
- codec/processing/meson.build | 4 ++++
- meson.build                  | 6 ++++++
- 5 files changed, 22 insertions(+)
-
-diff --git codec/common/meson.build codec/common/meson.build
-index beab66a4..963da74b 100644
---- codec/common/meson.build
-+++ codec/common/meson.build
-@@ -71,6 +71,10 @@ elif cpu_family in ['loongarch32', 'loongarch64']
-   cpp_sources += asm_sources
- elif cpu_family == 'riscv64'
-   asm_sources = []
-+elif cpu_family == 'ppc'
-+  asm_sources = []
-+elif cpu_family == 'ppc64'
-+  asm_sources = []
- else
-   error('Unsupported cpu_family @0@'.format(cpu_family))
- endif
-diff --git codec/decoder/meson.build codec/decoder/meson.build
-index 7c5b4c58..23352ff8 100644
---- codec/decoder/meson.build
-+++ codec/decoder/meson.build
-@@ -56,6 +56,10 @@ elif cpu_family in ['loongarch32', 'loongarch64']
-   cpp_sources += asm_sources
- elif cpu_family == 'riscv64'
-   asm_sources = []
-+elif cpu_family == 'ppc'
-+  asm_sources = []
-+elif cpu_family == 'ppc64'
-+  asm_sources = []
- else
-   error('Unsupported cpu family @0@'.format(cpu_family))
- endif
-diff --git codec/encoder/meson.build codec/encoder/meson.build
-index 194253a7..bebb74c2 100644
---- codec/encoder/meson.build
-+++ codec/encoder/meson.build
-@@ -85,6 +85,10 @@ elif cpu_family in ['loongarch32', 'loongarch64']
-   cpp_sources += asm_sources
- elif cpu_family == 'riscv64'
-   asm_sources = []
-+elif cpu_family == 'ppc'
-+  asm_sources = []
-+elif cpu_family == 'ppc64'
-+  asm_sources = []
- else
-   error('Unsupported cpu family @0@'.format(cpu_family))
- endif
-diff --git codec/processing/meson.build codec/processing/meson.build
-index d126ffa6..1c56eb57 100644
---- codec/processing/meson.build
-+++ codec/processing/meson.build
-@@ -58,6 +58,10 @@ elif cpu_family in ['loongarch32', 'loongarch64']
-   cpp_sources += asm_sources
- elif cpu_family == 'riscv64'
-   asm_sources = []
-+elif cpu_family == 'ppc'
-+  asm_sources = []
-+elif cpu_family == 'ppc64'
-+  asm_sources = []
- else
-   error('Unsupported cpu family @0@'.format(cpu_family))
- endif
-diff --git meson.build meson.build
-index 5dbefa43..4447b10e 100644
---- meson.build
-+++ meson.build
-@@ -101,6 +101,12 @@ if ['linux', 'android', 'ios', 'darwin'].contains(system)
-   elif cpu_family == 'riscv64'
-     # We dont't have riscv64-specific optimization for now.
-     asm_format = asm_format64
-+  elif cpu_family == 'ppc'
-+    # We dont't have powerpc-specific optimization for now.
-+    asm_format = asm_format32
-+  elif cpu_family == 'ppc64'
-+    # We dont't have powerpc64-specific optimization for now.
-+    asm_format = asm_format64
-   else
-     error('FIXME: unhandled CPU family @0@ for @1@'.format(cpu_family, system))
-   endif

multimedia/openh264/files/meson-build-do-not-hardcode-libc-on-darwin.diff

@@ -2,13 +2,6 @@ From cb90ec4d5e519f00a44e48eb4d5144bb054926ee Mon Sep 17 00:00:00 2001
 From: Sergey Fedorov <barracuda@macos-powerpc.org>
 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)

multimedia/openh264/files/no-Werror.patch

@@ -1,11 +0,0 @@
-Do not use -Werror.
---- meson.build.orig	2024-11-06 00:05:33.000000000 -0600
-+++ meson.build	2024-11-20 01:48:58.000000000 -0600
-@@ -42,7 +42,6 @@
- supported_arguments = cpp.get_supported_arguments([
-   '-Wno-non-virtual-dtor',
-   '-Wno-class-memaccess',
--  '-Werror',
-   '-Wunused-but-set-variable',
-   '-Wno-strict-aliasing'])
-