mirror of
https://github.com/microsoft/vcpkg.git
synced 2026-01-18 01:11:23 +01:00
[openh264] Fix support for NetBSD (#48038)
This commit is contained in:
22
ports/openh264/001-add-bsds-to-meson.patch
Normal file
22
ports/openh264/001-add-bsds-to-meson.patch
Normal file
@@ -0,0 +1,22 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 573f6c6..b9519b3 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -57,7 +57,7 @@ cpp_lib = '-lstdc++'
|
||||
libm_dep = cpp.find_library('m', required : false)
|
||||
deps += [libm_dep]
|
||||
|
||||
-if ['linux', 'android', 'ios', 'darwin'].contains(system)
|
||||
+if ['linux', 'android', 'ios', 'darwin', 'freebsd', 'netbsd', 'openbsd'].contains(system)
|
||||
asm_format32 = 'elf'
|
||||
asm_format64 = 'elf64'
|
||||
if ['ios', 'darwin'].contains(system)
|
||||
@@ -109,7 +109,7 @@ if ['linux', 'android', 'ios', 'darwin'].contains(system)
|
||||
error('FIXME: unhandled CPU family @0@ for @1@'.format(cpu_family, system))
|
||||
endif
|
||||
|
||||
- if ['ios', 'darwin', 'android'].contains(system)
|
||||
+ if ['ios', 'darwin', 'android', 'freebsd', 'openbsd'].contains(system)
|
||||
cpp_lib = '-lc++'
|
||||
endif
|
||||
elif system == 'windows'
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index c604389e..a0dfd219 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -57,7 +57,7 @@ cpp_lib = '-lstdc++'
|
||||
libm_dep = cpp.find_library('m', required : false)
|
||||
deps += [libm_dep]
|
||||
|
||||
-if ['linux', 'android', 'ios', 'darwin'].contains(system)
|
||||
+if ['linux', 'freebsd', 'openbsd', 'android', 'ios', 'darwin'].contains(system)
|
||||
asm_format32 = 'elf'
|
||||
asm_format64 = 'elf64'
|
||||
if ['ios', 'darwin'].contains(system)
|
||||
@@ -4,7 +4,7 @@ vcpkg_from_github(
|
||||
REF v${VERSION}
|
||||
SHA512 26a03acde7153a6b40b99f00641772433a244c72a3cc4bca6d903cf3b770174d028369a2fb73b2f0774e1124db0e269758eed6d88975347a815e0366c820d247
|
||||
PATCHES
|
||||
add-openbsd-and-freebsd-to-meson.patch
|
||||
001-add-bsds-to-meson.patch
|
||||
)
|
||||
|
||||
set(cxx_link_libraries "")
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "openh264",
|
||||
"version": "2.6.0",
|
||||
"port-version": 3,
|
||||
"port-version": 4,
|
||||
"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/",
|
||||
"license": "BSD-2-Clause",
|
||||
|
||||
@@ -7150,7 +7150,7 @@
|
||||
},
|
||||
"openh264": {
|
||||
"baseline": "2.6.0",
|
||||
"port-version": 3
|
||||
"port-version": 4
|
||||
},
|
||||
"openigtlink": {
|
||||
"baseline": "3.0",
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "c6f6d9f25761c263ab423ad0121e4f5e502a60cd",
|
||||
"version": "2.6.0",
|
||||
"port-version": 4
|
||||
},
|
||||
{
|
||||
"git-tree": "7461d259d5c19b63782ea9f4aac029397dbe26d0",
|
||||
"version": "2.6.0",
|
||||
|
||||
Reference in New Issue
Block a user