diff --git a/graphics/magnum/Makefile b/graphics/magnum/Makefile
index e35c7737d71e..4f1829298997 100644
--- a/graphics/magnum/Makefile
+++ b/graphics/magnum/Makefile
@@ -1,77 +1,103 @@
 PORTNAME=	magnum
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2020.06-3075
 DISTVERSIONSUFFIX=	-gf91638c46
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 
 MAINTAINER=	yuri@FreeBSD.org
-COMMENT=	C++11 graphics middleware for games and data visualization
+COMMENT=	Magnum Graphics: Graphics middleware for games and data visualization
 WWW=		https://magnum.graphics/ \
 		https://github.com/mosra/magnum
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libCorradeUtility.so:devel/corrade
 
 USES=		cmake compiler:c++11-lang gl
 USE_GL=		opengl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mosra
 GH_TUPLE=	mosra:toolchains:2243706:toolchains/toolchains
 
 CMAKE_ARGS=	-DLIB_SUFFIX=""
 
 APP_MODULES_STATIC?=	yes
 .if "${APP_MODULES_STATIC}" == yes
 CMAKE_ARGS+=	-DFREEBSD_APP_MODULES_LINK_TYPE=STATIC # users can only use the libs when staticakky linked (due to missing symbols)
 PLIST_SUB+=	APP_MODULES_EXT=.a
 .else # SHARED
 CMAKE_ARGS+=	-DFREEBSD_APP_MODULES_LINK_TYPE=SHARED # needed to check that options' dependencies are correct
 PLIST_SUB+=	APP_MODULES_EXT=.so
 .endif
 
 CXXFLAGS+=	-fPIC
 
+OPTIONS_DEFINE=		GLXCONTEXT
 OPTIONS_GROUP=		APPS PLUGINS
-OPTIONS_GROUP_APPS=	GLFW GLX SDL2 XEGL # other application types are available
-OPTIONS_GROUP_PLUGINS=	ANYAUDIOIMPORTER ANYIMAGEIMPORTER
+OPTIONS_GROUP_APPS=	AUDIO GLFW GLX SDL2 VULKAN XEGL # other application types are available
+OPTIONS_GROUP_PLUGINS=	ANYAUDIOIMPORTER ANYIMAGEIMPORTER MAGNUMFONT MAGNUMFONTCONVERTER
 OPTIONS_SUB=		yes
-OPTIONS_DEFAULT=	${OPTIONS_GROUP_APPS} ${OPTIONS_GROUP_PLUGINS}
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE} ${OPTIONS_GROUP_APPS} ${OPTIONS_GROUP_PLUGINS}
+
+# separate options
+
+GLXCONTEXT_DESC=	Build GlxContext library
+GLXCONTEXT_CMAKE_BOOL=	MAGNUM_WITH_GLXCONTEXT
 
 # applicaton type options
 
 APPS_DESC=		Application support to build
 .for a in ${OPTIONS_GROUP_APPS}
 ${a}_DESC=		${a} applications
 .endfor
 
+AUDIO_CMAKE_BOOL=	MAGNUM_WITH_AUDIO
+AUDIO_USES=		openal
+
 GLFW_CMAKE_BOOL=	MAGNUM_WITH_GLFWAPPLICATION
 GLFW_LIB_DEPENDS=	libglfw.so:graphics/glfw
 
 GLX_CMAKE_BOOL=		MAGNUM_WITH_GLXAPPLICATION
-XEGL_USES=		xorg
 GLX_USE=		XORG=ice,sm,x11,xext
 
 SDL2_CMAKE_BOOL=	MAGNUM_WITH_SDL2APPLICATION
 SDL2_USES=		sdl
 SDL2_USE=		SDL=sdl2
 
+VULKAN_CMAKE_BOOL=	MAGNUM_WITH_VK
+VULKAN_BUILD_DEPENDS=	glslc:graphics/shaderc \
+			vulkan-headers>0:graphics/vulkan-headers
+VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
+
 XEGL_CMAKE_BOOL=	MAGNUM_WITH_XEGLAPPLICATION
 XEGL_USES=		xorg
 XEGL_USE=		XORG=ice,sm,x11,xext
 
 # plugin options
 
 PLUGINS_DESC=			Build plugins:
 
 ANYAUDIOIMPORTER_DESC=		Any audio importer plugin
 ANYAUDIOIMPORTER_CMAKE_BOOL=	MAGNUM_WITH_ANYAUDIOIMPORTER
 ANYAUDIOIMPORTER_USES=		openal
 
 ANYIMAGEIMPORTER_DESC=		Any image importer plugin
 ANYIMAGEIMPORTER_CMAKE_BOOL=	MAGNUM_WITH_ANYIMAGEIMPORTER
 
