From a545f7278a9e89d0ad66d83716de81be76c11adc Mon Sep 17 00:00:00 2001
From: tartanpaint <35690467+tartanpaint@users.noreply.github.com>
Date: Fri, 20 Dec 2024 19:34:56 +0000
Subject: [PATCH 01/12] [openh264] Update to version 2.5.0

---
 .../0001-respect-default-library-option.patch | 57 -------------------
 ports/openh264/portfile.cmake                 |  8 +--
 ports/openh264/vcpkg.json                     |  3 +-
 3 files changed, 4 insertions(+), 64 deletions(-)
 delete mode 100644 ports/openh264/0001-respect-default-library-option.patch

diff --git a/ports/openh264/0001-respect-default-library-option.patch b/ports/openh264/0001-respect-default-library-option.patch
deleted file mode 100644
index 15e3c715451d5a..00000000000000
--- a/ports/openh264/0001-respect-default-library-option.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 328b15a962caa928373b55d85f9911f45442886e Mon Sep 17 00:00:00 2001
-From: Xavier Claessens <xavier.claessens@collabora.com>
-Date: Mon, 19 Oct 2020 17:03:25 -0400
-Subject: [PATCH] meson: Respect default_library option
-
-When using library() instead of shared_library() and static_library,
-meson will build shared, static, or both depending on the
-value of static_library option.
-
-As far as I know extract_all_objects() was uses as workaround for Meson
-bugs fixed a while ago when using not installed static libraries.
----
- meson.build | 19 +++----------------
- 1 file changed, 3 insertions(+), 16 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 283413375b..65641508de 100644
---- a/meson.build
-+++ b/meson.build
-@@ -184,26 +184,13 @@ api_header_deps = []
- subdir ('codec')
- subdir ('test')
- 
--all_objects = [
--  libcommon.extract_all_objects(),
--  libprocessing.extract_all_objects(),
--  libencoder.extract_all_objects(),
--  libdecoder.extract_all_objects()
--]
--
--libopenh264_shared = shared_library('openh264',
--  objects: all_objects,
-+libopenh264 = library('openh264',
-+  link_whole: [libcommon, libprocessing, libencoder, libdecoder],
-   install: true,
-   soversion: major_version,
--  version: meson.project_version(),
-   vs_module_defs: 'openh264.def',
-   dependencies: deps)
- 
--libopenh264_static = static_library('openh264',
--  objects: all_objects,
--  install: true,
--  dependencies: deps)
--
- pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir'))
- 
- foreach t : ['', '-static']
-@@ -235,7 +222,7 @@ foreach t : ['', '-static']
- endforeach
- 
- openh264_dep = declare_dependency(
--  link_with: libopenh264_shared,
-+  link_with: libopenh264,
-   include_directories: include_directories('include'),
-   dependencies: deps + api_header_deps)
- 
diff --git a/ports/openh264/portfile.cmake b/ports/openh264/portfile.cmake
index d2848c790dd292..6a1662171dcaa2 100644
--- a/ports/openh264/portfile.cmake
+++ b/ports/openh264/portfile.cmake
@@ -1,10 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cisco/openh264
-    REF f15f940425eebf24ce66984db2445733cf500b7b
-    SHA512 361003296e9cef2956aeff76ae4df7a949a585710facd84a92c1b4164c5a4522d6615fcc485ebc2e50be8a13feb942b870efdd28837307467081cb1eba1f17d2
-    PATCHES
-        0001-respect-default-library-option.patch  # https://github.com/cisco/openh264/pull/3351
+    REF v${VERSION}
+    SHA512 cb6d3ca8d5277325dd64dec399421c4c62bc1fd012fe1521d7195e95ce7f59527919cf698829044dca3d9b1d8288c49b49111d01c9d2896c819da806492af838
 )
 
 if((VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64"))
@@ -39,4 +37,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/openh264/vcpkg.json b/ports/openh264/vcpkg.json
index 00766959931b9d..b98f125f09e8cd 100644
--- a/ports/openh264/vcpkg.json
+++ b/ports/openh264/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "openh264",
-  "version-date": "2021-03-16",
-  "port-version": 4,
+  "version": "2.5.0",
   "description": "OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.",
   "homepage": "https://www.openh264.org/",
   "supports": "!uwp",

From 58671ae18841cb65a7469c765ac2d8eddd115cdf Mon Sep 17 00:00:00 2001
From: tartanpaint <35690467+tartanpaint@users.noreply.github.com>
Date: Fri, 20 Dec 2024 19:36:47 +0000
Subject: [PATCH 02/12] Update version database

---
 versions/baseline.json    | 4 ++--
 versions/o-/openh264.json | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 64719600e4e576..180161dce25802 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6705,8 +6705,8 @@
       "port-version": 1
     },
     "openh264": {
-      "baseline": "2021-03-16",
-      "port-version": 4
+      "baseline": "2.5.0",
+      "port-version": 0
     },
     "openigtlink": {
       "baseline": "3.0",
diff --git a/versions/o-/openh264.json b/versions/o-/openh264.json
index 3c3176dfecffe7..6e9cd11e50d431 100644
--- a/versions/o-/openh264.json
+++ b/versions/o-/openh264.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ed5a07017a53364b163eb947a8a44d2558a66c62",
+      "version": "2.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "34faf5afdf562b2dff8472e4101d3a01f51d3372",
       "version-date": "2021-03-16",

From bc032cc9e389ca069f1d060cd2057a555c8235ec Mon Sep 17 00:00:00 2001
From: tartanpaint <35690467+tartanpaint@users.noreply.github.com>
Date: Fri, 20 Dec 2024 21:55:56 +0000
Subject: [PATCH 03/12] Remove redundant vcpkg_replace_string calls

---
 ports/openh264/portfile.cmake | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/ports/openh264/portfile.cmake b/ports/openh264/portfile.cmake
index 6a1662171dcaa2..1974dc2089a51b 100644
--- a/ports/openh264/portfile.cmake
+++ b/ports/openh264/portfile.cmake
@@ -26,13 +26,6 @@ vcpkg_install_meson()
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
-if(VCPKG_TARGET_IS_WINDOWS)
-  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/openh264.pc" " -lstdc++" "")
-  if(NOT VCPKG_BUILD_TYPE)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/openh264.pc" " -lstdc++" "")
-  endif()
-endif()
-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()

From 05e04c4db229d58c11c93642031a314f9dfce607 Mon Sep 17 00:00:00 2001
From: tartanpaint <35690467+tartanpaint@users.noreply.github.com>
Date: Fri, 20 Dec 2024 22:07:19 +0000
Subject: [PATCH 04/12] Update version database

---
 versions/o-/openh264.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/o-/openh264.json b/versions/o-/openh264.json
index 6e9cd11e50d431..8da15565ae028d 100644
--- a/versions/o-/openh264.json
+++ b/versions/o-/openh264.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "ed5a07017a53364b163eb947a8a44d2558a66c62",
+      "git-tree": "700cffde354087387b3ae9759bd1bb530f00da66",
       "version": "2.5.0",
       "port-version": 0
     },

From 7615fb451df6e5eebb95f150ed7c36496e45dbca Mon Sep 17 00:00:00 2001
From: tartanpaint <35690467+tartanpaint@users.noreply.github.com>
Date: Tue, 24 Dec 2024 09:41:44 +0000
Subject: [PATCH 05/12] Apply patch to OpenH264 pkg-config to resolve vcpkg CI
 issues

---
 ports/openh264/portfile.cmake                 |  2 +
 ports/openh264/revert-pkgconfig-changes.patch | 56 +++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 ports/openh264/revert-pkgconfig-changes.patch

diff --git a/ports/openh264/portfile.cmake b/ports/openh264/portfile.cmake
index 1974dc2089a51b..289020da590162 100644
--- a/ports/openh264/portfile.cmake
+++ b/ports/openh264/portfile.cmake
@@ -3,6 +3,8 @@ vcpkg_from_github(
     REPO cisco/openh264
     REF v${VERSION}
     SHA512 cb6d3ca8d5277325dd64dec399421c4c62bc1fd012fe1521d7195e95ce7f59527919cf698829044dca3d9b1d8288c49b49111d01c9d2896c819da806492af838
+    PATCHES
+        revert-pkgconfig-changes.patch  # vcpkg fix following https://github.com/cisco/openh264/pull/3351
 )
 
 if((VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64"))
diff --git a/ports/openh264/revert-pkgconfig-changes.patch b/ports/openh264/revert-pkgconfig-changes.patch
new file mode 100644
index 00000000000000..d67c6f0602555e
--- /dev/null
+++ b/ports/openh264/revert-pkgconfig-changes.patch
@@ -0,0 +1,56 @@
+diff --git a/meson.build b/meson.build
+index 5dbefa43..721ce19d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -193,7 +193,7 @@ endif
+ subdir ('codec')
+ subdir ('test')
+ 
+-libopenh264 = library('openh264',
++libopenh264_shared = library('openh264',
+   link_whole: [libcommon, libprocessing, libencoder, libdecoder],
+   install: true,
+   soversion: major_version,
+@@ -201,14 +201,35 @@ libopenh264 = library('openh264',
+   vs_module_defs: 'openh264.def',
+   dependencies: deps)
+ 
++pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir'))
++
++foreach t : ['', '-static']
++  pkgconf = configuration_data()
++  pkgconf.set('prefix', join_paths(get_option('prefix')))
++  pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
++  pkgconf.set('VERSION', meson.project_version())
++  pkglibs = cpp_lib
++  if libm_dep.found()
++    pkglibs += ' -lm'
++  endif
++  if t == '-static'
++    pkgconf.set('LIBS', pkglibs)
++    pkgconf.set('LIBS_PRIVATE', '')
++  else
++    pkgconf.set('LIBS', '')
++    pkgconf.set('LIBS_PRIVATE', pkglibs)
++  endif
++
++  configure_file(
++    input: 'openh264.pc.in',
++    output: 'openh264@0@.pc'.format(t),
++    install: t == '-static' ? false : true,
++    install_dir: t == '-static' ? '' : pkg_install_dir,
++    configuration: pkgconf)
++endforeach
++
+ openh264_dep = declare_dependency(
+-  link_with: libopenh264,
++  link_with: libopenh264_shared,
+   include_directories: include_directories('codec/api'),
+   dependencies: deps)
+ 
+-pkg = import('pkgconfig')
+-pkg.generate(libopenh264,
+-  description: 'OpenH264 is a codec library which supports H.264 encoding ' +
+-               'and decoding. It is suitable for use in real time ' +
+-               'applications such as WebRTC.',
+-)

From 9adeb54628a0fe21feffad7c70f67364956c2623 Mon Sep 17 00:00:00 2001
From: tartanpaint <35690467+tartanpaint@users.noreply.github.com>
Date: Tue, 24 Dec 2024 11:59:55 +0000
Subject: [PATCH 06/12] Update version database

---
 versions/o-/openh264.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/o-/openh264.json b/versions/o-/openh264.json
index 8da15565ae028d..9c3db075c6b8b4 100644
--- a/versions/o-/openh264.json
+++ b/versions/o-/openh264.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "700cffde354087387b3ae9759bd1bb530f00da66",
+      "git-tree": "9ba976e89a2d393f39dfcd35284aa22b57b48c32",
       "version": "2.5.0",
       "port-version": 0
     },

From 608f50d8142534f8b997888b15865c703101b608 Mon Sep 17 00:00:00 2001
From: tartanpaint <35690467+tartanpaint@users.noreply.github.com>
Date: Tue, 24 Dec 2024 17:18:22 +0000
Subject: [PATCH 07/12] Update pkg-config patch to preserve lib type fix

---
 ports/openh264/portfile.cmake                 |  2 +-
 ports/openh264/revert-pkgconfig-changes.patch | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/ports/openh264/portfile.cmake b/ports/openh264/portfile.cmake
index 289020da590162..a6f9793188de1a 100644
--- a/ports/openh264/portfile.cmake
+++ b/ports/openh264/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     REF v${VERSION}
     SHA512 cb6d3ca8d5277325dd64dec399421c4c62bc1fd012fe1521d7195e95ce7f59527919cf698829044dca3d9b1d8288c49b49111d01c9d2896c819da806492af838
     PATCHES
-        revert-pkgconfig-changes.patch  # vcpkg fix following https://github.com/cisco/openh264/pull/3351
+        revert-pkgconfig-changes.patch  # vcpkg fix following https://github.com/cisco/openh264/pull/3351, specifically https://github.com/cisco/openh264/pull/3351/commits/e614eb9cdfc02c5e01b72f6415b975d8576885e9
 )
 
 if((VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64"))
diff --git a/ports/openh264/revert-pkgconfig-changes.patch b/ports/openh264/revert-pkgconfig-changes.patch
index d67c6f0602555e..7eb279dcca7978 100644
--- a/ports/openh264/revert-pkgconfig-changes.patch
+++ b/ports/openh264/revert-pkgconfig-changes.patch
@@ -1,17 +1,12 @@
 diff --git a/meson.build b/meson.build
-index 5dbefa43..721ce19d 100644
+index 5dbefa43..50b48232 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -193,7 +193,7 @@ endif
- subdir ('codec')
- subdir ('test')
- 
--libopenh264 = library('openh264',
-+libopenh264_shared = library('openh264',
+@@ -197,18 +197,38 @@ libopenh264 = library('openh264',
    link_whole: [libcommon, libprocessing, libencoder, libdecoder],
    install: true,
    soversion: major_version,
-@@ -201,14 +201,35 @@ libopenh264 = library('openh264',
+-  version: meson.project_version(),
    vs_module_defs: 'openh264.def',
    dependencies: deps)
  
@@ -43,8 +38,7 @@ index 5dbefa43..721ce19d 100644
 +endforeach
 +
  openh264_dep = declare_dependency(
--  link_with: libopenh264,
-+  link_with: libopenh264_shared,
+   link_with: libopenh264,
    include_directories: include_directories('codec/api'),
    dependencies: deps)
  

From bc9f8fd58916d26ccb7c2a2f679e1779c886eb58 Mon Sep 17 00:00:00 2001
From: tartanpaint <35690467+tartanpaint@users.noreply.github.com>
Date: Tue, 24 Dec 2024 17:19:55 +0000
Subject: [PATCH 08/12] Update version database

---
 versions/o-/openh264.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/o-/openh264.json b/versions/o-/openh264.json
index 9c3db075c6b8b4..6e3f73c341635f 100644
--- a/versions/o-/openh264.json
+++ b/versions/o-/openh264.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "9ba976e89a2d393f39dfcd35284aa22b57b48c32",
+      "git-tree": "ad71a28ff4347124592b910081d89e65b431760f",
       "version": "2.5.0",
       "port-version": 0
     },

From 48dd849715ef0c6b057dc96cfd9e0dd87364ef93 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 27 Dec 2024 10:51:11 +0100
Subject: [PATCH 09/12] Export C++ linkage via pkgconfig

---
 ports/openh264/portfile.cmake                 | 29 +++++++++--
 ports/openh264/revert-pkgconfig-changes.patch | 50 -------------------
 ports/openh264/vcpkg.json                     |  4 ++
 3 files changed, 29 insertions(+), 54 deletions(-)
 delete mode 100644 ports/openh264/revert-pkgconfig-changes.patch

diff --git a/ports/openh264/portfile.cmake b/ports/openh264/portfile.cmake
index a6f9793188de1a..15eec6e6789f40 100644
--- a/ports/openh264/portfile.cmake
+++ b/ports/openh264/portfile.cmake
@@ -3,10 +3,20 @@ vcpkg_from_github(
     REPO cisco/openh264
     REF v${VERSION}
     SHA512 cb6d3ca8d5277325dd64dec399421c4c62bc1fd012fe1521d7195e95ce7f59527919cf698829044dca3d9b1d8288c49b49111d01c9d2896c819da806492af838
-    PATCHES
-        revert-pkgconfig-changes.patch  # vcpkg fix following https://github.com/cisco/openh264/pull/3351, specifically https://github.com/cisco/openh264/pull/3351/commits/e614eb9cdfc02c5e01b72f6415b975d8576885e9
 )
 
+set(cxx_link_libraries "")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    block(PROPAGATE cxx_link_libraries)
+        vcpkg_list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS "-DVCPKG_DEFAULT_VARS_TO_CHECK=CMAKE_C_IMPLICIT_LINK_LIBRARIES;CMAKE_CXX_IMPLICIT_LINK_LIBRARIES")
+        vcpkg_cmake_get_vars(cmake_vars_file)
+        include("${cmake_vars_file}")
+        list(REMOVE_ITEM VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_LIBRARIES ${VCPKG_DETECTED_CMAKE_C_IMPLICIT_LINK_LIBRARIES})
+        list(TRANSFORM VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_LIBRARIES PREPEND "-l")
+        string(JOIN " " cxx_link_libraries ${VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_LIBRARIES})
+    endblock()
+endif()
+
 if((VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64"))
     vcpkg_find_acquire_program(NASM)
     get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
@@ -28,8 +38,19 @@ vcpkg_install_meson()
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+if(cxx_link_libraries)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/openh264.pc"
+        "(Libs:[^\r\n]*)"
+        "\\1 ${cxx_link_libraries}"
+        REGEX
+    )
+    if(NOT VCPKG_BUILD_TYPE)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/openh264.pc"
+            "(Libs:[^\r\n]*)"
+            "\\1 ${cxx_link_libraries}"
+            REGEX
+        )
+    endif()
 endif()
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/openh264/revert-pkgconfig-changes.patch b/ports/openh264/revert-pkgconfig-changes.patch
deleted file mode 100644
index 7eb279dcca7978..00000000000000
--- a/ports/openh264/revert-pkgconfig-changes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 5dbefa43..50b48232 100644
---- a/meson.build
-+++ b/meson.build
-@@ -197,18 +197,38 @@ libopenh264 = library('openh264',
-   link_whole: [libcommon, libprocessing, libencoder, libdecoder],
-   install: true,
-   soversion: major_version,
--  version: meson.project_version(),
-   vs_module_defs: 'openh264.def',
-   dependencies: deps)
- 
-+pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir'))
-+
-+foreach t : ['', '-static']
-+  pkgconf = configuration_data()
-+  pkgconf.set('prefix', join_paths(get_option('prefix')))
-+  pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
-+  pkgconf.set('VERSION', meson.project_version())
-+  pkglibs = cpp_lib
-+  if libm_dep.found()
-+    pkglibs += ' -lm'
-+  endif
-+  if t == '-static'
-+    pkgconf.set('LIBS', pkglibs)
-+    pkgconf.set('LIBS_PRIVATE', '')
-+  else
-+    pkgconf.set('LIBS', '')
-+    pkgconf.set('LIBS_PRIVATE', pkglibs)
-+  endif
-+
-+  configure_file(
-+    input: 'openh264.pc.in',
-+    output: 'openh264@0@.pc'.format(t),
-+    install: t == '-static' ? false : true,
-+    install_dir: t == '-static' ? '' : pkg_install_dir,
-+    configuration: pkgconf)
-+endforeach
-+
- openh264_dep = declare_dependency(
-   link_with: libopenh264,
-   include_directories: include_directories('codec/api'),
-   dependencies: deps)
- 
--pkg = import('pkgconfig')
--pkg.generate(libopenh264,
--  description: 'OpenH264 is a codec library which supports H.264 encoding ' +
--               'and decoding. It is suitable for use in real time ' +
--               'applications such as WebRTC.',
--)
diff --git a/ports/openh264/vcpkg.json b/ports/openh264/vcpkg.json
index b98f125f09e8cd..7cbefa5210c269 100644
--- a/ports/openh264/vcpkg.json
+++ b/ports/openh264/vcpkg.json
@@ -5,6 +5,10 @@
   "homepage": "https://www.openh264.org/",
   "supports": "!uwp",
   "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
     {
       "name": "vcpkg-tool-meson",
       "host": true

From 1fd01652887514604512e91824640c7eb32c4954 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 27 Dec 2024 10:59:43 +0100
Subject: [PATCH 10/12] Explicitly pass additional binaries

---
 ports/openh264/portfile.cmake | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/openh264/portfile.cmake b/ports/openh264/portfile.cmake
index 15eec6e6789f40..38a20e1f109cf3 100644
--- a/ports/openh264/portfile.cmake
+++ b/ports/openh264/portfile.cmake
@@ -17,21 +17,21 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     endblock()
 endif()
 
+vcpkg_list(SET additional_binaries)
 if((VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64"))
     vcpkg_find_acquire_program(NASM)
-    get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
-    vcpkg_add_to_path(${NASM_EXE_PATH})
+    vcpkg_list(APPEND additional_binaries "nasm = ['${NASM}']")
 elseif(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_find_acquire_program(GASPREPROCESSOR)
-    foreach(GAS_PATH ${GASPREPROCESSOR})
-        get_filename_component(GAS_ITEM_PATH ${GAS_PATH} DIRECTORY)
-        vcpkg_add_to_path(${GAS_ITEM_PATH})
-    endforeach(GAS_PATH)
+    list(JOIN GASPREPROCESSOR "','" gaspreprocessor)
+    vcpkg_list(APPEND additional_binaries "gas-preprocessor.pl = ['${gaspreprocessor}']")
 endif()
 
 vcpkg_configure_meson(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS -Dtests=disabled
+    ADDITIONAL_BINARIES
+        ${additional_binaries}
 )
 
 vcpkg_install_meson()

From 0b1eb61d8194faff11c5fd135d42360dcba93b77 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 27 Dec 2024 11:00:01 +0100
Subject: [PATCH 11/12] Finish

---
 ports/openh264/portfile.cmake | 6 +++---
 ports/openh264/vcpkg.json     | 2 +-
 versions/o-/openh264.json     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/openh264/portfile.cmake b/ports/openh264/portfile.cmake
index 38a20e1f109cf3..8da8eded073b16 100644
--- a/ports/openh264/portfile.cmake
+++ b/ports/openh264/portfile.cmake
@@ -28,12 +28,12 @@ elseif(VCPKG_TARGET_IS_WINDOWS)
 endif()
 
 vcpkg_configure_meson(
-    SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS -Dtests=disabled
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -Dtests=disabled
     ADDITIONAL_BINARIES
         ${additional_binaries}
 )
-
 vcpkg_install_meson()
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
diff --git a/ports/openh264/vcpkg.json b/ports/openh264/vcpkg.json
index 7cbefa5210c269..160686a563f74b 100644
--- a/ports/openh264/vcpkg.json
+++ b/ports/openh264/vcpkg.json
@@ -3,7 +3,7 @@
   "version": "2.5.0",
   "description": "OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.",
   "homepage": "https://www.openh264.org/",
-  "supports": "!uwp",
+  "license": "BSD-2-Clause",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/versions/o-/openh264.json b/versions/o-/openh264.json
index 6e3f73c341635f..ae582a54e9c738 100644
--- a/versions/o-/openh264.json
+++ b/versions/o-/openh264.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "ad71a28ff4347124592b910081d89e65b431760f",
+      "git-tree": "91cf19eb2e0e9de617f43708201c69dbf097b649",
       "version": "2.5.0",
       "port-version": 0
     },

From c25254eb31b3089d0c0c0d4f4d146e2ca83b1359 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 27 Dec 2024 11:23:24 +0100
Subject: [PATCH 12/12] Update vcpkg-ci-ffmpeg

---
 scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
index f49976bcd83be2..73ff8575f7cfa1 100644
--- a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
+++ b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
@@ -20,6 +20,7 @@
         "lzma",
         "mp3lame",
         "nonfree",
+        "openh264",
         "openjpeg",
         "openmpt",
         "openssl",
@@ -73,7 +74,6 @@
         "fribidi",
         "modplug",
         "opencl",
-        "openh264",
         "srt"
       ],
       "platform": "!uwp"