Date: Tue, 16 Jun 2020 17:53:25 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r539373 - head/misc/ncnn Message-ID: <202006161753.05GHrPxP060002@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Jun 16 17:53:24 2020 New Revision: 539373 URL: https://svnweb.freebsd.org/changeset/ports/539373 Log: misc/ncnn: unbreak new VULKAN feature after r539362 https://github.com/Tencent/ncnn/commit/17c445480fee https://github.com/Tencent/ncnn/commit/eec5cf718015 CMake Warning at CMakeLists.txt:98 (message): The submodules were not downloaded! NCNN_VULKAN_ONLINE_SPIRV will be turned off. Modified: head/misc/ncnn/Makefile (contents, props changed) Modified: head/misc/ncnn/Makefile ============================================================================== --- head/misc/ncnn/Makefile Tue Jun 16 17:36:55 2020 (r539372) +++ head/misc/ncnn/Makefile Tue Jun 16 17:53:24 2020 (r539373) @@ -2,6 +2,7 @@ PORTNAME= ncnn DISTVERSION= 20200616 +PORTREVISION= 1 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org @@ -18,9 +19,13 @@ OPTIONS_DEFINE= VULKAN OPTIONS_DEFAULT= VULKAN VULKAN_DESC= Vulkan compute support -VULKAN_CMAKE_BOOL= NCNN_VULKAN -VULKAN_BUILD_DEPENDS= glslangValidator:devel/glslang \ +VULKAN_BUILD_DEPENDS= glslang>0:devel/glslang \ ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \ ${LOCALBASE}/lib/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 <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006161753.05GHrPxP060002>