diff options
| -rw-r--r-- | cad/solvespace/Makefile | 30 | ||||
| -rw-r--r-- | cad/solvespace/PLIST | 91 | ||||
| -rw-r--r-- | cad/solvespace/distinfo | 16 | ||||
| -rw-r--r-- | cad/solvespace/patches/patch-CMakeLists.txt | 31 |
4 files changed, 140 insertions, 28 deletions
diff --git a/cad/solvespace/Makefile b/cad/solvespace/Makefile index cc2a58bc643..fa6c5efe683 100644 --- a/cad/solvespace/Makefile +++ b/cad/solvespace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2021/12/08 16:03:25 adam Exp $ +# $NetBSD: Makefile,v 1.16 2022/05/23 19:02:59 plunky Exp $ # # # Both of these hashes need to be updated when the solvespace version @@ -9,21 +9,20 @@ # Solvespace has a private fork of libdxfrw which is stored in github # as a submodule, which is not included in the v2.3 archive. # -LIBDXF_HASH= 8f958955f54668c142ded760dc951ffd16d9c71b -SOLVESPACE_HASH= 7c1ca460769fc8cbef26d296338d4bbc6f2ef6d0 +LIBDXF_HASH= 0b7b7b709d9299565db603f878214656ef5e9ddf +SOLVESPACE_HASH= 0e0b0252e23dd5bd4ae82ababcc54c44aee036d6 -DISTNAME= solvespace-2.3 -PKGREVISION= 12 +DISTNAME= solvespace-3.0 CATEGORIES= cad -MASTER_SITES= http://github.com/solvespace/solvespace/archive/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=solvespace/solvespace/archive/} DIST_SUBDIR= ${PKGNAME_NOREV} DISTFILES= v${PKGVERSION_NOREV}.tar.gz DISTFILES+= ${LIBDXF_HASH}.tar.gz SITES.${LIBDXF_HASH}.tar.gz= \ - http://github.com/solvespace/libdxfrw/archive/ + ${MASTER_SITE_GITHUB:=solvespace/libdxfrw/archive/} MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.solvespace.com/ +HOMEPAGE= https://www.solvespace.com/ COMMENT= Parametric 2D/3D CAD LICENSE= gnu-gpl-v3 @@ -37,18 +36,19 @@ USE_CMAKE= yes CMAKE_ARGS+= -DGIT_COMMIT_HASH=${SOLVESPACE_HASH} -SUBST_CLASSES+= desktop -SUBST_STAGE.desktop= pre-configure -SUBST_MESSAGE.desktop= Fixing absolute path in desktop file -SUBST_FILES.desktop= src/unix/solvespace.desktop -SUBST_SED.desktop= -e "s,/usr/bin,${PREFIX}/bin," - SUBST_CLASSES+= libdxfrw SUBST_STAGE.libdxfrw= pre-configure SUBST_MESSAGE.libdxfrw= Set libdxfrw directory SUBST_FILES.libdxfrw= CMakeLists.txt SUBST_SED.libdxfrw= -e "s,extlib/libdxfrw,extlib/libdxfrw-${LIBDXF_HASH}," +CONFIGURE_DIRS= build +CMAKE_ARG_PATH= .. + +pre-configure: + cd ${WRKSRC} && ${MKDIR} ${CONFIGURE_DIRS} + +.include "../../devel/mimalloc/buildlink3.mk" .include "../../devel/pangomm/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" @@ -60,5 +60,5 @@ SUBST_SED.libdxfrw= -e "s,extlib/libdxfrw,extlib/libdxfrw-${LIBDXF_HASH}," .include "../../graphics/png/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../textproc/json-c/buildlink3.mk" -.include "../../x11/gtkmm/buildlink3.mk" +.include "../../x11/gtkmm3/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/solvespace/PLIST b/cad/solvespace/PLIST index 03f3fc4aeae..ebae9b6fcf5 100644 --- a/cad/solvespace/PLIST +++ b/cad/solvespace/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1 2017/02/21 20:36:39 plunky Exp $ +@comment $NetBSD: PLIST,v 1.2 2022/05/23 19:02:59 plunky Exp $ bin/solvespace +bin/solvespace-cli include/slvs.h lib/libslvs.so lib/libslvs.so.1 @@ -13,7 +14,95 @@ share/icons/hicolor/32x32/apps/solvespace.png share/icons/hicolor/32x32/mimetypes/application.x-solvespace.png share/icons/hicolor/48x48/apps/solvespace.png share/icons/hicolor/48x48/mimetypes/application.x-solvespace.png +share/icons/hicolor/scalable/apps/solvespace.svg +share/icons/hicolor/scalable/mimetypes/application.x-solvespace.svg +share/mime/packages/solvespace-slvs.xml share/pixmaps/solvespace-16x16.xpm share/pixmaps/solvespace-24x24.xpm share/pixmaps/solvespace-32x32.xpm share/pixmaps/solvespace-48x48.xpm +share/solvespace/banner.txt +share/solvespace/fonts/BitstreamVeraSans-Roman-builtin.ttf +share/solvespace/fonts/private/0-check-false.png +share/solvespace/fonts/private/1-check-true.png +share/solvespace/fonts/private/2-radio-false.png +share/solvespace/fonts/private/3-radio-true.png +share/solvespace/fonts/private/4-stipple-dot.png +share/solvespace/fonts/private/5-stipple-dash-long.png +share/solvespace/fonts/private/6-stipple-dash.png +share/solvespace/fonts/private/7-stipple-zigzag.png +share/solvespace/fonts/unicode.lff.gz +share/solvespace/fonts/unifont.hex.gz +share/solvespace/freedesktop/solvespace-48x48.png +share/solvespace/icons/graphics-window/angle.png +share/solvespace/icons/graphics-window/arc.png +share/solvespace/icons/graphics-window/assemble.png +share/solvespace/icons/graphics-window/bezier.png +share/solvespace/icons/graphics-window/circle.png +share/solvespace/icons/graphics-window/construction.png +share/solvespace/icons/graphics-window/equal.png +share/solvespace/icons/graphics-window/extrude.png +share/solvespace/icons/graphics-window/helix.png +share/solvespace/icons/graphics-window/horiz.png +share/solvespace/icons/graphics-window/image.png +share/solvespace/icons/graphics-window/in3d.png +share/solvespace/icons/graphics-window/lathe.png +share/solvespace/icons/graphics-window/length.png +share/solvespace/icons/graphics-window/line.png +share/solvespace/icons/graphics-window/ontoworkplane.png +share/solvespace/icons/graphics-window/other-supp.png +share/solvespace/icons/graphics-window/parallel.png +share/solvespace/icons/graphics-window/perpendicular.png +share/solvespace/icons/graphics-window/point.png +share/solvespace/icons/graphics-window/pointonx.png +share/solvespace/icons/graphics-window/rectangle.png +share/solvespace/icons/graphics-window/ref.png +share/solvespace/icons/graphics-window/revolve.png +share/solvespace/icons/graphics-window/same-orientation.png +share/solvespace/icons/graphics-window/sketch-in-3d.png +share/solvespace/icons/graphics-window/sketch-in-plane.png +share/solvespace/icons/graphics-window/step-rotate.png +share/solvespace/icons/graphics-window/step-translate.png +share/solvespace/icons/graphics-window/symmetric.png +share/solvespace/icons/graphics-window/tangent-arc.png +share/solvespace/icons/graphics-window/text.png +share/solvespace/icons/graphics-window/trim.png +share/solvespace/icons/graphics-window/vert.png +share/solvespace/icons/text-window/constraint.png +share/solvespace/icons/text-window/construction.png +share/solvespace/icons/text-window/edges.png +share/solvespace/icons/text-window/faces.png +share/solvespace/icons/text-window/mesh.png +share/solvespace/icons/text-window/normal.png +share/solvespace/icons/text-window/occluded-invisible.png +share/solvespace/icons/text-window/occluded-stippled.png +share/solvespace/icons/text-window/occluded-visible.png +share/solvespace/icons/text-window/outlines.png +share/solvespace/icons/text-window/point.png +share/solvespace/icons/text-window/shaded.png +share/solvespace/icons/text-window/workplane.png +share/solvespace/locales.txt +share/solvespace/locales/de_DE.po +share/solvespace/locales/en_US.po +share/solvespace/locales/fr_FR.po +share/solvespace/locales/ru_RU.po +share/solvespace/locales/tr_TR.po +share/solvespace/locales/uk_UA.po +share/solvespace/locales/zh_CN.po +share/solvespace/shaders/edge.frag +share/solvespace/shaders/edge.vert +share/solvespace/shaders/imesh.frag +share/solvespace/shaders/imesh.vert +share/solvespace/shaders/imesh_point.frag +share/solvespace/shaders/imesh_point.vert +share/solvespace/shaders/imesh_tex.frag +share/solvespace/shaders/imesh_tex.vert +share/solvespace/shaders/imesh_texa.frag +share/solvespace/shaders/mesh.frag +share/solvespace/shaders/mesh.vert +share/solvespace/shaders/mesh_fill.frag +share/solvespace/shaders/mesh_fill.vert +share/solvespace/shaders/outline.vert +share/solvespace/threejs/SolveSpaceControls.js +share/solvespace/threejs/hammer-2.0.8.js.gz +share/solvespace/threejs/three-r111.min.js.gz diff --git a/cad/solvespace/distinfo b/cad/solvespace/distinfo index 67d7ef959f3..39753a3aad4 100644 --- a/cad/solvespace/distinfo +++ b/cad/solvespace/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2021/10/26 10:04:16 nia Exp $ +$NetBSD: distinfo,v 1.4 2022/05/23 19:02:59 plunky Exp $ -BLAKE2s (solvespace-2.3/8f958955f54668c142ded760dc951ffd16d9c71b.tar.gz) = eae48ae5b7b8726f52a4ad72aa10647e0b83d0b4206ce36376a2521f0617bfcb -SHA512 (solvespace-2.3/8f958955f54668c142ded760dc951ffd16d9c71b.tar.gz) = 40f27cf32c1a2be1f654d82406c2f7d765cf350d3ceb134e3e1a82b17443f7a12dfda1102fe8438b70f13982af675f97fb1a62ad892acb3ed3d2e19b89a7c013 -Size (solvespace-2.3/8f958955f54668c142ded760dc951ffd16d9c71b.tar.gz) = 691686 bytes -BLAKE2s (solvespace-2.3/v2.3.tar.gz) = cbe152ac56baecc001f755a3858780ed8bc9e05ba393f9716c9428d66248ed03 -SHA512 (solvespace-2.3/v2.3.tar.gz) = 9d22e467337591cd9a4935124d18733b8337f5785ab5738f4a94300f283ffe7d313569e379ae77e509d14182ffde8c9db7beaebb46ea7c0507c6b05010fe1a56 -Size (solvespace-2.3/v2.3.tar.gz) = 2115940 bytes -SHA1 (patch-CMakeLists.txt) = c3716d2317b606e7e4367cef4b781f3ab2854c4f +BLAKE2s (solvespace-3.0/0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz) = 868d7f5b2086dac96d8d3d7e81b5c8f4dd825fa79dbec16c24e092f842d07aed +SHA512 (solvespace-3.0/0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz) = 9ab498aa7f369be79d800e8ca5ec55fa54be79d0778937b81d4c8da776b3419cb8a75400b54b205efc338da32e2e781afd0bed1bd8efed1a0b212dc8682a2615 +Size (solvespace-3.0/0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz) = 691804 bytes +BLAKE2s (solvespace-3.0/v3.0.tar.gz) = 113a7b47f4492fc436f4459222791e9e5d50edfc886c07fcde2a24e65bd7f9b8 +SHA512 (solvespace-3.0/v3.0.tar.gz) = b07b41fac1d67c5350082600a2f09e3fa611a1273e0c93ff93d11a7a1dbf550ff33465686eaff04fdb8350d1fe854ab0301d8723ef31cc65c687ba59cb89187f +Size (solvespace-3.0/v3.0.tar.gz) = 2734860 bytes +SHA1 (patch-CMakeLists.txt) = c5fa324ea481850b5ce8933e976d80e04ddcdf80 diff --git a/cad/solvespace/patches/patch-CMakeLists.txt b/cad/solvespace/patches/patch-CMakeLists.txt index f1acd63d2bb..94bfa8a1c53 100644 --- a/cad/solvespace/patches/patch-CMakeLists.txt +++ b/cad/solvespace/patches/patch-CMakeLists.txt @@ -1,15 +1,38 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2017/02/21 20:36:39 plunky Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2022/05/23 19:02:59 plunky Exp $ disable finding the commit hash: we provide it in the Makefile ---- CMakeLists.txt.orig 2016-12-24 02:09:48.000000000 +0000 +use pkgsrc mimalloc directly + +--- CMakeLists.txt.orig 2021-04-18 09:48:36.000000000 +0000 +++ CMakeLists.txt -@@ -20,7 +20,7 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX +@@ -30,7 +30,6 @@ endif() # NOTE TO PACKAGERS: The embedded git commit hash is critical for rapid bug triage when the builds # can come from a variety of sources. If you are mirroring the sources or otherwise build when # the .git directory is not present, please comment the following line: -include(GetGitCommitHash) -+# include(GetGitCommitHash) # and instead uncomment the following, adding the complete git hash of the checkout you are using: # set(GIT_COMMIT_HASH 0000000000000000000000000000000000000000) +@@ -173,13 +172,6 @@ endif() + message(STATUS "Using in-tree libdxfrw") + add_subdirectory(extlib/libdxfrw) + +-message(STATUS "Using in-tree mimalloc") +-set(MI_OVERRIDE OFF CACHE BOOL "") +-set(MI_BUILD_SHARED OFF CACHE BOOL "") +-set(MI_BUILD_OBJECT OFF CACHE BOOL "") +-set(MI_BUILD_TESTS OFF CACHE BOOL "") +-add_subdirectory(extlib/mimalloc EXCLUDE_FROM_ALL) +-set(MIMALLOC_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/extlib/mimalloc/include) + + if(WIN32 OR APPLE) + # On Win32 and macOS we use vendored packages, since there is little to no benefit +@@ -242,6 +234,7 @@ else() + find_package(ZLIB REQUIRED) + find_package(PNG REQUIRED) + find_package(Freetype REQUIRED) ++ find_package(mimalloc REQUIRED) + pkg_check_modules(CAIRO REQUIRED cairo) + endif() + |