From 2ed21bec6c91142d45601b33884e718161fd279a Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sat, 26 Dec 2020 00:23:49 +0000 Subject: devel/spirv-tools: move to graphics/ where glslang is --- MOVED | 1 + devel/Makefile | 1 - devel/spirv-tools/Makefile | 25 ----------------------- devel/spirv-tools/distinfo | 5 ----- devel/spirv-tools/pkg-descr | 11 ---------- devel/spirv-tools/pkg-plist | 32 ------------------------------ graphics/Makefile | 1 + graphics/shaderc/Makefile | 4 ++-- graphics/spirv-tools/Makefile | 25 +++++++++++++++++++++++ graphics/spirv-tools/distinfo | 5 +++++ graphics/spirv-tools/pkg-descr | 11 ++++++++++ graphics/spirv-tools/pkg-plist | 32 ++++++++++++++++++++++++++++++ graphics/vkd3d/Makefile | 6 +++--- graphics/vulkan-validation-layers/Makefile | 2 +- multimedia/ffmpeg/Makefile | 2 +- x11-wm/chamfer/Makefile | 2 +- 16 files changed, 83 insertions(+), 82 deletions(-) delete mode 100644 devel/spirv-tools/Makefile delete mode 100644 devel/spirv-tools/distinfo delete mode 100644 devel/spirv-tools/pkg-descr delete mode 100644 devel/spirv-tools/pkg-plist create mode 100644 graphics/spirv-tools/Makefile create mode 100644 graphics/spirv-tools/distinfo create mode 100644 graphics/spirv-tools/pkg-descr create mode 100644 graphics/spirv-tools/pkg-plist diff --git a/MOVED b/MOVED index d401aa54903f..25c7cdd91852 100644 --- a/MOVED +++ b/MOVED @@ -15801,3 +15801,4 @@ devel/vulkan-headers|graphics/vulkan-headers|2020-12-23|Moved to a better catego devel/vulkan-tools|graphics/vulkan-tools|2020-12-23|Moved to a better category, aligning with vulkan-loader devel/vulkan-vulkan-validation-layers|graphics/vulkan-vulkan-validation-layers|2020-12-23|Moved to a better category, aligning with vulkan-loader devel/glslang|graphics/glslang|2020-12-23|Moved to a better category, aligning with shaderc +devel/spirv-tools|graphics/spirv-tools|2020-12-25|Moved to a better category, aligning with glslang and shaderc diff --git a/devel/Makefile b/devel/Makefile index d8c7761fc55f..392fc63b82b9 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -6730,7 +6730,6 @@ SUBDIR += spice-protocol SUBDIR += spin SUBDIR += spirv-llvm-translator - SUBDIR += spirv-tools SUBDIR += splint SUBDIR += spread-sheet-widget SUBDIR += srecord diff --git a/devel/spirv-tools/Makefile b/devel/spirv-tools/Makefile deleted file mode 100644 index b6a02f1a4d3c..000000000000 --- a/devel/spirv-tools/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# $FreeBSD$ - -PORTNAME= spirv-tools -DISTVERSIONPREFIX= v -DISTVERSION= 2020.6 -CATEGORIES= devel graphics - -MAINTAINER= jbeich@FreeBSD.org -COMMENT= Tools for processing SPIR-V intermediate shader language modules - -LICENSE= APACHE20 - -USES= cmake compiler:c++11-lib python:3.4+,build shebangfix -USE_LDCONFIG= yes -SHEBANG_FILES= tools/lesspipe/spirv-lesspipe.sh - -USE_GITHUB= yes -GH_ACCOUNT= KhronosGroup -GH_PROJECT= SPIRV-Tools -GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed:headers/external/spirv-headers - -CMAKE_ON= SPIRV_SKIP_TESTS -CMAKE_OFF= SPIRV_WERROR - -.include diff --git a/devel/spirv-tools/distinfo b/devel/spirv-tools/distinfo deleted file mode 100644 index 1f51a6bc3838..000000000000 --- a/devel/spirv-tools/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1607357641 -SHA256 (KhronosGroup-SPIRV-Tools-v2020.6_GH0.tar.gz) = de2392682df8def7ac666a2a320cd475751badf4790b01c7391b7644ecb550a3 -SIZE (KhronosGroup-SPIRV-Tools-v2020.6_GH0.tar.gz) = 2595300 -SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed_GH0.tar.gz) = df2ad2520be4d95a479fa248921065885bbf435a658349a7fc164ad7b26b68c6 -SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed_GH0.tar.gz) = 395500 diff --git a/devel/spirv-tools/pkg-descr b/devel/spirv-tools/pkg-descr deleted file mode 100644 index 069e3fc4ed73..000000000000 --- a/devel/spirv-tools/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -The SPIR-V Tools project provides an API and commands for processing SPIR-V -modules. - -The project includes an assembler, binary module parser, disassembler, -validator, and optimizer for SPIR-V. Except for the optimizer, all are based -on a common static library. The library contains all of the implementation -details, and is used in the standalone tools whilst also enabling integration -into other code bases directly. The optimizer implementation resides in its own -library, which depends on the core library. - -WWW: https://github.com/KhronosGroup/SPIRV-Tools diff --git a/devel/spirv-tools/pkg-plist b/devel/spirv-tools/pkg-plist deleted file mode 100644 index e54a5ec428f1..000000000000 --- a/devel/spirv-tools/pkg-plist +++ /dev/null @@ -1,32 +0,0 @@ -bin/spirv-as -bin/spirv-cfg -bin/spirv-dis -bin/spirv-lesspipe.sh -bin/spirv-link -bin/spirv-opt -bin/spirv-reduce -bin/spirv-val -include/spirv-tools/instrument.hpp -include/spirv-tools/libspirv.h -include/spirv-tools/libspirv.hpp -include/spirv-tools/linker.hpp -include/spirv-tools/optimizer.hpp -lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkConfig.cmake -lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets.cmake -lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optConfig.cmake -lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake -lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceConfig.cmake -lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget.cmake -lib/cmake/SPIRV-Tools/SPIRV-ToolsConfig.cmake -lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake -lib/libSPIRV-Tools-link.a -lib/libSPIRV-Tools-opt.a -lib/libSPIRV-Tools-reduce.a -lib/libSPIRV-Tools-shared.so -lib/libSPIRV-Tools.a -libdata/pkgconfig/SPIRV-Tools-shared.pc -libdata/pkgconfig/SPIRV-Tools.pc diff --git a/graphics/Makefile b/graphics/Makefile index 621b49907bff..ab4ae18a3348 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -1019,6 +1019,7 @@ SUBDIR += sk1libs SUBDIR += skanlite SUBDIR += spectacle + SUBDIR += spirv-tools SUBDIR += springgraph SUBDIR += squish SUBDIR += ssocr diff --git a/graphics/shaderc/Makefile b/graphics/shaderc/Makefile index 6a17d37301a3..abca8cc9580c 100644 --- a/graphics/shaderc/Makefile +++ b/graphics/shaderc/Makefile @@ -10,8 +10,8 @@ COMMENT= GLSL/HLSL to SPIR-V shader compiler LICENSE= APACHE20 -BUILD_DEPENDS= ${LOCALBASE}/lib/libSPIRV-Tools-opt.a:devel/spirv-tools \ - ${LOCALBASE}/lib/libHLSL.a:graphics/glslang +BUILD_DEPENDS= ${LOCALBASE}/lib/libHLSL.a:graphics/glslang \ + ${LOCALBASE}/lib/libSPIRV-Tools-opt.a:graphics/spirv-tools USES= cmake compiler:c++11-lib pkgconfig localbase:ldflags python:build USE_LDCONFIG= yes diff --git a/graphics/spirv-tools/Makefile b/graphics/spirv-tools/Makefile new file mode 100644 index 000000000000..7a4e5bf402fa --- /dev/null +++ b/graphics/spirv-tools/Makefile @@ -0,0 +1,25 @@ +# $FreeBSD$ + +PORTNAME= spirv-tools +DISTVERSIONPREFIX= v +DISTVERSION= 2020.6 +CATEGORIES= graphics + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= Tools for processing SPIR-V intermediate shader language modules + +LICENSE= APACHE20 + +USES= cmake compiler:c++11-lib python:3.4+,build shebangfix +USE_LDCONFIG= yes +SHEBANG_FILES= tools/lesspipe/spirv-lesspipe.sh + +USE_GITHUB= yes +GH_ACCOUNT= KhronosGroup +GH_PROJECT= SPIRV-Tools +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed:headers/external/spirv-headers + +CMAKE_ON= SPIRV_SKIP_TESTS +CMAKE_OFF= SPIRV_WERROR + +.include diff --git a/graphics/spirv-tools/distinfo b/graphics/spirv-tools/distinfo new file mode 100644 index 000000000000..1f51a6bc3838 --- /dev/null +++ b/graphics/spirv-tools/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1607357641 +SHA256 (KhronosGroup-SPIRV-Tools-v2020.6_GH0.tar.gz) = de2392682df8def7ac666a2a320cd475751badf4790b01c7391b7644ecb550a3 +SIZE (KhronosGroup-SPIRV-Tools-v2020.6_GH0.tar.gz) = 2595300 +SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed_GH0.tar.gz) = df2ad2520be4d95a479fa248921065885bbf435a658349a7fc164ad7b26b68c6 +SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed_GH0.tar.gz) = 395500 diff --git a/graphics/spirv-tools/pkg-descr b/graphics/spirv-tools/pkg-descr new file mode 100644 index 000000000000..069e3fc4ed73 --- /dev/null +++ b/graphics/spirv-tools/pkg-descr @@ -0,0 +1,11 @@ +The SPIR-V Tools project provides an API and commands for processing SPIR-V +modules. + +The project includes an assembler, binary module parser, disassembler, +validator, and optimizer for SPIR-V. Except for the optimizer, all are based +on a common static library. The library contains all of the implementation +details, and is used in the standalone tools whilst also enabling integration +into other code bases directly. The optimizer implementation resides in its own +library, which depends on the core library. + +WWW: https://github.com/KhronosGroup/SPIRV-Tools diff --git a/graphics/spirv-tools/pkg-plist b/graphics/spirv-tools/pkg-plist new file mode 100644 index 000000000000..e54a5ec428f1 --- /dev/null +++ b/graphics/spirv-tools/pkg-plist @@ -0,0 +1,32 @@ +bin/spirv-as +bin/spirv-cfg +bin/spirv-dis +bin/spirv-lesspipe.sh +bin/spirv-link +bin/spirv-opt +bin/spirv-reduce +bin/spirv-val +include/spirv-tools/instrument.hpp +include/spirv-tools/libspirv.h +include/spirv-tools/libspirv.hpp +include/spirv-tools/linker.hpp +include/spirv-tools/optimizer.hpp +lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkConfig.cmake +lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets.cmake +lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optConfig.cmake +lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake +lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceConfig.cmake +lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget.cmake +lib/cmake/SPIRV-Tools/SPIRV-ToolsConfig.cmake +lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake +lib/libSPIRV-Tools-link.a +lib/libSPIRV-Tools-opt.a +lib/libSPIRV-Tools-reduce.a +lib/libSPIRV-Tools-shared.so +lib/libSPIRV-Tools.a +libdata/pkgconfig/SPIRV-Tools-shared.pc +libdata/pkgconfig/SPIRV-Tools.pc diff --git a/graphics/vkd3d/Makefile b/graphics/vkd3d/Makefile index 913ece5f69a6..0895c7e72ef9 100644 --- a/graphics/vkd3d/Makefile +++ b/graphics/vkd3d/Makefile @@ -12,9 +12,9 @@ COMMENT= Direct3D 12 to Vulkan translation LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${LOCALBASE}/include/spirv-tools/libspirv.h:devel/spirv-tools \ +BUILD_DEPENDS= ${LOCALBASE}/include/spirv-tools/libspirv.h:graphics/spirv-tools \ ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers -LIB_DEPENDS= libSPIRV-Tools-shared.so:devel/spirv-tools \ +LIB_DEPENDS= libSPIRV-Tools-shared.so:graphics/spirv-tools \ libvulkan.so:graphics/vulkan-loader RUN_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers @@ -25,7 +25,7 @@ CONFIGURE_ARGS= --with-spirv-tools TEST_TARGET= check # XXX Move to a separate port (a la graphics/vulkan-headers) and maybe make -# devel/spirv-tools depend on it as well +# graphics/spirv-tools depend on it as well USE_GITHUB= nodefault GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.3:headers/external/spirv-headers CPPFLAGS+= -isystem${WRKSRC}/external/spirv-headers/include diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index 7153362db5d6..af50ace18650 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 # NOTE: keep spirv-tools and glslang up to date when updating Vulkan BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \ - ${LOCALBASE}/include/spirv-tools/libspirv.h:devel/spirv-tools \ + ${LOCALBASE}/include/spirv-tools/libspirv.h:graphics/spirv-tools \ ${LOCALBASE}/include/glslang/SPIRV/spirv.hpp:graphics/glslang USES= cmake compiler:c++11-lib pkgconfig python:3.4+,build diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 6e54b58a39e0..dc824526ab82 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -249,7 +249,7 @@ GCRYPT_CONFIGURE_ENABLE= gcrypt # glslang GLSLANG_BUILD_DEPENDS= glslang>0:graphics/glslang \ - spirv-tools>0:devel/spirv-tools + spirv-tools>0:graphics/spirv-tools GLSLANG_CONFIGURE_ENABLE= libglslang GLSLANG_LDFLAGS= -lm diff --git a/x11-wm/chamfer/Makefile b/x11-wm/chamfer/Makefile index bb9d2ae90ac9..1e9475ab5df3 100644 --- a/x11-wm/chamfer/Makefile +++ b/x11-wm/chamfer/Makefile @@ -10,7 +10,7 @@ COMMENT= Tiling X11 window manager with Vulkan compositor LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= spirv-opt:devel/spirv-tools \ +BUILD_DEPENDS= spirv-opt:graphics/spirv-tools \ vulkan-headers>0:graphics/vulkan-headers \ glslc:graphics/shaderc \ glm>0:math/glm -- cgit v1.2.3