From nobody Thu Oct 13 21:18:37 2022 X-Original-To: dev-commits-ports-all@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 4MpMnp1mWMz4fg7q; Thu, 13 Oct 2022 21:18:38 +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 4MpMnp1MMMz46MK; Thu, 13 Oct 2022 21:18:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665695918; 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=rwcgOb02cH/96sPBYieOTIvGqxc7dk5kPTqSna2ALCU=; b=lVnnJ2nHyqDEGmj7Xdg+JkZajvSwUsV58iRvioPl9ZT0z7NrXPLKfnXj3igPLbEAWnrlE1 OK1FqQGC1Votf3+GW3rtc0NC0xSlj11TjHjrE8ruuVZjBpjqDAiYWNVILO1vPHFNJx3Muo mmcordRZQW4Hl1JUrE4uHgyqYf8GxPBEaJZe9U4Kh8FIGkG4+EFtQGTfYdleYagIGHKFQU spjPfTlW4Q/t5RCSzvmn3OyARCIdojmG9FvL3GTtbXasaVdvYArSo1v/JDKkDaiWm/2y7+ DGxo0PAr0aJOY/mScBWBGC04DwSoTj3cnMAqETdAbgXzAZoR94EUlbvnQQyicA== 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 4MpMnp0JYnzYbx; Thu, 13 Oct 2022 21:18:38 +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 29DLIbxF034135; Thu, 13 Oct 2022 21:18:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29DLIbmE034134; Thu, 13 Oct 2022 21:18:37 GMT (envelope-from git) Date: Thu, 13 Oct 2022 21:18:37 GMT Message-Id: <202210132118.29DLIbmE034134@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: 5c6a3bfc9825 - main - graphics/vapoursynth-waifu2x-ncnn-vulkan: unbreak after 51a9ba187752 via bundling List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 5c6a3bfc98254176162106df1e29d9e3a019b974 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665695918; 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=rwcgOb02cH/96sPBYieOTIvGqxc7dk5kPTqSna2ALCU=; b=dH+mHHc1e+LA8MIDSopvuCI4SyNbkLlQuv92TSXvli1dKLWaxVSz/+DkK4/LS5f5fDtCxf Oh9ug7kfJ0hvoqKE5RFCUAQUj7FFp+qrGtJM8m+UpM3QW3sKBn7ogvSQWp28aPKSlwWsJz /D7nmQyOPUmhFlQ5p94Esiu1E0eDMJ4oqejjZoPQjFJp0W3fWqJP1XswEW5NgwNUR3NTOM gjJU9n4FisRKd1k/4A2NMAh3mDOoMXoiuiiqCSL+aKlHVE93AwRpIcIPr1raa5GOepujfT XYIqNzBuM9HcKoxs+qmFgGbtcjaby9OovVLh2S1NU1OUkbwImhg44TuZ1ZUMfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665695918; a=rsa-sha256; cv=none; b=sYcZER/WZt8PL32tRqj6o0Pgs/2tp7/fLklBcs3zNvt36O5oRoM5EriksTTdlkpelUT6bB yCMZxXGgDTAQbTtiAh40cVjZW2kViMEu76LyUrK0sHcU7mR2zrYHy8kGDNAFhAX1qGEpOz s/DMF/uniOuDRyS1+kl/GS1960xEKdvMzTuSKyQrs5LE/AkzrsyGtia2r2erPggk97c6WB eCSVDhvMNkJ1eqYON6hYfCAlNTcpLhswBoo88DsKowm5jvGtsg8xRwn7Dan8gZ+u/yhp+m K/5hpU8mIbaXDH3q/iIX0prZJ5OiAhdXZWjtzSMqFt/5/EnKKBhAeBr3y+Z2Pg== 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=5c6a3bfc98254176162106df1e29d9e3a019b974 commit 5c6a3bfc98254176162106df1e29d9e3a019b974 Author: Jan Beich AuthorDate: 2022-10-13 20:52:23 +0000 Commit: Jan Beich CommitDate: 2022-10-13 21:18:16 +0000 graphics/vapoursynth-waifu2x-ncnn-vulkan: 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): deps/ncnn/CMakeLists.txt:205 (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): deps/ncnn/CMakeLists.txt:205 (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): deps/ncnn/CMakeLists.txt:205 (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): deps/ncnn/CMakeLists.txt:206 (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): deps/ncnn/CMakeLists.txt:206 (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): deps/ncnn/CMakeLists.txt:206 (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): deps/ncnn/CMakeLists.txt:209 (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): deps/ncnn/CMakeLists.txt:209 (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): deps/ncnn/CMakeLists.txt:209 (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): deps/ncnn/CMakeLists.txt:211 (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): deps/ncnn/CMakeLists.txt:211 (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): deps/ncnn/CMakeLists.txt:211 (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): deps/ncnn/CMakeLists.txt:211 (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): deps/ncnn/CMakeLists.txt:211 (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): deps/ncnn/CMakeLists.txt:212 (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): deps/ncnn/CMakeLists.txt:212 (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): deps/ncnn/CMakeLists.txt:212 (include) CMake Warning at deps/ncnn/CMakeLists.txt:215 (message): glslang or SPIRV target not found! NCNN_SYSTEM_GLSLANG will be turned off. CMake Error at deps/ncnn/CMakeLists.txt:223 (message): The submodules were not downloaded! Please update submodules with "git submodule update --init" and try again. --- graphics/vapoursynth-waifu2x-ncnn-vulkan/Makefile | 10 ++++------ graphics/vapoursynth-waifu2x-ncnn-vulkan/distinfo | 2 ++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/graphics/vapoursynth-waifu2x-ncnn-vulkan/Makefile b/graphics/vapoursynth-waifu2x-ncnn-vulkan/Makefile index 9ba5c5ac7197..77024b5059c6 100644 --- a/graphics/vapoursynth-waifu2x-ncnn-vulkan/Makefile +++ b/graphics/vapoursynth-waifu2x-ncnn-vulkan/Makefile @@ -1,5 +1,6 @@ PORTNAME= vapoursynth-waifu2x-ncnn-vulkan DISTVERSION= r5 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org @@ -18,10 +19,9 @@ RUN_DEPENDS= waifu2x-ncnn-vulkan>0:graphics/waifu2x-ncnn-vulkan USES= cmake compiler:c++11-lib USE_GITHUB= yes GH_ACCOUNT= Nlzy -GH_TUPLE= Tencent:ncnn:20210525:ncnn/deps/ncnn -CMAKE_ON= NCNN_SYSTEM_GLSLANG -CMAKE_ARGS= -DGLSLANG_TARGET_DIR:PATH="${LOCALBASE}/lib/cmake" \ - -DVAPOURSYNTH_HEADER_DIR:PATH="${LOCALBASE}/include/vapoursynth" +GH_TUPLE= KhronosGroup:glslang:11.9.0-19-g86ff4bca:glslang/deps/ncnn/glslang \ + Tencent:ncnn:20210525:ncnn/deps/ncnn +CMAKE_ARGS= -DVAPOURSYNTH_HEADER_DIR:PATH="${LOCALBASE}/include/vapoursynth" DATADIR= ${PREFIX}/lib/vapoursynth PORTDATA= libvsw2xnvk.so PORTDOCS= *.md @@ -29,8 +29,6 @@ PORTDOCS= *.md OPTIONS_DEFINE= DOCS post-patch: -# Drop submodule prefix for NCNN_SYSTEM_GLSLANG - @${REINPLACE_CMD} 's,/glslang,,' ${WRKSRC_ncnn}/src/gpu.cpp # Models from CLI package are same @${REINPLACE_CMD} -e '/pluginFilePath{/d' \ -e '/pluginDir/s, =[^;]*,{"${LOCALBASE}/share/waifu2x-ncnn-vulkan"},' \ diff --git a/graphics/vapoursynth-waifu2x-ncnn-vulkan/distinfo b/graphics/vapoursynth-waifu2x-ncnn-vulkan/distinfo index 247cf34c9266..99f19c3fd50d 100644 --- a/graphics/vapoursynth-waifu2x-ncnn-vulkan/distinfo +++ b/graphics/vapoursynth-waifu2x-ncnn-vulkan/distinfo @@ -1,5 +1,7 @@ TIMESTAMP = 1655095760 SHA256 (Nlzy-vapoursynth-waifu2x-ncnn-vulkan-r5_GH0.tar.gz) = cc7bf044b79c7ef7f65a2749f28df5865ed81d69aaa55bb1ebc1bd1a61bb9743 SIZE (Nlzy-vapoursynth-waifu2x-ncnn-vulkan-r5_GH0.tar.gz) = 10501 +SHA256 (KhronosGroup-glslang-11.9.0-19-g86ff4bca_GH0.tar.gz) = f7a19b57af200feeba77a5cc010fc031ba47c32287cb1438440ad32628fb798a +SIZE (KhronosGroup-glslang-11.9.0-19-g86ff4bca_GH0.tar.gz) = 3535721 SHA256 (Tencent-ncnn-20210525_GH0.tar.gz) = a385eb5505f09e59ae486fa89584e5a15d4c45e7463927bbdddf9060d81b9a18 SIZE (Tencent-ncnn-20210525_GH0.tar.gz) = 11578821