+MAGNUMFONT_DESC=		MagnumFont plugin
+MAGNUMFONT_CMAKE_BOOL=		MAGNUM_WITH_MAGNUMFONT
+
+MAGNUMFONTCONVERTER_DESC=	MagnumFontConverter plugin
+MAGNUMFONTCONVERTER_CMAKE_BOOL=	MAGNUM_WITH_MAGNUMFONTCONVERTER
+
+.include <bsd.port.options.mk>
+
+.if !empty(PORT_OPTIONS:MXEGL) || !empty(PORT_OPTIONS:MGLX)
+PLIST_FILES=	include/Magnum/Platform/AbstractXApplication.h
+.endif
+
 .include <bsd.port.mk>
diff --git a/graphics/magnum/pkg-descr b/graphics/magnum/pkg-descr
index 2410b709e8b3..7cb4bd3089f9 100644
--- a/graphics/magnum/pkg-descr
+++ b/graphics/magnum/pkg-descr
@@ -1,2 +1,2 @@
-kbd-audio is a collection of command-line and GUI tools for capturing and
-analyzing audio data.
+Magnum is lightweight and modular C++11/C++14 graphics middleware
+for games and data visualization.
diff --git a/graphics/magnum/pkg-plist b/graphics/magnum/pkg-plist
index 2641c26b2ed4..f85c5a3eeb8e 100644
--- a/graphics/magnum/pkg-plist
+++ b/graphics/magnum/pkg-plist
@@ -1,376 +1,456 @@
 include/Magnum/AbstractResourceLoader.h
 include/Magnum/Animation/Animation.h
 include/Magnum/Animation/Easing.h
 include/Magnum/Animation/Interpolation.h
 include/Magnum/Animation/Player.h
 include/Magnum/Animation/Player.hpp
 include/Magnum/Animation/Track.h
 include/Magnum/Array.h
 %%ANYAUDIOIMPORTER%%include/Magnum/Audio/AbstractImporter.h
 %%ANYAUDIOIMPORTER%%include/Magnum/Audio/Audio.h
 %%ANYAUDIOIMPORTER%%include/Magnum/Audio/Buffer.h
 %%ANYAUDIOIMPORTER%%include/Magnum/Audio/BufferFormat.h
 %%ANYAUDIOIMPORTER%%include/Magnum/Audio/Context.h
 %%ANYAUDIOIMPORTER%%include/Magnum/Audio/Extensions.h
 %%ANYAUDIOIMPORTER%%include/Magnum/Audio/Listener.h
 %%ANYAUDIOIMPORTER%%include/Magnum/Audio/Playable.h
 %%ANYAUDIOIMPORTER%%include/Magnum/Audio/PlayableGroup.h
 %%ANYAUDIOIMPORTER%%include/Magnum/Audio/Renderer.h
 %%ANYAUDIOIMPORTER%%include/Magnum/Audio/Source.h
 %%ANYAUDIOIMPORTER%%include/Magnum/Audio/visibility.h
 include/Magnum/British.h
 include/Magnum/DebugTools/BufferData.h
 include/Magnum/DebugTools/ColorMap.h
 include/Magnum/DebugTools/CompareImage.h
 include/Magnum/DebugTools/CompareMaterial.h
 include/Magnum/DebugTools/DebugTools.h
 include/Magnum/DebugTools/ForceRenderer.h
 include/Magnum/DebugTools/FrameProfiler.h
 include/Magnum/DebugTools/ObjectRenderer.h
 include/Magnum/DebugTools/Profiler.h
 include/Magnum/DebugTools/ResourceManager.h
 include/Magnum/DebugTools/Screenshot.h
 include/Magnum/DebugTools/TextureImage.h
 include/Magnum/DebugTools/visibility.h
 include/Magnum/DimensionTraits.h
 include/Magnum/FileCallback.h
 include/Magnum/GL/AbstractFramebuffer.h
 include/Magnum/GL/AbstractObject.h
 include/Magnum/GL/AbstractQuery.h
 include/Magnum/GL/AbstractShaderProgram.h
 include/Magnum/GL/AbstractTexture.h
 include/Magnum/GL/Attribute.h
 include/Magnum/GL/Buffer.h
 include/Magnum/GL/BufferImage.h
 include/Magnum/GL/BufferTexture.h
 include/Magnum/GL/BufferTextureFormat.h
 include/Magnum/GL/Context.h
 include/Magnum/GL/CubeMapTexture.h
 include/Magnum/GL/CubeMapTextureArray.h
 include/Magnum/GL/DebugOutput.h
 include/Magnum/GL/DefaultFramebuffer.h
 include/Magnum/GL/Extensions.h
 include/Magnum/GL/Framebuffer.h
 include/Magnum/GL/GL.h
 include/Magnum/GL/ImageFormat.h
 include/Magnum/GL/Mesh.h
 include/Magnum/GL/MeshView.h
 include/Magnum/GL/MultisampleTexture.h
 include/Magnum/GL/OpenGL.h
 include/Magnum/GL/PipelineStatisticsQuery.h
 include/Magnum/GL/PixelFormat.h
 include/Magnum/GL/PrimitiveQuery.h
 include/Magnum/GL/RectangleTexture.h
 include/Magnum/GL/Renderbuffer.h
 include/Magnum/GL/RenderbufferFormat.h
 include/Magnum/GL/Renderer.h
 include/Magnum/GL/SampleQuery.h
 include/Magnum/GL/Sampler.h
 include/Magnum/GL/Shader.h
 include/Magnum/GL/Texture.h
 include/Magnum/GL/TextureArray.h
 include/Magnum/GL/TextureFormat.h
 include/Magnum/GL/TimeQuery.h
 include/Magnum/GL/TransformFeedback.h
 include/Magnum/GL/Version.h
 include/Magnum/GL/visibility.h
 include/Magnum/Image.h
 include/Magnum/ImageFlags.h
 include/Magnum/ImageView.h
 include/Magnum/Magnum.h
 include/Magnum/MaterialTools/Copy.h
 include/Magnum/MaterialTools/Filter.h
 include/Magnum/MaterialTools/Merge.h
 include/Magnum/MaterialTools/PhongToPbrMetallicRoughness.h
 include/Magnum/MaterialTools/RemoveDuplicates.h
 include/Magnum/MaterialTools/visibility.h
 include/Magnum/Math/Algorithms/GaussJordan.h
 include/Magnum/Math/Algorithms/GramSchmidt.h
 include/Magnum/Math/Algorithms/KahanSum.h
 include/Magnum/Math/Algorithms/Qr.h
 include/Magnum/Math/Algorithms/Svd.h
 include/Magnum/Math/Angle.h
 include/Magnum/Math/Bezier.h
 include/Magnum/Math/BitVector.h
 include/Magnum/Math/BoolVector.h
 include/Magnum/Math/Color.h
 include/Magnum/Math/ColorBatch.h
 include/Magnum/Math/Complex.h
 include/Magnum/Math/ConfigurationValue.h
 include/Magnum/Math/Constants.h
 include/Magnum/Math/CubicHermite.h
 include/Magnum/Math/Distance.h
 include/Magnum/Math/Dual.h
 include/Magnum/Math/DualComplex.h
 include/Magnum/Math/DualQuaternion.h
 include/Magnum/Math/Frustum.h
 include/Magnum/Math/Functions.h
 include/Magnum/Math/FunctionsBatch.h
 include/Magnum/Math/Half.h
 include/Magnum/Math/Intersection.h
 include/Magnum/Math/Math.h
 include/Magnum/Math/Matrix.h
 include/Magnum/Math/Matrix3.h
 include/Magnum/Math/Matrix4.h
 include/Magnum/Math/Packing.h
 include/Magnum/Math/PackingBatch.h
 include/Magnum/Math/Quaternion.h
 include/Magnum/Math/Range.h
 include/Magnum/Math/RectangularMatrix.h
 include/Magnum/Math/StrictWeakOrdering.h
 include/Magnum/Math/Swizzle.h
 include/Magnum/Math/Tags.h
 include/Magnum/Math/Time.h
 include/Magnum/Math/TimeStl.h
 include/Magnum/Math/TypeTraits.h
 include/Magnum/Math/Unit.h
 include/Magnum/Math/Vector.h
 include/Magnum/Math/Vector2.h
 include/Magnum/Math/Vector3.h
 include/Magnum/Math/Vector4.h
 include/Magnum/Mesh.h
 include/Magnum/MeshTools/BoundingVolume.h
 include/Magnum/MeshTools/Combine.h
 include/Magnum/MeshTools/CombineIndexedArrays.h
 include/Magnum/MeshTools/Compile.h
 include/Magnum/MeshTools/CompileLines.h
 include/Magnum/MeshTools/CompressIndices.h
 include/Magnum/MeshTools/Concatenate.h
 include/Magnum/MeshTools/Copy.h
 include/Magnum/MeshTools/Duplicate.h
 include/Magnum/MeshTools/Filter.h
 include/Magnum/MeshTools/FilterAttributes.h
 include/Magnum/MeshTools/FlipNormals.h
 include/Magnum/MeshTools/FullScreenTriangle.h
 include/Magnum/MeshTools/GenerateFlatNormals.h
 include/Magnum/MeshTools/GenerateIndices.h
 include/Magnum/MeshTools/GenerateLines.h
 include/Magnum/MeshTools/GenerateNormals.h
 include/Magnum/MeshTools/Interleave.h
 include/Magnum/MeshTools/InterleaveFlags.h
 include/Magnum/MeshTools/Reference.h
 include/Magnum/MeshTools/RemoveDuplicates.h
 include/Magnum/MeshTools/Subdivide.h
 include/Magnum/MeshTools/Tipsify.h
 include/Magnum/MeshTools/Transform.h
 include/Magnum/MeshTools/visibility.h
 include/Magnum/PixelFormat.h
 include/Magnum/PixelStorage.h
