Date: Sat, 26 Dec 2020 00:23:49 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559263 - in head: . devel devel/spirv-tools graphics graphics/shaderc graphics/spirv-tools graphics/vkd3d graphics/vulkan-validation-layers multimedia/ffmpeg x11-wm/chamfer Message-ID: <202012260023.0BQ0Nns6066745@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Dec 26 00:23:49 2020 New Revision: 559263 URL: https://svnweb.freebsd.org/changeset/ports/559263 Log: devel/spirv-tools: move to graphics/ where glslang is Added: head/graphics/spirv-tools/ head/graphics/spirv-tools/Makefile (contents, props changed) - copied, changed from r559262, head/devel/spirv-tools/Makefile head/graphics/spirv-tools/distinfo (contents, props changed) - copied, changed from r559262, head/devel/spirv-tools/distinfo head/graphics/spirv-tools/pkg-descr (contents, props changed) - copied, changed from r559262, head/devel/spirv-tools/pkg-descr head/graphics/spirv-tools/pkg-plist (contents, props changed) - copied, changed from r559262, head/devel/spirv-tools/pkg-plist Deleted: head/devel/spirv-tools/ Modified: head/MOVED head/devel/Makefile (contents, props changed) head/graphics/Makefile (contents, props changed) head/graphics/shaderc/Makefile (contents, props changed) head/graphics/vkd3d/Makefile (contents, props changed) head/graphics/vulkan-validation-layers/Makefile (contents, props changed) head/multimedia/ffmpeg/Makefile (contents, props changed) head/x11-wm/chamfer/Makefile (contents, props changed) Modified: head/MOVED ============================================================================== --- head/MOVED Sat Dec 26 00:00:57 2020 (r559262) +++ head/MOVED Sat Dec 26 00:23:49 2020 (r559263) @@ -15801,3 +15801,4 @@ devel/vulkan-headers|graphics/vulkan-headers|2020-12-2 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 Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Sat Dec 26 00:00:57 2020 (r559262) +++ head/devel/Makefile Sat Dec 26 00:23:49 2020 (r559263) @@ -6730,7 +6730,6 @@ SUBDIR += spice-protocol SUBDIR += spin SUBDIR += spirv-llvm-translator - SUBDIR += spirv-tools SUBDIR += splint SUBDIR += spread-sheet-widget SUBDIR += srecord Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Sat Dec 26 00:00:57 2020 (r559262) +++ head/graphics/Makefile Sat Dec 26 00:23:49 2020 (r559263) @@ -1019,6 +1019,7 @@ SUBDIR += sk1libs SUBDIR += skanlite SUBDIR += spectacle + SUBDIR += spirv-tools SUBDIR += springgraph SUBDIR += squish SUBDIR += ssocr Modified: head/graphics/shaderc/Makefile ============================================================================== --- head/graphics/shaderc/Makefile Sat Dec 26 00:00:57 2020 (r559262) +++ head/graphics/shaderc/Makefile Sat Dec 26 00:23:49 2020 (r559263) @@ -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 Copied and modified: head/graphics/spirv-tools/Makefile (from r559262, head/devel/spirv-tools/Makefile) ============================================================================== --- head/devel/spirv-tools/Makefile Sat Dec 26 00:00:57 2020 (r559262, copy source) +++ head/graphics/spirv-tools/Makefile Sat Dec 26 00:23:49 2020 (r559263) @@ -3,7 +3,7 @@ PORTNAME= spirv-tools DISTVERSIONPREFIX= v DISTVERSION= 2020.6 -CATEGORIES= devel graphics +CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Tools for processing SPIR-V intermediate shader language modules Copied and modified: head/graphics/spirv-tools/distinfo (from r559262, head/devel/spirv-tools/distinfo) ============================================================================== Copied and modified: head/graphics/spirv-tools/pkg-descr (from r559262, head/devel/spirv-tools/pkg-descr) ============================================================================== Copied and modified: head/graphics/spirv-tools/pkg-plist (from r559262, head/devel/spirv-tools/pkg-plist) ============================================================================== Modified: head/graphics/vkd3d/Makefile ============================================================================== --- head/graphics/vkd3d/Makefile Sat Dec 26 00:00:57 2020 (r559262) +++ head/graphics/vkd3d/Makefile Sat Dec 26 00:23:49 2020 (r559263) @@ -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 Modified: head/graphics/vulkan-validation-layers/Makefile ============================================================================== --- head/graphics/vulkan-validation-layers/Makefile Sat Dec 26 00:00:57 2020 (r559262) +++ head/graphics/vulkan-validation-layers/Makefile Sat Dec 26 00:23:49 2020 (r559263) @@ -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 Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Sat Dec 26 00:00:57 2020 (r559262) +++ head/multimedia/ffmpeg/Makefile Sat Dec 26 00:23:49 2020 (r559263) @@ -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 Modified: head/x11-wm/chamfer/Makefile ============================================================================== --- head/x11-wm/chamfer/Makefile Sat Dec 26 00:00:57 2020 (r559262) +++ head/x11-wm/chamfer/Makefile Sat Dec 26 00:23:49 2020 (r559263) @@ -10,7 +10,7 @@ COMMENT= Tiling X11 window manager with Vulkan composi 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012260023.0BQ0Nns6066745>