diff --git a/MOVED b/MOVED index acac62955d57..d401aa54903f 100644 --- a/MOVED +++ b/MOVED @@ -15800,3 +15800,4 @@ www/rubygem-rack21|www/rubygem-rack|2020-12-18|Obsolete, please use www/rubygem- devel/vulkan-headers|graphics/vulkan-headers|2020-12-23|Moved to a better category, aligning with vulkan-loader 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 diff --git a/benchmarks/mangohud/Makefile b/benchmarks/mangohud/Makefile index 690a29893094..abb9b69ab255 100644 --- a/benchmarks/mangohud/Makefile +++ b/benchmarks/mangohud/Makefile @@ -15,7 +15,7 @@ COMMENT= Vulkan/OpenGL overlay for CPU/GPU monitoring LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= glslangValidator:devel/glslang \ +BUILD_DEPENDS= glslangValidator:graphics/glslang \ ${LOCALBASE}/share/vulkan/registry/vk.xml:graphics/vulkan-headers \ ${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR} LIB_DEPENDS= libinotify.so:devel/libinotify diff --git a/devel/Makefile b/devel/Makefile index b3f23133e62d..83360c039996 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -819,7 +819,6 @@ SUBDIR += global SUBDIR += glog SUBDIR += glrparser - SUBDIR += glslang SUBDIR += glui SUBDIR += gmake SUBDIR += gn diff --git a/graphics/Makefile b/graphics/Makefile index 50ff448809f8..621b49907bff 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -263,6 +263,7 @@ SUBDIR += gliv SUBDIR += glosm SUBDIR += glpng + SUBDIR += glslang SUBDIR += gltt SUBDIR += glx-utils SUBDIR += gmic diff --git a/devel/glslang/Makefile b/graphics/glslang/Makefile similarity index 93% rename from devel/glslang/Makefile rename to graphics/glslang/Makefile index 547a75ffbf5c..856fcbd7bfd6 100644 --- a/devel/glslang/Makefile +++ b/graphics/glslang/Makefile @@ -2,7 +2,7 @@ PORTNAME= glslang DISTVERSION= 8.13.3743 -CATEGORIES= devel graphics +CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= OpenGL and OpenGL ES shader front end and validator diff --git a/devel/glslang/distinfo b/graphics/glslang/distinfo similarity index 100% rename from devel/glslang/distinfo rename to graphics/glslang/distinfo diff --git a/devel/glslang/pkg-descr b/graphics/glslang/pkg-descr similarity index 100% rename from devel/glslang/pkg-descr rename to graphics/glslang/pkg-descr diff --git a/devel/glslang/pkg-plist b/graphics/glslang/pkg-plist similarity index 100% rename from devel/glslang/pkg-plist rename to graphics/glslang/pkg-plist diff --git a/graphics/libplacebo/Makefile b/graphics/libplacebo/Makefile index 85188da8cfb0..ed2a2c9a69f8 100644 --- a/graphics/libplacebo/Makefile +++ b/graphics/libplacebo/Makefile @@ -23,7 +23,7 @@ OPTIONS_SINGLE_VULKAN= GLSLANG SHADERC OPTIONS_SUB= yes GLSLANG_DESC= glslang SPIR-V compiler -GLSLANG_BUILD_DEPENDS= glslang>0:devel/glslang +GLSLANG_BUILD_DEPENDS= glslang>0:graphics/glslang GLSLANG_MESON_ENABLED= glslang GLSLANG_VARS= LLD_UNSAFE=yes GLSLANG_IMPLIES= VULKAN diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 8a53cd74556c..a88c9831268c 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -118,7 +118,7 @@ VDPAU_BUILD_DEPENDS= libvdpau>0:multimedia/libvdpau VDPAU_MESON_ENABLED= gallium-vdpau VULKAN_DESC= Vulkan drivers and layers -VULKAN_BUILD_DEPENDS= glslangValidator:devel/glslang +VULKAN_BUILD_DEPENDS= glslangValidator:graphics/glslang VULKAN_MESON_TRUE= vulkan-device-select-layer vulkan-overlay-layer anv_DESC= Haswell and newer radv_DESC= Southern Islands and newer diff --git a/graphics/shaderc/Makefile b/graphics/shaderc/Makefile index 3dd43df20047..e2e5192a8391 100644 --- a/graphics/shaderc/Makefile +++ b/graphics/shaderc/Makefile @@ -14,7 +14,7 @@ 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:devel/glslang + ${LOCALBASE}/lib/libHLSL.a:graphics/glslang USES= cmake compiler:c++11-lib pkgconfig localbase:ldflags python:build USE_LDCONFIG= yes diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile index 84535b177375..a4162c410e8b 100644 --- a/graphics/vulkan-tools/Makefile +++ b/graphics/vulkan-tools/Makefile @@ -11,7 +11,7 @@ COMMENT= Tools and demos for the Vulkan graphics API LICENSE= APACHE20 BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \ - glslangValidator:devel/glslang + glslangValidator:graphics/glslang LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader USES= cmake compiler:c++11-lib pkgconfig python:3.4+,build diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index 7e7bf4bce9ad..b1de8517faae 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -13,7 +13,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/spirv.hpp:devel/glslang + ${LOCALBASE}/include/SPIRV/spirv.hpp:graphics/glslang USES= cmake compiler:c++11-lib pkgconfig python:3.4+,build USE_LDCONFIG= yes diff --git a/graphics/waifu2x-ncnn-vulkan/Makefile b/graphics/waifu2x-ncnn-vulkan/Makefile index 348c573bf16a..259a87508cf5 100644 --- a/graphics/waifu2x-ncnn-vulkan/Makefile +++ b/graphics/waifu2x-ncnn-vulkan/Makefile @@ -10,7 +10,7 @@ COMMENT= Scale and denoise images using convolutional neural networks LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= glslangValidator:devel/glslang \ +BUILD_DEPENDS= glslangValidator:graphics/glslang \ vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libwebp.so:graphics/webp \ libvulkan.so:graphics/vulkan-loader diff --git a/misc/ncnn/Makefile b/misc/ncnn/Makefile index cb6d80df9cf5..30b131f5eac6 100644 --- a/misc/ncnn/Makefile +++ b/misc/ncnn/Makefile @@ -18,7 +18,7 @@ OPTIONS_DEFINE= VULKAN OPTIONS_DEFAULT= VULKAN VULKAN_DESC= Vulkan compute support -VULKAN_BUILD_DEPENDS= glslang>0:devel/glslang \ +VULKAN_BUILD_DEPENDS= glslang>0:graphics/glslang \ ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \ ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader VULKAN_CMAKE_BOOL= NCNN_VULKAN NCNN_SYSTEM_GLSLANG diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 78c9a9f7361b..6e54b58a39e0 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -248,7 +248,7 @@ GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt GCRYPT_CONFIGURE_ENABLE= gcrypt # glslang -GLSLANG_BUILD_DEPENDS= glslang>0:devel/glslang \ +GLSLANG_BUILD_DEPENDS= glslang>0:graphics/glslang \ spirv-tools>0:devel/spirv-tools GLSLANG_CONFIGURE_ENABLE= libglslang GLSLANG_LDFLAGS= -lm diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index 808d3b28b24b..8f43da9a3d2b 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -17,7 +17,7 @@ COMMENT= Micro-compositor from SteamOS LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= glslangValidator:devel/glslang \ +BUILD_DEPENDS= glslangValidator:graphics/glslang \ evdev-proto>0:devel/evdev-proto \ vulkan-headers>0:graphics/vulkan-headers \ wayland-protocols>=1.17:graphics/wayland-protocols \