diff --git a/benchmarks/vkmark/Makefile b/benchmarks/vkmark/Makefile index ae04059e4a97..869865bde059 100644 --- a/benchmarks/vkmark/Makefile +++ b/benchmarks/vkmark/Makefile @@ -1,51 +1,52 @@ PORTNAME= vkmark DISTVERSION= 2017.08-29 +PORTREVISION= 1 DISTVERSIONSUFFIX= -gd872846 CATEGORIES= benchmarks wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 27fa846e34ed.patch:-p1 # https://github.com/vkmark/vkmark/pull/29 MAINTAINER= jbeich@FreeBSD.org COMMENT= Vulkan benchmark 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= compiler:c++14-lang localbase meson pkgconfig USE_GITHUB= yes OPTIONS_DEFINE= DRM WAYLAND X11 OPTIONS_DEFAULT=DRM WAYLAND X11 OPTIONS_EXCLUDE=DRM # https://github.com/vkmark/vkmark/issues/33 OPTIONS_SUB= yes DRM_DESC= KMS console support DRM_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan_intel.h:graphics/mesa-dri DRM_LIB_DEPENDS= libdrm.so:graphics/libdrm DRM_USES= gl DRM_USE= GL=gbm DRM_MESON_TRUE= kms 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 394f555882db..a2231ec9957a 100644 --- a/games/doomsday/Makefile +++ b/games/doomsday/Makefile @@ -1,41 +1,41 @@ PORTNAME= doomsday PORTVERSION= 2.3.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= SF/deng/Doomsday%20Engine/${PORTVERSION} MAINTAINER= danilo@FreeBSD.org COMMENT= Enhanced Doom, Heretic, and Hexen source port 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:3.5+,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/pioneer/Makefile b/games/pioneer/Makefile index 630f567296cb..b1853b03c60c 100644 --- a/games/pioneer/Makefile +++ b/games/pioneer/Makefile @@ -1,71 +1,72 @@ PORTNAME= pioneer DISTVERSION= 20220203 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Space adventure game set in the Milky Way galaxy 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= data PORTDOCS= AUTHORS.txt Changelog.txt Modelviewer.txt Quickstart.txt \ README.md 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 post-patch: @${REINPLACE_CMD} -e '/^include(FindGit/d ; \ /TIMESTAMP PROJECT_VERSION/s|.*|set(PROJECT_VERSION "${GH_TAGNAME}")|' \ ${WRKSRC}/CMakeLists.txt post-install: .for f in modelcompiler savegamedump ${MV} ${STAGEDIR}${PREFIX}/bin/${f} \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-${f} .endfor post-install-DOCS-on: @(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile index 84dcf5ff7e6f..0a09c659616b 100644 --- a/graphics/qt5-3d/Makefile +++ b/graphics/qt5-3d/Makefile @@ -1,23 +1,24 @@ PORTNAME= 3d PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} +PORTREVISION= 1 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 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/misc/dartsim/Makefile b/misc/dartsim/Makefile index 4faed0ed1146..6f43ce237833 100644 --- a/misc/dartsim/Makefile +++ b/misc/dartsim/Makefile @@ -1,56 +1,56 @@ PORTNAME= dartsim DISTVERSIONPREFIX= v DISTVERSION= 6.12.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org COMMENT= Dynamic Animation and Robotics Toolkit 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 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 \ libipopt.so:math/ipopt \ liblz4.so:archivers/liblz4 \ liboctomap.so:math/octomap \ libode.so:devel/ode \ libosg.so:graphics/osg34 \ libnlopt.so:math/nlopt \ libpagmo.so:science/pagmo2 \ libtbb.so:devel/tbb \ libtinyxml2.so:textproc/tinyxml2 \ liburdfdom_world.so:devel/ros-urdfdom USES= cmake compiler:c++17-lang eigen:3,build,run gl localbase:ldflags \ pkgconfig 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_VERBOSE CMAKE_ARGS= -DODE_DIR=${LOCALBASE} DATADIR= share/dart DOCSDIR= ${PREFIX}/share/doc/dart OPTIONS_DEFINE= DOCS PORTDOCS= * .include diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile index 05cdcef34719..1c3007e0f2a9 100644 --- a/multimedia/assimp/Makefile +++ b/multimedia/assimp/Makefile @@ -1,28 +1,28 @@ PORTNAME= assimp DISTVERSIONPREFIX= v -DISTVERSION= 5.1.5 +DISTVERSION= 5.2.4 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org COMMENT= Library to import various 3D model formats in a uniform manner LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_armv6= field within 'Assimp::MDL::Vertex_MDL7' is less aligned than 'Assimp::MDL::Vertex_MDL7::..., see https://github.com/assimp/assimp/issues/4640 -USES= cmake:testing compiler:c++11-lib cpe localbase:ldflags minizip pkgconfig +USES= cmake:testing compiler:c++11-lib 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 +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 -do-test: +post-test: @cd ${BUILD_WRKSRC} && \ - ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -D${CMAKE_TESTING_ON}=ON ${CMAKE_SOURCE_PATH} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} ${CMAKE_TESTING_TARGET} && \ ${BUILD_WRKSRC}/bin/unit .include diff --git a/multimedia/assimp/distinfo b/multimedia/assimp/distinfo index 35891dad0fcd..6c7fdb6254e9 100644 --- a/multimedia/assimp/distinfo +++ b/multimedia/assimp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1641403619 -SHA256 (assimp-assimp-v5.1.5_GH0.tar.gz) = d62b58ed3b35c20f89570863a5415df97cb1b301b444d39687140fc883717ced -SIZE (assimp-assimp-v5.1.5_GH0.tar.gz) = 48972912 +TIMESTAMP = 1658288612 +SHA256 (assimp-assimp-v5.2.4_GH0.tar.gz) = 6a4ff75dc727821f75ef529cea1c4fc0a7b5fc2e0a0b2ff2f6b7993fe6cb54ba +SIZE (assimp-assimp-v5.2.4_GH0.tar.gz) = 49613683 diff --git a/multimedia/assimp/pkg-plist b/multimedia/assimp/pkg-plist index 5b8b43774fcb..394aba6d8ab7 100644 --- a/multimedia/assimp/pkg-plist +++ b/multimedia/assimp/pkg-plist @@ -1,95 +1,97 @@ bin/assimp +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.1/assimpConfig.cmake -lib/cmake/assimp-5.1/assimpConfigVersion.cmake -lib/cmake/assimp-5.1/assimpTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/assimp-5.1/assimpTargets.cmake +lib/cmake/assimp-5.2/assimpConfig.cmake +lib/cmake/assimp-5.2/assimpConfigVersion.cmake +lib/cmake/assimp-5.2/assimpTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/assimp-5.2/assimpTargets.cmake lib/libassimp.so lib/libassimp.so.5 -lib/libassimp.so.5.1.4 +lib/libassimp.so.5.2.0 libdata/pkgconfig/assimp.pc diff --git a/x11-toolkits/qt5-quick3d/Makefile b/x11-toolkits/qt5-quick3d/Makefile index 8cde6a481c6b..4d7d9cc85c7a 100644 --- a/x11-toolkits/qt5-quick3d/Makefile +++ b/x11-toolkits/qt5-quick3d/Makefile @@ -1,17 +1,18 @@ PORTNAME= quick3d PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Set of controls for building complete interfaces in Qt Quick3D LIB_DEPENDS= libassimp.so:multimedia/assimp USES= compiler:c++11-lang qmake qt-dist:5 USE_QT= core declarative gui network opengl \ buildtools_build QT_BINARIES= yes .include