-include/Magnum/Platform/AbstractXApplication.h
 include/Magnum/Platform/GLContext.h
 include/Magnum/Platform/Gesture.h
 %%GLFW%%include/Magnum/Platform/GlfwApplication.h
 %%GLX%%include/Magnum/Platform/GlxApplication.h
 include/Magnum/Platform/Platform.h
 include/Magnum/Platform/Screen.h
 include/Magnum/Platform/ScreenedApplication.h
 include/Magnum/Platform/ScreenedApplication.hpp
 %%SDL2%%include/Magnum/Platform/Sdl2Application.h
 %%XEGL%%include/Magnum/Platform/XEglApplication.h
 include/Magnum/Primitives/Axis.h
 include/Magnum/Primitives/Capsule.h
 include/Magnum/Primitives/Circle.h
 include/Magnum/Primitives/Cone.h
 include/Magnum/Primitives/Crosshair.h
 include/Magnum/Primitives/Cube.h
 include/Magnum/Primitives/Cylinder.h
 include/Magnum/Primitives/Gradient.h
 include/Magnum/Primitives/Grid.h
 include/Magnum/Primitives/Icosphere.h
 include/Magnum/Primitives/Line.h
 include/Magnum/Primitives/Plane.h
 include/Magnum/Primitives/Square.h
 include/Magnum/Primitives/UVSphere.h
 include/Magnum/Primitives/visibility.h
 include/Magnum/Resource.h
 include/Magnum/ResourceManager.h
 include/Magnum/Sampler.h
 include/Magnum/SceneGraph/AbstractFeature.h
 include/Magnum/SceneGraph/AbstractFeature.hpp
 include/Magnum/SceneGraph/AbstractGroupedFeature.h
 include/Magnum/SceneGraph/AbstractObject.h
 include/Magnum/SceneGraph/AbstractTransformation.h
 include/Magnum/SceneGraph/AbstractTranslation.h
 include/Magnum/SceneGraph/AbstractTranslationRotation2D.h
 include/Magnum/SceneGraph/AbstractTranslationRotation3D.h
 include/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h
 include/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h
 include/Magnum/SceneGraph/Animable.h
 include/Magnum/SceneGraph/Animable.hpp
 include/Magnum/SceneGraph/AnimableGroup.h
 include/Magnum/SceneGraph/Camera.h
 include/Magnum/SceneGraph/Camera.hpp
 include/Magnum/SceneGraph/Drawable.h
 include/Magnum/SceneGraph/Drawable.hpp
 include/Magnum/SceneGraph/DualComplexTransformation.h
 include/Magnum/SceneGraph/DualQuaternionTransformation.h
 include/Magnum/SceneGraph/FeatureGroup.h
 include/Magnum/SceneGraph/FeatureGroup.hpp
 include/Magnum/SceneGraph/MatrixTransformation2D.h
 include/Magnum/SceneGraph/MatrixTransformation2D.hpp
 include/Magnum/SceneGraph/MatrixTransformation3D.h
 include/Magnum/SceneGraph/MatrixTransformation3D.hpp
 include/Magnum/SceneGraph/Object.h
 include/Magnum/SceneGraph/Object.hpp
 include/Magnum/SceneGraph/RigidMatrixTransformation2D.h
 include/Magnum/SceneGraph/RigidMatrixTransformation2D.hpp
 include/Magnum/SceneGraph/RigidMatrixTransformation3D.h
 include/Magnum/SceneGraph/RigidMatrixTransformation3D.hpp
 include/Magnum/SceneGraph/Scene.h
 include/Magnum/SceneGraph/SceneGraph.h
 include/Magnum/SceneGraph/TranslationRotationScalingTransformation2D.h
 include/Magnum/SceneGraph/TranslationRotationScalingTransformation3D.h
 include/Magnum/SceneGraph/TranslationTransformation.h
 include/Magnum/SceneGraph/visibility.h
 include/Magnum/SceneTools/Combine.h
 include/Magnum/SceneTools/Filter.h
 include/Magnum/SceneTools/FlattenMeshHierarchy.h
 include/Magnum/SceneTools/FlattenTransformationHierarchy.h
 include/Magnum/SceneTools/Hierarchy.h
 include/Magnum/SceneTools/Map.h
 include/Magnum/SceneTools/OrderClusterParents.h
 include/Magnum/SceneTools/visibility.h
 include/Magnum/ShaderTools/AbstractConverter.h
 include/Magnum/ShaderTools/ShaderTools.h
 include/Magnum/ShaderTools/Stage.h
 include/Magnum/ShaderTools/visibility.h
 include/Magnum/Shaders/DistanceFieldVector.h
 include/Magnum/Shaders/DistanceFieldVectorGL.h
 include/Magnum/Shaders/Flat.h
 include/Magnum/Shaders/FlatGL.h
 include/Magnum/Shaders/Generic.h
 include/Magnum/Shaders/GenericGL.h
 include/Magnum/Shaders/Line.h
 include/Magnum/Shaders/LineGL.h
 include/Magnum/Shaders/MeshVisualizer.h
 include/Magnum/Shaders/MeshVisualizerGL.h
 include/Magnum/Shaders/Phong.h
 include/Magnum/Shaders/PhongGL.h
 include/Magnum/Shaders/Shaders.h
 include/Magnum/Shaders/Vector.h
 include/Magnum/Shaders/VectorGL.h
 include/Magnum/Shaders/VertexColor.h
 include/Magnum/Shaders/VertexColorGL.h
 include/Magnum/Shaders/glShaderWrapper.h
 include/Magnum/Shaders/visibility.h
 include/Magnum/Tags.h
 include/Magnum/Text/AbstractFont.h
 include/Magnum/Text/AbstractFontConverter.h
 include/Magnum/Text/AbstractGlyphCache.h
 include/Magnum/Text/AbstractShaper.h
 include/Magnum/Text/Alignment.h
 include/Magnum/Text/Direction.h
 include/Magnum/Text/DistanceFieldGlyphCache.h
 include/Magnum/Text/DistanceFieldGlyphCacheGL.h
 include/Magnum/Text/Feature.h
 include/Magnum/Text/GlyphCache.h
 include/Magnum/Text/GlyphCacheGL.h
 include/Magnum/Text/Renderer.h
 include/Magnum/Text/Script.h
 include/Magnum/Text/Text.h
 include/Magnum/Text/visibility.h
 include/Magnum/TextureTools/Atlas.h
 include/Magnum/TextureTools/DistanceField.h
 include/Magnum/TextureTools/DistanceFieldGL.h
 include/Magnum/TextureTools/TextureTools.h
 include/Magnum/TextureTools/visibility.h
 include/Magnum/Timeline.h
 include/Magnum/Trade/AbstractImageConverter.h
 include/Magnum/Trade/AbstractImporter.h
 include/Magnum/Trade/AbstractMaterialData.h
 include/Magnum/Trade/AbstractSceneConverter.h
 include/Magnum/Trade/AnimationData.h
 include/Magnum/Trade/ArrayAllocator.h
 include/Magnum/Trade/CameraData.h
 include/Magnum/Trade/Data.h
 include/Magnum/Trade/FlatMaterialData.h
 include/Magnum/Trade/ImageData.h
 include/Magnum/Trade/LightData.h
 include/Magnum/Trade/MaterialData.h
 include/Magnum/Trade/MaterialLayerData.h
 include/Magnum/Trade/MeshData.h
 include/Magnum/Trade/MeshData2D.h
 include/Magnum/Trade/MeshData3D.h
 include/Magnum/Trade/MeshObjectData2D.h
 include/Magnum/Trade/MeshObjectData3D.h
 include/Magnum/Trade/ObjectData2D.h
 include/Magnum/Trade/ObjectData3D.h
 include/Magnum/Trade/PbrClearCoatMaterialData.h
 include/Magnum/Trade/PbrMetallicRoughnessMaterialData.h
 include/Magnum/Trade/PbrSpecularGlossinessMaterialData.h
 include/Magnum/Trade/PhongMaterialData.h
 include/Magnum/Trade/SceneData.h
 include/Magnum/Trade/SkinData.h
 include/Magnum/Trade/TextureData.h
 include/Magnum/Trade/Trade.h
 include/Magnum/Trade/visibility.h
 include/Magnum/Types.h
 include/Magnum/VertexFormat.h
