kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

This patch updates Cura and all associated dependencies to 4.7.1.

Browse source 
Also, it adds math/py-numpy-stl - an optional dependency that makes
loading STL files much faster. Without it, Cura was complaining:

2020-09-20 02:19:31,877 - WARNING - [MainThread] STLReader.STLReader.<module> [32]: Could not find numpy-stl, falling back to slower code.

I'm not sure where the 6.x version in cad/fdm_materials came from, seems
like now that project has its version in sync with the Cura version,
so I chose to increment PORTEPOCH for that. [Greg]

- fdm_materials adds some new materials usable with Cura
- I had to bump PORTEPOCH on a couple of ports
- py-numpy-stl was added on a separate commit
- Bump version checking in Cura on some dependancies
[db]

PR:		ports/249468
Submitted by:	greg@unrelenting.technology
This commit is contained in:
Diane Bruce 2020-09-26 19:53:09 +00:00
parent 09f3ef6ec0
commit 5019d0a382
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=550214
17 changed files with 970 additions and 181 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cad/cura-engine/Makefile
View file

@ -1,10 +1,7 @@
# $FreeBSD$
PORTNAME= CuraEngine
DISTVERSIONPREFIX= v
DISTVERSION= 4.5.0-19
DISTVERSIONSUFFIX= -gdbf3d79
PORTREVISION= 2
DISTVERSION= 4.7.1
PORTEPOCH= 1
CATEGORIES= cad
DIST_SUBDIR= Ultimaker
@ -24,7 +21,7 @@ STB_TAG= d5d052c
USE_GITHUB= yes
GH_ACCOUNT= Ultimaker
GH_PROJECT= CuraEngine
GH_TAGNAME= dbf3d79
GH_TAGNAME= fadb5d6b
GH_TUPLE= nothings:stb:${STB_TAG}:stb/include/stb
CMAKE_ARGS+= -DStb_FOUND:BOOL=ON \

6
cad/cura-engine/distinfo
View file

@ -1,5 +1,5 @@
TIMESTAMP = 1584491887
SHA256 (Ultimaker/Ultimaker-CuraEngine-v4.5.0-19-gdbf3d79-dbf3d79_GH0.tar.gz) = da639d1ea47b61628a9df065140e11a5b4a2c0181c3d3547b00791ba48a20ac9
SIZE (Ultimaker/Ultimaker-CuraEngine-v4.5.0-19-gdbf3d79-dbf3d79_GH0.tar.gz) = 1684086
TIMESTAMP = 1600557026
SHA256 (Ultimaker/Ultimaker-CuraEngine-4.7.1-fadb5d6b_GH0.tar.gz) = 28cabbc8d102eed1cd16774440973f0912adc8fbd2901eae8de6856888099f02
SIZE (Ultimaker/Ultimaker-CuraEngine-4.7.1-fadb5d6b_GH0.tar.gz) = 1684943
SHA256 (Ultimaker/nothings-stb-d5d052c_GH0.tar.gz) = ce1a6424b43287166a962827d83d98cedcd9d515e69052b17d8a7896f9fb7517
SIZE (Ultimaker/nothings-stb-d5d052c_GH0.tar.gz) = 1358441

13
cad/cura/Makefile
View file

