diff --git a/ports/icey/001-devendor-nlohmann-json.patch b/ports/icey/001-devendor-nlohmann-json.patch deleted file mode 100644 index 1db44fab89..0000000000 --- a/ports/icey/001-devendor-nlohmann-json.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/cmake/icey_build_config.cmake.in b/cmake/icey_build_config.cmake.in -index aae2c22c..ccf13c38 100644 ---- a/cmake/icey_build_config.cmake.in -+++ b/cmake/icey_build_config.cmake.in -@@ -44,6 +44,9 @@ if(_icey_have_libdatachannel AND DEFINED icey_FIND_COMPONENTS AND "webrtc" IN_LI - endif() - - if(@USE_SYSTEM_DEPS@) -+ if("json" IN_LIST _icey_supported_components) -+ find_dependency(nlohmann_json CONFIG) -+ endif() - find_package(libuv CONFIG QUIET) - if(NOT TARGET libuv::uv_a AND NOT TARGET libuv::uv AND NOT TARGET libuv::libuv AND PkgConfig_FOUND) - pkg_check_modules(LIBUV QUIET IMPORTED_TARGET GLOBAL libuv) -diff --git a/cmake/icey_config.cmake.in b/cmake/icey_config.cmake.in -index 447929b9..0e14d025 100644 ---- a/cmake/icey_config.cmake.in -+++ b/cmake/icey_config.cmake.in -@@ -59,6 +59,9 @@ if(NOT TARGET llhttp_static) - endif() - - if(@USE_SYSTEM_DEPS@) -+ if("json" IN_LIST _icey_supported_components) -+ find_dependency(nlohmann_json CONFIG) -+ endif() - find_dependency(ZLIB) - if("archo" IN_LIST _icey_supported_components OR "pacm" IN_LIST _icey_supported_components) - find_dependency(unofficial-minizip CONFIG QUIET) -diff --git a/icey.cmake b/icey.cmake -index f99c4f7f..0d766619 100644 ---- a/icey.cmake -+++ b/icey.cmake -@@ -210,6 +210,9 @@ else() - pkg_check_modules(LIBUV QUIET IMPORTED_TARGET GLOBAL libuv) - endif() - find_package(llhttp CONFIG QUIET) -+ if(BUILD_MODULES AND (NOT DEFINED BUILD_MODULE_json OR BUILD_MODULE_json)) -+ find_package(nlohmann_json CONFIG REQUIRED) -+ endif() - find_package(ZLIB REQUIRED) - if(NOT TARGET llhttp_static - AND NOT TARGET llhttp::llhttp_static -diff --git a/src/json/CMakeLists.txt b/src/json/CMakeLists.txt -index 8983ef5c..905c5008 100644 ---- a/src/json/CMakeLists.txt -+++ b/src/json/CMakeLists.txt -@@ -1,6 +1,20 @@ --icy_add_module(json -- DEPENDS base -- PRETTY_NAME JSON --) --# nlohmann/json.hpp is vendored in include/nlohmann/ (MIT licensed, single-header) --# so no external dependency is needed - icy_add_module already adds our include dir. -+if(USE_SYSTEM_DEPS) -+ icy_add_module(json -+ DEPENDS base -+ PACKAGES nlohmann_json::nlohmann_json -+ PRETTY_NAME JSON -+ ) -+else() -+ icy_add_module(json -+ DEPENDS base -+ PRETTY_NAME JSON -+ ) -+ target_include_directories(json -+ PUBLIC -+ $ -+ ) -+ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vendor/" -+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" -+ COMPONENT dev -+ ) -+endif() -diff --git a/src/json/include/nlohmann/json.hpp b/src/json/vendor/nlohmann/json.hpp -similarity index 100% -rename from src/json/include/nlohmann/json.hpp -rename to src/json/vendor/nlohmann/json.hpp diff --git a/ports/icey/portfile.cmake b/ports/icey/portfile.cmake index 36d9f4f7d6..a9d869c42e 100644 --- a/ports/icey/portfile.cmake +++ b/ports/icey/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nilstate/icey - REF 6692243b82e687279ed40f6df54ab93d8964b6a1 # 2.4.2 - SHA512 c1956e7035c2f4aef8cd1005fc8f6373d4b90c4409bd1dd104b5f9f415f9e347da7b1c530ac8f1192f7953a076ec21f0a8aed9618e236324e0c5154f12e79dce + REF 689364c94475e36af24f0e39665aebfb9bb16a9c # 2.4.11 + SHA512 d37e43f303b2a8d63dd78afc7cb3f5c614650f91520638a90362e7e558501eca245ffd08e73c1a6415b0b618e70ba64234d62b869602940c2990e08ecc278824 HEAD_REF main - PATCHES - 001-devendor-nlohmann-json.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/icey/vcpkg.json b/ports/icey/vcpkg.json index 2085bfcd29..360f9e8e13 100644 --- a/ports/icey/vcpkg.json +++ b/ports/icey/vcpkg.json @@ -1,7 +1,6 @@ { "name": "icey", - "version": "2.4.2", - "port-version": 1, + "version": "2.4.11", "maintainers": "0state OSS ", "description": "C++20 media stack and libwebrtc alternative for real-time video, signalling, TURN, and media servers", "homepage": "https://0state.com/icey/", diff --git a/versions/baseline.json b/versions/baseline.json index c8ca2963ce..89cb102304 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3921,8 +3921,8 @@ "port-version": 1 }, "icey": { - "baseline": "2.4.2", - "port-version": 1 + "baseline": "2.4.11", + "port-version": 0 }, "icu": { "baseline": "78.3", diff --git a/versions/i-/icey.json b/versions/i-/icey.json index e77b6035f6..6c4c20a4fb 100644 --- a/versions/i-/icey.json +++ b/versions/i-/icey.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "879b3663b2cb7b247336340c30d509fd3ff4b662", + "version": "2.4.11", + "port-version": 0 + }, { "git-tree": "bf0aa15dc2cf655705528a6d4a19a7d1f3d5a6a6", "version": "2.4.2",