+%%VULKAN%%include/Magnum/Vk/Assert.h
+%%VULKAN%%include/Magnum/Vk/Buffer.h
+%%VULKAN%%include/Magnum/Vk/BufferCreateInfo.h
+%%VULKAN%%include/Magnum/Vk/CommandBuffer.h
+%%VULKAN%%include/Magnum/Vk/CommandPool.h
+%%VULKAN%%include/Magnum/Vk/CommandPoolCreateInfo.h
+%%VULKAN%%include/Magnum/Vk/ComputePipelineCreateInfo.h
+%%VULKAN%%include/Magnum/Vk/DescriptorPool.h
+%%VULKAN%%include/Magnum/Vk/DescriptorPoolCreateInfo.h
+%%VULKAN%%include/Magnum/Vk/DescriptorSet.h
+%%VULKAN%%include/Magnum/Vk/DescriptorSetLayout.h
+%%VULKAN%%include/Magnum/Vk/DescriptorSetLayoutCreateInfo.h
+%%VULKAN%%include/Magnum/Vk/DescriptorType.h
+%%VULKAN%%include/Magnum/Vk/Device.h
+%%VULKAN%%include/Magnum/Vk/DeviceCreateInfo.h
+%%VULKAN%%include/Magnum/Vk/DeviceFeatures.h
+%%VULKAN%%include/Magnum/Vk/DeviceProperties.h
+%%VULKAN%%include/Magnum/Vk/Enums.h
+%%VULKAN%%include/Magnum/Vk/ExtensionProperties.h
+%%VULKAN%%include/Magnum/Vk/Extensions.h
+%%VULKAN%%include/Magnum/Vk/Fence.h
+%%VULKAN%%include/Magnum/Vk/FenceCreateInfo.h
+%%VULKAN%%include/Magnum/Vk/Framebuffer.h
+%%VULKAN%%include/Magnum/Vk/FramebufferCreateInfo.h
+%%VULKAN%%include/Magnum/Vk/Handle.h
+%%VULKAN%%include/Magnum/Vk/Image.h
+%%VULKAN%%include/Magnum/Vk/ImageCreateInfo.h
+%%VULKAN%%include/Magnum/Vk/ImageView.h
+%%VULKAN%%include/Magnum/Vk/ImageViewCreateInfo.h
+%%VULKAN%%include/Magnum/Vk/Instance.h
+%%VULKAN%%include/Magnum/Vk/InstanceCreateInfo.h
+%%VULKAN%%include/Magnum/Vk/Integration.h
+%%VULKAN%%include/Magnum/Vk/LayerProperties.h
+%%VULKAN%%include/Magnum/Vk/Memory.h
+%%VULKAN%%include/Magnum/Vk/MemoryAllocateInfo.h
+%%VULKAN%%include/Magnum/Vk/Mesh.h
+%%VULKAN%%include/Magnum/Vk/MeshLayout.h
+%%VULKAN%%include/Magnum/Vk/Pipeline.h
+%%VULKAN%%include/Magnum/Vk/PipelineLayout.h
+%%VULKAN%%include/Magnum/Vk/PipelineLayoutCreateInfo.h
+%%VULKAN%%include/Magnum/Vk/PixelFormat.h
+%%VULKAN%%include/Magnum/Vk/Queue.h
+%%VULKAN%%include/Magnum/Vk/RasterizationPipelineCreateInfo.h
+%%VULKAN%%include/Magnum/Vk/RenderPass.h
+%%VULKAN%%include/Magnum/Vk/RenderPassCreateInfo.h
+%%VULKAN%%include/Magnum/Vk/Result.h
+%%VULKAN%%include/Magnum/Vk/Sampler.h
+%%VULKAN%%include/Magnum/Vk/SamplerCreateInfo.h
+%%VULKAN%%include/Magnum/Vk/Shader.h
+%%VULKAN%%include/Magnum/Vk/ShaderCreateInfo.h
+%%VULKAN%%include/Magnum/Vk/ShaderSet.h
+%%VULKAN%%include/Magnum/Vk/TypeTraits.h
+%%VULKAN%%include/Magnum/Vk/Version.h
+%%VULKAN%%include/Magnum/Vk/VertexFormat.h
+%%VULKAN%%include/Magnum/Vk/Vk.h
+%%VULKAN%%include/Magnum/Vk/Vulkan.h
+%%VULKAN%%include/Magnum/Vk/visibility.h
 include/Magnum/configure.h
 include/Magnum/version.h
 include/Magnum/visibility.h
 %%ANYAUDIOIMPORTER%%include/MagnumExternal/OpenAL/extensions.h
 include/MagnumExternal/OpenGL/GL/flextGL.h
 include/MagnumExternal/OpenGL/KHR/khrplatform.h
