2 files changed, 101 insertions, 24 deletions

diff --git a/graphics/magnum/Makefile b/graphics/magnum/Makefile
index 9ed63c4a5814..009bce6cfe08 100644
--- a/graphics/magnum/Makefile
+++ b/graphics/magnum/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	magnum
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2019.01
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -11,15 +12,25 @@ COMMENT=	Lightweight, modular graphics middleware for games, data visualization
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libCorradeUtility.so:devel/corrade
+LIB_DEPENDS=	libCorradeUtility.so:devel/corrade \
+		libglfw.so:graphics/glfw
 
-USES=		cmake compiler:c++14-lang gl
+USES=		cmake compiler:c++14-lang gl openal
 USE_GITHUB=	yes
 GH_ACCOUNT=	mosra
 GH_TUPLE=	mosra:toolchains:a3e0aff:t/toolchains
-USE_GL=		gl
+USE_GL=		gl egl
+USE_SDL=	sdl2
+USE_XORG=	x11
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DLIB_SUFFIX:STRING=""
 
+CMAKE_ON=	BUILD_SHARED_LIBS \
+		TARGET_GLES WITH_GL_INFO WITH_IMAGECONVERTER WITH_ANYIMAGEIMPORTER WITH_ANYAUDIOIMPORTER \
+		WITH_ANYIMAGECONVERTER WITH_ANYSCENEIMPORTER WITH_WAVAUDIOIMPORTER WITH_MAGNUMFONT WITH_OBJIMPORTER \
+		WITH_SHAPES WITH_SHADERS WITH_TEXT WITH_TEXTURETOOLS WITH_TRADE \
+		WITH_GL WITH_PRIMITIVES WITH_EGLCONTEXT WITH_GLXAPPLICATION WITH_WINDOWLESSGLXAPPLICATION \
+		WITH_GLXCONTEXT WITH_XEGLAPPLICATION WITH_GLFWAPPLICATION WITH_SDL2APPLICATION
+
 .include <bsd.port.mk>
diff --git a/graphics/magnum/pkg-plist b/graphics/magnum/pkg-plist
index 07d23af0c69d..f697d44b0a1d 100644
--- a/graphics/magnum/pkg-plist
+++ b/graphics/magnum/pkg-plist
@@ -1,3 +1,5 @@
+bin/magnum-gl-info
+bin/magnum-imageconverter
 include/Magnum/AbstractFramebuffer.h
 include/Magnum/AbstractObject.h
 include/Magnum/AbstractQuery.h
@@ -12,13 +14,21 @@ include/Magnum/Animation/Player.hpp
 include/Magnum/Animation/Track.h
 include/Magnum/Array.h
 include/Magnum/Attribute.h
+include/Magnum/Audio/AbstractImporter.h
+include/Magnum/Audio/Audio.h
+include/Magnum/Audio/Buffer.h
+include/Magnum/Audio/BufferFormat.h
+include/Magnum/Audio/Context.h
+include/Magnum/Audio/Extensions.h
+include/Magnum/Audio/Listener.h
+include/Magnum/Audio/Playable.h
+include/Magnum/Audio/PlayableGroup.h
+include/Magnum/Audio/Renderer.h
+include/Magnum/Audio/Source.h
+include/Magnum/Audio/visibility.h
 include/Magnum/Buffer.h
-include/Magnum/BufferImage.h
-include/Magnum/BufferTexture.h
-include/Magnum/BufferTextureFormat.h
 include/Magnum/Context.h
 include/Magnum/CubeMapTexture.h
-include/Magnum/CubeMapTextureArray.h
 include/Magnum/DebugOutput.h
 include/Magnum/DebugTools/BufferData.h
 include/Magnum/DebugTools/CompareImage.h
@@ -27,6 +37,7 @@ include/Magnum/DebugTools/ForceRenderer.h
 include/Magnum/DebugTools/ObjectRenderer.h
 include/Magnum/DebugTools/Profiler.h
 include/Magnum/DebugTools/ResourceManager.h
