diff --git a/ports/ncnn/portfile.cmake b/ports/ncnn/portfile.cmake index a3dec468a3..40000fcc82 100644 --- a/ports/ncnn/portfile.cmake +++ b/ports/ncnn/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tencent/ncnn - REF "${VERSION}" - SHA512 31bc3c2f461a00241fb8f69ca6ea8cc590af6618856b1b84a048bde924e4b474fd883ad5d54dbfbdd1e5b59015889e15ffc4fbafccb3e42e052a02071f2017b1 + REF "${VERSION}" + SHA512 31bc3c2f461a00241fb8f69ca6ea8cc590af6618856b1b84a048bde924e4b474fd883ad5d54dbfbdd1e5b59015889e15ffc4fbafccb3e42e052a02071f2017b1 HEAD_REF master PATCHES fix_uwp.patch #https://github.com/Tencent/ncnn/pull/5328 @@ -10,9 +10,16 @@ vcpkg_from_github( 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 +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DNCNN_BUILD_TOOLS=OFF -DNCNN_BUILD_EXAMPLES=OFF -DNCNN_BUILD_BENCHMARK=OFF diff --git a/ports/ncnn/vcpkg.json b/ports/ncnn/vcpkg.json index 28be929f74..3369007843 100644 --- a/ports/ncnn/vcpkg.json +++ b/ports/ncnn/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ncnn", "version": "20240102", + "port-version": 1, "description": "ncnn is a high-performance neural network inference computing framework.", "homepage": "https://github.com/Tencent/ncnn", "license": "BSD-3-Clause", @@ -14,5 +15,14 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "vulkan": { + "description": "Enable Vulkan support", + "dependencies": [ + "glslang", + "vulkan" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 466c935d23..0b388160e2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6062,7 +6062,7 @@ }, "ncnn": { "baseline": "20240102", - "port-version": 0 + "port-version": 1 }, "ncurses": { "baseline": "6.4", diff --git a/versions/n-/ncnn.json b/versions/n-/ncnn.json index 60b0168727..3bff868a6d 100644 --- a/versions/n-/ncnn.json +++ b/versions/n-/ncnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d52e0be36ae3ae67d9d1b2dac78ec753e50fb66", + "version": "20240102", + "port-version": 1 + }, { "git-tree": "322a0f4cfc94f9d73060a9636854a8e1260796fd", "version": "20240102",