+%%VULKAN%%include/MagnumExternal/Vulkan/flextVk.h
+%%VULKAN%%include/MagnumExternal/Vulkan/flextVkGlobal.h
+%%VULKAN%%include/MagnumExternal/Vulkan/spirv.h
 %%ANYAUDIOIMPORTER%%include/MagnumPlugins/AnyAudioImporter/AnyImporter.h
 %%ANYAUDIOIMPORTER%%include/MagnumPlugins/AnyAudioImporter/configure.h
 %%ANYIMAGEIMPORTER%%include/MagnumPlugins/AnyImageImporter/AnyImageImporter.h
 %%ANYIMAGEIMPORTER%%include/MagnumPlugins/AnyImageImporter/configure.h
+%%MAGNUMFONT%%include/MagnumPlugins/MagnumFont/MagnumFont.h
+%%MAGNUMFONT%%include/MagnumPlugins/MagnumFont/configure.h
+%%MAGNUMFONTCONVERTER%%include/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h
+%%MAGNUMFONTCONVERTER%%include/MagnumPlugins/MagnumFontConverter/configure.h
+%%MAGNUMFONTCONVERTER%%include/MagnumPlugins/TgaImageConverter/TgaImageConverter.h
+%%MAGNUMFONTCONVERTER%%include/MagnumPlugins/TgaImageConverter/configure.h
+%%MAGNUMFONT%%include/MagnumPlugins/TgaImporter/TgaImporter.h
+%%MAGNUMFONT%%include/MagnumPlugins/TgaImporter/configure.h
 lib/libMagnum.so
 lib/libMagnum.so.2
 lib/libMagnum.so.2.4
 %%ANYAUDIOIMPORTER%%lib/libMagnumAudio.so
 %%ANYAUDIOIMPORTER%%lib/libMagnumAudio.so.2
 %%ANYAUDIOIMPORTER%%lib/libMagnumAudio.so.2.4
 lib/libMagnumDebugTools.so
 lib/libMagnumDebugTools.so.2
 lib/libMagnumDebugTools.so.2.4
 lib/libMagnumGL.so
 lib/libMagnumGL.so.2
 lib/libMagnumGL.so.2.4
 %%GLFW%%lib/libMagnumGlfwApplication%%APP_MODULES_EXT%%
 %%GLX%%lib/libMagnumGlxApplication%%APP_MODULES_EXT%%
