devel/vulkan-*: move to graphics/ where vulkan-loader is

Vulkan isn't used for generic compute workloads unlike OpenCL. For example, waifu2x-ncnn-vulkan is still graphics-related.
svn path=/head/; revision=559022
2024-11-22 00:35:15 +00:00 · 2020-12-23 20:12:14 +00:00 · 2020-12-23 20:12:14 +00:00 · 8d2b2a2768 · 2021-03-31 03:12:20 +00:00
commit 8d2b2a2768
parent bd5a415767
39 changed files with 33 additions and 30 deletions
--- a/3
+++ b/3
@ -15797,3 +15797,6 @@ devel/py-gobject||2020-12-12|Has expired: Uses deprecated version of python
 games/gemrb||2020-12-18|Has expired: Uses deprecated version of python
 net/iplog||2020-12-18|Has expired: Unmaintained and dead upstream. Does not build with modern compilers.
 www/rubygem-rack21|www/rubygem-rack|2020-12-18|Obsolete, please use www/rubygem-rack
+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
--- a/benchmarks/mangohud/Makefile
+++ b/benchmarks/mangohud/Makefile
@ -16,7 +16,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE

 BUILD_DEPENDS=	glslangValidator:devel/glslang \
-		${LOCALBASE}/share/vulkan/registry/vk.xml:devel/vulkan-headers \
+		${LOCALBASE}/share/vulkan/registry/vk.xml:graphics/vulkan-headers \
 		${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR}
 LIB_DEPENDS=	libinotify.so:devel/libinotify

--- a/devel/Makefile
+++ b/devel/Makefile
@ -6861,9 +6861,6 @@
    SUBDIR += vitables
    SUBDIR += volk
    SUBDIR += vstr
-    SUBDIR += vulkan-headers
-    SUBDIR += vulkan-tools
-    SUBDIR += vulkan-validation-layers
    SUBDIR += vxlog
    SUBDIR += wand-libconfig
    SUBDIR += wandio
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@ -71,7 +71,7 @@ PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	USE_PULSE

 VULKAN_DESC=		Vulkan renderer
-VULKAN_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
+VULKAN_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 VULKAN_CMAKE_BOOL=	USE_VULKAN

--- a/games/homura/Makefile
+++ b/games/homura/Makefile
@ -20,7 +20,7 @@ RUN_DEPENDS=	zenity:x11/zenity \
 		7z:archivers/p7zip \
 		webfonts>=0:x11-fonts/webfonts \
 		winetricks:emulators/winetricks \
-		vulkaninfo:devel/vulkan-tools \
+		vulkaninfo:graphics/vulkan-tools \
 		glxinfo:graphics/mesa-demos

 USE_GITLAB=	yes
--- a/games/retroarch/Makefile
+++ b/games/retroarch/Makefile
@ -24,7 +24,7 @@ LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon \
 		libdrm.so:graphics/libdrm \
 		libass.so:multimedia/libass
 BUILD_DEPENDS=	vulkan-loader>0:graphics/vulkan-loader \
