diff --git a/graphics/dust3d/Makefile b/graphics/dust3d/Makefile index 6c7f2706fe70..69ca8edf6b54 100644 --- a/graphics/dust3d/Makefile +++ b/graphics/dust3d/Makefile @@ -1,57 +1,36 @@ PORTNAME= dust3d -DISTVERSION= 1.0.0-rc.6 -PORTREVISION= 1 +PORTVERSION= 1.1.6 CATEGORIES= graphics -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ -PATCHFILES= f8339d25ddb79f893413.diff:-p1 821285de824baf01ae99.diff:-p1 - MAINTAINER= danfe@FreeBSD.org -COMMENT= Open-source 3D modeling software +COMMENT= Low polygon 3D modeling tool WWW= https://dust3d.org/ LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE - -BROKEN_aarch64= build fails: use of undeclared identifier '__TBB_machine_fetchadd4', see https://github.com/huxingyi/dust3d/issues/127 +LICENSE_FILE= ${WRKSRC}/../LICENSE -BUILD_DEPENDS= ${LOCALBASE}/include/boost/config.hpp:devel/boost-libs \ - ${LOCALBASE}/include/CGAL/Polygon_mesh_processing/corefinement.h:math/cgal \ - cmake:devel/cmake-core -LIB_DEPENDS= libgmp.so:math/gmp libmpfr.so:math/mpfr - -USES= compiler:c++14-lang gmake qt:5 +USES= compiler:c++17-lang gmake qmake qt:5 USE_GITHUB= yes GH_ACCOUNT= huxingyi -USE_QT= buildtools:build linguisttools:build qmake:build \ - core gui network opengl widgets -ALL_TARGET= all - -DESKTOP_ENTRIES="Dust3D" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" \ - "Application;" false +USE_QT= buildtools:build \ + core gui multimedia network opengl svg widgets +WRKSRC_SUBDIR= application -PLIST_FILES= bin/${PORTNAME} +PLIST_FILES= bin/${PORTNAME} share/applications/${PORTNAME}.desktop \ + share/pixmaps/${PORTNAME}.png PORTSCOUT= skipv:unstable -.include - -.if ${ARCH} == powerpc || ${ARCH} == riscv64 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-thirdparty_instant-meshes_instant-meshes-dust3d_ext_tbb_src_tbb_tools__api_ittnotify__config.h -.endif - post-patch: @${REINPLACE_CMD} -e '/PLATFORM =/s,Linux,${OPSYS},' \ - ${WRKSRC}/${PORTNAME}.pro -do-configure: - cd ${CONFIGURE_WRKSRC} && ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS} - -pre-build: - cd ${BUILD_WRKSRC}/thirdparty/instant-meshes && cmake -B build - ${MAKE_CMD} -C ${BUILD_WRKSRC}/thirdparty/instant-meshes/build + ${PATCH_WRKSRC}/application.pro do-install: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${INSTALL_WRKSRC}/../ci/appimage/${PORTNAME}.desktop \ + ${STAGEDIR}${DESKTOPDIR} + ${INSTALL_DATA} ${INSTALL_WRKSRC}/../ci/appimage/${PORTNAME}.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps .include diff --git a/graphics/dust3d/distinfo b/graphics/dust3d/distinfo index a86dfc179d2b..1ad1d431ce09 100644 --- a/graphics/dust3d/distinfo +++ b/graphics/dust3d/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1586688260 -SHA256 (huxingyi-dust3d-1.0.0-rc.6_GH0.tar.gz) = 171a12dad39ffd40551126e304a05f036958145fab2a45631929831e2c6bbee9 -SIZE (huxingyi-dust3d-1.0.0-rc.6_GH0.tar.gz) = 98477614 -SHA256 (f8339d25ddb79f893413.diff) = af493121277cb795720c063bf65abc6437657a368fb6338c385c5cbd5454b7e8 -SIZE (f8339d25ddb79f893413.diff) = 926 -SHA256 (821285de824baf01ae99.diff) = 3340ac2a9d9d9bacc8778e763797c421281baf608f5b17e6fbf39207b877b8ab -SIZE (821285de824baf01ae99.diff) = 7847 +TIMESTAMP = 1780956012 +SHA256 (huxingyi-dust3d-1.1.6_GH0.tar.gz) = 3262ab442f9080f2d61475cb265855f82b1b51d776f17f457b13f7bc47e22655 +SIZE (huxingyi-dust3d-1.1.6_GH0.tar.gz) = 1520496 diff --git a/graphics/dust3d/files/extra-patch-thirdparty_instant-meshes_instant-meshes-dust3d_ext_tbb_src_tbb_tools__api_ittnotify__config.h b/graphics/dust3d/files/extra-patch-thirdparty_instant-meshes_instant-meshes-dust3d_ext_tbb_src_tbb_tools__api_ittnotify__config.h deleted file mode 100644 index cb95787669b4..000000000000 --- a/graphics/dust3d/files/extra-patch-thirdparty_instant-meshes_instant-meshes-dust3d_ext_tbb_src_tbb_tools__api_ittnotify__config.h +++ /dev/null @@ -1,11 +0,0 @@ ---- thirdparty/instant-meshes/instant-meshes-dust3d/ext/tbb/src/tbb/tools_api/ittnotify_config.h.orig 2021-06-30 18:42:09 UTC -+++ thirdparty/instant-meshes/instant-meshes-dust3d/ext/tbb/src/tbb/tools_api/ittnotify_config.h -@@ -335,7 +335,7 @@ ITT_INLINE long - __itt_interlocked_increment(volatile long* ptr) ITT_INLINE_ATTRIBUTE; - ITT_INLINE long __itt_interlocked_increment(volatile long* ptr) - { -- return __TBB_machine_fetchadd4(ptr, 1) + 1L; -+ return __atomic_fetch_add(ptr, 1L, __ATOMIC_SEQ_CST) + 1L; - } - #endif /* ITT_SIMPLE_INIT */ - diff --git a/graphics/dust3d/files/patch-src_contourtopartconverter.cpp b/graphics/dust3d/files/patch-src_contourtopartconverter.cpp deleted file mode 100644 index d4da6c95ff50..000000000000 --- a/graphics/dust3d/files/patch-src_contourtopartconverter.cpp +++ /dev/null @@ -1,9 +0,0 @@ ---- src/contourtopartconverter.cpp.orig 2020-04-12 10:44:20 UTC -+++ src/contourtopartconverter.cpp -@@ -1,5 +1,6 @@ - #include - #include -+#include - #include - #include - #include diff --git a/graphics/dust3d/files/patch-thirdparty_quickjs_quickjs-2019-07-09-dust3d_quickjs.c b/graphics/dust3d/files/patch-thirdparty_quickjs_quickjs-2019-07-09-dust3d_quickjs.c deleted file mode 100644 index 1eab0e6455f1..000000000000 --- a/graphics/dust3d/files/patch-thirdparty_quickjs_quickjs-2019-07-09-dust3d_quickjs.c +++ /dev/null @@ -1,11 +0,0 @@ ---- thirdparty/quickjs/quickjs-2019-07-09-dust3d/quickjs.c.orig 2020-04-12 10:44:20 UTC -+++ thirdparty/quickjs/quickjs-2019-07-09-dust3d/quickjs.c -@@ -36,6 +36,8 @@ - #include - #elif defined(__linux__) - #include -+#elif defined(__FreeBSD__) -+#include - #endif - - #include "cutils.h"