+%%GLXCONTEXT%%lib/libMagnumGlxContext%%APP_MODULES_EXT%%
 lib/libMagnumMaterialTools.so
 lib/libMagnumMaterialTools.so.2
 lib/libMagnumMaterialTools.so.2.4
 lib/libMagnumMeshTools.so
 lib/libMagnumMeshTools.so.2
 lib/libMagnumMeshTools.so.2.4
 lib/libMagnumPrimitives.so
 lib/libMagnumPrimitives.so.2
 lib/libMagnumPrimitives.so.2.4
 lib/libMagnumSceneGraph.so
 lib/libMagnumSceneGraph.so.2
 lib/libMagnumSceneGraph.so.2.4
 lib/libMagnumSceneTools.so
 lib/libMagnumSceneTools.so.2
 lib/libMagnumSceneTools.so.2.4
 %%SDL2%%lib/libMagnumSdl2Application%%APP_MODULES_EXT%%
 lib/libMagnumShaderTools.so
 lib/libMagnumShaderTools.so.2
 lib/libMagnumShaderTools.so.2.4
 lib/libMagnumShaders.so
 lib/libMagnumShaders.so.2
 lib/libMagnumShaders.so.2.4
 lib/libMagnumText.so
 lib/libMagnumText.so.2
 lib/libMagnumText.so.2.4
 lib/libMagnumTextureTools.so
 lib/libMagnumTextureTools.so.2
 lib/libMagnumTextureTools.so.2.4
 lib/libMagnumTrade.so
 lib/libMagnumTrade.so.2
 lib/libMagnumTrade.so.2.4
