diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile index bf5476cd03ff..b3ed4fe0af64 100644 --- a/cad/openscad/Makefile +++ b/cad/openscad/Makefile @@ -1,48 +1,59 @@ PORTNAME= openscad -DISTVERSION= 2021.01.01-20221206 -PORTREVISION= 5 +PORTVERSION= 2024.10.11 +#PORTREVISION= 1 CATEGORIES= cad +#PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +#PATCHFILES+= cc49ad8dac24.patch:-p1 + MAINTAINER= mr@FreeBSD.org COMMENT= Programmer's solid 3D CAD modeller #' -WWW= https://openscad.org/ +WWW= https://www.openscad.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to build with boost-1.85+ - BUILD_DEPENDS= cgal>0:math/cgal \ - ${LOCALBASE}/include/linux/input.h:devel/evdev-proto + evdev-proto>0:devel/evdev-proto \ + ${LOCALBASE}/include/glm/glm.hpp:math/glm \ + ${LOCALBASE}/include/clipper2/clipper.h:cad/Clipper2 \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libzip.so:archivers/libzip \ libhidapi.so:comms/hidapi \ libboost_regex.so:devel/boost-libs \ libqscintilla2_qt5.so:devel/qscintilla2-qt5 \ libopencsg.so:graphics/opencsg \ libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libfontconfig.so:x11-fonts/fontconfig \ - libdouble-conversion.so:devel/double-conversion + libdouble-conversion.so:devel/double-conversion \ + libasound_module_pcm_oss.so:audio/alsa-plugins \ + libtbb.so:devel/onetbb + +CONFLICTS= openscad-devel USES= bison cmake compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \ - gl gnome localbase:ldflags pkgconfig qt:5 shared-mime-info xorg + gl gnome pkgconfig python qt:5 shared-mime-info xorg +USE_GITHUB= yes USE_GL= gl glu glew USE_GNOME= cairo glib20 libxml2 -USE_QT= buildtools:build core concurrent:build dbus gui multimedia network svg widgets qmake:build +USE_QT= buildtools:build core concurrent:build dbus gui multimedia qmake svg widgets USE_XORG= x11 -QMAKE_ARGS= CONFIG+="experimental" VERSION=${PORTVERSION} +GH_ACCOUNT= microsoft:mimalloc elalish:manifold arsenm:sanitizerscmake openscad:opencsg +GH_PROJECT= MCAD:mcad mimalloc:mimalloc manifold:manifold sanitizers-cmake:sanitizerscmake OpenCSG:opencsg +GH_TAGNAME= 19a4d67 bd0a7ba3f042bfbced5ca1894b236cea08904e26:mcad \ + fe61be8:mimalloc 22c6605:manifold c3dc841:sanitizerscmake 059a173:opencsg +GH_SUBDIR= libraries/MCAD:mcad submodules/mimalloc:mimalloc submodules/manifold:manifold \ + submodules/sanitizers-cmake:sanitizerscmake submodules/OpenCSG:opencsg # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport) -LDFLAGS+= -Wl,--as-needed - -USE_GITHUB= yes -GH_TAGNAME= 972d184 -GH_TUPLE= openscad:MCAD:1ea4022:MCAD/libraries/MCAD \ - microsoft:mimalloc:fe61be8:mimalloc/submodules/mimalloc +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -Wl,--as-needed -L${LOCALBASE}/lib -CMAKE_ARGS= -DQT5QSCINTILLA_LIBRARY=/usr/local/lib/qt5/libqscintilla2_qt5.so +.include -CONFLICTS_INSTALL= openscad-devel # bin/openscad +do-install: + ${CMAKE_BIN} --install ${BUILD_WRKSRC} --prefix ${STAGEDIR}${PREFIX} -.include +.include diff --git a/cad/openscad/distinfo b/cad/openscad/distinfo index ba528d6c84ba..39bc26ab97c4 100644 --- a/cad/openscad/distinfo +++ b/cad/openscad/distinfo @@ -1,7 +1,13 @@ -TIMESTAMP = 1671494678 -SHA256 (openscad-openscad-2021.01.01-20221206-972d184_GH0.tar.gz) = fc6a33395cdebbe457489d0593548c19abfc53ad15aef771c31e3f84f1615b35 -SIZE (openscad-openscad-2021.01.01-20221206-972d184_GH0.tar.gz) = 23120895 -SHA256 (openscad-MCAD-1ea4022_GH0.tar.gz) = c32e9ebb29b7fff12de408d76258f109b37001740a6f76a2f65b0792e32890d1 -SIZE (openscad-MCAD-1ea4022_GH0.tar.gz) = 56897 +TIMESTAMP = 1728663723 +SHA256 (openscad-openscad-2024.10.11-19a4d67_GH0.tar.gz) = ad9389d3657c9283ef27d03bea25b324bde2b3c87686a65939a6876b39ce58b6 +SIZE (openscad-openscad-2024.10.11-19a4d67_GH0.tar.gz) = 25286240 SHA256 (microsoft-mimalloc-fe61be8_GH0.tar.gz) = 3669f0f83e3d904cbef5625be2105cb8438428de2e152740220a7acead1b8800 SIZE (microsoft-mimalloc-fe61be8_GH0.tar.gz) = 1127821 +SHA256 (elalish-manifold-22c6605_GH0.tar.gz) = 896655257392ba1e4976e5e5aca5b75f5755b2822ce636a454b11ef04c358b8a +SIZE (elalish-manifold-22c6605_GH0.tar.gz) = 28752916 +SHA256 (arsenm-sanitizers-cmake-c3dc841_GH0.tar.gz) = bc5cddf6451c3edecc75bf605e7976cb47208d31021db6f5bf99c579efc01f5a +SIZE (arsenm-sanitizers-cmake-c3dc841_GH0.tar.gz) = 7436 +SHA256 (openscad-OpenCSG-059a173_GH0.tar.gz) = d84ec6f6b4857a5563701018673378d630b95702f2706b2a5eb2ab0c64e32da5 +SIZE (openscad-OpenCSG-059a173_GH0.tar.gz) = 299886 +SHA256 (openscad-MCAD-bd0a7ba3f042bfbced5ca1894b236cea08904e26_GH0.tar.gz) = 1f7003bf1bdfe9c7e5898eb5e82c54834b156569e79da97d906f3bbcf7c5549c +SIZE (openscad-MCAD-bd0a7ba3f042bfbced5ca1894b236cea08904e26_GH0.tar.gz) = 58895 diff --git a/cad/openscad/files/patch-cmake_Modules_FindQt5QScintilla.cmake b/cad/openscad/files/patch-cmake_Modules_FindQt5QScintilla.cmake new file mode 100644 index 000000000000..e9b1a9fac601 --- /dev/null +++ b/cad/openscad/files/patch-cmake_Modules_FindQt5QScintilla.cmake @@ -0,0 +1,10 @@ +--- cmake/Modules/FindQt5QScintilla.cmake.orig 2021-10-23 02:33:13 UTC ++++ cmake/Modules/FindQt5QScintilla.cmake +@@ -50,6 +50,7 @@ find_path ( QT5QSCINTILLA_INCLUDE_DIR + ) + + set ( QT5QSCINTILLA_INCLUDE_DIRS ${QT5QSCINTILLA_INCLUDE_DIR} ) ++set (Qt5Widgets_LIBRARIES /usr/local/lib/qt5 /usr/local/lib /usr/lib ) + + # version + set ( _VERSION_FILE ${QT5QSCINTILLA_INCLUDE_DIR}/qsciglobal.h ) diff --git a/cad/openscad/files/patch-src_handle__dep.cc b/cad/openscad/files/patch-src_handle__dep.cc deleted file mode 100644 index 8fabaa4e3524..000000000000 --- a/cad/openscad/files/patch-src_handle__dep.cc +++ /dev/null @@ -1,13 +0,0 @@ -- https://github.com/openscad/openscad/issues/4453 - ---- src/handle_dep.cc.orig 2022-12-20 00:11:57 UTC -+++ src/handle_dep.cc -@@ -9,6 +9,8 @@ - #include - namespace fs = boost::filesystem; - -+#include -+ - std::unordered_set dependencies; - const char *make_command = nullptr; - diff --git a/cad/openscad/pkg-plist b/cad/openscad/pkg-plist index 288770b9a318..ffee6166f86d 100644 --- a/cad/openscad/pkg-plist +++ b/cad/openscad/pkg-plist @@ -1,189 +1,191 @@ bin/openscad share/applications/openscad.desktop share/icons/hicolor/128x128/apps/openscad.png share/icons/hicolor/256x256/apps/openscad.png share/icons/hicolor/48x48/apps/openscad.png share/icons/hicolor/512x512/apps/openscad.png share/icons/hicolor/64x64/apps/openscad.png share/man/man1/openscad.1.gz share/metainfo/org.openscad.OpenSCAD.appdata.xml share/mime/packages/openscad.xml %%DATADIR%%/color-schemes/editor/dark-background.json %%DATADIR%%/color-schemes/editor/high-contrast-dark.json %%DATADIR%%/color-schemes/editor/high-contrast-light.json %%DATADIR%%/color-schemes/editor/light-background.json %%DATADIR%%/color-schemes/editor/monokai.json %%DATADIR%%/color-schemes/editor/solarized-dark.json %%DATADIR%%/color-schemes/editor/solarized-light.json %%DATADIR%%/color-schemes/editor/tomorrow-night.json %%DATADIR%%/color-schemes/editor/tomorrow.json %%DATADIR%%/color-schemes/editor/visualstudio.json %%DATADIR%%/color-schemes/editor/xcode.json %%DATADIR%%/color-schemes/readme.txt %%DATADIR%%/color-schemes/render/beforedawn.json %%DATADIR%%/color-schemes/render/clearsky.json +%%DATADIR%%/color-schemes/render/daylight-gem.json %%DATADIR%%/color-schemes/render/deepocean.json %%DATADIR%%/color-schemes/render/metallic.json %%DATADIR%%/color-schemes/render/monotone.json %%DATADIR%%/color-schemes/render/nature.json +%%DATADIR%%/color-schemes/render/nocturnal-gem.json %%DATADIR%%/color-schemes/render/solarized.json %%DATADIR%%/color-schemes/render/starnight.json %%DATADIR%%/color-schemes/render/sunset.json %%DATADIR%%/color-schemes/render/tomorrow-night.json %%DATADIR%%/color-schemes/render/tomorrow.json %%DATADIR%%/examples/Advanced/GEB.scad %%DATADIR%%/examples/Advanced/animation.scad %%DATADIR%%/examples/Advanced/assert.scad %%DATADIR%%/examples/Advanced/children.scad %%DATADIR%%/examples/Advanced/children_indexed.scad %%DATADIR%%/examples/Advanced/module_recursion.scad %%DATADIR%%/examples/Advanced/offset.scad %%DATADIR%%/examples/Advanced/surface_image.png %%DATADIR%%/examples/Advanced/surface_image.scad %%DATADIR%%/examples/Basics/CSG-modules.scad %%DATADIR%%/examples/Basics/CSG.scad %%DATADIR%%/examples/Basics/LetterBlock.scad %%DATADIR%%/examples/Basics/hull.scad %%DATADIR%%/examples/Basics/linear_extrude.scad %%DATADIR%%/examples/Basics/logo.scad %%DATADIR%%/examples/Basics/logo_and_text.scad %%DATADIR%%/examples/Basics/projection.scad %%DATADIR%%/examples/Basics/projection.stl %%DATADIR%%/examples/Basics/roof.scad %%DATADIR%%/examples/Basics/rotate_extrude.scad %%DATADIR%%/examples/Basics/text_on_cube.scad %%DATADIR%%/examples/COPYING-CC0.txt %%DATADIR%%/examples/Functions/echo.scad %%DATADIR%%/examples/Functions/functions.scad %%DATADIR%%/examples/Functions/list_comprehensions.scad %%DATADIR%%/examples/Functions/polygon_areas.scad %%DATADIR%%/examples/Functions/recursion.scad %%DATADIR%%/examples/Old/example001.scad %%DATADIR%%/examples/Old/example002.scad %%DATADIR%%/examples/Old/example003.scad %%DATADIR%%/examples/Old/example004.scad %%DATADIR%%/examples/Old/example005.scad %%DATADIR%%/examples/Old/example006.scad %%DATADIR%%/examples/Old/example007.dxf %%DATADIR%%/examples/Old/example007.scad %%DATADIR%%/examples/Old/example008.dxf %%DATADIR%%/examples/Old/example008.scad %%DATADIR%%/examples/Old/example009.dxf %%DATADIR%%/examples/Old/example009.scad %%DATADIR%%/examples/Old/example010.dat %%DATADIR%%/examples/Old/example010.scad %%DATADIR%%/examples/Old/example011.scad %%DATADIR%%/examples/Old/example012.scad %%DATADIR%%/examples/Old/example012.stl %%DATADIR%%/examples/Old/example013.dxf %%DATADIR%%/examples/Old/example013.scad %%DATADIR%%/examples/Old/example014.scad %%DATADIR%%/examples/Old/example015.scad %%DATADIR%%/examples/Old/example016.scad %%DATADIR%%/examples/Old/example016.stl %%DATADIR%%/examples/Old/example017.scad %%DATADIR%%/examples/Old/example018.scad %%DATADIR%%/examples/Old/example019.scad %%DATADIR%%/examples/Old/example020.scad %%DATADIR%%/examples/Old/example021.scad %%DATADIR%%/examples/Old/example022.scad %%DATADIR%%/examples/Old/example023.scad %%DATADIR%%/examples/Old/example024.scad %%DATADIR%%/examples/Parametric/candleStand.json %%DATADIR%%/examples/Parametric/candleStand.scad %%DATADIR%%/examples/Parametric/sign.json %%DATADIR%%/examples/Parametric/sign.scad %%DATADIR%%/examples/examples.json %%DATADIR%%/fonts/05-osx-fonts.conf %%DATADIR%%/fonts/10-liberation.conf %%DATADIR%%/fonts/Liberation-2.00.1/AUTHORS %%DATADIR%%/fonts/Liberation-2.00.1/ChangeLog %%DATADIR%%/fonts/Liberation-2.00.1/LICENSE %%DATADIR%%/fonts/Liberation-2.00.1/README %%DATADIR%%/fonts/Liberation-2.00.1/TODO %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-Bold.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-BoldItalic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-Italic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-Regular.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-Bold.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-BoldItalic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-Italic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-Regular.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Bold.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-BoldItalic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Italic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Regular.ttf %%DATADIR%%/libraries/MCAD/2Dshapes.scad %%DATADIR%%/libraries/MCAD/3d_triangle.scad %%DATADIR%%/libraries/MCAD/README.markdown %%DATADIR%%/libraries/MCAD/TODO %%DATADIR%%/libraries/MCAD/__init__.py %%DATADIR%%/libraries/MCAD/array.scad %%DATADIR%%/libraries/MCAD/bearing.scad %%DATADIR%%/libraries/MCAD/bitmap/README %%DATADIR%%/libraries/MCAD/bitmap/alphabet_block.scad %%DATADIR%%/libraries/MCAD/bitmap/bitmap.scad %%DATADIR%%/libraries/MCAD/bitmap/height_map.scad %%DATADIR%%/libraries/MCAD/bitmap/letter_necklace.scad %%DATADIR%%/libraries/MCAD/bitmap/name_tag.scad %%DATADIR%%/libraries/MCAD/bitmap/test_name_tag.scad %%DATADIR%%/libraries/MCAD/boxes.scad %%DATADIR%%/libraries/MCAD/constants.scad %%DATADIR%%/libraries/MCAD/curves.scad %%DATADIR%%/libraries/MCAD/fonts.scad %%DATADIR%%/libraries/MCAD/gears.scad %%DATADIR%%/libraries/MCAD/gridbeam.scad %%DATADIR%%/libraries/MCAD/hardware.scad %%DATADIR%%/libraries/MCAD/involute_gears.scad %%DATADIR%%/libraries/MCAD/layouts.scad %%DATADIR%%/libraries/MCAD/lego_compatibility.scad %%DATADIR%%/libraries/MCAD/lgpl-2.1.txt %%DATADIR%%/libraries/MCAD/libtriangles.scad %%DATADIR%%/libraries/MCAD/linear_bearing.scad %%DATADIR%%/libraries/MCAD/materials.scad %%DATADIR%%/libraries/MCAD/math.scad %%DATADIR%%/libraries/MCAD/metric_fastners.scad %%DATADIR%%/libraries/MCAD/motors.scad %%DATADIR%%/libraries/MCAD/multiply.scad %%DATADIR%%/libraries/MCAD/nuts_and_bolts.scad %%DATADIR%%/libraries/MCAD/openscad_testing.py %%DATADIR%%/libraries/MCAD/openscad_utils.py %%DATADIR%%/libraries/MCAD/polyholes.scad %%DATADIR%%/libraries/MCAD/profiles.scad %%DATADIR%%/libraries/MCAD/regular_shapes.scad %%DATADIR%%/libraries/MCAD/screw.scad %%DATADIR%%/libraries/MCAD/servos.scad %%DATADIR%%/libraries/MCAD/shapes.scad %%DATADIR%%/libraries/MCAD/stepper.scad %%DATADIR%%/libraries/MCAD/teardrop.scad %%DATADIR%%/libraries/MCAD/test_docs.py %%DATADIR%%/libraries/MCAD/test_mcad.py %%DATADIR%%/libraries/MCAD/transformations.scad %%DATADIR%%/libraries/MCAD/triangles.scad %%DATADIR%%/libraries/MCAD/trochoids.scad %%DATADIR%%/libraries/MCAD/units.scad %%DATADIR%%/libraries/MCAD/unregular_shapes.scad %%DATADIR%%/libraries/MCAD/utilities.scad %%DATADIR%%/locale/cs/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/de/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/es/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/fr/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/hy/LC_MESSAGES/openscad.mo +%%DATADIR%%/locale/ka/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/pl/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/ru/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/tr/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/uk/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/zh_CN/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/zh_TW/LC_MESSAGES/openscad.mo %%DATADIR%%/shaders/MouseSelector.frag %%DATADIR%%/shaders/MouseSelector.vert %%DATADIR%%/shaders/Preview.frag %%DATADIR%%/shaders/Preview.vert %%DATADIR%%/templates/CC0.json %%DATADIR%%/templates/difference.json %%DATADIR%%/templates/for.json %%DATADIR%%/templates/function.json %%DATADIR%%/templates/module.json %%DATADIR%%/templates/rotate.json %%DATADIR%%/templates/translate.json -@dir %%DATADIR%%/libraries/MCAD