From owner-svn-ports-head@freebsd.org Tue Jun 16 17:53:25 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6F12B346004; Tue, 16 Jun 2020 17:53:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49mbQs2Nfyz4S4m; Tue, 16 Jun 2020 17:53:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4D1EE1304F; Tue, 16 Jun 2020 17:53:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05GHrPvm060003; Tue, 16 Jun 2020 17:53:25 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05GHrPxP060002; Tue, 16 Jun 2020 17:53:25 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006161753.05GHrPxP060002@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 16 Jun 2020 17:53:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r539373 - head/misc/ncnn X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/misc/ncnn X-SVN-Commit-Revision: 539373 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jun 2020 17:53:25 -0000 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