+%%VULKAN%%lib/libMagnumVk.so
+%%VULKAN%%lib/libMagnumVk.so.2
+%%VULKAN%%lib/libMagnumVk.so.2.4
 %%XEGL%%lib/libMagnumXEglApplication%%APP_MODULES_EXT%%
 %%ANYAUDIOIMPORTER%%lib/magnum/audioimporters/AnyAudioImporter.conf
 %%ANYAUDIOIMPORTER%%lib/magnum/audioimporters/AnyAudioImporter.so
+%%MAGNUMFONT%%lib/magnum/fonts/MagnumFont.conf
+%%MAGNUMFONT%%lib/magnum/fonts/MagnumFont.so
+%%MAGNUMFONTCONVERTER%%lib/magnum/fontconverters/MagnumFontConverter.conf
+%%MAGNUMFONTCONVERTER%%lib/magnum/fontconverters/MagnumFontConverter.so
+%%MAGNUMFONTCONVERTER%%lib/magnum/imageconverters/TgaImageConverter.conf
+%%MAGNUMFONTCONVERTER%%lib/magnum/imageconverters/TgaImageConverter.so
 %%ANYIMAGEIMPORTER%%lib/magnum/importers/AnyImageImporter.conf
 %%ANYIMAGEIMPORTER%%lib/magnum/importers/AnyImageImporter.so
+%%MAGNUMFONT%%lib/magnum/importers/TgaImporter.conf
+%%MAGNUMFONT%%lib/magnum/importers/TgaImporter.so
 share/cmake/Magnum/FindMagnum.cmake
 share/cmake/Magnum/MagnumConfig.cmake
-share/cmake/Magnum/dependencies/FindEGL.cmake
-share/cmake/Magnum/dependencies/FindGLFW.cmake
-share/cmake/Magnum/dependencies/FindOpenAL.cmake
-share/cmake/Magnum/dependencies/FindSDL2.cmake
+%%XEGL%%share/cmake/Magnum/dependencies/FindEGL.cmake
+%%GLFW%%share/cmake/Magnum/dependencies/FindGLFW.cmake
+%%AUDIO%%share/cmake/Magnum/dependencies/FindOpenAL.cmake
+%%SDL2%%share/cmake/Magnum/dependencies/FindSDL2.cmake
+%%VULKAN%%share/cmake/Magnum/dependencies/FindVulkan.cmake
 share/gdb/python/magnum/__init__.py
 share/gdb/python/magnum/printers.py