+include/Magnum/DebugTools/ShapeRenderer.h
 include/Magnum/DebugTools/TextureImage.h
 include/Magnum/DebugTools/visibility.h
 include/Magnum/DefaultFramebuffer.h
@@ -40,25 +51,17 @@ 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/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
@@ -66,14 +69,11 @@ 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/ImageFormat.h
 include/Magnum/ImageView.h
 include/Magnum/Magnum.h
 include/Magnum/Math/Algorithms/GaussJordan.h
@@ -130,17 +130,22 @@ include/Magnum/MeshTools/Tipsify.h
 include/Magnum/MeshTools/Transform.h
 include/Magnum/MeshTools/visibility.h
 include/Magnum/MeshView.h
-include/Magnum/MultisampleTexture.h
 include/Magnum/OpenGL.h
 include/Magnum/PixelFormat.h
 include/Magnum/PixelStorage.h
+include/Magnum/Platform/AbstractXApplication.h
 include/Magnum/Platform/Context.h
 include/Magnum/Platform/GLContext.h
+include/Magnum/Platform/GlfwApplication.h
+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
-include/Magnum/PrimitiveQuery.h
+include/Magnum/Platform/Sdl2Application.h
+include/Magnum/Platform/WindowlessEglApplication.h
+include/Magnum/Platform/WindowlessGlxApplication.h
+include/Magnum/Platform/XEglApplication.h
 include/Magnum/Primitives/Axis.h
 include/Magnum/Primitives/Capsule.h
 include/Magnum/Primitives/Circle.h
@@ -156,7 +161,6 @@ include/Magnum/Primitives/Plane.h
 include/Magnum/Primitives/Square.h
 include/Magnum/Primitives/UVSphere.h
 include/Magnum/Primitives/visibility.h
-include/Magnum/RectangleTexture.h
 include/Magnum/Renderbuffer.h
 include/Magnum/RenderbufferFormat.h
 include/Magnum/Renderer.h
@@ -209,6 +213,23 @@ include/Magnum/Shaders/Shaders.h
 include/Magnum/Shaders/Vector.h
 include/Magnum/Shaders/VertexColor.h
 include/Magnum/Shaders/visibility.h
+include/Magnum/Shapes/AbstractShape.h
+include/Magnum/Shapes/AxisAlignedBox.h
+include/Magnum/Shapes/Box.h
+include/Magnum/Shapes/Capsule.h
+include/Magnum/Shapes/Collision.h
+include/Magnum/Shapes/Composition.h
+include/Magnum/Shapes/Cylinder.h
+include/Magnum/Shapes/Line.h
+include/Magnum/Shapes/LineSegment.h
+include/Magnum/Shapes/Plane.h
+include/Magnum/Shapes/Point.h
+include/Magnum/Shapes/Shape.h
+include/Magnum/Shapes/ShapeGroup.h
+include/Magnum/Shapes/Shapes.h
+include/Magnum/Shapes/Sphere.h
+include/Magnum/Shapes/shapeImplementation.h
+include/Magnum/Shapes/visibility.h
 include/Magnum/Tags.h
 include/Magnum/Text/AbstractFont.h
 include/Magnum/Text/AbstractFontConverter.h
@@ -219,7 +240,6 @@ include/Magnum/Text/Renderer.h
 include/Magnum/Text/Text.h
 include/Magnum/Text/visibility.h
 include/Magnum/Texture.h
-include/Magnum/TextureArray.h
 include/Magnum/TextureFormat.h
 include/Magnum/TextureTools/Atlas.h
 include/Magnum/TextureTools/DistanceField.h
@@ -244,22 +264,45 @@ include/Magnum/Trade/SceneData.h
 include/Magnum/Trade/TextureData.h
 include/Magnum/Trade/Trade.h
 include/Magnum/Trade/visibility.h
-include/Magnum/TransformFeedback.h
 include/Magnum/Types.h
 include/Magnum/Version.h
 include/Magnum/configure.h
 include/Magnum/visibility.h
-include/MagnumExternal/OpenGL/GL/flextGL.h
+include/MagnumExternal/OpenAL/extensions.h
+include/MagnumExternal/OpenGL/GLES2/flextGL.h
 include/MagnumExternal/OpenGL/KHR/khrplatform.h