@ -1,9 +1,7 @@
# $FreeBSD$
PORTNAME= Cura
DISTVERSION= 4.5.0-82
DISTVERSIONSUFFIX= -g7c70ace
PORTREVISION= 3
DISTVERSION= 4.7.1
PORTEPOCH= 2
CATEGORIES= cad
DIST_SUBDIR= Ultimaker
@ -14,20 +12,21 @@ COMMENT= Slicing application for 3D printers
LICENSE= AGPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= Uranium>0:cad/uranium
BUILD_DEPENDS= Uranium>0,1:cad/uranium
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt5-gui>0:x11-toolkits/py-qt5-gui@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}qt5-widgets>0:x11-toolkits/py-qt5-widgets@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}qt5-qml>0:lang/py-qt5-qml@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Shapely>0:devel/py-shapely@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}numpy-stl>0:math/py-numpy-stl@${PY_FLAVOR} \
qt5-graphicaleffects>0:graphics/qt5-graphicaleffects \
qt5-quickcontrols>0:x11-toolkits/qt5-quickcontrols \
qt5-quickcontrols2>0:x11-toolkits/qt5-quickcontrols2 \
Uranium>0:cad/uranium \
libCharon>0:net/libcharon \
CuraEngine>0:cad/cura-engine \
fdm_materials>0:cad/fdm_materials \
CuraEngine>0,1:cad/cura-engine \
fdm_materials>0,1:cad/fdm_materials \
${PYTHON_PKGNAMEPREFIX}trimesh>0:devel/py-trimesh@${PY_FLAVOR}
LIB_DEPENDS= libArcus.so:net/libarcus \
libSavitar.so:devel/libsavitar
@ -36,7 +35,7 @@ USES= cmake gettext shebangfix python:3.4+ desktop-file-utils shared-mime-info
CMAKE_ARGS+= -DURANIUM_SCRIPTS_DIR:STRING="${LOCALBASE}/share/uranium/scripts"
USE_GITHUB= yes
GH_ACCOUNT= Ultimaker
GH_TAGNAME= 7c70ace
GH_TAGNAME= d115efbb
NO_ARCH= yes
post-patch:

6
cad/cura/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1585313387
SHA256 (Ultimaker/Ultimaker-Cura-4.5.0-82-g7c70ace-7c70ace_GH0.tar.gz) = 74123ef60aad0a03c334726bd4f6161761324894156a354f2c3c3cb7a4a14d2d
SIZE (Ultimaker/Ultimaker-Cura-4.5.0-82-g7c70ace-7c70ace_GH0.tar.gz) = 34919081
TIMESTAMP = 1600557131
SHA256 (Ultimaker/Ultimaker-Cura-4.7.1-d115efbb_GH0.tar.gz) = 6468e64df72ac3feaf6ace463c2b5ebd20edaa705decb8e7ec2428fbee4d5ce7
SIZE (Ultimaker/Ultimaker-Cura-4.7.1-d115efbb_GH0.tar.gz) = 29717269

2
cad/cura/files/patch-cura__app.py
View file

@ -4,5 +4,5 @@
-#!/usr/bin/env python3
+#!/usr/bin/env %%PYTHON_CMD%%
# Copyright (c) 2019 Ultimaker B.V.
# Copyright (c) 2020 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.

6
cad/cura/files/patch-plugins_USBPrinting_USBPrinterOutputDeviceManager.py
View file

