From nobody Sun Oct 13 17:11:54 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRRjl2yCSz5ZDT5; Sun, 13 Oct 2024 17:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRRjl0nwnz49cV; Sun, 13 Oct 2024 17:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728839515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1iay9StyOJu6bf0fXPZ+X+aCV8SXxEadUEplPGy0ACc=; b=jFummfgF2+0EwqTxMd8s8htEKlYwh22dPfY1t9Dqiihp0M57PItcS9z9Fm73/6RrpGq48a KWykbb76IiS7idqHxN0zVg4QpYBh6vZrPNj67B9ksp8hYV9JXz3mNSA2OaTIZtHWi5XFZ4 uuQCcsuteSOCxomook3jHZXImciuqopbEKt3xlhJi4BELdPus6fLng/o6Rasoz1OS18m7C epM+xVA34KJp73uon4vkCOLa5abDh4zgxhn9Lkdk5hBPOGGY6ZYF2VRjIYfza8rIdpXLoS 3HAyCIyOzXKaD/Wflh419X9I1X8YaRbw7P4hQosXcY/d69gGSC9qPp2vts3Ynw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728839515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1iay9StyOJu6bf0fXPZ+X+aCV8SXxEadUEplPGy0ACc=; b=iJhDWS3rxomBrmXL1z4Or/5vNzBAbt3HOm8zmtJBPs2UKJ2JLO6MSB3/XzrAjrqbdPb5Cn 5JaKftzFawZdCByw2w0ye5JuhandRzaK4RU68qVuQEeK/N4OSRDAOHyqkigMeuHpMUbf// wBDVnq4j6xdJ23nsOsm2mGQgNjEsXbCULYsRhVQUhD5/kHuNkyc/Bv9yxCXUq6MD2R5Pce pAEiozJMX2OSebiudq8VAsDKzqIabg3EdSP7Fu+/kUmmjZTfKbGylWkmWJgo6TcmyUKoo7 32AsCrAG37sK0NoYTQ0Ba+IJ3j5VDb5ecQM3W3RP60tHDSK8uRZ7e7sadsm3lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728839515; a=rsa-sha256; cv=none; b=gBcWmiI5T7h13r7zCPpnRml+GyUvD6JV4lBPjLBBc1fr3oG1nKvMaDnv3l5C2fIATvdn4X Bs8aetDHIOL6RRBoH+8conS/EgA0i/xVZC6pkFitvYk5ec2wzzKVhAK8UYgNog6bqDtj87 X70DQYtvVQuUWTyUhMPwAEyLQ/3wmNxrsEb7sf7mGn3G3zwWCNVVYwi9g0VgLA5UmbhRnu nsxVLojiX5+gzTeGbyVnSbmNKJxZ0H81G9r88IpmHXqVca3006LRpf7GETAc0OEuj3Zs+X wuodW1mdIMGk5QuZzt+tID1fH6sv3PqbHfNFQOWe9s1IYqFmG6k4mhBOlaxL+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XRRjl0QXFz12wL; Sun, 13 Oct 2024 17:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DHBsea002247; Sun, 13 Oct 2024 17:11:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DHBsI8002244; Sun, 13 Oct 2024 17:11:54 GMT (envelope-from git) Date: Sun, 13 Oct 2024 17:11:54 GMT Message-Id: <202410131711.49DHBsI8002244@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Michael Reifenberger Subject: git: 44443821dd01 - 2024Q4 - cad/openscad-devel: Update List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mr X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: 44443821dd011f468808cc1563ee5804900309e5 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by mr: URL: https://cgit.FreeBSD.org/ports/commit/?id=44443821dd011f468808cc1563ee5804900309e5 commit 44443821dd011f468808cc1563ee5804900309e5 Author: Michael Reifenberger AuthorDate: 2024-10-13 11:27:30 +0000 Commit: Michael Reifenberger CommitDate: 2024-10-13 17:10:13 +0000 cad/openscad-devel: Update Unbreak and update to a more recent snapshot 2024.10.11 (cherry picked from commit a76a16749b3127f0d62a2ac5361353c1c5d3622c) --- cad/openscad-devel/Makefile | 32 +++++++++++------------ cad/openscad-devel/distinfo | 16 ++++++++---- cad/openscad-devel/files/patch-src_handle__dep.cc | 8 ------ cad/openscad-devel/pkg-plist | 3 +++ 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile index 61fe24a7350d..0dc0bc577220 100644 --- a/cad/openscad-devel/Makefile +++ b/cad/openscad-devel/Makefile @@ -1,6 +1,5 @@ PORTNAME= openscad -PORTVERSION= 2022.12.20 -PORTREVISION= 2 +PORTVERSION= 2024.10.11 #PORTREVISION= 1 CATEGORIES= cad PKGNAMESUFFIX= -devel @@ -16,7 +15,10 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= cgal>0:math/cgal \ - evdev-proto>0: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 \ @@ -27,33 +29,31 @@ LIB_DEPENDS= libzip.so:archivers/libzip \ 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 USES= bison cmake compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \ - gl gnome 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 qmake:build svg widgets +USE_QT= buildtools:build core concurrent:build dbus gui multimedia qmake svg widgets USE_XORG= x11 -GH_ACCOUNT= microsoft:mimalloc -GH_PROJECT= MCAD:mcad mimalloc:mimalloc -GH_TAGNAME= b621fa6d3d2d2d795b30d1b6aade6ff1b3c8ba29 bd0a7ba3f042bfbced5ca1894b236cea08904e26:mcad v2.0.3:mimalloc -GH_SUBDIR= libraries/MCAD:mcad submodules/mimalloc:mimalloc -#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) CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -Wl,--as-needed -L${LOCALBASE}/lib .include -#post-patch: -# @${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf -# @${REINPLACE_CMD} -e 's,share/man,man,' \ -# ${WRKSRC}/openscad.pro - do-install: ${CMAKE_BIN} --install ${BUILD_WRKSRC} --prefix ${STAGEDIR}${PREFIX} diff --git a/cad/openscad-devel/distinfo b/cad/openscad-devel/distinfo index c4aa207495cb..39bc26ab97c4 100644 --- a/cad/openscad-devel/distinfo +++ b/cad/openscad-devel/distinfo @@ -1,7 +1,13 @@ -TIMESTAMP = 1671651024 -SHA256 (openscad-openscad-2022.12.20-b621fa6d3d2d2d795b30d1b6aade6ff1b3c8ba29_GH0.tar.gz) = 8c2877a623a1ce0411d0ba5999b11cd5ebfc61fc7ea8589eafa9fa6158b8f8a2 -SIZE (openscad-openscad-2022.12.20-b621fa6d3d2d2d795b30d1b6aade6ff1b3c8ba29_GH0.tar.gz) = 23121605 -SHA256 (microsoft-mimalloc-v2.0.3_GH0.tar.gz) = 5af497f360879bf9d07a5146961d275a25f4177fbe21ee6c437db604422acd60 -SIZE (microsoft-mimalloc-v2.0.3_GH0.tar.gz) = 917461 +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-devel/files/patch-src_handle__dep.cc b/cad/openscad-devel/files/patch-src_handle__dep.cc deleted file mode 100644 index 6c23311f11e6..000000000000 --- a/cad/openscad-devel/files/patch-src_handle__dep.cc +++ /dev/null @@ -1,8 +0,0 @@ ---- src/handle_dep.cc.orig 2021-10-23 10:18:49 UTC -+++ src/handle_dep.cc -@@ -1,3 +1,5 @@ -+#include -+#include - #include "handle_dep.h" - #include "printutils.h" - #include diff --git a/cad/openscad-devel/pkg-plist b/cad/openscad-devel/pkg-plist index 280f72d3d666..ffee6166f86d 100644 --- a/cad/openscad-devel/pkg-plist +++ b/cad/openscad-devel/pkg-plist @@ -22,10 +22,12 @@ share/mime/packages/openscad.xml %%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 @@ -169,6 +171,7 @@ share/mime/packages/openscad.xml %%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