Date: Sat, 11 Jan 2025 17:28:41 GMT From: Michael Reifenberger <mr@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: acba5636dc0b - main - cad/openscad-devel: Update to current as of 2025.01.10 Message-ID: <202501111728.50BHSfTu018128@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mr: URL: https://cgit.FreeBSD.org/ports/commit/?id=acba5636dc0bc60388d6eb6296ed8cae9d544d2c commit acba5636dc0bc60388d6eb6296ed8cae9d544d2c Author: Michael Reifenberger <mr@FreeBSD.org> AuthorDate: 2025-01-11 17:21:41 +0000 Commit: Michael Reifenberger <mr@FreeBSD.org> CommitDate: 2025-01-11 17:28:20 +0000 cad/openscad-devel: Update to current as of 2025.01.10 --- cad/openscad-devel/Makefile | 22 ++++++++++++++-------- cad/openscad-devel/Makefile.git_rev | 8 ++++++++ cad/openscad-devel/distinfo | 28 +++++++++++++++------------- cad/openscad-devel/files/newVersion.sh | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 21 deletions(-) diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile index a201af395340..edfc634fb644 100644 --- a/cad/openscad-devel/Makefile +++ b/cad/openscad-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= openscad -PORTVERSION= 2024.10.11 -PORTREVISION= 5 +PORTVERSION= ${GIT_SRC_DATE} +#PORTREVISION= 1 CATEGORIES= cad PKGNAMESUFFIX= -devel @@ -17,7 +17,6 @@ WWW= https://www.openscad.org/ BUILD_DEPENDS= cgal>0:math/cgal \ 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 \ @@ -41,18 +40,25 @@ USE_GL= gl glu glew USE_GNOME= cairo glib20 libxml2 USE_QT= buildtools:build core concurrent:build dbus gui multimedia qmake svg widgets USE_XORG= x11 -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_ACCOUNT= microsoft:mimalloc elalish:manifold arsenm:sanitizerscmake \ + openscad:opencsg AngusJohnson:clipper2 +GH_PROJECT= MCAD:mcad mimalloc:mimalloc manifold:manifold sanitizers-cmake:sanitizerscmake \ + OpenCSG:opencsg Clipper2:clipper2 +GH_TAGNAME= ${GIT_SRC_HASH} ${GIT_MCAD_HASH}:mcad \ + ${GIT_CLIPPER2_HASH}:clipper2 ${GIT_OPENCSG_HASH}:opencsg \ + ${GIT_MANIFOLD_HASH}:manifold ${GIT_MIMALLOC_HASH}:mimalloc \ + ${GIT_SANITIZERSCMAKE_HASH}:sanitizerscmake GH_SUBDIR= libraries/MCAD:mcad submodules/mimalloc:mimalloc submodules/manifold:manifold \ - submodules/sanitizers-cmake:sanitizerscmake submodules/OpenCSG:opencsg + submodules/sanitizers-cmake:sanitizerscmake submodules/OpenCSG:opencsg \ + submodules/Clipper2:clipper2 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport) CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -Wl,--as-needed -L${LOCALBASE}/lib #CMAKE_OFF= USE_GLAD:BOOL=OFF #CMAKE_ON= USE_GLEW:BOOL=ON +.include "Makefile.git_rev" + .include <bsd.port.pre.mk> do-install: diff --git a/cad/openscad-devel/Makefile.git_rev b/cad/openscad-devel/Makefile.git_rev new file mode 100644 index 000000000000..e2006ac4aa9c --- /dev/null +++ b/cad/openscad-devel/Makefile.git_rev @@ -0,0 +1,8 @@ +GIT_SRC_HASH= 9eed1da368ed9e3c4fb9ce9f65d81621994d424e +GIT_SRC_DATE= 2025.01.10 +GIT_MCAD_HASH= 1ea402208c3127ffb443931e9bb1681c191dacca +GIT_CLIPPER2_HASH= 736ddb0b53d97fd5f65dd3d9bbf8a0993eaf387c +GIT_OPENCSG_HASH= 059a173f161a39a4ab28a32a5b89adabd4f77370 +GIT_MANIFOLD_HASH= 98b8142519d35c13e0e25cfa9fd6e3a271403be6 +GIT_MIMALLOC_HASH= fe61be80bf8942e764e18d469e96f8dacab44728 +GIT_SANITIZERSCMAKE_HASH= c3dc841af4dbf44669e65b82cb68a575864326bd diff --git a/cad/openscad-devel/distinfo b/cad/openscad-devel/distinfo index 39bc26ab97c4..caa3ac92e330 100644 --- a/cad/openscad-devel/distinfo +++ b/cad/openscad-devel/distinfo @@ -1,13 +1,15 @@ -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 +TIMESTAMP = 1736615995 +SHA256 (openscad-openscad-2025.01.10-9eed1da368ed9e3c4fb9ce9f65d81621994d424e_GH0.tar.gz) = 8515c77f4aa9e6710bb1933e56b03a3ebaa4e58a708a9277f0d6a373fbc81de2 +SIZE (openscad-openscad-2025.01.10-9eed1da368ed9e3c4fb9ce9f65d81621994d424e_GH0.tar.gz) = 25561677 +SHA256 (microsoft-mimalloc-fe61be80bf8942e764e18d469e96f8dacab44728_GH0.tar.gz) = 414f9abb64d692a59c91132695e9cf01c2ded2d05f57aca4a597cf3e746fb191 +SIZE (microsoft-mimalloc-fe61be80bf8942e764e18d469e96f8dacab44728_GH0.tar.gz) = 1128112 +SHA256 (elalish-manifold-98b8142519d35c13e0e25cfa9fd6e3a271403be6_GH0.tar.gz) = 3555c55d5e4596396cb72d112ae81b796c19ce777da1874f315ac859dd5b91bd +SIZE (elalish-manifold-98b8142519d35c13e0e25cfa9fd6e3a271403be6_GH0.tar.gz) = 29248651 +SHA256 (arsenm-sanitizers-cmake-c3dc841af4dbf44669e65b82cb68a575864326bd_GH0.tar.gz) = 19d511a3a4ddc872c89ab62c070dd8d1fcc733e6ea4655f5876a60237cd556ba +SIZE (arsenm-sanitizers-cmake-c3dc841af4dbf44669e65b82cb68a575864326bd_GH0.tar.gz) = 7433 +SHA256 (openscad-OpenCSG-059a173f161a39a4ab28a32a5b89adabd4f77370_GH0.tar.gz) = bfa101dcf25e8cf437722d96c3959aff324610f899d62197c834a029d94573e9 +SIZE (openscad-OpenCSG-059a173f161a39a4ab28a32a5b89adabd4f77370_GH0.tar.gz) = 300004 +SHA256 (AngusJohnson-Clipper2-736ddb0b53d97fd5f65dd3d9bbf8a0993eaf387c_GH0.tar.gz) = efb777323a19fca36bd6dad40726415c2823bac24ef6892385385f3432b66112 +SIZE (AngusJohnson-Clipper2-736ddb0b53d97fd5f65dd3d9bbf8a0993eaf387c_GH0.tar.gz) = 600493 +SHA256 (openscad-MCAD-1ea402208c3127ffb443931e9bb1681c191dacca_GH0.tar.gz) = 3d04077d369814638c3f018fecc39439011a47f545026f43c1a465bce1773f57 +SIZE (openscad-MCAD-1ea402208c3127ffb443931e9bb1681c191dacca_GH0.tar.gz) = 56943 diff --git a/cad/openscad-devel/files/newVersion.sh b/cad/openscad-devel/files/newVersion.sh new file mode 100644 index 000000000000..0210e89aadf7 --- /dev/null +++ b/cad/openscad-devel/files/newVersion.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +CURDIR=`pwd` +WRKDIR=`pwd`/work +#mkdir -p "${WRKDIR}" + +if [ \! -d "${CURDIR}/openscad-repo" ]; then + git clone https://github.com/openscad/openscad -b master "${CURDIR}/openscad-repo"; +else + cd "${CURDIR}/openscad-repo" + git pull https://github.com/openscad/openscad; +fi + +cd "${CURDIR}/openscad-repo" +GIT_SRC_HASH=`git log -n 1 --pretty=format:"%H"`; +GIT_SRC_DATE=`git log -n 1 --date=iso-local -n 1 --pretty=format:"%cd" --date=format-local:'%Y.%m.%d' | \ + cut -c '1-19' | sed -e 's,-,,g' -e 's,:,,g' -e 's, ,,g'` +GIT_MCAD_HASH=`git ls-tree HEAD libraries/MCAD/ | awk '{print $3}'` +GIT_CLIPPER2_HASH=`git ls-tree HEAD submodules/Clipper2/ | awk '{print $3}'` +GIT_OPENCSG_HASH=`git ls-tree HEAD submodules/OpenCSG/ | awk '{print $3}'` +GIT_MANIFOLD_HASH=`git ls-tree HEAD submodules/manifold/ | awk '{print $3}'` +GIT_MIMALLOC_HASH=`git ls-tree HEAD submodules/mimalloc/ | awk '{print $3}'` +GIT_SANITIZERSCMAKE_HASH=`git ls-tree HEAD submodules/sanitizers-cmake/ | awk '{print $3}'` + +echo "$GIT_SRC_HASH, $GIT_SRC_DATE" +echo "GIT_SRC_HASH= ${GIT_SRC_HASH}" > ${CURDIR}/Makefile.git_rev +echo "GIT_SRC_DATE= ${GIT_SRC_DATE}" >> ${CURDIR}/Makefile.git_rev +echo "GIT_MCAD_HASH= ${GIT_MCAD_HASH}" >> ${CURDIR}/Makefile.git_rev +echo "GIT_CLIPPER2_HASH= ${GIT_CLIPPER2_HASH}" >> ${CURDIR}/Makefile.git_rev +echo "GIT_OPENCSG_HASH= ${GIT_OPENCSG_HASH}" >> ${CURDIR}/Makefile.git_rev +echo "GIT_MANIFOLD_HASH= ${GIT_MANIFOLD_HASH}" >> ${CURDIR}/Makefile.git_rev +echo "GIT_MIMALLOC_HASH= ${GIT_MIMALLOC_HASH}" >> ${CURDIR}/Makefile.git_rev +echo "GIT_SANITIZERSCMAKE_HASH= ${GIT_SANITIZERSCMAKE_HASH}" >> ${CURDIR}/Makefile.git_rev +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501111728.50BHSfTu018128>