svn commit: r559023 - in head: . benchmarks/mangohud devel devel/glslang graphics graphics/glslang graphics/libplacebo graphics/mesa-devel graphics/shaderc graphics/vulkan-tools graphics/vulkan-val...

Jan Beich jbeich at FreeBSD.org
Wed Dec 23 20:12:40 UTC 2020 

Author: jbeich
Date: Wed Dec 23 20:12:36 2020
New Revision: 559023
URL: https://svnweb.freebsd.org/changeset/ports/559023

Log:
  devel/glslang: move to graphics/ where shaderc is

Added:
  head/graphics/glslang/
  head/graphics/glslang/Makefile   (contents, props changed)
     - copied, changed from r559022, head/devel/glslang/Makefile
  head/graphics/glslang/distinfo   (contents, props changed)
     - copied, changed from r559022, head/devel/glslang/distinfo
  head/graphics/glslang/pkg-descr   (contents, props changed)
     - copied, changed from r559022, head/devel/glslang/pkg-descr
  head/graphics/glslang/pkg-plist   (contents, props changed)
     - copied, changed from r559022, head/devel/glslang/pkg-plist
Deleted:
  head/devel/glslang/
Modified:
  head/MOVED
  head/benchmarks/mangohud/Makefile   (contents, props changed)
  head/devel/Makefile   (contents, props changed)
  head/graphics/Makefile   (contents, props changed)
  head/graphics/libplacebo/Makefile   (contents, props changed)
  head/graphics/mesa-devel/Makefile   (contents, props changed)
  head/graphics/shaderc/Makefile   (contents, props changed)
  head/graphics/vulkan-tools/Makefile   (contents, props changed)
  head/graphics/vulkan-validation-layers/Makefile   (contents, props changed)
  head/graphics/waifu2x-ncnn-vulkan/Makefile   (contents, props changed)
  head/misc/ncnn/Makefile   (contents, props changed)
  head/multimedia/ffmpeg/Makefile   (contents, props changed)
  head/x11-wm/gamescope/Makefile   (contents, props changed)

Modified: head/MOVED
==============================================================================
--- head/MOVED	Wed Dec 23 20:12:14 2020	(r559022)
+++ head/MOVED	Wed Dec 23 20:12:36 2020	(r559023)
@@ -15800,3 +15800,4 @@ www/rubygem-rack21|www/rubygem-rack|2020-12-18|Obsolet
 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

Modified: head/benchmarks/mangohud/Makefile
==============================================================================
--- head/benchmarks/mangohud/Makefile	Wed Dec 23 20:12:14 2020	(r559022)
+++ head/benchmarks/mangohud/Makefile	Wed Dec 23 20:12:36 2020	(r559023)
@@ -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

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Wed Dec 23 20:12:14 2020	(r559022)
+++ head/devel/Makefile	Wed Dec 23 20:12:36 2020	(r559023)
@@ -819,7 +819,6 @@
     SUBDIR += global
     SUBDIR += glog
     SUBDIR += glrparser
-    SUBDIR += glslang
     SUBDIR += glui
     SUBDIR += gmake
     SUBDIR += gn

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Wed Dec 23 20:12:14 2020	(r559022)
+++ head/graphics/Makefile	Wed Dec 23 20:12:36 2020	(r559023)
@@ -263,6 +263,7 @@
     SUBDIR += gliv
     SUBDIR += glosm
     SUBDIR += glpng
+    SUBDIR += glslang
     SUBDIR += gltt
     SUBDIR += glx-utils
     SUBDIR += gmic

Copied and modified: head/graphics/glslang/Makefile (from r559022, head/devel/glslang/Makefile)
==============================================================================
--- head/devel/glslang/Makefile	Wed Dec 23 20:12:14 2020	(r559022, copy source)
+++ head/graphics/glslang/Makefile	Wed Dec 23 20:12:36 2020	(r559023)
@@ -2,7 +2,7 @@
 
 PORTNAME=	glslang
 DISTVERSION=	8.13.3743
-CATEGORIES=	devel graphics
+CATEGORIES=	graphics
 
 MAINTAINER=	jbeich at FreeBSD.org
 COMMENT=	OpenGL and OpenGL ES shader front end and validator

Copied and modified: head/graphics/glslang/distinfo (from r559022, head/devel/glslang/distinfo)
==============================================================================

Copied and modified: head/graphics/glslang/pkg-descr (from r559022, head/devel/glslang/pkg-descr)
==============================================================================

Copied and modified: head/graphics/glslang/pkg-plist (from r559022, head/devel/glslang/pkg-plist)
==============================================================================

Modified: head/graphics/libplacebo/Makefile
==============================================================================
--- head/graphics/libplacebo/Makefile	Wed Dec 23 20:12:14 2020	(r559022)
+++ head/graphics/libplacebo/Makefile	Wed Dec 23 20:12:36 2020	(r559023)
@@ -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

Modified: head/graphics/mesa-devel/Makefile
==============================================================================
--- head/graphics/mesa-devel/Makefile	Wed Dec 23 20:12:14 2020	(r559022)
+++ head/graphics/mesa-devel/Makefile	Wed Dec 23 20:12:36 2020	(r559023)
@@ -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

Modified: head/graphics/shaderc/Makefile
==============================================================================
--- head/graphics/shaderc/Makefile	Wed Dec 23 20:12:14 2020	(r559022)
+++ head/graphics/shaderc/Makefile	Wed Dec 23 20:12:36 2020	(r559023)
@@ -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

Modified: head/graphics/vulkan-tools/Makefile
==============================================================================
--- head/graphics/vulkan-tools/Makefile	Wed Dec 23 20:12:14 2020	(r559022)
+++ head/graphics/vulkan-tools/Makefile	Wed Dec 23 20:12:36 2020	(r559023)
@@ -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

Modified: head/graphics/vulkan-validation-layers/Makefile
==============================================================================
--- head/graphics/vulkan-validation-layers/Makefile	Wed Dec 23 20:12:14 2020	(r559022)
+++ head/graphics/vulkan-validation-layers/Makefile	Wed Dec 23 20:12:36 2020	(r559023)
@@ -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

Modified: head/graphics/waifu2x-ncnn-vulkan/Makefile
==============================================================================
--- head/graphics/waifu2x-ncnn-vulkan/Makefile	Wed Dec 23 20:12:14 2020	(r559022)
+++ head/graphics/waifu2x-ncnn-vulkan/Makefile	Wed Dec 23 20:12:36 2020	(r559023)
@@ -10,7 +10,7 @@ COMMENT=	Scale and denoise images using convolutional 
 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

Modified: head/misc/ncnn/Makefile
==============================================================================
--- head/misc/ncnn/Makefile	Wed Dec 23 20:12:14 2020	(r559022)
+++ head/misc/ncnn/Makefile	Wed Dec 23 20:12:36 2020	(r559023)
@@ -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

Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile	Wed Dec 23 20:12:14 2020	(r559022)
+++ head/multimedia/ffmpeg/Makefile	Wed Dec 23 20:12:36 2020	(r559023)
@@ -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

Modified: head/x11-wm/gamescope/Makefile
==============================================================================
--- head/x11-wm/gamescope/Makefile	Wed Dec 23 20:12:14 2020	(r559022)
+++ head/x11-wm/gamescope/Makefile	Wed Dec 23 20:12:36 2020	(r559023)
@@ -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 \

More information about the svn-ports-all mailing list