Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[openh264] Update to version 2.5.0 #42827

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
+11 −73
Draft

[openh264] Update to version 2.5.0 #42827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a545f72
[openh264] Update to version 2.5.0
tartanpaint Dec 20, 2024
58671ae
Update version database
tartanpaint Dec 20, 2024
bc032cc
Remove redundant vcpkg_replace_string calls
tartanpaint Dec 20, 2024
05e04c4
Update version database
tartanpaint Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 0 additions & 57 deletions ports/openh264/0001-respect-default-library-option.patch
View file
Open in desktop

This file was deleted.

15 changes: 3 additions & 12 deletions ports/openh264/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"))
Expand All @@ -28,15 +26,8 @@ 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()

configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
3 changes: 1 addition & 2 deletions ports/openh264/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/openh264.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "700cffde354087387b3ae9759bd1bb530f00da66",
"version": "2.5.0",
"port-version": 0
},
{
"git-tree": "34faf5afdf562b2dff8472e4101d3a01f51d3372",
"version-date": "2021-03-16",
Expand Down
Loading