From 5c6a3bfc98254176162106df1e29d9e3a019b974 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Thu, 13 Oct 2022 20:52:23 +0000 Subject: [PATCH] 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