From nobody Sun Nov 10 03:49:09 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XmJZY2dRSz5c8XH; Sun, 10 Nov 2024 03:49:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XmJZY11ztz47nC; Sun, 10 Nov 2024 03:49:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731210549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6R3e46JSIOJLS9LcLkNyVDYfzs1X+znOn7KpSBgBXyc=; b=u3tRXtVNHB5o9kkq2UUg8F3zcBOQHhIjVT00NTvy6szcWCwbZErQNTKyuWthklOqLulbJX 8j7GDik6KdYiV8wixeOB4FbOLyFlt+Xm3vXwnus0W62Y/dB9HhFDY80K/RVH4G+IKnZysR AZVVbdhNYMynZW2yiMK0KWsM0EMhTTqF7ys+t2o4W1K9Gb14dBo54TcItTFHwDAaFDGyG4 35G2NBBVIiH/Pwdq7LwjtWWJtGgjdtkzJPOnwhW0Dz6e3HZf4yNf9xi5OLh/LOw4AWFkE8 jX5Byaq9lTm/tGpEneWB8fTv2nUjFXRIxRCDVaG9RSGZqkQlU2Tk/7B/RvVe3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731210549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6R3e46JSIOJLS9LcLkNyVDYfzs1X+znOn7KpSBgBXyc=; b=Zz2RcqeJtkYNfDC32y7PeQaHgWGv7O7Wrw56EAiqwQ/kUtw8Eq7aDKoj4yLNIGnM7VS3Ev cUfhgie1s/gUIg9qzjdRKzdKLFXwWvmZRjitBIPvebx8RmqrFGNaigEVdf3CXTDj9gTNzh iXyvRXziUCR6K245mZKhX5OtBn9H8hrba2hvRCvaYFMpy13WMHbfswm2M103IZ/o30M3pg xSFZYQ4ZEpztOsGU0hTk59j6Mp+tBlfUHeq7hnvXjpvke+N+3i6eOI6N+0k4OKFQSGsABD 4iuT2qfkQ16nT//pM90wKLzhkWWONri6jQaOOBww6jAXq90Zpl/Bykzgp85jhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731210549; a=rsa-sha256; cv=none; b=Q6NntJCpiKREQxbTxmiwmdkygZWSB028zc7rRJ3hF8OydH6orJI8OcifZH2KW+QxNTfIWc oW/P3VNRcR/LDSa5A8cia1ZCVRBrnoNop2htvQHHTdMAhLZ6LLb4V3NUh0iZqVM+vM2pvZ tOlEAFYN1pXzLtryNcuSkPN3559m+4Eb+FCHCEZxuOtxWN+I1eXxZipqbXzeQXbCTl1l5i j++YdjIVgDrZK466Tp14/oFdD8KQb6uZUbGCiaVkEg+IfGZIuE+SDhNnKDnUSbVCzhybV8 CJ3cfr9hPC0cIjYi4CJ+RHulBqK2VOUFCYlCf0l/rDAw5bowvhMTv15nSyo4Ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XmJZY0dbHzR0H; Sun, 10 Nov 2024 03:49:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AA3n9TW068606; Sun, 10 Nov 2024 03:49:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AA3n9uw068603; Sun, 10 Nov 2024 03:49:09 GMT (envelope-from git) Date: Sun, 10 Nov 2024 03:49:09 GMT Message-Id: <202411100349.4AA3n9uw068603@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 572aaca2211d - main - graphics/magnum: Correct pkg-plist and COMMENT; Add plugins, backends and options List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 572aaca2211d5857e9a0a726bf368f4af92c131d Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=572aaca2211d5857e9a0a726bf368f4af92c131d commit 572aaca2211d5857e9a0a726bf368f4af92c131d Author: Yuri Victorovich AuthorDate: 2024-11-10 03:39:56 +0000 Commit: Yuri Victorovich CommitDate: 2024-11-10 03:49:06 +0000 graphics/magnum: Correct pkg-plist and COMMENT; Add plugins, backends and options PR: 282653 (pkg-descr) Reported by: Chad Jacob Milios --- graphics/magnum/Makefile | 36 ++++++++++++++++--- graphics/magnum/pkg-descr | 4 +-- graphics/magnum/pkg-plist | 90 ++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 118 insertions(+), 12 deletions(-) diff --git a/graphics/magnum/Makefile b/graphics/magnum/Makefile index e35c7737d71e..4f1829298997 100644 --- a/graphics/magnum/Makefile +++ b/graphics/magnum/Makefile @@ -2,10 +2,11 @@ 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 @@ -35,11 +36,17 @@ PLIST_SUB+= APP_MODULES_EXT=.so 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 @@ -48,17 +55,24 @@ APPS_DESC= Application support to build ${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 @@ -74,4 +88,16 @@ 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 + +.if !empty(PORT_OPTIONS:MXEGL) || !empty(PORT_OPTIONS:MGLX) +PLIST_FILES= include/Magnum/Platform/AbstractXApplication.h +.endif + .include 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 @@ -156,7 +156,6 @@ 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 @@ -306,16 +305,84 @@ 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 @@ -330,6 +397,7 @@ 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 @@ -361,16 +429,28 @@ 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