diff --git a/benchmarks/vkmark/Makefile b/benchmarks/vkmark/Makefile index e71573cb326d..0cd13d5e72ec 100644 --- a/benchmarks/vkmark/Makefile +++ b/benchmarks/vkmark/Makefile @@ -1,47 +1,48 @@ PORTNAME= vkmark DISTVERSION= 2025.01 +PORTREVISION= 1 CATEGORIES= benchmarks MAINTAINER= jbeich@FreeBSD.org COMMENT= Vulkan benchmark WWW= https://github.com/vkmark/vkmark LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING-LGPL2.1 BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers \ glm>0:math/glm LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader \ libassimp.so:multimedia/assimp USES= cmake:indirect compiler:c++14-lang localbase meson pkgconfig USE_GITHUB= yes OPTIONS_DEFINE= DRM WAYLAND X11 OPTIONS_DEFAULT=DRM WAYLAND X11 OPTIONS_SUB= yes DRM_DESC= KMS console support DRM_LIB_DEPENDS= libdrm.so:graphics/libdrm DRM_USES= gl DRM_USE= GL=gbm DRM_MESON_TRUE= kms WAYLAND_CATEGORIES= wayland WAYLAND_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.12:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_MESON_TRUE= wayland X11_LIB_DEPENDS= libxcb-icccm.so:x11/xcb-util-wm X11_USES= xorg X11_USE= XORG=xcb X11_MESON_TRUE= xcb post-patch: # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \ -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build .include diff --git a/games/doomsday/Makefile b/games/doomsday/Makefile index 38765485b14b..d18623a9fb03 100644 --- a/games/doomsday/Makefile +++ b/games/doomsday/Makefile @@ -1,42 +1,42 @@ PORTNAME= doomsday PORTVERSION= 2.3.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF/deng/Doomsday%20Engine/${PORTVERSION} MAINTAINER= danilo@FreeBSD.org COMMENT= Enhanced Doom, Heretic, and Hexen source port WWW= https://www.dengine.net/ LICENSE= GPLv2 LIB_DEPENDS= libcurl.so:ftp/curl \ libassimp.so:multimedia/assimp \ libfluidsynth.so:audio/fluidsynth RUN_DEPENDS= timidity:audio/timidity USES= cmake compiler:c++11-lib gl localbase:ldflags ncurses ninja openal pkgconfig \ python:build qt:5 sdl xorg USE_GL= gl glu USE_LDCONFIG= yes USE_SDL= sdl2 mixer2 USE_XORG= x11 sm ice xext xrandr xxf86vm USE_QT= buildtools:build core gui network widgets qmake:build opengl x11extras CMAKE_ARGS+= -DDENG_ENABLE_COTIRE=OFF -DDENG_ASSIMP_EMBEDDED=OFF LDFLAGS+= -lexecinfo WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME} PORTSCOUT= limit:^\d+\.\d+\.\d+$$ post-patch: # Removing (three) non-ascii bytes from the beginning of the file @${REINPLACE_CMD} '1s,^...,,' \ ${WRKSRC}/apps/client/src/client/cl_sound.cpp @${REINPLACE_CMD} -E -e 's|(DENG_DISTRIB_DIR /usr)|\1/local|' \ -e 's|python3|${PYTHON_VERSION}|' \ ${WRKSRC}/cmake/Config.cmake @cd ${WRKSRC} && ${FIND} . -name '*.orig' -delete .include diff --git a/games/lwjgl3/Makefile b/games/lwjgl3/Makefile index 79047b8123e7..09a1386f309f 100644 --- a/games/lwjgl3/Makefile +++ b/games/lwjgl3/Makefile @@ -1,124 +1,124 @@ PORTNAME= lwjgl DISTVERSION= 3.3.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games java MASTER_SITES= https://repo1.maven.org/:source1 PKGNAMESUFFIX= 3 DISTFILES= maven2/com/beust/jcommander/1.78/jcommander-1.78.jar:source1 \ maven2/net/sf/jopt-simple/jopt-simple/5.0.4/jopt-simple-5.0.4.jar:source1 \ maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar:source1 \ maven2/org/joml/joml/1.10.8/joml-1.10.8-sources.jar:source1 \ maven2/org/joml/joml/1.10.8/joml-1.10.8.jar:source1 \ maven2/org/jspecify/jspecify/1.0.0/jspecify-1.0.0-sources.jar:source1 \ maven2/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.jar:source1 \ maven2/org/openjdk/jmh/jmh-core/1.37/jmh-core-1.37-sources.jar:source1 \ maven2/org/openjdk/jmh/jmh-core/1.37/jmh-core-1.37.jar:source1 \ maven2/org/openjdk/jmh/jmh-generator-annprocess/1.37/jmh-generator-annprocess-1.37.jar:source1 \ maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar:source1 \ maven2/org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36.jar:source1 \ maven2/org/testng/testng/7.5/testng-7.5-sources.jar:source1 \ maven2/org/testng/testng/7.5/testng-7.5.jar:source1 \ maven2/org/webjars/jquery/3.5.1/jquery-3.5.1.jar:source1 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= vvd@FreeBSD.org COMMENT= Lightweight Java Game Library WWW= https://www.lwjgl.org LICENSE= BSD3CLAUSE ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= Upstream support FreeBSD on amd64 only: https://github.com/LWJGL/lwjgl3/issues/421 BUILD_DEPENDS= ${LOCALBASE}/openjdk8/bin/java:java/openjdk8 \ kotlinc-jvm:lang/kotlin LIB_DEPENDS= libdraco.so:archivers/draco \ libopenal.so:audio/openal-soft \ libopus.so:audio/opus \ libdbus-1.so:devel/dbus \ libhwloc.so:devel/hwloc2 \ libffi.so:devel/libffi \ libbgfx.so:graphics/bgfx \ libglfw.so:graphics/glfw \ libktx.so:graphics/khronos-texture \ libopenxr_loader.so:graphics/openxr \ libshaderc_shared.so:graphics/shaderc \ libspirv-cross-c-shared.so:graphics/spirv-cross \ libassimp.so:multimedia/assimp \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz USES= gl gnome java:ant,run JAVA_VERSION= 17+ USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME:tu} GH_PROJECT= ${PORTNAME}${PKGNAMESUFFIX} USE_GL= gl USE_GNOME= glib20 gtk30 MAKE_ARGS= -Dbuild.offline=true \ -Djavadoc.skip=true \ -Duse.libffi.so=true \ -Dlibffi.path=${LOCALBASE}/lib \ -Dlocal.kotlin=${LOCALBASE}/share/kotlin MAKE_ENV+= JAVA8_HOME=${LOCALBASE}/openjdk8 PLIST_SUB+= MAJORVERSION=${PKGNAMESUFFIX} LIBSDIR= ${WRKSRC}/bin/libs/native/freebsd/*/org/lwjgl .include .if ${ARCH} == i386 MAKE_ENV+= ANT_OPTS=-Xmx2G .endif post-extract: ${MKDIR} ${WRKSRC}/bin/libs/java ${LN} -s ${DISTDIR}/maven2/com/beust/jcommander/1.78/jcommander-1.78.jar \ ${WRKSRC}/bin/libs/java/jcommander.jar ${LN} -s ${DISTDIR}/maven2/net/sf/jopt-simple/jopt-simple/5.0.4/jopt-simple-5.0.4.jar \ ${WRKSRC}/bin/libs/java/jopt-simple.jar ${LN} -s ${DISTDIR}/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar \ ${WRKSRC}/bin/libs/java/commons-math3.jar ${LN} -s ${DISTDIR}/maven2/org/joml/joml/1.10.8/joml-1.10.8-sources.jar \ ${WRKSRC}/bin/libs/java/joml-sources.jar ${LN} -s ${DISTDIR}/maven2/org/joml/joml/1.10.8/joml-1.10.8.jar \ ${WRKSRC}/bin/libs/java/joml.jar ${LN} -s ${DISTDIR}/maven2/org/jspecify/jspecify/1.0.0/jspecify-1.0.0-sources.jar \ ${WRKSRC}/bin/libs/java/jspecify-sources.jar ${CP} ${DISTDIR}/maven2/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.jar \ ${WRKSRC}/bin/libs/java/jspecify.jar ${LN} -s ${DISTDIR}/maven2/org/openjdk/jmh/jmh-core/1.37/jmh-core-1.37-sources.jar \ ${WRKSRC}/bin/libs/java/jmh-core-sources.jar ${LN} -s ${DISTDIR}/maven2/org/openjdk/jmh/jmh-core/1.37/jmh-core-1.37.jar \ ${WRKSRC}/bin/libs/java/jmh-core.jar ${LN} -s ${DISTDIR}/maven2/org/openjdk/jmh/jmh-generator-annprocess/1.37/jmh-generator-annprocess-1.37.jar \ ${WRKSRC}/bin/libs/java/jmh-generator-annprocess.jar ${LN} -s ${DISTDIR}/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar \ ${WRKSRC}/bin/libs/java/slf4j-api.jar ${LN} -s ${DISTDIR}/maven2/org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36.jar \ ${WRKSRC}/bin/libs/java/slf4j-jdk14.jar ${LN} -s ${DISTDIR}/maven2/org/testng/testng/7.5/testng-7.5-sources.jar \ ${WRKSRC}/bin/libs/java/testng-sources.jar ${LN} -s ${DISTDIR}/maven2/org/testng/testng/7.5/testng-7.5.jar \ ${WRKSRC}/bin/libs/java/testng.jar ${LN} -s ${DISTDIR}/maven2/org/webjars/jquery/3.5.1/jquery-3.5.1.jar \ ${WRKSRC}/bin/libs/java/jquery.jar post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/config/freebsd/build.xml \ ${WRKSRC}/modules/lwjgl/cuda/src/main/java/org/lwjgl/cuda/CUDA.java do-install: @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${ANT} release ${MAKE_ARGS} @${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX} @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX} .for x in ${WRKSRC}/bin/RELEASE/lwjgl*/*.jar ${INSTALL_DATA} ${WRKSRC}${x} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX}/ .endfor .for x in ${LIBSDIR}/liblwjgl.so ${LIBSDIR}/*/liblwjgl*.so ${INSTALL_LIB} ${WRKSRC}${x} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}/ .endfor .include diff --git a/games/pioneer/Makefile b/games/pioneer/Makefile index 2d8adaa92378..6e7bc0d21379 100644 --- a/games/pioneer/Makefile +++ b/games/pioneer/Makefile @@ -1,67 +1,68 @@ PORTNAME= pioneer DISTVERSION= 20250501 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Space adventure game set in the Milky Way galaxy WWW= https://pioneerspacesim.net/ LICENSE= APACHE20 BSD2CLAUSE CC-BY-SA-3.0 DejaVu GPLv3 IUP \ MIT SIL ZLIB LICENSE_COMB= multi LICENSE_NAME_DejaVu= Bitstream Vera and Arev fonts license LICENSE_NAME_IUP= Galaxy colour image use policy LICENSE_NAME_SIL= SIL open font license version 1.1 LICENSE_FILE_APACHE20= ${WRKSRC}/licenses/Apache-2.0.txt LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/licenses/LZ4.txt LICENSE_FILE_CC-BY-SA-3.0= ${WRKSRC}/licenses/CC-BY-SA-3.0.txt LICENSE_FILE_DejaVu= ${WRKSRC}/licenses/DejaVu-license.txt LICENSE_FILE_GPLv3= ${WRKSRC}/licenses/GPL-3.txt LICENSE_FILE_IUP= ${WRKSRC}/licenses/Image\ Use\ Policy\ -\ NASA\ Spitzer\ Space\ Telescope.html LICENSE_FILE_SIL= ${WRKSRC}/licenses/SIL-1.1.txt LICENSE_PERMS_DejaVu= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_IUP= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_SIL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept # XXX: if you have similar error, try adding failing arch to USE_CHRONO condition in contrib/profiler/Profiler.h BROKEN_xxx= fails to build: contrib/profiler/Profiler.h:158:51: inconsistent operand constraints in an 'asm' LIB_DEPENDS= libassimp.so:multimedia/assimp \ libfreetype.so:print/freetype2 \ libsigc-2.0.so:devel/libsigc++20 \ libvorbisfile.so:audio/libvorbis USES= cmake compiler:c++17-lang gl gnome lua:52 pkgconfig sdl USE_GITHUB= yes USE_GL= gl glu glew USE_SDL= image2 sdl2 GH_ACCOUNT= pioneerspacesim ALL_TARGET= all build-data CMAKE_ARGS= -DPIONEER_DATA_DIR:PATH="${DATADIR}/data" CMAKE_ON= USE_SYSTEM_LIBGLEW USE_SYSTEM_LIBLUA PORTDATA= * PORTDOCS= AUTHORS.txt Changelog.txt Quickstart.txt \ README.md editor.txt SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS PROFILER NOGPUJOBS_DESC= Disable EnableGPUJobs for config.ini by default PROFILER_DESC= Build with internal profiler DOCS_SUB_LIST= QUICKSTART_PATH="${DOCSDIR}" DOCS_SUB_LIST_OFF= QUICKSTART_PATH="https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${GH_TAGNAME}" PROFILER_CMAKE_BOOL= PROFILER_ENABLED .include .if ${ARCH} != amd64 && ${ARCH} != i386 CMAKE_OFF+= USE_SSE42 .endif post-install-DOCS-on: @(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include diff --git a/graphics/f3d/Makefile b/graphics/f3d/Makefile index 03f2bee25755..e4b924af27bc 100644 --- a/graphics/f3d/Makefile +++ b/graphics/f3d/Makefile @@ -1,87 +1,88 @@ PORTNAME= f3d DISTVERSIONPREFIX= v DISTVERSION= 3.1.0 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org COMMENT= Fast and minimalist 3D viewer WWW= https://f3d.app/ \ https://github.com/f3d-app/f3d LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libfontconfig.so:x11-fonts/fontconfig \ libfreeimage.so:graphics/freeimage \ libfreetype.so:print/freetype2 \ libhdf5.so:science/hdf5 \ libinotify.so:devel/libinotify \ libnetcdf.so:science/netcdf \ libtbb.so:devel/onetbb \ libvtkCommonMisc-${VTK_VER}.so:math/vtk${VTK_VER:R} USES= cmake:testing compiler:c++17-lang desktop-file-utils gl \ localbase:ldflags shared-mime-info tcl tk xorg USE_GL= gl USE_XORG= ice sm x11 xt USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= f3d-app CMAKE_ON= F3D_LINUX_INSTALL_DEFAULT_CONFIGURATION_FILE_IN_PREFIX CMAKE_OFF= F3D_STRICT_BUILD # disable -Werror CMAKE_OFF+= F3D_LINUX_APPLICATION_LINK_FILESYSTEM LDFLAGS+= -linotify # dependency descroptions are in https://f3d.app/doc/dev/BUILD.html OPTIONS_GROUP= MODULES PLUGINS OPTIONS_GROUP_MODULES= EXTERNAL_RENDERING RAYTRACING OPTIONS_GROUP_PLUGINS= ALEMBIC ASSIMP DRACO EXODUS OCCT OPTIONS_DEFAULT= ALEMBIC ASSIMP DRACO EXODUS OCCT OPTIONS_SUB= yes MODULES_DESC= Build modules: ALEMBIC_DESC= Alembic plugin (for ABC files) ALEMBIC_CMAKE_BOOL= F3D_PLUGIN_BUILD_ALEMBIC ALEMBIC_LIB_DEPENDS= libAlembic.so:graphics/alembic \ libImath-3_1.so:math/Imath ASSIMP_DESC= Assimp plugin (for FBX, OFF, DAE and DXF files) ASSIMP_CMAKE_BOOL= F3D_PLUGIN_BUILD_ASSIMP ASSIMP_LIB_DEPENDS= libassimp.so:multimedia/assimp DRACO_DESC= Draco plugin DRACO_CMAKE_BOOL= F3D_PLUGIN_BUILD_DRACO DRACO_LIB_DEPENDS= libdraco.so:archivers/draco EXODUS_DESC= ExodusII plugin EXODUS_CMAKE_BOOL= F3D_PLUGIN_BUILD_EXODUS EXTERNAL_RENDERING_DESC= External rendering module EXTERNAL_RENDERING_CMAKE_BOOL= F3D_MODULE_EXTERNAL_RENDERING EXTERNAL_RENDERING_BROKEN= Requires VTK::RenderingExternal enabled in VTK OCCT_DESC= OpenCASCADE plugin (for STEP and IGES files) OCCT_USES= localbase:ldflags OCCT_CMAKE_BOOL= F3D_PLUGIN_BUILD_OCCT OCCT_LIB_DEPENDS= libTKBRep.so:cad/opencascade OCCT_CMAKE_ON= -DOpenCASCADE_DIR=${LOCALBASE}/lib/cmake RAYTRACING_DESC= Raytracing module RAYTRACING_CMAKE_BOOL= F3D_MODULE_RAYTRACING RAYTRACING_BROKEN= Requires VTK::RenderingRayTracing enabled in VTK post-install: @${RM} -r ${STAGEDIR}${DOCSDIR} # component-based install cd ${BUILD_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${CMAKE_BIN} --install . --component configuration && \ ${SETENV} ${MAKE_ENV} ${CMAKE_BIN} --install . --component sdk && \ ${SETENV} ${MAKE_ENV} ${CMAKE_BIN} --install . --component mimetypes .include <../../math/vtk9/Makefile.version> .include diff --git a/graphics/f3d/files/patch-external_dmon_dmon.h b/graphics/f3d/files/patch-external_dmon_dmon.h index d6239980cb57..a125e1d301a3 100644 --- a/graphics/f3d/files/patch-external_dmon_dmon.h +++ b/graphics/f3d/files/patch-external_dmon_dmon.h @@ -1,20 +1,20 @@ ---- external/dmon/dmon.h.orig 2024-04-03 12:42:33 UTC +--- external/dmon/dmon.h.orig 2025-04-16 06:15:03 UTC +++ external/dmon/dmon.h -@@ -137,7 +137,7 @@ DMON_API_DECL void dmon_unwatch(dmon_watch_id id); +@@ -142,7 +142,7 @@ DMON_API_DECL void dmon_unwatch(dmon_watch_id id); #if defined(_WIN32) || defined(_WIN64) # undef DMON_OS_WINDOWS # define DMON_OS_WINDOWS 1 -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) # undef DMON_OS_LINUX # define DMON_OS_LINUX 1 #elif defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) -@@ -167,7 +167,7 @@ DMON_API_DECL void dmon_unwatch(dmon_watch_id id); +@@ -172,7 +172,7 @@ DMON_API_DECL void dmon_unwatch(dmon_watch_id id); # include # include # include -# include +//# include # include # include # include diff --git a/graphics/f3d/files/patch-plugins_assimp_CMakeLists.txt b/graphics/f3d/files/patch-plugins_assimp_CMakeLists.txt new file mode 100644 index 000000000000..1119e588b41b --- /dev/null +++ b/graphics/f3d/files/patch-plugins_assimp_CMakeLists.txt @@ -0,0 +1,11 @@ +--- plugins/assimp/CMakeLists.txt.orig 2025-06-02 22:44:41 UTC ++++ plugins/assimp/CMakeLists.txt +@@ -11,7 +11,7 @@ endif() + include(f3dPlugin) + endif() + +-find_package(assimp 5.4.0 REQUIRED) ++find_package(assimp REQUIRED) + + set(F3D_ASSIMP_VERSION "${assimp_VERSION}" CACHE INTERNAL "") + message(STATUS "Plugin: assimp ${assimp_VERSION} found") diff --git a/graphics/magnum-examples/Makefile b/graphics/magnum-examples/Makefile index b3830d8a0b93..bfe662c0d518 100644 --- a/graphics/magnum-examples/Makefile +++ b/graphics/magnum-examples/Makefile @@ -1,73 +1,73 @@ PORTNAME= magnum-examples DISTVERSIONPREFIX= v DISTVERSION= 2020.06-265 DISTVERSIONSUFFIX= -gb843f07a -PORTREVISION= 3 +PORTREVISION= 4 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 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 #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-integration/Makefile b/graphics/magnum-integration/Makefile index fa1bdcd435c9..b2aa0c2f5b37 100644 --- a/graphics/magnum-integration/Makefile +++ b/graphics/magnum-integration/Makefile @@ -1,45 +1,45 @@ PORTNAME= magnum-integration DISTVERSIONPREFIX= v DISTVERSION= 2020.06-264 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONSUFFIX= -g50ac4db CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org COMMENT= Magnum Graphics: Integration libraries WWW= https://magnum.graphics/ \ https://github.com/mosra/magnum-integration LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= glm>0:math/glm LIB_DEPENDS= libassimp.so:multimedia/assimp \ libLinearMath.so:devel/bullet \ libccd.so:math/libccd \ libCorradePluginManager.so:devel/corrade \ libdart.so:misc/dartsim \ libfcl.so:math/fcl \ libglfw.so:graphics/glfw \ libfmt.so:devel/libfmt \ libimgui.so:x11-toolkits/imgui \ libMagnum.so:graphics/magnum \ liboctomap.so:math/octomap USES= cmake compiler:c++14-lang gl USE_GL= opengl USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= mosra GH_TUPLE= mosra:toolchains:2243706:t/toolchains CMAKE_ARGS= -DLIB_SUFFIX:STRING="" CMAKE_ON= MAGNUM_WITH_BULLET \ MAGNUM_WITH_EIGEN \ MAGNUM_WITH_GLM \ MAGNUM_WITH_DART \ MAGNUM_WITH_IMGUI .include diff --git a/graphics/magnum-plugins/Makefile b/graphics/magnum-plugins/Makefile index a8e28188c17f..67af2aec4c20 100644 --- a/graphics/magnum-plugins/Makefile +++ b/graphics/magnum-plugins/Makefile @@ -1,37 +1,38 @@ PORTNAME= magnum-plugins DISTVERSIONPREFIX= v DISTVERSION= 2020.06-1526 +PORTREVISION= 1 DISTVERSIONSUFFIX= -gffc92bcd CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org COMMENT= Plugins for the Magnum C++11/C++14 graphics engine WWW= https://magnum.graphics/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libassimp.so:multimedia/assimp \ libCorradeUtility.so:devel/corrade \ libfaad.so:audio/faad \ libfreetype.so:print/freetype2 \ libIL.so:graphics/devil \ libMagnum.so:graphics/magnum \ libpng.so:graphics/png USES= cmake compiler:c++14-lang gl jpeg openal xorg USE_GL= glesv2 USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= mosra GH_TUPLE= mosra:toolchains:fc22ff5:t/toolchains CMAKE_ARGS= -DLIB_SUFFIX:STRING="" CMAKE_ON= WITH_ASSIMPIMPORTER WITH_DDSIMPORTER WITH_DEVILIMAGEIMPORTER WITH_DRFLACAUDIOIMPORTER WITH_DRWAVAUDIOIMPORTER \ WITH_FAAD2AUDIOIMPORTER WITH_FREETYPEFONT WITH_JPEGIMPORTER WITH_JPEGIMAGECONVERTER WITH_MINIEXRIMAGECONVERTER \ WITH_PNGIMAGECONVERTER WITH_PNGIMPORTER WITH_OPENGEXIMPORTER WITH_STANFORDIMPORTER WITH_STBIMAGECONVERTER \ WITH_STBIMAGEIMPORTER WITH_STBTRUETYPEFONT WITH_STBVORBISAUDIOIMPORTER WITH_TINYGLTFIMPORTER .include diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile index 0f7cf8beb18b..d20a52d9868c 100644 --- a/graphics/qt5-3d/Makefile +++ b/graphics/qt5-3d/Makefile @@ -1,25 +1,25 @@ PORTNAME= 3d PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt3D module LIB_DEPENDS= libassimp.so:multimedia/assimp USES= compiler:c++11-lang perl5 pkgconfig qmake:norecursive qt-dist:5,3d USE_PERL5= extract USE_QT= concurrent core declarative gui network buildtools:build USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} OPTIONS_DEFINE_amd64= AVX OPTIONS_DEFINE_i386= AVX AVX_DESC= Build for Intel CPUs with AVX* support (Haswell+) AVX_EXTRA_PATCHES= ${FILESDIR}/extrapatch-src_core_configure.json QT_BINARIES= yes .include diff --git a/graphics/qt6-3d/Makefile b/graphics/qt6-3d/Makefile index e94c04ce9f98..5e20512521b5 100644 --- a/graphics/qt6-3d/Makefile +++ b/graphics/qt6-3d/Makefile @@ -1,27 +1,28 @@ PORTNAME= 3d DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= C++ and QML APIs for easy inclusion of 3D graphics BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers LIB_DEPENDS= libassimp.so:multimedia/assimp \ libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl python:build \ pkgconfig qt-dist:6 USE_GL= opengl USE_QT= base declarative shadertools USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include .if ${ARCH} == amd64 || ${ARCH} == i386 PLIST_SUB+= SIMD="" .else PLIST_SUB+= SIMD="@comment " .endif .include diff --git a/math/manifold/Makefile b/math/manifold/Makefile index f15d9c8f5851..06140f02e20b 100644 --- a/math/manifold/Makefile +++ b/math/manifold/Makefile @@ -1,47 +1,48 @@ PORTNAME= manifold DISTVERSIONPREFIX=v DISTVERSION= 3.0.1 +PORTREVISION= 1 CATEGORIES= math cad MAINTAINER= thierry@FreeBSD.org COMMENT= Geometry library for topological robustness WWW= https://github.com/elalish/manifold LICENSE= APACHE20 BUILD_DEPENDS= glm>0:math/glm \ googletest>0:devel/googletest LIB_DEPENDS= libtbb.so:devel/onetbb \ libClipper2.so:cad/Clipper2 \ libassimp.so:multimedia/assimp USES= cmake compiler:c++17-lang pathfix USE_GITHUB= yes GH_ACCOUNT= elalish CMAKE_ARGS= -DMANIFOLD_FLAGS="${CFLAGS}" \ -DMANIFOLD_PAR:STRING="NONE" CMAKE_ON= BUILD_SHARED_LIBS \ MANIFOLD_EXPORT \ MANIFOLD_TEST CMAKE_OFF= MANIFOLD_DOWNLOADS \ MANIFOLD_JSBIND \ MANIFOLD_CBIND \ MANIFOLD_PYBIND \ MANIFOLD_FUZZ \ TRACY_ENABLE USE_LDCONFIG= yes .include pre-configure: .if ${ARCH} == "i386" || ${ARCH} == "armv7" ${REINPLACE_CMD} -e 's|-Werror|-Wno-format|' ${WRKSRC}/CMakeLists.txt .endif do-test: (cd ${BUILD_WRKSRC}/test && ./manifold_test) .include diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile index 260ffc8d9202..ff9dd24fa7f8 100644 --- a/misc/dartsim/Makefile +++ b/misc/dartsim/Makefile @@ -1,76 +1,76 @@ PORTNAME= dartsim DISTVERSIONPREFIX= v DISTVERSION= 6.15.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org COMMENT= Dynamic Animation and Robotics Toolkit WWW= https://dartsim.github.io/ \ https://github.com/dartsim/dart LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= clang failure: https://bugs.llvm.org/show_bug.cgi?id=41757 BUILD_DEPENDS= pagmo2>0:science/pagmo2 \ pybind11>0:devel/pybind11 LIB_DEPENDS= libassimp.so:multimedia/assimp \ libBulletDynamics.so:devel/bullet \ libboost_system.so:devel/boost-libs \ libccd.so:math/libccd \ libconsole_bridge.so:devel/ros-console_bridge \ libfcl.so:math/fcl \ libflann_cpp.so:math/flann \ libfmt.so:devel/libfmt \ libipopt.so:math/ipopt \ liblz4.so:archivers/liblz4 \ liboctomap.so:math/octomap \ libode.so:devel/ode \ libosg.so:graphics/osg \ libnlopt.so:math/nlopt \ libpagmo.so:science/pagmo2 \ libtinyxml2.so:textproc/tinyxml2 \ liburdfdom_world.so:devel/ros-urdfdom TEST_DEPENDS= googletest>0:devel/googletest USES= cmake:testing compiler:c++17-lang eigen:3,build,run gl localbase:ldflags \ pkgconfig python xorg USE_GL= gl glu glut USE_XORG= xi xmu USE_CXXSTD= c++17 # missing in the project, it uses std::void_t (through pagmo2) which is a c++17 feature USE_LDCONFIG= yes USE_GITHUB= yes GH_PROJECT= dart CXXFLAGS+= -I${LOCALBASE}/include/coin # because of pagmo2 headers include CMAKE_ON= BUILD_SHARED_LIBS DART_USE_SYSTEM_GOOGLETEST # DART_VERBOSE CMAKE_OFF= BUILD_TESTING CMAKE_OFF+= DART_TREAT_WARNINGS_AS_ERRORS # workaround for https://github.com/dartsim/dart/issues/1799 CMAKE_ARGS= -DODE_DIR=${LOCALBASE} \ -DFREEBSD_PYTHON_VER=${PYTHON_VER} CMAKE_TESTING_TARGET= tests # only builds test DATADIR= share/dart DOCSDIR= ${PREFIX}/share/doc/dart BINARY_ALIAS= python3=${PYTHON_CMD} OPTIONS_DEFINE= DOCS PORTDOCS= * .include .if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=unused-but-set-variable .endif post-test: # run tests: 8 tests fail, see https://github.com/dartsim/dart/issues/1797#issuecomment-2191988407 @cd ${BUILD_WRKSRC} && \ ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile index cf245a3dca95..6c91224e00ea 100644 --- a/multimedia/assimp/Makefile +++ b/multimedia/assimp/Makefile @@ -1,28 +1,30 @@ PORTNAME= assimp DISTVERSIONPREFIX= v -DISTVERSION= 5.4.3 +DISTVERSION= 6.0.1 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org COMMENT= Library to import various 3D model formats in a uniform manner WWW= https://www.assimp.org \ https://github.com/assimp/assimp LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake:testing compiler:c++17-lang cpe localbase:ldflags pkgconfig # minizip is disabled for https://github.com/assimp/assimp/issues/4374 USE_GITHUB= yes USE_LDCONFIG= yes CMAKE_OFF= ASSIMP_BUILD_TESTS ASSIMP_BUILD_ZLIB BUILD_STATIC_LIBS CMAKE_ON= ASSIMP_BUILD_MINIZIP # workaround for https://github.com/assimp/assimp/issues/4374 CMAKE_TESTING_ON= ASSIMP_BUILD_TESTS CMAKE_TESTING_TARGET= ${ALL_TARGET} # hack to avoid target -post-test: # 1 test fails, see https://github.com/assimp/assimp/issues/4751 +post-test: @cd ${BUILD_WRKSRC} && \ ${BUILD_WRKSRC}/bin/unit +# tests as of 6.0.1: 591 tests from 117 test suites ran. (18189 ms total) + .include diff --git a/multimedia/assimp/distinfo b/multimedia/assimp/distinfo index bf09c25327dd..3620e3a65508 100644 --- a/multimedia/assimp/distinfo +++ b/multimedia/assimp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725080529 -SHA256 (assimp-assimp-v5.4.3_GH0.tar.gz) = 66dfbaee288f2bc43172440a55d0235dfc7bf885dda6435c038e8000e79582cb -SIZE (assimp-assimp-v5.4.3_GH0.tar.gz) = 53964510 +TIMESTAMP = 1748857404 +SHA256 (assimp-assimp-v6.0.1_GH0.tar.gz) = 0c6ec0e601cab4700019c1e60b5cd332cc6355e63e59c11344693623c08a7d38 +SIZE (assimp-assimp-v6.0.1_GH0.tar.gz) = 152221215 diff --git a/multimedia/assimp/files/patch-code_AssetLib_MDL_MDLFileData.h b/multimedia/assimp/files/patch-code_AssetLib_MDL_MDLFileData.h deleted file mode 100644 index bbd40c65b773..000000000000 --- a/multimedia/assimp/files/patch-code_AssetLib_MDL_MDLFileData.h +++ /dev/null @@ -1,13 +0,0 @@ -- https://github.com/assimp/assimp/issues/4640 - ---- code/AssetLib/MDL/MDLFileData.h.orig 2023-10-16 03:31:18 UTC -+++ code/AssetLib/MDL/MDLFileData.h -@@ -603,7 +603,7 @@ struct Vertex_MDL7 - union { - uint8_t norm162index; - float norm[3]; -- }; -+ } PACK_STRUCT; - } PACK_STRUCT; - - // ------------------------------------------------------------------------------------- diff --git a/multimedia/assimp/pkg-plist b/multimedia/assimp/pkg-plist index 8752d2f1254c..a2d7aed1d325 100644 --- a/multimedia/assimp/pkg-plist +++ b/multimedia/assimp/pkg-plist @@ -1,97 +1,97 @@ include/assimp/AssertHandler.h include/assimp/Base64.hpp include/assimp/BaseImporter.h include/assimp/Bitmap.h include/assimp/BlobIOSystem.h include/assimp/ByteSwapper.h include/assimp/ColladaMetaData.h include/assimp/Compiler/poppack1.h include/assimp/Compiler/pstdint.h include/assimp/Compiler/pushpack1.h include/assimp/CreateAnimMesh.h include/assimp/DefaultIOStream.h include/assimp/DefaultIOSystem.h include/assimp/DefaultLogger.hpp include/assimp/Exceptional.h include/assimp/Exporter.hpp include/assimp/GenericProperty.h include/assimp/GltfMaterial.h include/assimp/Hash.h include/assimp/IOStream.hpp include/assimp/IOStreamBuffer.h include/assimp/IOSystem.hpp include/assimp/Importer.hpp include/assimp/LineSplitter.h include/assimp/LogAux.h include/assimp/LogStream.hpp include/assimp/Logger.hpp include/assimp/MathFunctions.h include/assimp/MemoryIOWrapper.h include/assimp/NullLogger.hpp include/assimp/ObjMaterial.h include/assimp/ParsingUtils.h include/assimp/Profiler.h include/assimp/ProgressHandler.hpp include/assimp/RemoveComments.h include/assimp/SGSpatialSort.h include/assimp/SceneCombiner.h include/assimp/SkeletonMeshBuilder.h include/assimp/SmallVector.h include/assimp/SmoothingGroups.h include/assimp/SmoothingGroups.inl include/assimp/SpatialSort.h include/assimp/StandardShapes.h include/assimp/StreamReader.h include/assimp/StreamWriter.h include/assimp/StringComparison.h include/assimp/StringUtils.h include/assimp/Subdivision.h include/assimp/TinyFormatter.h include/assimp/Vertex.h include/assimp/XMLTools.h include/assimp/XmlParser.h include/assimp/ZipArchiveIOSystem.h include/assimp/aabb.h include/assimp/ai_assert.h include/assimp/anim.h include/assimp/camera.h include/assimp/cexport.h include/assimp/cfileio.h include/assimp/cimport.h include/assimp/color4.h include/assimp/color4.inl include/assimp/commonMetaData.h include/assimp/config.h include/assimp/defs.h include/assimp/fast_atof.h include/assimp/importerdesc.h include/assimp/light.h include/assimp/material.h include/assimp/material.inl include/assimp/matrix3x3.h include/assimp/matrix3x3.inl include/assimp/matrix4x4.h include/assimp/matrix4x4.inl include/assimp/mesh.h include/assimp/metadata.h include/assimp/pbrmaterial.h include/assimp/postprocess.h include/assimp/qnan.h include/assimp/quaternion.h include/assimp/quaternion.inl include/assimp/scene.h include/assimp/texture.h include/assimp/types.h include/assimp/vector2.h include/assimp/vector2.inl include/assimp/vector3.h include/assimp/vector3.inl include/assimp/version.h -lib/cmake/assimp-5.4/assimpConfig.cmake -lib/cmake/assimp-5.4/assimpConfigVersion.cmake -lib/cmake/assimp-5.4/assimpTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/assimp-5.4/assimpTargets.cmake +lib/cmake/assimp-6.0/assimpConfig.cmake +lib/cmake/assimp-6.0/assimpConfigVersion.cmake +lib/cmake/assimp-6.0/assimpTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/assimp-6.0/assimpTargets.cmake lib/libassimp.so lib/libassimp.so.5 -lib/libassimp.so.5.4.3 +lib/libassimp.so.6.0.1 libdata/pkgconfig/assimp.pc diff --git a/x11-toolkits/qt5-quick3d/Makefile b/x11-toolkits/qt5-quick3d/Makefile index e0d742349b52..92dc1b5b62b6 100644 --- a/x11-toolkits/qt5-quick3d/Makefile +++ b/x11-toolkits/qt5-quick3d/Makefile @@ -1,21 +1,21 @@ PORTNAME= quick3d PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Set of controls for building complete interfaces in Qt Quick3D WWW= https://qt-project.org LIB_DEPENDS= libassimp.so:multimedia/assimp USES= compiler:c++11-lang perl5 qmake qt-dist:5 USE_PERL5= build USE_QT= core declarative gui network opengl \ buildtools:build USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_BINARIES= yes .include diff --git a/x11-toolkits/qt6-quick3d/Makefile b/x11-toolkits/qt6-quick3d/Makefile index e5975b14e6b3..870ebc54f6a1 100644 --- a/x11-toolkits/qt6-quick3d/Makefile +++ b/x11-toolkits/qt6-quick3d/Makefile @@ -1,19 +1,20 @@ PORTNAME= quick3d DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Provides a high-level API for creating 3D content or UIs based on Qt Quick BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers LIB_DEPENDS= libassimp.so:multimedia/assimp \ libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl python:build \ qt-dist:6 USE_GL= opengl USE_QT= base declarative quicktimeline shadertools USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include