From nobody Thu Oct 13 21:18:36 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MpMnn19Rhz4ffvM; Thu, 13 Oct 2022 21:18:37 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MpMnn0WRYz46Lt; Thu, 13 Oct 2022 21:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665695917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ip9TVeXDYd7YqdUry5X8E0ejY+3jH/K2iuxsvL3EWUA=; b=QC+Bfdgr/QYQT8TedusXRmeBhCHt0GCEzFqWzxKBee4CyOk0NSRG21yge0pz+M5nGkZm+z 5gO48bP25Z3ul3M1i/c20uGXCxlnqlsICrFkjNNvmVk7v+FdNlAJbAKfcFosIV0Dx+ffbd 27CsiYGxWGkieHTWVVIk7mLJj/2tO7qiJAtm54tPh7B0JCjeM04LJVgHavF7VY5FMaf5/g fVoyeO9gRZYDK2G+WMthsgnhiVGaigJFM4iw0Eytoqt6p4x7nxN2YC0Lci2tFTBf0fk79E BUq7c8nxwSEUARwXU0IUYIu12WcSN49c7/MoOheHoTg2twaY37FBtN6sijl2dA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MpMnm6d8QzYfV; Thu, 13 Oct 2022 21:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29DLIaoZ034111; Thu, 13 Oct 2022 21:18:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29DLIa6i034110; Thu, 13 Oct 2022 21:18:36 GMT (envelope-from git) Date: Thu, 13 Oct 2022 21:18:36 GMT Message-Id: <202210132118.29DLIa6i034110@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: c1b8092c8abb - main - misc/ncnn: unbreak after 51a9ba187752 via bundling List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1b8092c8abb0d95d9e3a6e353a0fe7d5b90a5a3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665695917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ip9TVeXDYd7YqdUry5X8E0ejY+3jH/K2iuxsvL3EWUA=; b=dgH7T2h9pU0md41dzPuDgjZVGZloQ4eXWAdB0viQtrGa4ZvHTLT+UDFxO9fjgSuzXwzcd5 FLSzl7zyq51e/KBF7pff2tROcXtEJ3ebLe4KFXzzO+pO6osGs/aVQAyNsBNLJu0SmS4Q1+ VINX9RxMNL8g4ZLO0JQHzQXhAoIS4Y2W6d2gp/Y7Xuh8l+bGHh2bLmBRODKWKiOUeQNdPG FaUwAX44gT1tP2FHdIEJxHiKpPAJO4oQaiHF4RHZjDQ/h9w0jy02sGLQKSXhoH+p+CtrRs 1XaFC/HGE4GmB0lTtnwHXJez4FADyD9sqtDdrKa28ky3Y2lEibaVjzdxz4SDow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665695917; a=rsa-sha256; cv=none; b=xZ/2FIKFpnS31nbq+bfJmO8hawCzkm43I/kQcgOA7F8Vq9bdmx34yRrgYKLAXh/FvOQERL IyIIVJe8bjObkNN/8g/vRgTgo4nHMnMlc19XqL3tQ+ZIwagkG+lLgpYeOcz1weZfr/uudZ pyIfE++wpHQVyIu848Y343jxZ+eI5PxDgJwGTzp+/NpA5qFPALk1HB8gWvNTjdo2m9NlxD FfLQeRqf8iVebq6Glbit+8qRah1Tnf4Avre3PDFn7Yg4AQ+GI34J/ASN75//drPP9D1S4O 70C+Vy2tqSqMLjTn5tOuuEC9hIe2LPbgY9B0TO7YRL3wssKaYEF/4DVlPpyq4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c1b8092c8abb0d95d9e3a6e353a0fe7d5b90a5a3 commit c1b8092c8abb0d95d9e3a6e353a0fe7d5b90a5a3 Author: Jan Beich AuthorDate: 2022-10-13 20:52:23 +0000 Commit: Jan Beich CommitDate: 2022-10-13 21:17:32 +0000 misc/ncnn: unbreak after 51a9ba187752 via bundling CMake Warning at /usr/local/lib/cmake/OSDependentTargets.cmake:2 (message): Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets. Call Stack (most recent call first): CMakeLists.txt:481 (include) CMake Error at /usr/local/lib/cmake/OSDependentTargets.cmake:5 (include): include could not find requested file: /usr/local/lib/cmake/../../lib/glslang/glslang-targets.cmake Call Stack (most recent call first): CMakeLists.txt:481 (include) CMake Error at /usr/local/lib/cmake/OSDependentTargets.cmake:8 (add_library): add_library cannot create ALIAS target "OSDependent" because target "glslang::OSDependent" does not already exist. Call Stack (most recent call first): CMakeLists.txt:481 (include) CMake Warning at /usr/local/lib/cmake/OGLCompilerTargets.cmake:2 (message): Using `OGLCompilerTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets. Call Stack (most recent call first): CMakeLists.txt:482 (include) CMake Error at /usr/local/lib/cmake/OGLCompilerTargets.cmake:5 (include): include could not find requested file: /usr/local/lib/cmake/../../lib/glslang/glslang-targets.cmake Call Stack (most recent call first): CMakeLists.txt:482 (include) CMake Error at /usr/local/lib/cmake/OGLCompilerTargets.cmake:8 (add_library): add_library cannot create ALIAS target "OGLCompiler" because target "glslang::OGLCompiler" does not already exist. Call Stack (most recent call first): CMakeLists.txt:482 (include) CMake Warning at /usr/local/lib/cmake/HLSLTargets.cmake:2 (message): Using `HLSLTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets. Call Stack (most recent call first): CMakeLists.txt:485 (include) CMake Error at /usr/local/lib/cmake/HLSLTargets.cmake:5 (include): include could not find requested file: /usr/local/lib/cmake/../../lib/glslang/glslang-targets.cmake Call Stack (most recent call first): CMakeLists.txt:485 (include) CMake Error at /usr/local/lib/cmake/HLSLTargets.cmake:8 (add_library): add_library cannot create ALIAS target "HLSL" because target "glslang::HLSL" does not already exist. Call Stack (most recent call first): CMakeLists.txt:485 (include) CMake Warning at /usr/local/lib/cmake/glslangTargets.cmake:2 (message): Using `glslangTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets. Call Stack (most recent call first): CMakeLists.txt:487 (include) CMake Error at /usr/local/lib/cmake/glslangTargets.cmake:5 (include): include could not find requested file: /usr/local/lib/cmake/../../lib/glslang/glslang-targets.cmake Call Stack (most recent call first): CMakeLists.txt:487 (include) CMake Error at /usr/local/lib/cmake/glslangTargets.cmake:11 (add_library): add_library cannot create ALIAS target "glslang" because target "glslang::glslang" does not already exist. Call Stack (most recent call first): CMakeLists.txt:487 (include) CMake Error at /usr/local/lib/cmake/glslangTargets.cmake:12 (add_library): add_library cannot create ALIAS target "MachineIndependent" because target "glslang::MachineIndependent" does not already exist. Call Stack (most recent call first): CMakeLists.txt:487 (include) CMake Error at /usr/local/lib/cmake/glslangTargets.cmake:13 (add_library): add_library cannot create ALIAS target "GenericCodeGen" because target "glslang::GenericCodeGen" does not already exist. Call Stack (most recent call first): CMakeLists.txt:487 (include) CMake Warning at /usr/local/lib/cmake/SPIRVTargets.cmake:2 (message): Using `SPIRVTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets. Call Stack (most recent call first): CMakeLists.txt:488 (include) CMake Error at /usr/local/lib/cmake/SPIRVTargets.cmake:5 (include): include could not find requested file: /usr/local/lib/cmake/../../lib/glslang/glslang-targets.cmake Call Stack (most recent call first): CMakeLists.txt:488 (include) CMake Error at /usr/local/lib/cmake/SPIRVTargets.cmake:8 (add_library): add_library cannot create ALIAS target "SPIRV" because target "glslang::SPIRV" does not already exist. Call Stack (most recent call first): CMakeLists.txt:488 (include) CMake Warning at CMakeLists.txt:491 (message): glslang or SPIRV target not found! NCNN_SYSTEM_GLSLANG will be turned off. CMake Error at CMakeLists.txt:499 (message): The submodules were not downloaded! Please update submodules with "git submodule update --init" and try again. This reverts commit 3fb41287be4428e362311ead29135c264d19d4fd. --- misc/ncnn/Makefile | 12 ++---- misc/ncnn/distinfo | 2 + misc/ncnn/files/patch-CMakeLists.txt | 82 ++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 8 deletions(-) diff --git a/misc/ncnn/Makefile b/misc/ncnn/Makefile index 19b546cb6860..971a97a6a62f 100644 --- a/misc/ncnn/Makefile +++ b/misc/ncnn/Makefile @@ -1,6 +1,6 @@ PORTNAME= ncnn DISTVERSION= 20220729 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org @@ -25,13 +25,9 @@ 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_GH_TUPLE= KhronosGroup:glslang:11.9.0-19-g86ff4bca: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 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 +VULKAN_CMAKE_BOOL= NCNN_VULKAN .include diff --git a/misc/ncnn/distinfo b/misc/ncnn/distinfo index 191900aeeb6a..002a78cd91cb 100644 --- a/misc/ncnn/distinfo +++ b/misc/ncnn/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1664765781 SHA256 (Tencent-ncnn-20220729_GH0.tar.gz) = fa337dce2db3aea82749633322c3572490a86d6f2e144e53aba03480f651991f SIZE (Tencent-ncnn-20220729_GH0.tar.gz) = 12235306 +SHA256 (KhronosGroup-glslang-11.9.0-19-g86ff4bca_GH0.tar.gz) = f7a19b57af200feeba77a5cc010fc031ba47c32287cb1438440ad32628fb798a +SIZE (KhronosGroup-glslang-11.9.0-19-g86ff4bca_GH0.tar.gz) = 3535721 diff --git a/misc/ncnn/files/patch-CMakeLists.txt b/misc/ncnn/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..1e7ebf6f403d --- /dev/null +++ b/misc/ncnn/files/patch-CMakeLists.txt @@ -0,0 +1,82 @@ +Don't try to install bundled glslang as part of ncnn + +====> Checking for pkg-plist issues (check-plist) +===> Parsing plist +===> Checking for items in STAGEDIR missing from pkg-plist +Error: Orphaned: include/glslang/Include/BaseTypes.h +Error: Orphaned: include/glslang/Include/Common.h +Error: Orphaned: include/glslang/Include/ConstantUnion.h +Error: Orphaned: include/glslang/Include/InfoSink.h +Error: Orphaned: include/glslang/Include/InitializeGlobals.h +Error: Orphaned: include/glslang/Include/PoolAlloc.h +Error: Orphaned: include/glslang/Include/ResourceLimits.h +Error: Orphaned: include/glslang/Include/ShHandle.h +Error: Orphaned: include/glslang/Include/SpirvIntrinsics.h +Error: Orphaned: include/glslang/Include/Types.h +Error: Orphaned: include/glslang/Include/arrays.h +Error: Orphaned: include/glslang/Include/glslang_c_interface.h +Error: Orphaned: include/glslang/Include/glslang_c_shader_types.h +Error: Orphaned: include/glslang/Include/intermediate.h +Error: Orphaned: include/glslang/MachineIndependent/Initialize.h +Error: Orphaned: include/glslang/MachineIndependent/LiveTraverser.h +Error: Orphaned: include/glslang/MachineIndependent/ParseHelper.h +Error: Orphaned: include/glslang/MachineIndependent/RemoveTree.h +Error: Orphaned: include/glslang/MachineIndependent/Scan.h +Error: Orphaned: include/glslang/MachineIndependent/ScanContext.h +Error: Orphaned: include/glslang/MachineIndependent/SymbolTable.h +Error: Orphaned: include/glslang/MachineIndependent/Versions.h +Error: Orphaned: include/glslang/MachineIndependent/attribute.h +Error: Orphaned: include/glslang/MachineIndependent/gl_types.h +Error: Orphaned: include/glslang/MachineIndependent/glslang_tab.cpp.h +Error: Orphaned: include/glslang/MachineIndependent/iomapper.h +Error: Orphaned: include/glslang/MachineIndependent/localintermediate.h +Error: Orphaned: include/glslang/MachineIndependent/parseVersions.h +Error: Orphaned: include/glslang/MachineIndependent/preprocessor/PpContext.h +Error: Orphaned: include/glslang/MachineIndependent/preprocessor/PpTokens.h +Error: Orphaned: include/glslang/MachineIndependent/propagateNoContraction.h +Error: Orphaned: include/glslang/MachineIndependent/reflection.h +Error: Orphaned: include/glslang/Public/ShaderLang.h +Error: Orphaned: include/glslang/SPIRV/GLSL.ext.AMD.h +Error: Orphaned: include/glslang/SPIRV/GLSL.ext.EXT.h +Error: Orphaned: include/glslang/SPIRV/GLSL.ext.KHR.h +Error: Orphaned: include/glslang/SPIRV/GLSL.ext.NV.h +Error: Orphaned: include/glslang/SPIRV/GLSL.std.450.h +Error: Orphaned: include/glslang/SPIRV/GlslangToSpv.h +Error: Orphaned: include/glslang/SPIRV/Logger.h +Error: Orphaned: include/glslang/SPIRV/NonSemanticDebugPrintf.h +Error: Orphaned: include/glslang/SPIRV/SPVRemapper.h +Error: Orphaned: include/glslang/SPIRV/SpvBuilder.h +Error: Orphaned: include/glslang/SPIRV/SpvTools.h +Error: Orphaned: include/glslang/SPIRV/bitutils.h +Error: Orphaned: include/glslang/SPIRV/disassemble.h +Error: Orphaned: include/glslang/SPIRV/doc.h +Error: Orphaned: include/glslang/SPIRV/hex_float.h +Error: Orphaned: include/glslang/SPIRV/spirv.hpp +Error: Orphaned: include/glslang/SPIRV/spvIR.h +Error: Orphaned: include/glslang/build_info.h +Error: Orphaned: lib/cmake/OGLCompilerTargets-%%CMAKE_BUILD_TYPE%%.cmake +Error: Orphaned: lib/cmake/OGLCompilerTargets.cmake +Error: Orphaned: lib/cmake/OSDependentTargets-%%CMAKE_BUILD_TYPE%%.cmake +Error: Orphaned: lib/cmake/OSDependentTargets.cmake +Error: Orphaned: lib/cmake/SPIRVTargets-%%CMAKE_BUILD_TYPE%%.cmake +Error: Orphaned: lib/cmake/SPIRVTargets.cmake +Error: Orphaned: lib/cmake/glslangTargets-%%CMAKE_BUILD_TYPE%%.cmake +Error: Orphaned: lib/cmake/glslangTargets.cmake +Error: Orphaned: lib/libGenericCodeGen.a +Error: Orphaned: lib/libMachineIndependent.a +Error: Orphaned: lib/libOGLCompiler.a +Error: Orphaned: lib/libOSDependent.a +Error: Orphaned: lib/libSPIRV.a +Error: Orphaned: lib/libglslang.a + +--- CMakeLists.txt.orig 2022-07-28 09:47:27 UTC ++++ CMakeLists.txt +@@ -513,7 +513,7 @@ if(NCNN_VULKAN) + if(NCNN_SHARED_LIB) + option(SKIP_GLSLANG_INSTALL "" ON) + endif() +- add_subdirectory(glslang) ++ add_subdirectory(glslang EXCLUDE_FROM_ALL) + if(NCNN_SHARED_LIB) + if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_CXX_COMPILER_FRONTEND_VARIANT MATCHES "MSVC")) + target_compile_options(glslang PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden)