From 4d4c0f158cc49b874cd6838ee4c17ccc37b3f400 Mon Sep 17 00:00:00 2001 From: Weihang Ding <798047000@qq.com> Date: Thu, 28 May 2026 03:17:40 +0800 Subject: [PATCH] [ncnn] Update to 20260526 (#52038) --- ports/ncnn/portfile.cmake | 82 +++++++++++++++++++-------------------- ports/ncnn/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/ncnn.json | 5 +++ 4 files changed, 48 insertions(+), 43 deletions(-) diff --git a/ports/ncnn/portfile.cmake b/ports/ncnn/portfile.cmake index e4b3a97513..ca7726878d 100644 --- a/ports/ncnn/portfile.cmake +++ b/ports/ncnn/portfile.cmake @@ -1,41 +1,41 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Tencent/ncnn - REF "${VERSION}" - SHA512 53de1d8c7b6ea3bdc01eeb1c742fecbf53ba1ec975087814197a270c8a2c104c3f48c81849631ca4460f9d875c45bba7e5e52ff572d0a86131c792867ee0a1f3 - HEAD_REF master -) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - vulkan NCNN_VULKAN - vulkan NCNN_SYSTEM_GLSLANG -) - -if(vulkan IN_LIST FEATURES AND VCPKG_TARGET_IS_OSX) - list(APPEND FEATURE_OPTIONS -DNCNN_SIMPLEVK=OFF) -endif() - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - -DNCNN_BUILD_TOOLS=OFF - -DNCNN_BUILD_EXAMPLES=OFF - -DNCNN_BUILD_BENCHMARK=OFF - -DNCNN_SHARED_LIB=${BUILD_SHARED} - -DNCNN_VERSION=${VERSION} -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ncnn) -vcpkg_copy_pdbs() -vcpkg_fixup_pkgconfig() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Tencent/ncnn + REF "${VERSION}" + SHA512 515c6b6adda0b57b84427314c75375312e2e1f8a7c47900ca1419735cbf956b1dab14cd3caad008bda7269578e01cae2dda8b49565c6e0eceff724bbc11f6c55 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + vulkan NCNN_VULKAN + vulkan NCNN_SYSTEM_GLSLANG +) + +if(vulkan IN_LIST FEATURES AND VCPKG_TARGET_IS_OSX) + list(APPEND FEATURE_OPTIONS -DNCNN_SIMPLEVK=OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DNCNN_BUILD_TOOLS=OFF + -DNCNN_BUILD_EXAMPLES=OFF + -DNCNN_BUILD_BENCHMARK=OFF + -DNCNN_SHARED_LIB=${BUILD_SHARED} + -DNCNN_VERSION=${VERSION} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ncnn) +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/ncnn/vcpkg.json b/ports/ncnn/vcpkg.json index 34d732a0cf..c1aa5664e6 100644 --- a/ports/ncnn/vcpkg.json +++ b/ports/ncnn/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ncnn", - "version": "20260113", + "version": "20260526", "description": "ncnn is a high-performance neural network inference computing framework.", "homepage": "https://github.com/Tencent/ncnn", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index db2764fbd0..c9c7806c00 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6925,7 +6925,7 @@ "port-version": 2 }, "ncnn": { - "baseline": "20260113", + "baseline": "20260526", "port-version": 0 }, "ncurses": { diff --git a/versions/n-/ncnn.json b/versions/n-/ncnn.json index e9f4799b10..71a5f48656 100644 --- a/versions/n-/ncnn.json +++ b/versions/n-/ncnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5e8efe4d599efd1b264d50c91c2bacf3c29f148", + "version": "20260526", + "port-version": 0 + }, { "git-tree": "6e4a7d2b3212557f0ee3968e6c22b1d6495c2489", "version": "20260113",