commit: 04ae9c5e0b5f8ce2c89c5c1266b6340bd9727f0f Author: Bernd Waibel <waebbl <AT> gmail <DOT> com> AuthorDate: Fri Jan 15 20:11:13 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Feb 15 09:03:53 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04ae9c5e
media-gfx/freecad: re-add package Pre-release version 0.19_pre with a commit date of 2020-12-31. The current stable upstream release 0.18.5 needs qtwebkit, that's why I didn't want to interfere with the removal of that package. Things to do: - bump sci-libs/vtk-9 and update dependency - add python-3.9 support (needs updated vtk) - update sci-mathematics/netgen and implement it in ebuild (FEM_NETGEN) - check for external zipios++ (package needed) - check for external smesh (package needed) - check for improvements in USE flags? Closes: https://bugs.gentoo.org/622726 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> media-gfx/freecad/Manifest | 1 + ...ndCoin3DDoc.cmake-fix-patch-for-coin-docs.patch | 26 ++ ...0002-CMakeLists.txt-add-option-for-ccache.patch | 33 +++ ...1231-0003-Gentoo-specific-don-t-check-vcs.patch | 26 ++ media-gfx/freecad/freecad-0.19_pre20201231.ebuild | 284 +++++++++++++++++++++ media-gfx/freecad/metadata.xml | 115 +++++++++ 6 files changed, 485 insertions(+) diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest new file mode 100644 index 00000000000..99ac7bbf679 --- /dev/null +++ b/media-gfx/freecad/Manifest @@ -0,0 +1 @@ +DIST freecad-0.19_pre20201231.tar.gz 236040771 BLAKE2B 648d8c1d8ab03f56403544f8e6a20dc5edc35b2cfc353c875202ce3e85449e450cbda93f410fec15366ce3aab342a93e981fa11cd9f5443a2fc40ef38ac0a1d0 SHA512 457792b0a12196d9e2d8113d9721a3b3a6d4fbc93bae001787db3eac43503a74a89a69564903b4005f8648476a150b6d871b3d78adfbf41c7260a4265132da34 diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch new file mode 100644 index 00000000000..d0097ab0730 --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch @@ -0,0 +1,26 @@ +From e08aec1344e753cd338a61c3584230741e00b23f Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <[email protected]> +Date: Thu, 31 Dec 2020 13:26:44 +0100 +Subject: [PATCH 1/2] FindCoin3DDoc.cmake: fix patch for coin docs + +Signed-off-by: Bernd Waibel <[email protected]> +--- + cMake/FindCoin3DDoc.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cMake/FindCoin3DDoc.cmake b/cMake/FindCoin3DDoc.cmake +index c6c92f2..1af53c2 100644 +--- a/cMake/FindCoin3DDoc.cmake ++++ b/cMake/FindCoin3DDoc.cmake +@@ -22,7 +22,7 @@ IF (COIN3D_FOUND) + # Unix systems + find_path(COIN3D_DOC_PATH index.html + /usr/share/doc/libcoin80-doc/html +- /usr/share/doc/coin/html ++ /usr/share/doc/coin-4.0.0/html + /usr/share/doc/Coin/html + ) + IF( EXISTS ${COIN3D_DOC_PATH}) +-- +2.30.0 + diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch new file mode 100644 index 00000000000..26bb4421077 --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch @@ -0,0 +1,33 @@ +From bce02c4804d14ae2257ad5f5e7fae4e2baa74503 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <[email protected]> +Date: Thu, 31 Dec 2020 13:31:47 +0100 +Subject: [PATCH 2/2] CMakeLists.txt: add option for ccache + +Signed-off-by: Bernd Waibel <[email protected]> +--- + CMakeLists.txt | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f4dabf7..17b9fad 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,9 +8,12 @@ if (POLICY CMP0072) + cmake_policy(SET CMP0072 OLD) + endif(POLICY CMP0072) + +-find_program(CCACHE_PROGRAM ccache) #This check should occur before project() +-if(CCACHE_PROGRAM) +- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") ++option(FREECAD_USE_CCACHE "Use ccache to build FreeCAD" OFF) ++if(FREECAD_USE_CCACHE) ++ find_program(CCACHE_PROGRAM ccache) #This check should occur before project() ++ if(CCACHE_PROGRAM) ++ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") ++ endif() + endif() + + project(FreeCAD) +-- +2.30.0 + diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch new file mode 100644 index 00000000000..1a384198ae3 --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch @@ -0,0 +1,26 @@ +From acc8a26b73a87ae024bce30e9f1531610b6e0e5f Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <[email protected]> +Date: Sat, 13 Feb 2021 14:54:28 +0100 +Subject: [PATCH] [Gentoo specific] don't check vcs + +Signed-off-by: Bernd Waibel <[email protected]> +--- + src/Tools/SubWCRev.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Tools/SubWCRev.py b/src/Tools/SubWCRev.py +index 9795450..59938bd 100644 +--- a/src/Tools/SubWCRev.py ++++ b/src/Tools/SubWCRev.py +@@ -455,7 +455,7 @@ def main(): + if o in ("-b", "--bindir"): + bindir = a + +- vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), MercurialControl(), DebianChangelog(), UnknownControl()] ++ vcs=[UnknownControl()] + for i in vcs: + if i.extractInfo(srcdir, bindir): + # Open the template file and the version file +-- +2.30.1 + diff --git a/media-gfx/freecad/freecad-0.19_pre20201231.ebuild b/media-gfx/freecad/freecad-0.19_pre20201231.ebuild new file mode 100644 index 00000000000..9d1447e685a --- /dev/null +++ b/media-gfx/freecad/freecad-0.19_pre20201231.ebuild @@ -0,0 +1,284 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# vtk needs updating to use 3.9 +PYTHON_COMPAT=( python3_{7,8} ) + +inherit check-reqs cmake desktop optfeature python-single-r1 xdg + +DESCRIPTION="QT based Computer Aided Design application" +HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"; + +if [[ ${PV} = *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"; + S="${WORKDIR}/freecad-${PV}" +else + COMMIT=82ec99dbc1f0f054748059ae8bb138eb44b43073 + SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/FreeCAD-${COMMIT}" +fi + +# code is licensed LGPL-2 +# examples are licensed CC-BY-SA (without note of specific version) +LICENSE="LGPL-2 CC-BY-SA-4.0" +SLOT="0" +IUSE="ccache debug headless pcl test" +RESTRICT="!test? ( test )" + +FREECAD_EXPERIMENTAL_MODULES="cloud plot ship" +FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image + inspection material mesh openscad part-design path points + raytracing robot show spreadsheet surface techdraw tux" + +for module in ${FREECAD_STABLE_MODULES}; do + IUSE="${IUSE} +${module}" +done +for module in ${FREECAD_EXPERIMENTAL_MODULES}; do + IUSE="${IUSE} -${module}" +done +unset module + +RDEPEND=" + ${PYTHON_DEPS} + >=dev-cpp/eigen-3.3.1:3 + dev-libs/OpenNI2[opengl(+)] + dev-libs/libspnav[X] + dev-libs/xerces-c + dev-qt/designer:5 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + >=media-libs/coin-4.0.0 + media-libs/freetype + media-libs/qhull + sci-libs/flann[openmp] + >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}] + sci-libs/opencascade:=[vtk(+)] + sci-libs/orocos_kdl:= + sys-libs/zlib + virtual/glu + virtual/libusb:1 + virtual/opengl + cloud? ( + dev-libs/openssl:= + net-misc/curl + ) + fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] ) + mesh? ( sci-libs/hdf5:=[fortran,zlib] ) + openscad? ( media-gfx/openscad ) + pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) + $(python_gen_cond_dep ' + dev-libs/boost:=[python,threads,${PYTHON_MULTI_USEDEP}] + dev-python/matplotlib[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + >=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}] + dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}] + dev-python/shiboken2[${PYTHON_MULTI_USEDEP}] + addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] ) + mesh? ( dev-python/pybind11[${PYTHON_MULTI_USEDEP}] ) + ') +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/swig + ccache? ( dev-util/ccache ) +" + +# To get required dependencies: +# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' +# We set the following requirements by default: +# draft, import, part, qt5, sketcher, start, web. +# +# Additionally if mesh is set, we auto-enable mesh_part, flat_mesh and smesh +# Fem actually needs smesh, but as long as we don't have a smesh package, we enable +# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't +# reflected by the REQUIRES_MODS macro, but at +# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187. +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + arch? ( mesh ) + debug? ( mesh ) + drawing? ( spreadsheet ) + fem? ( mesh ) + inspection? ( mesh points ) + openscad? ( mesh ) + path? ( mesh robot ) + ship? ( image plot ) + techdraw? ( spreadsheet drawing ) +" + +PATCHES=( + "${FILESDIR}"/${P}-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch + "${FILESDIR}"/${P}-0002-CMakeLists.txt-add-option-for-ccache.patch + "${FILESDIR}"/${P}-0003-Gentoo-specific-don-t-check-vcs.patch +) + +DOCS=( README.md ChangeLog.txt CODE_OF_CONDUCT.md ) + +CHECKREQS_DISK_BUILD="7G" + +pkg_setup() { + check-reqs_pkg_setup + python-single-r1_pkg_setup + [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade" +} + +src_prepare() { + # the upstream provided file doesn't find the coin doc tag file, + # but cmake ships a working one, so we use this. + rm "${S}/cMake/FindCoin3D.cmake" || die + + # Fix OpenCASCADE lookup + sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \ + -e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \ + -i cMake/FindOpenCasCade.cmake || die + + # Fix desktop file + sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_ADDONMGR=$(usex addonmgr) + -DBUILD_ARCH=$(usex arch) + -DBUILD_ASSEMBLY=OFF + -DBUILD_CLOUD=$(usex cloud) + -DBUILD_COMPLETE=OFF # deprecated + -DBUILD_DRAFT=ON # basic workspace, enable it by default + -DBUILD_DRAWING=$(usex drawing) + -DBUILD_ENABLE_CXX_STD:STRING="C++14" # needed for >=boost-1.75.0 + -DBUILD_FEM=$(usex fem) + -DBUILD_FEM_NETGEN=OFF + -DBUILD_FLAT_MESH=$(usex mesh) + -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory + -DBUILD_FREETYPE=ON # automagic dep + -DBUILD_GUI=$(usex !headless) + -DBUILD_IDF=$(usex idf) + -DBUILD_IMAGE=$(usex image) + -DBUILD_IMPORT=ON # import module for various file formats + -DBUILD_INSPECTION=$(usex inspection) + -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there + -DBUILD_MATERIAL=$(usex material) + -DBUILD_MESH=$(usex mesh) + -DBUILD_MESH_PART=$(usex mesh) + -DBUILD_OPENSCAD=$(usex openscad) + -DBUILD_PART=ON # basic workspace, enable it by default + -DBUILD_PART_DESIGN=$(usex part-design) + -DBUILD_PATH=$(usex path) + -DBUILD_PLOT=$(usex plot) # conflicts with possible external workbench + -DBUILD_POINTS=$(usex points) + -DBUILD_QT5=ON # OFF means to use Qt4 + -DBUILD_RAYTRACING=$(usex raytracing) + -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox + -DBUILD_ROBOT=$(usex robot) + -DBUILD_SHIP=$(usex ship) # conflicts with possible external workbench + -DBUILD_SHOW=$(usex show) + -DBUILD_SKETCHER=ON # needed by draft workspace + -DBUILD_SMESH=$(usex mesh) + -DBUILD_SPREADSHEET=$(usex spreadsheet) + -DBUILD_START=ON # basic workspace, enable it by default + -DBUILD_SURFACE=$(usex surface) + -DBUILD_TECHDRAW=$(usex techdraw) + -DBUILD_TUX=$(usex tux) + -DBUILD_VR=OFF + -DBUILD_WEB=ON # needed by start workspace + -DBUILD_WITH_CONDA=OFF + + -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN} + -DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN} + + -DFREECAD_BUILD_DEBIAN=OFF + + -DFREECAD_USE_CCACHE=$(usex ccache) + -DFREECAD_USE_EXTERNAL_KDL=ON + -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo + -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree + -DFREECAD_USE_FREETYPE=ON + -DFREECAD_USE_OCC_VARIANT:STRING="Official Version" + -DFREECAD_USE_PCL=$(usex pcl) + -DFREECAD_USE_PYBIND11=$(usex mesh) + -DFREECAD_USE_QT_FILEDIALOG=ON + -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" + + -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade + -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir) + -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo + ) + + if use debug; then + mycmakeargs+=( + # sandbox needs mesh support + -DBUILD_SANDBOX=$(usex mesh) + -DBUILD_TEMPLATE=ON + -DBUILD_TEST=ON + ) + else + mycmakeargs+=( + -DBUILD_SANDBOX=OFF + -DBUILD_TEMPLATE=OFF + -DBUILD_TEST=OFF + ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if ! use headless; then + dosym ../$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad + mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources" + fi + dosym ../$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd + + python_optimize "${ED}"/usr/share/${PN}/data/Mod/ "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ +} + +pkg_postinst() { + xdg_pkg_postinst + + if use plot; then + einfo "Note: You are enabling the 'plot' USE flag." + einfo "This conflicts with the plot workbench that can be loaded" + einfo "via the addon manager! You can only install one of those." + fi + + if use ship; then + einfo "Note: You are enabling the 'ship' USE flag." + einfo "This conflicts with the ship workbench that can be loaded" + einfo "via the addon manager! You can only install one of those." + fi + + einfo "You can load a lot of additional workbenches using the integrated" + einfo "AddonManager." + + einfo "There are a lot of additional tools, for which FreeCAD has builtin" + einfo "support. Some of them are available in Gentoo. Take a look at" + einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"; + optfeature "interact with git repositories" dev-python/GitPython + optfeature "work with COLLADA documents" dev-python/pycollada + optfeature "dependency graphs" media-gfx/graphviz + optfeature "PBR Rendering" media-gfx/povray + optfeature "FEM mesh generator" sci-libs/gmsh +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml new file mode 100644 index 00000000000..a36a8d876fb --- /dev/null +++ b/media-gfx/freecad/metadata.xml @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> + <maintainer type="person"> + <email>[email protected]</email> + <name>Bernd Waibel</name> + </maintainer> + <maintainer type="project"> + <email>[email protected]</email> + <description>Gentoo Proxy Maintainers</description> + </maintainer> + <use> + <flag name="addonmgr"> + Build the addon manager module for automatic handling of 3rd + party addons + </flag> + <flag name="arch"> + Build the architecture workbench for working with architectural + elements + </flag> + <flag name="ccache"> + Use <pkg>dev-util/ccache</pkg> to build the package. + </flag> + <flag name="cloud"> + Build the Cloud workbench, to access cloud providers (mostly + Amazon S3). + </flag> + <flag name="drawing"> + Build the drawing module and workbench to display 3D work on a + 2D sheet + </flag> + <flag name="fem"> + Build the FEM module and workbench which provides Finite Element + Analysis (FEA) workflows + </flag> + <flag name="headless"> + Build FreeCAD without a GUI, usable for server-side instances. + The Python modules are still available, without their GUI parts though. + </flag> + <flag name="idf"> + Build the IDF module to provide file exchange capabilities with + IDF files + </flag> + <flag name="image"> + Build the image module and workbench for working with bitmap + images + </flag> + <flag name="inspection"> + Build the inspection workbench which gives you specific tools + for examination of shapes (experimental) + </flag> + <flag name="material"> + Build the material module and workbench to work with materials + </flag> + <flag name="mesh"> + Build the mesh module and workbench to work with triangulated + meshes + </flag> + <flag name="openscad"> + Build the OpenSCAD module for interoperability with OpenSCAD + and repairing Constructive Solid Geometry (CSG) history + </flag> + <flag name="part-design"> + Build the part design module and workbench for build part shapes + from sketches + </flag> + <flag name="path"><!-- FIXME: auto-enable through robot? --> + Build the path module and workbench to procude G-Code instructions + for CNC + </flag> + <flag name="pcl"> + Use external <pkg>sci-libs/pcl</pkg> for point clouds support. + </flag> + <flag name="plot"> + Build the internal plot workbench. NOTE: This conflicts with the + external plot workbench, which you can add via the Addon Manager! + </flag> + <flag name="points"> + Build the points module and workbench for working with point clouds + </flag> + <flag name="raytracing"> + Build the raytracing module and workbench for raytracing and rendering + </flag> + <flag name="robot"> + Build the robot module and workbench for studying robot movements + </flag> + <flag name="ship"> + Build the ship module and workbench which works over ship entities, + that must be created on top of provided geometry. NOTE: This conflicts + with the external ship workbench, which you can add via the Addon Manager! + </flag> + <flag name="show"> + Build the show module, a helper module for visibility automation + </flag> + <flag name="spreadsheet"> + Build the spreadsheet module and workbench to create and manipulate + spreadsheet data + </flag> + <flag name="surface"> + Build the surface module and workbench + </flag> + <flag name="techdraw"> + Build the techdraw module and workbench, a more advanced and + feature-rich successor of the drawing workbench + </flag> + <flag name="tux"> + Build the Tux module + </flag> + </use> + <upstream> + <bugs-to>https://www.freecadweb.org/tracker/</bugs-to> + <remote-id type="github">FreeCAD/FreeCAD</remote-id> + <doc lang="en">https://www.freecadweb.org/wiki/MainPage</doc> + </upstream> +</pkgmetadata>
