Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Jan 2024 08:06:48 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: e7b86e162f70 - main - misc/ncnn: update 20231027 =?utf-8?Q?=E2=86=92?= 20240102
Message-ID:  <202401060806.40686m5X021334@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e7b86e162f70f498a64afcb4f926b019331c1d0c

commit e7b86e162f70f498a64afcb4f926b019331c1d0c
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-01-06 06:38:08 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-01-06 08:06:39 +0000

    misc/ncnn: update 20231027 → 20240102
    
    Reported by:    portscout
---
 misc/ncnn/Makefile  | 11 ++++++-----
 misc/ncnn/distinfo  |  6 +++---
 misc/ncnn/pkg-plist |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/misc/ncnn/Makefile b/misc/ncnn/Makefile
index 79b88c4300ab..0f3b3d55d1ae 100644
--- a/misc/ncnn/Makefile
+++ b/misc/ncnn/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	ncnn
-DISTVERSION=	20231027
-PORTREVISION=	1
+DISTVERSION=	20240102
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -10,9 +9,10 @@ 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
@@ -22,12 +22,13 @@ GH_ACCOUNT=	Tencent
 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 <bsd.port.mk>
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
@@ -33,6 +33,7 @@ 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401060806.40686m5X021334>