early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,57 @@
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)

35
externals/vcpkg/ports/openh264/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,35 @@
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
)
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})
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)
endif()
vcpkg_configure_meson(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS -Dtests=disabled
)
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")
endif()
configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)

14
externals/vcpkg/ports/openh264/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,14 @@
{
"name": "openh264",
"version-date": "2021-03-16",
"port-version": 3,
"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",
"dependencies": [
{
"name": "vcpkg-tool-meson",
"host": true
}
]
}