diff --git a/misc/ncnn/Makefile b/misc/ncnn/Makefile index 3e4a4fa32524..9fba11e04e01 100644 --- a/misc/ncnn/Makefile +++ b/misc/ncnn/Makefile @@ -1,32 +1,36 @@ PORTNAME= ncnn -DISTVERSION= 20220701 +DISTVERSION= 20220729 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org COMMENT= High-performance neural network inference framework WWW= https://github.com/Tencent/ncnn LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libprotobuf.so:devel/protobuf -USES= cmake compiler:c11 +USES= cmake:testing +USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= Tencent +#CMAKE_ON= NCNN_SHARED_LIB NCNN_ENABLE_LTO # NCNN_SHARED_LIB=ON causes variability in the shared library name, see https://github.com/Tencent/ncnn/issues/4234 +CMAKE_TESTING_ON= NCNN_BUILD_TESTS # in order to run tests please disable NCNN_SHARED_LIB above; many tests fail, see https://github.com/Tencent/ncnn/issues/4233 + OPTIONS_DEFINE= VULKAN OPTIONS_DEFAULT= VULKAN VULKAN_DESC= Vulkan compute support VULKAN_BUILD_DEPENDS= glslang>0:graphics/glslang \ ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_CMAKE_BOOL= NCNN_VULKAN NCNN_SYSTEM_GLSLANG VULKAN_CMAKE_ON= -DGLSLANG_TARGET_DIR:PATH="${LOCALBASE}/lib/cmake" post-patch-VULKAN-on: @${REINPLACE_CMD} 's,/glslang,,' ${WRKSRC}/src/gpu.cpp .include diff --git a/misc/ncnn/distinfo b/misc/ncnn/distinfo index 6c12433202a5..191900aeeb6a 100644 --- a/misc/ncnn/distinfo +++ b/misc/ncnn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656816698 -SHA256 (Tencent-ncnn-20220701_GH0.tar.gz) = e222f2ac54cc52ed7b1f6edc83ce4bf8ea1dc729c81f6a1560e4196032ec88ca -SIZE (Tencent-ncnn-20220701_GH0.tar.gz) = 12220010 +TIMESTAMP = 1664765781 +SHA256 (Tencent-ncnn-20220729_GH0.tar.gz) = fa337dce2db3aea82749633322c3572490a86d6f2e144e53aba03480f651991f +SIZE (Tencent-ncnn-20220729_GH0.tar.gz) = 12235306 diff --git a/misc/ncnn/pkg-plist b/misc/ncnn/pkg-plist index c7c590b92693..beacad414c01 100644 --- a/misc/ncnn/pkg-plist +++ b/misc/ncnn/pkg-plist @@ -1,39 +1,40 @@ bin/caffe2ncnn bin/darknet2ncnn bin/mxnet2ncnn bin/ncnn2int8 bin/ncnn2mem bin/ncnn2table bin/ncnnmerge bin/ncnnoptimize bin/onnx2ncnn include/ncnn/allocator.h include/ncnn/benchmark.h include/ncnn/blob.h include/ncnn/c_api.h include/ncnn/command.h include/ncnn/cpu.h include/ncnn/datareader.h include/ncnn/gpu.h include/ncnn/layer.h include/ncnn/layer_shader_type.h include/ncnn/layer_shader_type_enum.h include/ncnn/layer_type.h include/ncnn/layer_type_enum.h include/ncnn/mat.h include/ncnn/modelbin.h include/ncnn/ncnn_export.h include/ncnn/net.h include/ncnn/option.h include/ncnn/paramdict.h include/ncnn/pipeline.h include/ncnn/pipelinecache.h include/ncnn/platform.h include/ncnn/simpleocv.h include/ncnn/simpleomp.h include/ncnn/simplestl.h include/ncnn/vulkan_header_fix.h lib/cmake/ncnn/ncnn-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/ncnn/ncnn.cmake lib/cmake/ncnn/ncnnConfig.cmake lib/libncnn.a +libdata/pkgconfig/ncnn.pc