diff --git a/misc/ncnn/Makefile b/misc/ncnn/Makefile index 79b88c4300ab..0f3b3d55d1ae 100644 --- a/misc/ncnn/Makefile +++ b/misc/ncnn/Makefile @@ -1,33 +1,34 @@ PORTNAME= ncnn -DISTVERSION= 20231027 -PORTREVISION= 1 +DISTVERSION= 20240102 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 +LIB_DEPENDS= libabsl_flags_program_name.so:devel/abseil \ + libprotobuf.so:devel/protobuf -USES= cmake:testing # 2 tests fail, see https://github.com/Tencent/ncnn/issues/4742 +USES= cmake:testing # 1 test fails, see https://github.com/Tencent/ncnn/issues/4742#issuecomment-1879563662 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 +OPTIONS_DEFAULT= # broken: VULKAN VULKAN_DESC= Vulkan compute support VULKAN_GH_TUPLE= KhronosGroup:glslang:88fd417:glslang/glslang VULKAN_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_CMAKE_BOOL= NCNN_VULKAN +VULKAN_BROKEN= most tests are broken with Vulkan, see https://github.com/Tencent/ncnn/issues/4742#issuecomment-1879563662 .include diff --git a/misc/ncnn/distinfo b/misc/ncnn/distinfo index ba99a358922b..170c01024175 100644 --- a/misc/ncnn/distinfo +++ b/misc/ncnn/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1698602080 -SHA256 (Tencent-ncnn-20231027_GH0.tar.gz) = 8d85896ed095d09f05fff32fc85d75eea0b971796ce0f48a9874d93d3d347674 -SIZE (Tencent-ncnn-20231027_GH0.tar.gz) = 12722960 +TIMESTAMP = 1704506296 +SHA256 (Tencent-ncnn-20240102_GH0.tar.gz) = 0770b0b4ccbcb2b4e5f38574bb6f1086b07d48958b10f289251e0359faa1d9cc +SIZE (Tencent-ncnn-20240102_GH0.tar.gz) = 12791570 SHA256 (KhronosGroup-glslang-88fd417_GH0.tar.gz) = 7349344acf4ce49e0c0b7f2555e0165a6bd538cc927adece7c81571ce350e487 SIZE (KhronosGroup-glslang-88fd417_GH0.tar.gz) = 3656236 diff --git a/misc/ncnn/pkg-plist b/misc/ncnn/pkg-plist index 669dbc41684f..868a54aefc4f 100644 --- a/misc/ncnn/pkg-plist +++ b/misc/ncnn/pkg-plist @@ -1,41 +1,42 @@ 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/simplemath.h include/ncnn/simpleocv.h include/ncnn/simpleomp.h include/ncnn/simplestl.h +include/ncnn/simplevk.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