diff --git a/graphics/magnum-examples/Makefile b/graphics/magnum-examples/Makefile index d4789ab44832..309965fb6ad5 100644 --- a/graphics/magnum-examples/Makefile +++ b/graphics/magnum-examples/Makefile @@ -1,73 +1,74 @@ PORTNAME= magnum-examples DISTVERSIONPREFIX= v -DISTVERSION= 2020.06-265 -DISTVERSIONSUFFIX= -gb843f07a -PORTREVISION= 9 +DISTVERSION= 2020.06-357 +DISTVERSIONSUFFIX= -g358ca329 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org COMMENT= Magnum Graphics: Examples WWW= https://magnum.graphics/ \ https://github.com/mosra/magnum-examples LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libCorradeUtility.so:devel/corrade \ libMagnum.so:graphics/magnum \ libMagnumBulletIntegration.so:graphics/magnum-integration \ libMagnumUi.so:graphics/magnum-extras \ \ libassimp.so:multimedia/assimp \ libbox2d.so:misc/box2d \ libBulletDynamics.so:devel/bullet \ libccd.so:math/libccd \ libconsole_bridge.so:devel/ros-console_bridge \ libdart.so:misc/dartsim \ libfcl.so:math/fcl \ libfmt.so:devel/libfmt \ libglfw.so:graphics/glfw \ - libimgui.so:x11-toolkits/imgui \ liboctomap.so:math/octomap \ libtinyxml2.so:textproc/tinyxml2 \ liburdfdom_model.so:devel/ros-urdfdom \ libvulkan.so:graphics/vulkan-loader USES= cmake compiler:c++14-lang gl sdl USE_GL= opengl USE_SDL= sdl2 USE_GITHUB= yes GH_ACCOUNT= mosra -GH_TUPLE= mosra:toolchains:2243706:t/toolchains +GH_TUPLE= mosra:toolchains:fa282e8:t/toolchains CMAKE_ON= \ MAGNUM_WITH_ARCBALL_EXAMPLE \ MAGNUM_WITH_ANIMATED_GIF_EXAMPLE \ MAGNUM_WITH_AREALIGHTS_EXAMPLE \ MAGNUM_WITH_BOX2D_EXAMPLE \ MAGNUM_WITH_BULLET_EXAMPLE \ MAGNUM_WITH_CUBEMAP_EXAMPLE \ MAGNUM_WITH_DART_EXAMPLE \ - MAGNUM_WITH_FLUIDSIMULATION2D_EXAMPLE \ - MAGNUM_WITH_FLUIDSIMULATION3D_EXAMPLE \ - MAGNUM_WITH_IMGUI_EXAMPLE \ MAGNUM_WITH_MOUSEINTERACTION_EXAMPLE \ MAGNUM_WITH_MOTIONBLUR_EXAMPLE \ MAGNUM_WITH_OCTREE_EXAMPLE \ MAGNUM_WITH_PICKING_EXAMPLE \ MAGNUM_WITH_PRIMITIVES_EXAMPLE \ MAGNUM_WITH_RAYTRACING_EXAMPLE \ MAGNUM_WITH_SHADOWS_EXAMPLE \ MAGNUM_WITH_TEXT_EXAMPLE \ MAGNUM_WITH_TEXTUREDQUAD_EXAMPLE \ MAGNUM_WITH_TEXTUREDTRIANGLE_VULKAN_EXAMPLE \ MAGNUM_WITH_TRIANGLE_EXAMPLE \ MAGNUM_WITH_TRIANGLE_PLAIN_GLFW_EXAMPLE \ MAGNUM_WITH_TRIANGLE_VULKAN_EXAMPLE \ MAGNUM_WITH_VIEWER_EXAMPLE +# ImGui-based examples are disabled because the imgui port is built with the +# SDL3 backend by default, while Magnum uses SDL2. Mixing SDL2 and SDL3 in +# the same executable causes an INTERFACE_SDL_VERSION CMake error. +#CMAKE_ON+= MAGNUM_WITH_FLUIDSIMULATION2D_EXAMPLE +#CMAKE_ON+= MAGNUM_WITH_FLUIDSIMULATION3D_EXAMPLE +#CMAKE_ON+= MAGNUM_WITH_IMGUI_EXAMPLE #CMAKE_ON+= MAGNUM_WITH_OVR_EXAMPLE # unclear if this is for Linux/BSD #CMAKE_ON+= MAGNUM_WITH_LEAPMOTION_EXAMPLE # needs the Leap library #CMAKE_ON+= MAGNUM_WITH_TRIANGLE_SOKOL_EXAMPLE # broken, see https://github.com/mosra/magnum-examples/issues/111 .include diff --git a/graphics/magnum-examples/distinfo b/graphics/magnum-examples/distinfo index d702351359f4..050361da14ca 100644 --- a/graphics/magnum-examples/distinfo +++ b/graphics/magnum-examples/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1731181564 -SHA256 (mosra-magnum-examples-v2020.06-265-gb843f07a_GH0.tar.gz) = 9a05b88b331bad7706d7e54c2864b436441e732f2f061b63525fdd6f0138bd32 -SIZE (mosra-magnum-examples-v2020.06-265-gb843f07a_GH0.tar.gz) = 4794164 -SHA256 (mosra-toolchains-2243706_GH0.tar.gz) = 4103ccdf4cdebb35acf8671e40aeb49e204456523acfaf8510473d3c200dc12b -SIZE (mosra-toolchains-2243706_GH0.tar.gz) = 12312 +TIMESTAMP = 1790502384 +SHA256 (mosra-magnum-examples-v2020.06-357-g358ca329_GH0.tar.gz) = eadfa0178ca65ace5a78011b6ae44d9b6c973c1adeeb9c5700d3a471375cd8ba +SIZE (mosra-magnum-examples-v2020.06-357-g358ca329_GH0.tar.gz) = 4788741 +SHA256 (mosra-toolchains-fa282e8_GH0.tar.gz) = 2b396cf07f0b9fac4c672b3cb92da9ad644f51a1a80f7055292127d44d3e3809 +SIZE (mosra-toolchains-fa282e8_GH0.tar.gz) = 12499 diff --git a/graphics/magnum-examples/pkg-plist b/graphics/magnum-examples/pkg-plist index 1ed911743f83..40d23acd6eca 100644 --- a/graphics/magnum-examples/pkg-plist +++ b/graphics/magnum-examples/pkg-plist @@ -1,47 +1,44 @@ bin/magnum-animated-gif bin/magnum-animated-gif-console bin/magnum-arcball bin/magnum-arealights bin/magnum-box2d bin/magnum-bullet bin/magnum-cubemap bin/magnum-dart -bin/magnum-fluidsimulation2d -bin/magnum-fluidsimulation3d -bin/magnum-imgui bin/magnum-motionblur bin/magnum-mouseinteraction bin/magnum-octree bin/magnum-picking bin/magnum-primitives bin/magnum-raytracing bin/magnum-shadows bin/magnum-text bin/magnum-textured-triangle-vulkan bin/magnum-texturedquad bin/magnum-triangle bin/magnum-triangle-plain-glfw bin/magnum-triangle-vulkan bin/magnum-viewer share/magnum/examples/cubemap/+x.jpg share/magnum/examples/cubemap/+y.jpg share/magnum/examples/cubemap/+z.jpg share/magnum/examples/cubemap/-x.jpg share/magnum/examples/cubemap/-y.jpg share/magnum/examples/cubemap/-z.jpg share/magnum/examples/dart/iiwa14/link_0.stl share/magnum/examples/dart/iiwa14/link_1.stl share/magnum/examples/dart/iiwa14/link_2.stl share/magnum/examples/dart/iiwa14/link_3.stl share/magnum/examples/dart/iiwa14/link_4.stl share/magnum/examples/dart/iiwa14/link_5.stl share/magnum/examples/dart/iiwa14/link_6.stl share/magnum/examples/dart/iiwa14/link_7.stl share/magnum/examples/dart/iiwa14_simple.urdf share/magnum/examples/dart/robotiq.urdf share/magnum/examples/dart/robotiq/inner_finger_fine.stl share/magnum/examples/dart/robotiq/inner_knuckle_fine.stl share/magnum/examples/dart/robotiq/outer_finger_fine.stl share/magnum/examples/dart/robotiq/outer_knuckle_fine.stl share/magnum/examples/dart/robotiq/robotiq_85_base_link_fine.stl share/magnum/examples/viewer/scene.glb