+include/MagnumPlugins/AnyAudioImporter/AnyImporter.h
+include/MagnumPlugins/AnyAudioImporter/configure.h
+include/MagnumPlugins/AnyImageConverter/AnyImageConverter.h
+include/MagnumPlugins/AnyImageConverter/configure.h
+include/MagnumPlugins/AnyImageImporter/AnyImageImporter.h
+include/MagnumPlugins/AnyImageImporter/configure.h
+include/MagnumPlugins/AnySceneImporter/AnySceneImporter.h
+include/MagnumPlugins/AnySceneImporter/configure.h
+include/MagnumPlugins/MagnumFont/MagnumFont.h
+include/MagnumPlugins/MagnumFont/configure.h
+include/MagnumPlugins/ObjImporter/ObjImporter.h
+include/MagnumPlugins/ObjImporter/configure.h
+include/MagnumPlugins/TgaImporter/TgaImporter.h
+include/MagnumPlugins/TgaImporter/configure.h
+include/MagnumPlugins/WavAudioImporter/WavImporter.h
+include/MagnumPlugins/WavAudioImporter/configure.h
 lib/libMagnum.so
 lib/libMagnum.so.2
 lib/libMagnum.so.2.2
+lib/libMagnumAudio.so
+lib/libMagnumAudio.so.2
+lib/libMagnumAudio.so.2.2
 lib/libMagnumDebugTools.so
 lib/libMagnumDebugTools.so.2
 lib/libMagnumDebugTools.so.2.2
+lib/libMagnumEglContext.a
 lib/libMagnumGL.so
 lib/libMagnumGL.so.2
 lib/libMagnumGL.so.2.2
+lib/libMagnumGlfwApplication.a
+lib/libMagnumGlxApplication.a
+lib/libMagnumGlxContext.a
 lib/libMagnumMeshTools.so
 lib/libMagnumMeshTools.so.2
 lib/libMagnumMeshTools.so.2.2
@@ -269,9 +312,13 @@ lib/libMagnumPrimitives.so.2.2
 lib/libMagnumSceneGraph.so
 lib/libMagnumSceneGraph.so.2
 lib/libMagnumSceneGraph.so.2.2
+lib/libMagnumSdl2Application.a
 lib/libMagnumShaders.so
 lib/libMagnumShaders.so.2
 lib/libMagnumShaders.so.2.2
+lib/libMagnumShapes.so
+lib/libMagnumShapes.so.2
+lib/libMagnumShapes.so.2.2
 lib/libMagnumText.so
 lib/libMagnumText.so.2
 lib/libMagnumText.so.2.2
@@ -281,5 +328,24 @@ lib/libMagnumTextureTools.so.2.2
 lib/libMagnumTrade.so
 lib/libMagnumTrade.so.2
 lib/libMagnumTrade.so.2.2
+lib/libMagnumWindowlessEglApplication.a
+lib/libMagnumWindowlessGlxApplication.a
+lib/libMagnumXEglApplication.a
+lib/magnum/audioimporters/AnyAudioImporter.conf
+lib/magnum/audioimporters/AnyAudioImporter.so
+lib/magnum/audioimporters/WavAudioImporter.conf
+lib/magnum/audioimporters/WavAudioImporter.so
+lib/magnum/fonts/MagnumFont.conf
+lib/magnum/fonts/MagnumFont.so
+lib/magnum/imageconverters/AnyImageConverter.conf
+lib/magnum/imageconverters/AnyImageConverter.so
+lib/magnum/importers/AnyImageImporter.conf
+lib/magnum/importers/AnyImageImporter.so
+lib/magnum/importers/AnySceneImporter.conf
+lib/magnum/importers/AnySceneImporter.so
+lib/magnum/importers/ObjImporter.conf
+lib/magnum/importers/ObjImporter.so
+lib/magnum/importers/TgaImporter.conf
+lib/magnum/importers/TgaImporter.so
 share/cmake/Magnum/FindMagnum.cmake
 share/cmake/Magnum/MagnumConfig.cmake