diff --git a/cad/kicad-doc/Makefile b/cad/kicad-doc/Makefile index 5b8ac4488e4a..84a803ea278b 100644 --- a/cad/kicad-doc/Makefile +++ b/cad/kicad-doc/Makefile @@ -1,26 +1,26 @@ # Created by: Christoph Moench-Tegeder PORTNAME= kicad -PORTVERSION= 5.1.10 +PORTVERSION= 5.1.12 CATEGORIES= cad MASTER_SITES= https://kicad-downloads.s3.cern.ch/docs/ PKGNAMESUFFIX= -doc DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION} MAINTAINER= cmt@FreeBSD.org COMMENT= KiCad Documentation and Help Files LICENSE= GPLv3+ CC-BY-3.0 LICENSE_COMB= dual RUN_DEPENDS= kicad:cad/kicad CONFLICTS= kicad-devel-r2* NO_ARCH= yes NO_BUILD= yes do-install: cd ${WRKSRC}/share/doc/kicad && ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR} .include diff --git a/cad/kicad-doc/distinfo b/cad/kicad-doc/distinfo index e8b81508cdb3..0a12b964353d 100644 --- a/cad/kicad-doc/distinfo +++ b/cad/kicad-doc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619553893 -SHA256 (kicad-doc-5.1.10.tar.gz) = 73d986b7a9d5d777e4bf9bc7594e43568e067cd33466940957b5a513d9affd03 -SIZE (kicad-doc-5.1.10.tar.gz) = 316075538 +TIMESTAMP = 1636463164 +SHA256 (kicad-doc-5.1.12.tar.gz) = 8bf34f46758cf631f81f18490310ae7673e343da5eedc5c53192375ee1744479 +SIZE (kicad-doc-5.1.12.tar.gz) = 316618503 diff --git a/cad/kicad-library-footprints/Makefile b/cad/kicad-library-footprints/Makefile index e6ff69beecee..cd6d5e63f023 100644 --- a/cad/kicad-library-footprints/Makefile +++ b/cad/kicad-library-footprints/Makefile @@ -1,29 +1,29 @@ # Created by: Thierry Thomas PORTNAME= kicad -PORTVERSION= 5.1.10 +PORTVERSION= 5.1.12 CATEGORIES= cad MASTER_SITES= https://gitlab.com/kicad/libraries/${PORTNAME}-footprints/-/archive/${DISTVERSION}/ PKGNAMESUFFIX= -library-footprints DISTNAME= ${PORTNAME}-footprints-${DISTVERSION} MAINTAINER= cmt@FreeBSD.org COMMENT= Official KiCad Footprint Libraries LICENSE= GPLv2 RUN_DEPENDS= kicad:cad/kicad USES= cmake tar:bz2 CONFLICTS= kicad-devel-r2* CMAKE_ARGS= -DLOCALBASE="${LOCALBASE}" \ -DCMAKE_BUILD_TYPE="Release" \ -DKICAD_TESTING_VERSION=ON \ -DKICAD_BUILD_VERSION=${DISTVERSION} INSTALL_TARGET= install NO_ARCH= yes .include diff --git a/cad/kicad-library-footprints/distinfo b/cad/kicad-library-footprints/distinfo index e7acef0ac458..27be04c3c2b8 100644 --- a/cad/kicad-library-footprints/distinfo +++ b/cad/kicad-library-footprints/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619292915 -SHA256 (kicad-footprints-5.1.10.tar.bz2) = 6707d1c79f57a305773ed8c16971d223ae704fde3e6c238958711be41bec8975 -SIZE (kicad-footprints-5.1.10.tar.bz2) = 3382220 +TIMESTAMP = 1636062324 +SHA256 (kicad-footprints-5.1.12.tar.bz2) = 2f32db7986bfd7c9d42420542d83733c27a604270697e90c9affa15a0cc4707a +SIZE (kicad-footprints-5.1.12.tar.bz2) = 3382783 diff --git a/cad/kicad-library-packages3d/Makefile b/cad/kicad-library-packages3d/Makefile index 35d4c1663863..656fc7433e78 100644 --- a/cad/kicad-library-packages3d/Makefile +++ b/cad/kicad-library-packages3d/Makefile @@ -1,29 +1,29 @@ # Created by: Thierry Thomas PORTNAME= kicad -PORTVERSION= 5.1.10 +PORTVERSION= 5.1.12 CATEGORIES= cad MASTER_SITES= https://gitlab.com/kicad/libraries/${PORTNAME}-packages3D/-/archive/${DISTVERSION}/ PKGNAMESUFFIX= -library-packages3d DISTNAME= ${PORTNAME}-packages3D-${DISTVERSION} MAINTAINER= cmt@FreeBSD.org COMMENT= Official KiCad 3D model libraries for rendering and MCAD integration LICENSE= GPLv2 RUN_DEPENDS= kicad:cad/kicad USES= cmake tar:bz2 CONFLICTS= kicad-devel-r2* CMAKE_ARGS= -DLOCALBASE="${LOCALBASE}" \ -DCMAKE_BUILD_TYPE="Release" \ -DKICAD_TESTING_VERSION=ON \ -DKICAD_BUILD_VERSION=${DISTVERSION} INSTALL_TARGET= install NO_ARCH= yes .include diff --git a/cad/kicad-library-packages3d/distinfo b/cad/kicad-library-packages3d/distinfo index 3e64d83dfbdd..94179ba6d64d 100644 --- a/cad/kicad-library-packages3d/distinfo +++ b/cad/kicad-library-packages3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619293768 -SHA256 (kicad-packages3D-5.1.10.tar.bz2) = 5b02128fcb5ff69f9c9468b6876d7df68ace0eefb55359f6f37e36ebadd32a0b -SIZE (kicad-packages3D-5.1.10.tar.bz2) = 727194444 +TIMESTAMP = 1636063087 +SHA256 (kicad-packages3D-5.1.12.tar.bz2) = cf776c1cc76f9c0f2901111bf34350fcc5ddab20e658f07d150b81306107662e +SIZE (kicad-packages3D-5.1.12.tar.bz2) = 727191578 diff --git a/cad/kicad-library-symbols/Makefile b/cad/kicad-library-symbols/Makefile index 792900b7b348..9d40a9cc4d00 100644 --- a/cad/kicad-library-symbols/Makefile +++ b/cad/kicad-library-symbols/Makefile @@ -1,29 +1,29 @@ # Created by: Thierry Thomas PORTNAME= kicad -PORTVERSION= 5.1.10 +PORTVERSION= 5.1.12 CATEGORIES= cad MASTER_SITES= https://gitlab.com/kicad/libraries/${PORTNAME}-symbols/-/archive/${DISTVERSION}/ PKGNAMESUFFIX= -library-symbols DISTNAME= ${PORTNAME}-symbols-${DISTVERSION} MAINTAINER= cmt@FreeBSD.org COMMENT= Official KiCad schematic symbol libraries LICENSE= GPLv2 RUN_DEPENDS= kicad:cad/kicad USES= cmake tar:bz2 CONFLICTS= kicad-devel-r2* CMAKE_ARGS= -DLOCALBASE="${LOCALBASE}" \ -DCMAKE_BUILD_TYPE="Release" \ -DKICAD_TESTING_VERSION=ON \ -DKICAD_BUILD_VERSION=${DISTVERSION} INSTALL_TARGET= install NO_ARCH= yes .include diff --git a/cad/kicad-library-symbols/distinfo b/cad/kicad-library-symbols/distinfo index 14c337537d68..1c740c8eb31f 100644 --- a/cad/kicad-library-symbols/distinfo +++ b/cad/kicad-library-symbols/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619292928 -SHA256 (kicad-symbols-5.1.10.tar.bz2) = cbf71394a8f130c3480471e17e90816311ae3c9ca3f916800511e2f16a7b5285 -SIZE (kicad-symbols-5.1.10.tar.bz2) = 1815573 +TIMESTAMP = 1636062348 +SHA256 (kicad-symbols-5.1.12.tar.bz2) = ab2b42de0ca82c193df141e4883a19b1a16e5335f15964f9006b101eaa4c8f91 +SIZE (kicad-symbols-5.1.12.tar.bz2) = 1815145 diff --git a/cad/kicad-library-templates/Makefile b/cad/kicad-library-templates/Makefile index c228190042cf..ae0171c7da7e 100644 --- a/cad/kicad-library-templates/Makefile +++ b/cad/kicad-library-templates/Makefile @@ -1,29 +1,29 @@ # Created by: Thierry Thomas PORTNAME= kicad -PORTVERSION= 5.1.10 +PORTVERSION= 5.1.12 CATEGORIES= cad MASTER_SITES= https://gitlab.com/kicad/libraries/${PORTNAME}-templates/-/archive/${DISTVERSION}/ PKGNAMESUFFIX= -library-tmpl DISTNAME= ${PORTNAME}-templates-${DISTVERSION} MAINTAINER= cmt@FreeBSD.org COMMENT= Official KiCad project templates LICENSE= GPLv2 RUN_DEPENDS= kicad:cad/kicad USES= cmake tar:bz2 CONFLICTS= kicad-devel-r2* CMAKE_ARGS= -DLOCALBASE="${LOCALBASE}" \ -DCMAKE_BUILD_TYPE="Release" \ -DKICAD_TESTING_VERSION=ON \ -DKICAD_BUILD_VERSION=${DISTVERSION} INSTALL_TARGET= install NO_ARCH= yes .include diff --git a/cad/kicad-library-templates/distinfo b/cad/kicad-library-templates/distinfo index 86527db98ae3..775c8edcb2a3 100644 --- a/cad/kicad-library-templates/distinfo +++ b/cad/kicad-library-templates/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619292952 -SHA256 (kicad-templates-5.1.10.tar.bz2) = c02f516f15fac89c778cc3e90ca2c53bfb293eb98566c90b23f4bf1be942a2e2 -SIZE (kicad-templates-5.1.10.tar.bz2) = 1552124 +TIMESTAMP = 1636062369 +SHA256 (kicad-templates-5.1.12.tar.bz2) = 4afcf871b7f0c6d55d07deb8f13106861495a6166fd49edd8b18b5d952974e16 +SIZE (kicad-templates-5.1.12.tar.bz2) = 1552173 diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index 8fb63ce03d19..1f6c6202ded3 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -1,73 +1,72 @@ # Created by: Thierry Thomas PORTNAME= kicad -PORTVERSION= 5.1.10 -PORTREVISION= 1 +PORTVERSION= 5.1.12 PORTEPOCH= 2 CATEGORIES= cad MASTER_SITES= https://gitlab.com/${PORTNAME}/code/${PORTNAME}/-/archive/${DISTVERSION}/ MAINTAINER= cmt@FreeBSD.org COMMENT= Schematic and PCB editing software LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:math/glm \ swig:devel/swig LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libngspice.so:cad/ngspice_rework@shlib \ libTKernel.so:cad/opencascade \ libpixman-1.so:x11/pixman \ libpng.so:graphics/png \ libcurl.so:ftp/curl CONFLICTS= kicad-devel-r201* USES= cmake:noninja compiler:c++11-lib desktop-file-utils gl \ gnome pkgconfig python:3.5+ shared-mime-info shebangfix ssl \ tar:bz2 xorg SHEBANG_FILES= pcbnew/python/plugins/touch_slider_wizard.py USE_XORG= ice x11 xext USE_GL= gl glew glu glut USE_WX= 3.0 WX_COMPS= python:lib wx USE_GNOME= atk cairo CXXFLAGS+= --std=c++11 -I${WRKSRC}/include -I${LOCALBASE}/include CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG} \ -DwxWidgets_USE_UNICODE=ON \ -DKICAD_SCRIPTING_WXPYTHON=ON \ -DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD} \ -DKICAD_SCRIPTING=ON \ -DKICAD_SCRIPTING_MODULES=ON \ -DKICAD_SCRIPTING_PYTHON3=ON \ -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON \ -DKICAD_USE_OCE=OFF \ -DKICAD_USE_OCC=ON \ -DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE USE_LDCONFIG= yes PLIST_SUB= DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||} OPTIONS_DEFINE= DOCS DOXYGEN NLS OPTIONS_SUB= yes NLS_USES= gettext DOXYGEN_VARS= LICENSE+=GFDL LICENSE_COMB=multi DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_IMPLIES= DOCS DOXYGEN_ALL_TARGET= all doxygen-docs DOXYGEN_PORTDOCS= doxygen pre-configure: ${REINPLACE_CMD} -e 's|/usr/share/kicad|${DATADIR}|' \ -e 's|/usr/local|${PREFIX}|' \ ${WRKSRC}/common/gestfich.cpp ${REINPLACE_CMD} -e 's|/usr/bin/xdg-open|${LOCALBASE}/bin/xdg-open|' \ ${WRKSRC}/common/pgm_base.cpp post-install-DOCS-on: (cd ${WRKSRC}/Documentation && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include diff --git a/cad/kicad/distinfo b/cad/kicad/distinfo index 6813dbe5ac1f..d532a8028606 100644 --- a/cad/kicad/distinfo +++ b/cad/kicad/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619292871 -SHA256 (kicad-5.1.10.tar.bz2) = c1bd8521a581964e35b70d23d3b41380eae08e8ab8838db9a5f11b1f818378f9 -SIZE (kicad-5.1.10.tar.bz2) = 18586889 +TIMESTAMP = 1636062293 +SHA256 (kicad-5.1.12.tar.bz2) = af2a485911566097ca61efa394da6779d3bdf9b7dcbe27f56f4d9fc8b105d78b +SIZE (kicad-5.1.12.tar.bz2) = 18581842 diff --git a/cad/kicad/files/patch-plugins_3d_oce_loadmodel.cpp b/cad/kicad/files/patch-plugins_3d_oce_loadmodel.cpp new file mode 100644 index 000000000000..34d3de8e23a9 --- /dev/null +++ b/cad/kicad/files/patch-plugins_3d_oce_loadmodel.cpp @@ -0,0 +1,45 @@ +--- plugins/3d/oce/loadmodel.cpp.orig 2021-11-08 21:10:20.307953000 +0100 ++++ plugins/3d/oce/loadmodel.cpp 2021-11-08 21:42:19.793113000 +0100 +@@ -71,6 +71,8 @@ + #include + #include + ++#include ++ + #include "plugins/3dapi/ifsg_all.h" + + // log mask for wxLogTrace +@@ -865,8 +867,10 @@ + else + S3D::AddSGNodeRef( vshape.GetRawPtr(), ocolor ); + ++#if OCC_VERSION_HEX < 0x070600 + const TColgp_Array1OfPnt& arrPolyNodes = triangulation->Nodes(); + const Poly_Array1OfTriangle& arrTriangles = triangulation->Triangles(); ++#endif + + std::vector< SGPOINT > vertices; + std::vector< int > indices; +@@ -875,14 +879,22 @@ + + for(int i = 1; i <= triangulation->NbNodes(); i++) + { ++#if OCC_VERSION_HEX < 0x070600 + gp_XYZ v( arrPolyNodes(i).Coord() ); ++#else ++ gp_XYZ v( triangulation->Node(i).Coord() ); ++#endif + vertices.push_back( SGPOINT( v.X(), v.Y(), v.Z() ) ); + } + + for(int i = 1; i <= triangulation->NbTriangles(); i++) + { + int a, b, c; ++#if OCC_VERSION_HEX < 0x070600 + arrTriangles( i ).Get( a, b, c ); ++#else ++ triangulation->Triangle(i).Get(a, b, c); ++#endif + a--; + + if( reverse )