[zlmediakit] fix core build (#39773)

This commit is contained in:
autoantwort 2024-07-09 19:20:47 +02:00 committed by GitHub
parent 11dbcbb234
commit 22fde23bd8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 28 additions and 2 deletions

View 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;

View File

@ -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(

View File

@ -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",

View File

@ -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",

View File

@ -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",