@ -3,10 +3,10 @@ as port[2] is 'n/a' on FreeBSD.
--- plugins/USBPrinting/USBPrinterOutputDeviceManager.py.orig 2020-07-23 19:29:25 UTC
+++ plugins/USBPrinting/USBPrinterOutputDeviceManager.py
@@ -112,8 +112,6 @@ class USBPrinterOutputDeviceManager(QObject, OutputDev
for port in serial.tools.list_ports.comports():
if not isinstance(port, tuple):
@@ -123,8 +123,6 @@
port = (port.device, port.description, port.hwid)
if not port[2]: # HWID may be None if the device is not USB or the system doesn't report the type.
continue
- if only_list_usb and not port[2].startswith("USB"):
- continue

1054
cad/cura/pkg-plist
View file

File diff suppressed because it is too large Load diff

5
cad/fdm_materials/Makefile
View file

@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= fdm_materials
DISTVERSION= 6.3.2
PORTEPOCH= 1
DISTVERSION= 4.7.1
CATEGORIES= cad
DIST_SUBDIR= Ultimaker
@ -15,7 +16,7 @@ USES= cmake
USE_GITHUB= yes
GH_ACCOUNT= Ultimaker
GH_TAGNAME= c54199e
GH_TAGNAME= c7331d5ea
NO_ARCH= yes
STRIP=

6
cad/fdm_materials/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1584147771
SHA256 (Ultimaker/Ultimaker-fdm_materials-6.3.2-c54199e_GH0.tar.gz) = 0eebafad4243cb5cbd24b8acdaf135516ded64e6497072dfa65857cb1049fb19
SIZE (Ultimaker/Ultimaker-fdm_materials-6.3.2-c54199e_GH0.tar.gz) = 35536
TIMESTAMP = 1600556694
SHA256 (Ultimaker/Ultimaker-fdm_materials-4.7.1-c7331d5ea_GH0.tar.gz) = 5ac6b76a25c7aa8df9ebb9e6b16da7d1221b27c88346925144268282e73265f4
SIZE (Ultimaker/Ultimaker-fdm_materials-4.7.1-c7331d5ea_GH0.tar.gz) = 41141

10
cad/fdm_materials/pkg-plist
View file

@ -17,12 +17,13 @@ share/cura/resources/materials/eSUN_PLA_PRO_Grey.xml.fdm_material
share/cura/resources/materials/eSUN_PLA_PRO_Purple.xml.fdm_material
share/cura/resources/materials/eSUN_PLA_PRO_White.xml.fdm_material
share/cura/resources/materials/emotiontech_abs.xml.fdm_material
share/cura/resources/materials/emotiontech_absx.xml.fdm_material
share/cura/resources/materials/emotiontech_asax.xml.fdm_material
share/cura/resources/materials/emotiontech_bvoh.xml.fdm_material
share/cura/resources/materials/emotiontech_hips.xml.fdm_material
share/cura/resources/materials/emotiontech_petg.xml.fdm_material
share/cura/resources/materials/emotiontech_pla.xml.fdm_material
share/cura/resources/materials/emotiontech_pva-m.xml.fdm_material
share/cura/resources/materials/emotiontech_pva-oks.xml.fdm_material
share/cura/resources/materials/emotiontech_pva-s.xml.fdm_material
share/cura/resources/materials/emotiontech_tpu98a.xml.fdm_material
share/cura/resources/materials/fabtotum_abs.xml.fdm_material
@ -70,6 +71,13 @@ share/cura/resources/materials/polyflex_pla.xml.fdm_material
share/cura/resources/materials/polymax_pla.xml.fdm_material
share/cura/resources/materials/polyplus_pla.xml.fdm_material
share/cura/resources/materials/polywood_pla.xml.fdm_material
share/cura/resources/materials/redd_abs.xml.fdm_material
share/cura/resources/materials/redd_asa.xml.fdm_material
share/cura/resources/materials/redd_hips.xml.fdm_material
share/cura/resources/materials/redd_nylon.xml.fdm_material
share/cura/resources/materials/redd_petg.xml.fdm_material
share/cura/resources/materials/redd_pla.xml.fdm_material
share/cura/resources/materials/redd_tpe.xml.fdm_material
share/cura/resources/materials/structur3d_dap100silicone.xml.fdm_material
share/cura/resources/materials/tizyx_abs.xml.fdm_material
share/cura/resources/materials/tizyx_flex.xml.fdm_material

6
cad/uranium/Makefile
View file

@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= Uranium
DISTVERSION= 15.06.03
PORTREVISION= 1
DISTVERSION= 4.7.1
PORTEPOCH= 1
CATEGORIES= cad
DIST_SUBDIR= Ultimaker
@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
USES= cmake python:3.4+ gettext
USE_GITHUB= yes
GH_ACCOUNT= Ultimaker
GH_TAGNAME= 8d2bada
GH_TAGNAME= 3ed9c4de
STRIP=
NO_ARCH= yes

6
cad/uranium/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1584143528
SHA256 (Ultimaker/Ultimaker-Uranium-15.06.03-8d2bada_GH0.tar.gz) = fa79be6253beb43c15a6bc36cba933b4eeea4a0140a5eb0e9961bf2bf07a4738
SIZE (Ultimaker/Ultimaker-Uranium-15.06.03-8d2bada_GH0.tar.gz) = 1007872
TIMESTAMP = 1600556932
SHA256 (Ultimaker/Ultimaker-Uranium-4.7.1-3ed9c4de_GH0.tar.gz) = a7fc4e759f5efbfc9db1dfbcb32541986d8c0249248b1b1795f8f3701896840d
SIZE (Ultimaker/Ultimaker-Uranium-4.7.1-3ed9c4de_GH0.tar.gz) = 1022548

2
cad/uranium/pkg-plist
View file

@ -9,6 +9,7 @@
%%PYTHON_SITELIBDIR%%/UM/Dictionary.py
%%PYTHON_SITELIBDIR%%/UM/Event.py
%%PYTHON_SITELIBDIR%%/UM/Extension.py
%%PYTHON_SITELIBDIR%%/UM/FastConfigParser.py
%%PYTHON_SITELIBDIR%%/UM/FileHandler/FileHandler.py
%%PYTHON_SITELIBDIR%%/UM/FileHandler/FileReader.py
%%PYTHON_SITELIBDIR%%/UM/FileHandler/FileWriter.py
@ -84,6 +85,7 @@
%%PYTHON_SITELIBDIR%%/UM/Qt/Bindings/StageModel.py
%%PYTHON_SITELIBDIR%%/UM/Qt/Bindings/Theme.py
%%PYTHON_SITELIBDIR%%/UM/Qt/Bindings/ToolModel.py
%%PYTHON_SITELIBDIR%%/UM/Qt/Bindings/Utilities.py
%%PYTHON_SITELIBDIR%%/UM/Qt/Bindings/ViewModel.py
%%PYTHON_SITELIBDIR%%/UM/Qt/Bindings/VisibleMessagesModel.py
%%PYTHON_SITELIBDIR%%/UM/Qt/Bindings/__init__.py

6
net/libarcus/Makefile
View file

@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= libArcus
PORTVERSION= 15.06.03
PORTREVISION= 2
PORTVERSION= 4.7.1
PORTEPOCH= 1
CATEGORIES= net cad
DIST_SUBDIR= Ultimaker
@ -19,6 +19,6 @@ USES= cmake compiler:c++11-lang python:3.4+
USE_GITHUB= yes
GH_ACCOUNT= Ultimaker
USE_LDCONFIG= yes
GH_TAGNAME= d0f1ac1
GH_TAGNAME= 6a68d7e0
.include <bsd.port.mk>

6
net/libarcus/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1583929164
SHA256 (Ultimaker/Ultimaker-libArcus-15.06.03-d0f1ac1_GH0.tar.gz) = b51148ca15e0aa158c97b480b27d2321da5d732a36ae0f2b7a10366ecf6e183b
SIZE (Ultimaker/Ultimaker-libArcus-15.06.03-d0f1ac1_GH0.tar.gz) = 31955
TIMESTAMP = 1600556808
SHA256 (Ultimaker/Ultimaker-libArcus-4.7.1-6a68d7e0_GH0.tar.gz) = c7408c07b1cc79cb17a817b49cba5432a23159082e66efe58776022a31d7541a
SIZE (Ultimaker/Ultimaker-libArcus-4.7.1-6a68d7e0_GH0.tar.gz) = 31948

4
net/libcharon/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libCharon
DISTVERSION= 4.5.0
DISTVERSION= 4.7.1
CATEGORIES= net devel cad
DIST_SUBDIR= Ultimaker
@ -16,7 +16,7 @@ STRIP=
USE_GITHUB= yes
GH_ACCOUNT= Ultimaker
GH_TAGNAME= bfd36d0
GH_TAGNAME= c34738dd
NO_ARCH= yes
.include <bsd.port.mk>

6
net/libcharon/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1584018065
SHA256 (Ultimaker/Ultimaker-libCharon-4.5.0-bfd36d0_GH0.tar.gz) = 9c37f847993510555908743644b25fb6cd8e5957ad849d219661f7d2ad9d4fad
SIZE (Ultimaker/Ultimaker-libCharon-4.5.0-bfd36d0_GH0.tar.gz) = 145487
TIMESTAMP = 1600557973
SHA256 (Ultimaker/Ultimaker-libCharon-4.7.1-c34738dd_GH0.tar.gz) = cea1dd86c54cfdbe6e1d996fa01083d4c7c4b26301c523a2294d69ea53d7f109
SIZE (Ultimaker/Ultimaker-libCharon-4.7.1-c34738dd_GH0.tar.gz) = 151232