mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 03:10:57 +08:00
[zlmediakit] fix core build (#39773)
This commit is contained in:
parent
11dbcbb234
commit
22fde23bd8
20
ports/zlmediakit/fix-core.patch
Normal file
20
ports/zlmediakit/fix-core.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
diff --git a/server/WebApi.cpp b/server/WebApi.cpp
|
||||||
|
index 5fbe4e19..1ba30b58 100755
|
||||||
|
--- a/server/WebApi.cpp
|
||||||
|
+++ b/server/WebApi.cpp
|
||||||
|
@@ -1872,6 +1872,7 @@ void installWebApi() {
|
||||||
|
});
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if ENABLE_MP4
|
||||||
|
api_regist("/index/api/loadMP4File", [](API_ARGS_MAP) {
|
||||||
|
CHECK_SECRET();
|
||||||
|
CHECK_ARGS("vhost", "app", "stream", "file_path");
|
||||||
|
@@ -1890,6 +1891,7 @@ void installWebApi() {
|
||||||
|
// sample_ms设置为0,从配置文件加载;file_repeat可以指定,如果配置文件也指定循环解复用,那么强制开启
|
||||||
|
reader->startReadMP4(0, true, allArgs["file_repeat"]);
|
||||||
|
});
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
GET_CONFIG_FUNC(std::set<std::string>, download_roots, API::kDownloadRoot, [](const string &str) -> std::set<std::string> {
|
||||||
|
std::set<std::string> ret;
|
@ -7,6 +7,7 @@ vcpkg_from_github(
|
|||||||
PATCHES
|
PATCHES
|
||||||
fix-dependency.patch
|
fix-dependency.patch
|
||||||
fix-android-build.patch
|
fix-android-build.patch
|
||||||
|
fix-core.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "zlmediakit",
|
"name": "zlmediakit",
|
||||||
"version-date": "2024-03-30",
|
"version-date": "2024-03-30",
|
||||||
"port-version": 2,
|
"port-version": 3,
|
||||||
"description": "A high-performance carrier-grade streaming media service framework based on C++11.",
|
"description": "A high-performance carrier-grade streaming media service framework based on C++11.",
|
||||||
"homepage": "https://github.com/ZLMediaKit/ZLMediaKit",
|
"homepage": "https://github.com/ZLMediaKit/ZLMediaKit",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
@ -9754,7 +9754,7 @@
|
|||||||
},
|
},
|
||||||
"zlmediakit": {
|
"zlmediakit": {
|
||||||
"baseline": "2024-03-30",
|
"baseline": "2024-03-30",
|
||||||
"port-version": 2
|
"port-version": 3
|
||||||
},
|
},
|
||||||
"zoe": {
|
"zoe": {
|
||||||
"baseline": "3.1",
|
"baseline": "3.1",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "e2e858d8f4618dbb8a41963656970b659ad02813",
|
||||||
|
"version-date": "2024-03-30",
|
||||||
|
"port-version": 3
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "6e9961ba37fd6444cafde78116cb797229f116d3",
|
"git-tree": "6e9961ba37fd6444cafde78116cb797229f116d3",
|
||||||
"version-date": "2024-03-30",
|
"version-date": "2024-03-30",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user