-		${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
+		${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 RUN_DEPENDS=	retroarch-assets<=0:games/retroarch-assets

 USES=		compiler:c++11-lib gmake pkgconfig python:3.6+ shebangfix ssl
--- a/games/vkquake/Makefile
+++ b/games/vkquake/Makefile
@ -14,7 +14,7 @@ COMMENT=	Quake 1 port using Vulkan instead of OpenGL, based on QuakeSpasm
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/../LICENSE.txt

-BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
+BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 LIB_DEPENDS=	libX11-xcb.so:x11/libX11 \
 		libvulkan.so:graphics/vulkan-loader

--- a/graphics/Makefile
+++ b/graphics/Makefile
@ -1074,7 +1074,10 @@
    SUBDIR += vp
    SUBDIR += vpaint
    SUBDIR += vulkan-caps-viewer
+    SUBDIR += vulkan-headers
    SUBDIR += vulkan-loader
+    SUBDIR += vulkan-tools
+    SUBDIR += vulkan-validation-layers
    SUBDIR += vv
    SUBDIR += waffle
    SUBDIR += waifu2x-converter-cpp
--- a/graphics/libplacebo/Makefile
+++ b/graphics/libplacebo/Makefile
@ -42,7 +42,7 @@ SHADERC_IMPLIES=	VULKAN
 TEST_MESON_TRUE=	tests

 VULKAN_DESC=		Vulkan-based renderer
-VULKAN_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \
+VULKAN_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
 			${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 VULKAN_MESON_ENABLED=	vulkan
--- a/graphics/piglit/Makefile
+++ b/graphics/piglit/Makefile
@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
-		vulkan-headers>0:devel/vulkan-headers \
+		vulkan-headers>0:graphics/vulkan-headers \
 		wayland-protocols>=0:graphics/wayland-protocols
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libpng.so:graphics/png \
--- a/graphics/vkd3d/Makefile
+++ b/graphics/vkd3d/Makefile
@ -13,10 +13,10 @@ LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE

 BUILD_DEPENDS=	${LOCALBASE}/include/spirv-tools/libspirv.h:devel/spirv-tools \
-		${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
+		${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 LIB_DEPENDS=	libSPIRV-Tools-shared.so:devel/spirv-tools \
 		libvulkan.so:graphics/vulkan-loader
-RUN_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
+RUN_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers

 USES=		gmake libtool localbase pkgconfig tar:xz
 USE_LDCONFIG=	yes
@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-spirv-tools
 TEST_TARGET=	check

-# XXX Move to a separate port (a la devel/vulkan-headers) and maybe make
+# XXX Move to a separate port (a la graphics/vulkan-headers) and maybe make
 #     devel/spirv-tools depend on it as well
 USE_GITHUB=	nodefault
 GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.3:headers/external/spirv-headers
--- a/graphics/vulkan-headers/Makefile
+++ b/graphics/vulkan-headers/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	vulkan-headers
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.2.165
-CATEGORIES=	devel graphics
+CATEGORIES=	graphics

 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Headers for the Vulkan graphics API
--- a/graphics/vulkan-headers/distinfo
+++ b/graphics/vulkan-headers/distinfo
--- a/graphics/vulkan-headers/files/patch-include_vulkan_vulkan.hpp
+++ b/graphics/vulkan-headers/files/patch-include_vulkan_vulkan.hpp
--- a/graphics/vulkan-headers/pkg-descr
+++ b/graphics/vulkan-headers/pkg-descr
--- a/graphics/vulkan-headers/pkg-plist
+++ b/graphics/vulkan-headers/pkg-plist
--- a/graphics/vulkan-loader/Makefile
+++ b/graphics/vulkan-loader/Makefile
@ -10,7 +10,7 @@ COMMENT=	Driver loader for the Vulkan graphics API

 LICENSE=	APACHE20

-BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
+BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers

 USES=		cmake compiler:${ARCH:Mi386:C/.+/gcc-/}c++11-lib pkgconfig python:3.4+,build
 USE_LDCONFIG=	yes
--- a/graphics/vulkan-tools/Makefile
+++ b/graphics/vulkan-tools/Makefile
@ -3,14 +3,14 @@
 PORTNAME=	vulkan-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.162
-CATEGORIES=	devel graphics
+CATEGORIES=	graphics

 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Tools and demos for the Vulkan graphics API

 LICENSE=	APACHE20

-BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \
+BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
 		glslangValidator:devel/glslang
 LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader

--- a/graphics/vulkan-tools/distinfo
+++ b/graphics/vulkan-tools/distinfo
--- a/graphics/vulkan-tools/files/patch-cube_CMakeLists.txt
+++ b/graphics/vulkan-tools/files/patch-cube_CMakeLists.txt
--- a/graphics/vulkan-tools/files/patch-cube_cube.cpp
+++ b/graphics/vulkan-tools/files/patch-cube_cube.cpp
--- a/graphics/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h
+++ b/graphics/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h
--- a/graphics/vulkan-tools/pkg-descr
+++ b/graphics/vulkan-tools/pkg-descr
--- a/graphics/vulkan-tools/pkg-plist
+++ b/graphics/vulkan-tools/pkg-plist
--- a/graphics/vulkan-validation-layers/Makefile
+++ b/graphics/vulkan-validation-layers/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	vulkan-validation-layers
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.162
-CATEGORIES=	devel graphics
+CATEGORIES=	graphics

 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Validation layers for the Vulkan graphics API
@ -11,7 +11,7 @@ COMMENT=	Validation layers for the Vulkan graphics API
 LICENSE=	APACHE20

 # NOTE: keep spirv-tools and glslang up to date when updating Vulkan
-BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \
+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

--- a/graphics/vulkan-validation-layers/distinfo
+++ b/graphics/vulkan-validation-layers/distinfo
--- a/graphics/vulkan-validation-layers/files/patch-layers_vkloaderplatform.h
+++ b/graphics/vulkan-validation-layers/files/patch-layers_vkloaderplatform.h
--- a/graphics/vulkan-validation-layers/pkg-descr
+++ b/graphics/vulkan-validation-layers/pkg-descr
--- a/graphics/vulkan-validation-layers/pkg-plist
+++ b/graphics/vulkan-validation-layers/pkg-plist
--- a/graphics/waifu2x-ncnn-vulkan/Makefile
+++ b/graphics/waifu2x-ncnn-vulkan/Makefile
@ -11,7 +11,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE

 BUILD_DEPENDS=	glslangValidator:devel/glslang \
-		vulkan-headers>0:devel/vulkan-headers
+		vulkan-headers>0:graphics/vulkan-headers
 LIB_DEPENDS=	libwebp.so:graphics/webp \
 		libvulkan.so:graphics/vulkan-loader

--- a/misc/ncnn/Makefile
+++ b/misc/ncnn/Makefile
@ -19,7 +19,7 @@ OPTIONS_DEFAULT=	VULKAN

 VULKAN_DESC=		Vulkan compute support
 VULKAN_BUILD_DEPENDS=	glslang>0:devel/glslang \
-			${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \
+			${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
 			${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader
 VULKAN_CMAKE_BOOL=	NCNN_VULKAN NCNN_SYSTEM_GLSLANG
 VULKAN_CMAKE_ON=	-DGLSLANG_TARGET_DIR:PATH="${LOCALBASE}/lib/cmake"
--- a/multimedia/dav1d/Makefile
+++ b/multimedia/dav1d/Makefile
@ -27,7 +27,7 @@ OPTIONS_SUB=	yes

 SDL_USES=	pkgconfig sdl
 SDL_USE=	SDL=sdl2
-SDL_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
+SDL_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 SDL_LIB_DEPENDS=	libplacebo.so:graphics/libplacebo \
 			libvulkan.so:graphics/vulkan-loader
 SDL_MESON_TRUE=	enable_examples
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@ -541,7 +541,7 @@ VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_CONFIGURE_ENABLE=	libvpx

 # vulkan
-VULKAN_BUILD_DEPENDS=	vulkan-headers>0:devel/vulkan-headers
+VULKAN_BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 VULKAN_CONFIGURE_ENABLE=	vulkan
 VULKAN_IMPLIES=		GLSLANG
--- a/multimedia/gstreamer1-plugins/Makefile.common
+++ b/multimedia/gstreamer1-plugins/Makefile.common
@ -490,7 +490,7 @@ gst_vdpau_GST_PLUGIN_DIR=	sys/vdpau

 # vulkan
 gst_vulkan_USE_GSTREAMER1=	gl
-gst_vulkan_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \
+gst_vulkan_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
 				${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
 				wayland-protocols>=0:graphics/wayland-protocols
 gst_vulkan_LIB_DEPENDS=		libvulkan.so:graphics/vulkan-loader \
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@ -140,7 +140,7 @@ VAAPI_CONFIGURE_OFF=		--disable-vaapi
 VDPAU_LIB_DEPENDS=		libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_OFF=		--disable-vdpau

-VULKAN_BUILD_DEPENDS=		${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
+VULKAN_BUILD_DEPENDS=		${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 VULKAN_LIB_DEPENDS=		libplacebo.so:graphics/libplacebo \
 				libvulkan.so:graphics/vulkan-loader
 VULKAN_CONFIGURE_OFF=		--disable-vulkan --disable-libplacebo
--- a/multimedia/pipewire/Makefile
+++ b/multimedia/pipewire/Makefile
@ -27,7 +27,7 @@ GSTREAMER_LIB_DEPENDS=	libgstreamer-1.0.so:multimedia/gstreamer1 \

 VULKAN_DESC=	Enable Vulkan integration
 VULKAN_MESON_TRUE=	vulkan
-VULKAN_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
+VULKAN_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader

 USE_GNOME=	glib20
--- a/x11-toolkits/qt5-gui/Makefile
+++ b/x11-toolkits/qt5-gui/Makefile
@ -10,7 +10,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt graphical user interface module

 BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
-		${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \
+		${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
 		${LOCALBASE}/include/xf86drm.h:graphics/libdrm \
 		at-spi2-core>=0:accessibility/at-spi2-core
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
@ -26,7 +26,7 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libxcb-render-util.so:x11/xcb-util-renderutil \
 		libxcb.so:x11/libxcb \
 		libxkbcommon.so:x11/libxkbcommon
-RUN_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \
+RUN_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
 		xdg-open:devel/xdg-utils

 USES=			compiler:c++11-lang gl gnome jpeg localbase \
--- a/x11-wm/chamfer/Makefile
+++ b/x11-wm/chamfer/Makefile
@ -11,7 +11,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE

 BUILD_DEPENDS=	spirv-opt:devel/spirv-tools \
-		vulkan-headers>0:devel/vulkan-headers \
+		vulkan-headers>0:graphics/vulkan-headers \
 		glslc:graphics/shaderc \
 		glm>0:math/glm
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
--- a/x11-wm/gamescope/Makefile
+++ b/x11-wm/gamescope/Makefile
@ -19,7 +19,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 BUILD_DEPENDS=	glslangValidator:devel/glslang \
 		evdev-proto>0:devel/evdev-proto \
-		vulkan-headers>0:devel/vulkan-headers \
+		vulkan-headers>0:graphics/vulkan-headers \
 		wayland-protocols>=1.17:graphics/wayland-protocols \
 		wlroots>=0.11.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \