From b66ecfb4dc09ba76e37787df2f7df1a78c3c1cc9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 16 Sep 2024 12:11:35 +0100 Subject: gentoo auto-resync : 16:09:2024 - 12:11:35 --- media-gfx/Manifest.gz | Bin 38539 -> 38535 bytes media-gfx/entangle/Manifest | 4 +- media-gfx/entangle/entangle-3.0-r3.ebuild | 5 +- media-gfx/entangle/metadata.xml | 2 +- media-gfx/freecad/Manifest | 6 +- media-gfx/freecad/freecad-1.0_rc1-r1.ebuild | 392 +++++++++++++++++++++ media-gfx/freecad/freecad-1.0_rc1.ebuild | 388 -------------------- media-gfx/freecad/freecad-9999.ebuild | 25 +- media-gfx/freecad/metadata.xml | 3 + media-gfx/superslicer/Manifest | 2 + .../superslicer-2.5.59.10-boost-headers.patch | 45 +++ .../superslicer/superslicer-2.5.59.10-r1.ebuild | 110 ++++++ 12 files changed, 578 insertions(+), 404 deletions(-) create mode 100644 media-gfx/freecad/freecad-1.0_rc1-r1.ebuild delete mode 100644 media-gfx/freecad/freecad-1.0_rc1.ebuild create mode 100644 media-gfx/superslicer/files/superslicer-2.5.59.10-boost-headers.patch create mode 100644 media-gfx/superslicer/superslicer-2.5.59.10-r1.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 2da3a96f7b43..830af0b780be 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest index 5be4f001814a..d5bdea41c8df 100644 --- a/media-gfx/entangle/Manifest +++ b/media-gfx/entangle/Manifest @@ -1,4 +1,4 @@ AUX entangle-3.0-fix-meson-0.61-build.patch 810 BLAKE2B 4b4eac6fbddba41e6f6cdd2afa4f0db1b603bc96b1c281fde415cd71826ae15cb839b267a138229dd59e280459f7cc3cd1538e32357b0bab74b1a5a9507a9caa SHA512 fb2196fc1ec125c6b8ba237c74e9495d8e0e22bd584948a385d3ee906fd32ad9887d02093b3c690e5de90fa19e7d7e538aed9e1f8ede433e15bdd6ad80639ff1 DIST entangle-3.0.tar.xz 518808 BLAKE2B fe2bf4b114bc04fdc56792f984ae7387b70d693fa82f8deaa2023de71a8bba72bc95d4bfc430cdfaf5244e9114b4f7e8bb2e17f3b86de6529037519fa3877899 SHA512 8c6d7e067f88a770c63b76fde2a6ae71894aae95477fcf66b4670697889fdf7939d3f95532626d6f4ca7ae75841d8f247f6bcf78a1ce195b540989f1bfe5ebdd -EBUILD entangle-3.0-r3.ebuild 1700 BLAKE2B 2e97f166c0de255ae010cf4ffcfe6c3cd8eef26e2b850bdce4bfb9d6215e7bcf5a7ca8a764da111b03b15ebc71e3972851eaf16bc6e87cd8488e47eb3265d105 SHA512 79395c199f0426db64ca909798db5b39049e67430d7da81a7e31a95da61dc9110caaccf3c5864836010e52cfecb4b01bcf9c9dfa6160817c2a2c34bb20d7af58 -MISC metadata.xml 529 BLAKE2B ba406d65b63eb495962182c821cb2ad6498b3b67402f92891b7aa22d89ec76915cad324a2b25d41067f3345e75a5d993529e9be2de74443e3342cd0761f9e40e SHA512 db363ca3c2def3556bfb2e01e873b544cbc9c1ecba9ce15ee2de5decd7bbdf300357a5b722ee643454036d3eaaf6e1f29c0dc0cd379943408ceb1012520c5c16 +EBUILD entangle-3.0-r3.ebuild 1742 BLAKE2B 8920e7fa0880eb38d038bec6de172fa7f4239ee7e4b062445c01755ce6fc270beb94c273bd7117b23acfa1dc1a7559da4cbc3e02d2e387a3d0b094670b8a0033 SHA512 bef5a1942d338b1e09b088834505ca10d24a85d2e13b59a17aaf228042fa1ccb497a2a6382e89ccf4edbce62260d34af3935efb15a2771053a65e4ca314d634b +MISC metadata.xml 529 BLAKE2B 044afc2ddf07e5d4b99c865e88396aab898773b83c8409e108de4ee11ff096d9ca72ce7165bd4adc8966d73bfbe67db922d4ed4fb3b88aadb5205bb1a2d81482 SHA512 b5556dcb7a0ba3a9c716b29fab18e01e9d56d5a5d43aedd97dbe4315485b8441a6f52d94bded8205b59ae1a1d2baf9e35a1fde5ee944395f4591a55b8646bc61 diff --git a/media-gfx/entangle/entangle-3.0-r3.ebuild b/media-gfx/entangle/entangle-3.0-r3.ebuild index 575c7d78c119..d604ff90b1f6 100644 --- a/media-gfx/entangle/entangle-3.0-r3.ebuild +++ b/media-gfx/entangle/entangle-3.0-r3.ebuild @@ -8,7 +8,10 @@ PYTHON_COMPAT=( python3_{10..12} ) inherit gnome2-utils meson python-single-r1 xdg-utils DESCRIPTION="Tethered Camera Control & Capture" -HOMEPAGE="https://entangle-photo.org/" +HOMEPAGE=" + https://entangle-photo.org/ + https://gitlab.com/entangle/entangle/ +" SRC_URI="https://entangle-photo.org/download/sources/${P}.tar.xz" LICENSE="GPL-3+" diff --git a/media-gfx/entangle/metadata.xml b/media-gfx/entangle/metadata.xml index 60c98605ee19..52f8c5722568 100644 --- a/media-gfx/entangle/metadata.xml +++ b/media-gfx/entangle/metadata.xml @@ -13,6 +13,6 @@ Gentoo Video project - entangle/entangle + entangle/entangle diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index 518a5d3a49b5..086f887a3a2d 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -13,6 +13,6 @@ AUX freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch 469 BLAKE2B DIST freecad-0.21.2.tar.gz 66124278 BLAKE2B 84a4f8008192cd1a2ee1737b537b2668a8c028aa8c8645e6e412ab9ef79bf3bdd2cb73d96fcfd2dbcff613cdcc59cbab95821406acdc9cd7d4eb4636c081be78 SHA512 bd7e9029b24d49ac0955797bcdbea1fd0826bdf9ab246135366dfc35b427004f103acccfc66d008e3ab3928f99e04200e335908a03166545554e2d3e969ae0f5 DIST freecad-1.0_rc1.tar.gz 88552055 BLAKE2B 3e2607d87da86edd35c05abba0d7085bed7fc42f9831c7e2451e028b3ce267c7a1e44b82c9a51bdfc736b5c98198030aafb81a7ae5df158ae17bc5afe2df44e0 SHA512 1d0a0d131c35ee03b435a0b901cb56c8e98ce2dd62ff5102856b3777dfc6d3bfba6ff4ea87e8c8949640bd14fdb775db3e9eb9a8b6530dd1f86a903037c95dba EBUILD freecad-0.21.2-r3.ebuild 12437 BLAKE2B c9c9a77f7b7b0aadee67b3fb2aa6ac13da06bcc790e4291e6413826b246a92052f535962c974654646c79a481378b99582d2499b134d57b76cbcad4056fc2fc7 SHA512 c68c9f9a7d106ac48ddf280f716cd73398693e058e8c475d912e61d43466e80041d60847efa2cd5d022d1ac59d1057c14c61943c2eb3ce68032d232b29469c08 -EBUILD freecad-1.0_rc1.ebuild 12064 BLAKE2B 0d0684265e5c52b1ca10f932339bf12b13675bb2aa1802f78659a1e816fec77fc270242bff46c09c60e2ab9704d949dd9c6daba9cb7c04bdf6f884528fae4d7a SHA512 dd8ae632f75a56073a6c1c219b842260b7538099a188526bb08b8debff45a5769922b5edfb4eb5bd1c801ad749485f1c302b4bc9410434224bad74130a031473 -EBUILD freecad-9999.ebuild 11973 BLAKE2B 9befb852d6d7b8f5310c0692c5175ddb87a45260eddbe31a3376362218136a2e27b5cc5fbeff8269558c02b4448bdc553a68772ad9b565d19d3e2aa34dbb6fd8 SHA512 bf284186d32f598ab85fab40c7cdd67f185d8147e5951681ad86c030c523453049365c6cfc2a503268f82cf3ce0a5387e61541f765ca1fbffeee18cb5b875d1e -MISC metadata.xml 3190 BLAKE2B 5f8776248055147c9b2a308913e1d3476ad27b5a3b7795b4fdf15b4d7f10451d6f5ce16ab1ef691daedd74f02fa12efb6341a7ec10456786c427d7707948fdbc SHA512 2163a91c7f7ec97acf81e7c4a2481667388fb43f60ee48d40a09c9bebfebffa8a807ff275385d8dcbefefe16c51bc9de3c07c84d92344f968985693117007042 +EBUILD freecad-1.0_rc1-r1.ebuild 12159 BLAKE2B 6f5d35bdb359663b7ad722bfa10056d1243bec34f487a543fc61773124e3831685ca42e20af2e179bb8ba6e29c917bffb775a2282fb6660d111bc0fc1b7f87f7 SHA512 b0e4a6e71c4ba797fd414b5274ee2027fef6c9b4ad869814cac216e4d5b7b11fbe1e47fd98586bed4bf24805d4a790e4bb9d73341e7d5ab6a2618a7a57d2e654 +EBUILD freecad-9999.ebuild 12136 BLAKE2B 2ae1b5185a1182077a63cd54151d3f2c27601ab622b257ec1a135b34ebc4a446c0251aa27dd0af4a3ffc8f42e5ee9e5a2712af669334d819bfecba518d5edf99 SHA512 2d3a116c1b9e90067f06afde1c917716b93d8b1ee217303e430301a1ba97b9bba5d850531e96e93bccff6e57fc259d7750209586c52f945d10789662e8b9f49f +MISC metadata.xml 3255 BLAKE2B d9504bdcdbf11f8475f764ef03927314f2d57d69d1229cb5aab93872d28686d13ad6c8e5a680b49af9e63c7352d0fd2b93f798761d67b30bee2450e0fec052f9 SHA512 f030e226befb1a66723275cbff560d528915d0a749fe70a04ab73ba9016bcdc0127f4e3c9543a0f72bf0d59f624eda88d93a3968af112b20338b9d2c03903b34 diff --git a/media-gfx/freecad/freecad-1.0_rc1-r1.ebuild b/media-gfx/freecad/freecad-1.0_rc1-r1.ebuild new file mode 100644 index 000000000000..0cd5f233f0bb --- /dev/null +++ b/media-gfx/freecad/freecad-1.0_rc1-r1.ebuild @@ -0,0 +1,392 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg + +DESCRIPTION="QT based Computer Aided Design application" +HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD" + +MY_PN=FreeCAD +MY_PV="${PV/_/}" + +if [[ ${PV} = *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" + S="${WORKDIR}/freecad-${PV}" +else + SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/FreeCAD-${MY_PV}" +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="debug designer +gui +qt6 test" + +FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl" +FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material + openscad part-design path points raytracing robot show smesh + 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 + +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + dev-cpp/yaml-cpp + dev-libs/OpenNI2[opengl(+)] + dev-libs/boost:= + dev-libs/libfmt:= + dev-libs/libspnav[X] + dev-libs/xerces-c[icu] + dev-ruby/asciidoctor + !qt6? ( + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 + ) + qt6? ( + dev-qt/qtbase:6[concurrent,network,xml] + ) + media-libs/freetype + media-libs/qhull:= + sci-libs/hdf5:=[fortran,zlib] + >=sci-libs/med-4.0.0-r1 + sci-libs/opencascade:=[json,vtk] + sci-libs/orocos_kdl:= + sys-libs/zlib + virtual/libusb:1 + cloud? ( + dev-libs/openssl:= + net-misc/curl + ) + fem? ( + !qt6? ( sci-libs/vtk:=[qt5,rendering] ) + qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) + ) + gui? ( + >=media-libs/coin-4.0.0 + virtual/glu + virtual/opengl + !qt6? ( + dev-qt/designer:5 + dev-qt/qtgui: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 + pcl? ( sci-libs/pcl[qt5] ) + $(python_gen_cond_dep ' + dev-python/matplotlib[${PYTHON_USEDEP}] + >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] + dev-python/pyside2:=[gui,svg,webchannel,webengine,${PYTHON_USEDEP}] + dev-python/shiboken2:=[${PYTHON_USEDEP}] + ' python3_{10..11} ) + ) + qt6? ( + designer? ( dev-qt/qttools:6[designer] ) + dev-qt/qt5compat:6 + dev-qt/qttools:6[widgets] + dev-qt/qtbase:6[gui,opengl,widgets] + dev-qt/qtsvg:6 + dev-qt/qtwebengine:6[widgets] + pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) + $(python_gen_cond_dep ' + dev-python/matplotlib[${PYTHON_USEDEP}] + >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] + dev-python/pyside6:=[gui,svg,webchannel,webengine,${PYTHON_USEDEP}] + dev-python/shiboken6:=[${PYTHON_USEDEP}] + ' ) + ) + ) + netgen? ( media-gfx/netgen[opencascade] ) + openscad? ( media-gfx/openscad ) + pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) + smesh? ( + !qt6? ( sci-libs/vtk:=[qt5] ) + qt6? ( sci-libs/vtk:=[-qt5,qt6] ) + ) + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] ) + fem? ( dev-python/ply[${PYTHON_USEDEP}] ) + ') +" +DEPEND="${RDEPEND} + >=dev-cpp/eigen-3.3.1:3 + dev-cpp/ms-gsl + test? ( + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + !qt6? ( dev-qt/qttest:5 ) + ) +" +BDEPEND=" + app-text/dos2unix + dev-lang/swig + test? ( + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + !qt6? ( dev-qt/qttest:5 ) + ) +" + +# To get required dependencies: +# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' +# We set the following requirements by default: +# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, web. +# +# Additionally, 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. +# +# The increase in auto-enabled workbenches is due to their need in parts of the +# test suite when compiled with a minimal set of USE flags. +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + designer? ( gui ) + inspection? ( points ) + path? ( robot ) + python_single_target_python3_12? ( gui? ( qt6 ) ) +" +# There is no py3.12 support planned for pyside2 + +PATCHES=( + "${FILESDIR}"/${PN}-9999-Gentoo-specific-don-t-check-vcs.patch + "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch + "${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch +) + +DOCS=( CODE_OF_CONDUCT.md README.md ) + +CHECKREQS_DISK_BUILD="2G" + +pkg_setup() { + check-reqs_pkg_setup + python-single-r1_pkg_setup + [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade" +} + +src_prepare() { + # Fix desktop file + sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecad.FreeCAD.desktop || die + + find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings" + + cmake_src_prepare +} + +src_configure() { + # -Werror=odr, -Werror=lto-type-mismatch + # https://bugs.gentoo.org/875221 + # https://github.com/FreeCAD/FreeCAD/issues/13173 + filter-lto + + # Fix building tests + append-ldflags -Wl,--copy-dt-needed-entries + + local mycmakeargs=( + -DBUILD_ADDONMGR=$(usex addonmgr) + -DBUILD_ARCH=ON + -DBUILD_ASSEMBLY=OFF # Requires OndselSolver + -DBUILD_CLOUD=$(usex cloud) + -DBUILD_COMPLETE=OFF # deprecated + -DBUILD_DRAFT=ON + -DBUILD_DESIGNER_PLUGIN=$(usex designer) + -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for current git master + -DBUILD_FEM=$(usex fem) + -DBUILD_FEM_NETGEN=$(usex netgen) + -DBUILD_FLAT_MESH=ON + -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory + -DBUILD_FREETYPE=ON # automagic dep + -DBUILD_GUI=$(usex gui) + -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=ON + -DBUILD_MESH_PART=ON + -DBUILD_OPENSCAD=$(usex openscad) + -DBUILD_PART=ON + -DBUILD_PART_DESIGN=$(usex part-design) + -DBUILD_PATH=$(usex path) + -DBUILD_POINTS=$(usex points) + -DBUILD_RAYTRACING=$(usex raytracing) + -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox + -DBUILD_ROBOT=$(usex robot) + -DBUILD_SHOW=$(usex show) + -DBUILD_SKETCHER=ON # needed by draft workspace + -DBUILD_SMESH=$(usex smesh) + -DBUILD_SPREADSHEET=ON + -DBUILD_START=ON + -DBUILD_SURFACE=$(usex surface) + -DBUILD_TECHDRAW=$(usex techdraw) + -DBUILD_TEST=ON # always build test workbench for run-time testing + -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_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=ON + -DFREECAD_USE_QT_FILEDIALOG=ON + -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" + + # install python modules to site-packages' dir. True only for the main package, + # sub-packages will still be installed inside /usr/lib64/freecad + -DINSTALL_TO_SITEPACKAGES=ON + + # Use the version of shiboken2 that matches the selected python version + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + -DPython3_EXECUTABLE=${PYTHON} + ) + + if use debug; then + # BUILD_SANDBOX currently broken, see + # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595 + mycmakeargs+=( + -DBUILD_SANDBOX=OFF + -DBUILD_TEMPLATE=ON + ) + else + mycmakeargs+=( + -DBUILD_SANDBOX=OFF + -DBUILD_TEMPLATE=OFF + ) + fi + + if use qt6; then + mycmakeargs+=( + -DFREECAD_QT_MAJOR_VERSION=6 + -DFREECAD_QT_VERSION=6 + -DQT_DEFAULT_MAJOR_VERSION=6 + -DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc" + -DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc" + -DBUILD_QT5=OFF + # Drawing module unmaintained and not ported to qt6 + -DBUILD_DRAWING=OFF + ) + else + mycmakeargs+=( + -DFREECAD_QT_MAJOR_VERSION=5 + -DFREECAD_QT_VERSION=5 + -DQT_DEFAULT_MAJOR_VERSION=5 + -DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" + -DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc" + -DBUILD_QT5=ON + # Drawing module unmaintained and not ported to qt6 + -DBUILD_DRAWING=ON + ) + fi + + cmake_src_configure +} + +# We use the FreeCADCmd binary instead of the FreeCAD binary here +# for two reasons: +# 1. It works out of the box with USE=-gui as well, not needing a guard +# 2. We don't need virtualx.eclass and it's dependencies +# The exported environment variables are needed, so freecad does know +# where to save it's temporary files, and where to look and write it's +# configuration. Without those, there are sandbox violation, when it +# tries to create /var/lib/portage/home/.FreeCAD directory. +src_test() { + pushd "${BUILD_DIR}" > /dev/null || die + export FREECAD_USER_HOME="${HOME}" + export FREECAD_USER_DATA="${T}" + export FREECAD_USER_TEMP="${T}" + nonfatal ./bin/FreeCADCmd --run-test 0 + popd > /dev/null || die +} + +src_install() { + cmake_src_install + + dobin src/Tools/freecad-thumbnailer + + if use gui; then + newbin - freecad <<- _EOF_ + #!/bin/sh + # https://github.com/coin3d/coin/issues/451 + : \${QT_QPA_PLATFORM:=xcb} + export QT_QPA_PLATFORM + exec /usr/$(get_libdir)/${PN}/bin/FreeCAD "\${@}" + _EOF_ + mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources" + fi + dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd + + rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format" + + python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ + # compile main package in python site-packages as well + python_optimize +} + +pkg_postinst() { + xdg_pkg_postinst + + einfo "You can load a lot of additional workbenches using the integrated" + einfo "AddonManager." + + # ToDo: check opencv, pysolar (::science), elmerfem (::science) + # ifc++, ifcopenshell, z88 (no pkgs), calculix-ccx (::waebbl) + 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_header "Computational utilities" + optfeature "BLAS library" sci-libs/openblas + optfeature "Statistical computation with Python" dev-python/pandas + optfeature "Use scientific computation with Python" dev-python/scipy + optfeature "Use symbolic math with Python" dev-python/sympy + optfeature_header "Imaging, Plotting and Rendering utilities" + optfeature "Dependency graphs" media-gfx/graphviz + optfeature "PBR Rendering" media-gfx/povray + optfeature_header "Import / Export" + optfeature "Interact with git repositories" dev-python/GitPython + optfeature "Work with COLLADA documents" dev-python/pycollada + optfeature "YAML importer and emitter" dev-python/pyyaml + optfeature "Importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg + optfeature "Importing and exporting geospatial data formats" sci-libs/gdal + optfeature "Working with projection data" sci-libs/proj + optfeature_header "Meshing and FEM" + optfeature "FEM mesh generator" sci-libs/gmsh + optfeature "Triangulating meshes" sci-libs/gts + optfeature "Visualization" sci-visualization/paraview +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/media-gfx/freecad/freecad-1.0_rc1.ebuild b/media-gfx/freecad/freecad-1.0_rc1.ebuild deleted file mode 100644 index cfc5732f206f..000000000000 --- a/media-gfx/freecad/freecad-1.0_rc1.ebuild +++ /dev/null @@ -1,388 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg - -DESCRIPTION="QT based Computer Aided Design application" -HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD" - -MY_PN=FreeCAD -MY_PV="${PV/_/}" - -if [[ ${PV} = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" - S="${WORKDIR}/freecad-${PV}" -else - SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/FreeCAD-${MY_PV}" -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="debug designer +gui qt6 test" - -FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl" -FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material - openscad part-design path points raytracing robot show 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 - -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-cpp/yaml-cpp - dev-libs/OpenNI2[opengl(+)] - dev-libs/boost:= - dev-libs/libfmt:= - dev-libs/libspnav[X] - dev-libs/xerces-c[icu] - !qt6? ( - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5 - ) - qt6? ( - dev-qt/qtbase:6[concurrent,network,xml] - ) - media-libs/freetype - media-libs/qhull:= - sci-libs/hdf5:=[fortran,zlib] - >=sci-libs/med-4.0.0-r1 - sci-libs/opencascade:=[json,vtk] - sci-libs/orocos_kdl:= - sys-libs/zlib - virtual/libusb:1 - cloud? ( - dev-libs/openssl:= - net-misc/curl - ) - fem? ( - !qt6? ( sci-libs/vtk:=[qt5,rendering] ) - qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) - ) - gui? ( - >=media-libs/coin-4.0.0 - virtual/glu - virtual/opengl - !qt6? ( - dev-qt/designer:5 - dev-qt/qtgui: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 - pcl? ( sci-libs/pcl[qt5] ) - $(python_gen_cond_dep ' - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] - dev-python/pyside2:=[gui,svg,webchannel,webengine,${PYTHON_USEDEP}] - dev-python/shiboken2:=[${PYTHON_USEDEP}] - ' python3_{10..11} ) - ) - qt6? ( - designer? ( dev-qt/qttools:6[designer] ) - dev-qt/qt5compat:6 - dev-qt/qttools:6[widgets] - dev-qt/qtbase:6[gui,opengl,widgets] - dev-qt/qtsvg:6 - dev-qt/qtwebengine:6[widgets] - pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) - $(python_gen_cond_dep ' - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] - dev-python/pyside6:=[gui,svg,webchannel,webengine,${PYTHON_USEDEP}] - dev-python/shiboken6:=[${PYTHON_USEDEP}] - ' ) - ) - ) - netgen? ( media-gfx/netgen[opencascade] ) - openscad? ( media-gfx/openscad ) - pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] ) - fem? ( dev-python/ply[${PYTHON_USEDEP}] ) - ') -" -DEPEND=" - ${RDEPEND} - >=dev-cpp/eigen-3.3.1:3 - test? ( - $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - !qt6? ( dev-qt/qttest:5 ) - ) -" -BDEPEND=" - app-text/dos2unix - dev-lang/swig - test? ( - $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - !qt6? ( dev-qt/qttest:5 ) - ) -" - -# To get required dependencies: -# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' -# We set the following requirements by default: -# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, web. -# -# Additionally, 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. -# -# The increase in auto-enabled workbenches is due to their need in parts of the -# test suite when compiled with a minimal set of USE flags. -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - designer? ( gui ) - inspection? ( points ) - path? ( robot ) - python_single_target_python3_12? ( gui? ( qt6 ) ) -" -# There is no py3.12 support planned for pyside2 - -PATCHES=( - "${FILESDIR}"/${PN}-9999-Gentoo-specific-don-t-check-vcs.patch - "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch - "${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch -) - -DOCS=( CODE_OF_CONDUCT.md README.md ) - -CHECKREQS_DISK_BUILD="2G" - -pkg_setup() { - check-reqs_pkg_setup - python-single-r1_pkg_setup - [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade" -} - -src_prepare() { - # Fix desktop file - sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecad.FreeCAD.desktop || die - - find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings" - - cmake_src_prepare -} - -src_configure() { - # -Werror=odr, -Werror=lto-type-mismatch - # https://bugs.gentoo.org/875221 - # https://github.com/FreeCAD/FreeCAD/issues/13173 - filter-lto - - # Fix building tests - append-ldflags -Wl,--copy-dt-needed-entries - - local mycmakeargs=( - -DBUILD_ADDONMGR=$(usex addonmgr) - -DBUILD_ARCH=ON - -DBUILD_ASSEMBLY=OFF # deprecated - -DBUILD_CLOUD=$(usex cloud) - -DBUILD_COMPLETE=OFF # deprecated - -DBUILD_DRAFT=ON - -DBUILD_DESIGNER_PLUGIN=$(usex designer) - -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for current git master - -DBUILD_FEM=$(usex fem) - -DBUILD_FEM_NETGEN=$(usex netgen) - -DBUILD_FLAT_MESH=ON - -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory - -DBUILD_FREETYPE=ON # automagic dep - -DBUILD_GUI=$(usex gui) - -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=ON - -DBUILD_MESH_PART=ON - -DBUILD_OPENSCAD=$(usex openscad) - -DBUILD_PART=ON - -DBUILD_PART_DESIGN=$(usex part-design) - -DBUILD_PATH=$(usex path) - -DBUILD_POINTS=$(usex points) - -DBUILD_RAYTRACING=$(usex raytracing) - -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox - -DBUILD_ROBOT=$(usex robot) - -DBUILD_SHOW=$(usex show) - -DBUILD_SKETCHER=ON # needed by draft workspace - -DBUILD_SMESH=ON - -DBUILD_SPREADSHEET=ON - -DBUILD_START=ON - -DBUILD_SURFACE=$(usex surface) - -DBUILD_TECHDRAW=$(usex techdraw) - -DBUILD_TEST=ON # always build test workbench for run-time testing - -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_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=ON - -DFREECAD_USE_QT_FILEDIALOG=ON - -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" - - # install python modules to site-packages' dir. True only for the main package, - # sub-packages will still be installed inside /usr/lib64/freecad - -DINSTALL_TO_SITEPACKAGES=ON - - # Use the version of shiboken2 that matches the selected python version - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - -DPython3_EXECUTABLE=${PYTHON} - ) - - if use debug; then - # BUILD_SANDBOX currently broken, see - # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595 - mycmakeargs+=( - -DBUILD_SANDBOX=OFF - -DBUILD_TEMPLATE=ON - ) - else - mycmakeargs+=( - -DBUILD_SANDBOX=OFF - -DBUILD_TEMPLATE=OFF - ) - fi - - if use qt6; then - mycmakeargs+=( - -DFREECAD_QT_MAJOR_VERSION=6 - -DFREECAD_QT_VERSION=6 - -DQT_DEFAULT_MAJOR_VERSION=6 - -DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc" - -DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc" - -DBUILD_QT5=OFF - # Drawing module unmaintained and not ported to qt6 - -DBUILD_DRAWING=OFF - ) - else - mycmakeargs+=( - -DFREECAD_QT_MAJOR_VERSION=5 - -DFREECAD_QT_VERSION=5 - -DQT_DEFAULT_MAJOR_VERSION=5 - -DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" - -DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc" - -DBUILD_QT5=ON - # Drawing module unmaintained and not ported to qt6 - -DBUILD_DRAWING=ON - ) - fi - - cmake_src_configure -} - -# We use the FreeCADCmd binary instead of the FreeCAD binary here -# for two reasons: -# 1. It works out of the box with USE=-gui as well, not needing a guard -# 2. We don't need virtualx.eclass and it's dependencies -# The exported environment variables are needed, so freecad does know -# where to save it's temporary files, and where to look and write it's -# configuration. Without those, there are sandbox violation, when it -# tries to create /var/lib/portage/home/.FreeCAD directory. -src_test() { - pushd "${BUILD_DIR}" > /dev/null || die - export FREECAD_USER_HOME="${HOME}" - export FREECAD_USER_DATA="${T}" - export FREECAD_USER_TEMP="${T}" - nonfatal ./bin/FreeCADCmd --run-test 0 - popd > /dev/null || die -} - -src_install() { - cmake_src_install - - dobin src/Tools/freecad-thumbnailer - - if use gui; then - newbin - freecad <<- _EOF_ - #!/bin/sh - # https://github.com/coin3d/coin/issues/451 - : \${QT_QPA_PLATFORM:=xcb} - export QT_QPA_PLATFORM - exec /usr/$(get_libdir)/${PN}/bin/FreeCAD \${@} - _EOF_ - mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources" - fi - dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd - - rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format" - use test && (rm -r "${ED}"/usr/include/${PN}/{gmock,gtest} || die) - - python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ - # compile main package in python site-packages as well - python_optimize -} - -pkg_postinst() { - xdg_pkg_postinst - - einfo "You can load a lot of additional workbenches using the integrated" - einfo "AddonManager." - - # ToDo: check opencv, pysolar (::science), elmerfem (::science) - # ifc++, ifcopenshell, z88 (no pkgs), calculix-ccx (::waebbl) - 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_header "Computational utilities" - optfeature "BLAS library" sci-libs/openblas - optfeature "Statistical computation with Python" dev-python/pandas - optfeature "Use scientific computation with Python" dev-python/scipy - optfeature "Use symbolic math with Python" dev-python/sympy - optfeature_header "Imaging, Plotting and Rendering utilities" - optfeature "Dependency graphs" media-gfx/graphviz - optfeature "PBR Rendering" media-gfx/povray - optfeature_header "Import / Export" - optfeature "Interact with git repositories" dev-python/GitPython - optfeature "Work with COLLADA documents" dev-python/pycollada - optfeature "YAML importer and emitter" dev-python/pyyaml - optfeature "Importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg - optfeature "Importing and exporting geospatial data formats" sci-libs/gdal - optfeature "Working with projection data" sci-libs/proj - optfeature_header "Meshing and FEM" - optfeature "FEM mesh generator" sci-libs/gmsh - optfeature "Triangulating meshes" sci-libs/gts - optfeature "Visualization" sci-visualization/paraview -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 250c1a1dbbf7..239dd9e8222e 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -26,12 +26,12 @@ fi # examples are licensed CC-BY-SA (without note of specific version) LICENSE="LGPL-2 CC-BY-SA-4.0" SLOT="0" -IUSE="debug designer +gui qt6 test" +IUSE="debug designer +gui +qt6 test" FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl" FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material - openscad part-design path points raytracing robot show surface - techdraw tux" + openscad part-design path points raytracing robot show smesh + surface techdraw tux" for module in ${FREECAD_STABLE_MODULES}; do IUSE="${IUSE} +${module}" @@ -51,6 +51,7 @@ RDEPEND=" dev-libs/libfmt:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] + dev-ruby/asciidoctor !qt6? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 @@ -117,6 +118,10 @@ RDEPEND=" netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) + smesh? ( + !qt6? ( sci-libs/vtk:=[qt5] ) + qt6? ( sci-libs/vtk:=[-qt5,qt6] ) + ) $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] dev-python/pybind11[${PYTHON_USEDEP}] @@ -124,9 +129,9 @@ RDEPEND=" fem? ( dev-python/ply[${PYTHON_USEDEP}] ) ') " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND} >=dev-cpp/eigen-3.3.1:3 + dev-cpp/ms-gsl test? ( $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') !qt6? ( dev-qt/qttest:5 ) @@ -194,10 +199,13 @@ src_configure() { # https://github.com/FreeCAD/FreeCAD/issues/13173 filter-lto + # Fix building tests + append-ldflags -Wl,--copy-dt-needed-entries + local mycmakeargs=( -DBUILD_ADDONMGR=$(usex addonmgr) -DBUILD_ARCH=ON - -DBUILD_ASSEMBLY=OFF # deprecated + -DBUILD_ASSEMBLY=OFF # Requires OndselSolver -DBUILD_CLOUD=$(usex cloud) -DBUILD_COMPLETE=OFF # deprecated -DBUILD_DRAFT=ON @@ -227,7 +235,7 @@ src_configure() { -DBUILD_ROBOT=$(usex robot) -DBUILD_SHOW=$(usex show) -DBUILD_SKETCHER=ON # needed by draft workspace - -DBUILD_SMESH=ON + -DBUILD_SMESH=$(usex smesh) -DBUILD_SPREADSHEET=ON -DBUILD_START=ON -DBUILD_SURFACE=$(usex surface) @@ -333,14 +341,13 @@ src_install() { # https://github.com/coin3d/coin/issues/451 : \${QT_QPA_PLATFORM:=xcb} export QT_QPA_PLATFORM - exec /usr/$(get_libdir)/${PN}/bin/FreeCAD \${@} + exec /usr/$(get_libdir)/${PN}/bin/FreeCAD "\${@}" _EOF_ mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources" fi dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format" - use test && (rm -r "${ED}"/usr/include/${PN}/{gmock,gtest} || die) python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ # compile main package in python site-packages as well diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml index b934f4a2b2de..0787a07fc30c 100644 --- a/media-gfx/freecad/metadata.xml +++ b/media-gfx/freecad/metadata.xml @@ -78,6 +78,9 @@ Build the show module, a helper module for visibility automation + + Build the Salome SMESH module + Build the surface module and workbench diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest index 4684099b27a4..d12265639493 100644 --- a/media-gfx/superslicer/Manifest +++ b/media-gfx/superslicer/Manifest @@ -1,4 +1,5 @@ AUX superslicer-2.5.59.10-boost-1.85.patch 2693 BLAKE2B eb434eedc4b1188c1e8df875d8f57ba9f3c9a6ea88521f5707c47e16b23e7939b9382dc416d023293642a3e5af6317e51058adf691cd2201b92ea8f390b60ca8 SHA512 c94ef6475a3dd81bfbfe80f44b571094476b21725b496fe5b26d81d55aa987953f9c642c0275260f9f149d1a6b85addf5b750ff4a306d555c324304055a4375b +AUX superslicer-2.5.59.10-boost-headers.patch 1561 BLAKE2B 9e8fd0003bf95786dfffc5a7d9da4fba997ebe8cffe204dd7ebc6b2c4a887f80d909f76c6686b4c0ae73278e17df45db53725dffa6f44cfcff3f7a15029ec722 SHA512 2df7c4f05847b3b5422fff517dfbbfb17f58da4c03c6224d7c23e07ff1939bc75819d3cf03e237f221a1f83322f73779cea03ffd8b25dad2a274be7c32e48508 AUX superslicer-2.5.59.2-boost.patch 12899 BLAKE2B 53cfab69e12af506c276fcc34851c62deba2c4ef5682176977ed1b07a60c1967264f56752f0c286aeb059fa7924272fa5d837c8c2add768590dd9604444705fe SHA512 798a275a6b310e6fa16e630a841fc3198fc287fa1ac9de0fc70a41effadd30b10887fed969ab59e73993c9ca1830ac1a8e633bbeaf0560a9225d0c5f1b00eab3 AUX superslicer-2.5.59.2-cereal.patch 1807 BLAKE2B 0ab8eb8e7f283e09e19c55d95bd6fe874797cc3d67f153a7c3920e1ff02e3b974c64f0dfc510b0cf3dde2484eeb00f550eab636e304bb6ba3c76b066bf537caf SHA512 503d3e8483315affb77f9bf9299e529455b73484cb278eda413a7e17f27f687b24158210b2fbf50581a970821930511934c994fa70c2ef8b68702f7614528d38 AUX superslicer-2.5.59.2-dont-install-angelscript.patch 427 BLAKE2B 8f853d1c8c861bcb18e3272467c5a4ca745b67790d88be9943d4cf92f1f5dfdd3b4e022ba697c90997ead2c8ad77debf7ea96fc262a21caa2087cd7b62901bdb SHA512 c4a718ead714b9d2a22cff7e9a48846954f9606290ad533c0e491429b3455f43dee7a10a93a34f564e03e9e3b2eeef87d8276f6062d770f57afef27a7fbdb868 @@ -20,6 +21,7 @@ DIST superslicer-2.5.59.2-profiles.tar.gz 16253775 BLAKE2B 20c99b14ba8ee26ea2a21 DIST superslicer-2.5.59.2.tar.gz 45622782 BLAKE2B ff2fecf233d2710d706b64eb2191bfac39df3f631634de5f9eb1bca6ca712e94b0283beb7c6e9f3b293dc308b50240871ef8651a5355a4d7c5ea6092ac1a836b SHA512 af8878bd8e0c3e0dd5247ce01bdbd2b42b6766d81efbde11b71c6642787a12dfeaea91e653ac928066b9610cd911ea1f4dc77cf4823639030b3c104d955b8cbd DIST superslicer-2.5.59.8-profiles.tar.gz 17931886 BLAKE2B 953a777dd12971c355a5f48148d4c3831b9435cf08f1baecb32ff0ef6245678f81c53bf5078cc4d6d04642e9ee18e1023d5d1578ebdf1384c7c1ce44a1153c50 SHA512 2e4561de7c57308a91c8964c8a957bc10c5e4cedc47c5fc37633bbcf78e3576ed1eaa6d7126485e94eb0aa593940c73a460f3d5ad65f33001d32953caa2fb4e1 DIST superslicer-2.5.59.8.tar.gz 46021260 BLAKE2B 04abffd1a9cdf417d544539d5cde9b3559f2da7c1cb24cfa0e4a5d11359bca53cb25a90a3a14b26ee10e33e283ba4774d404265e6740b5457f82110be2a44af9 SHA512 57ef6c129c24378d6f4f78d34a60ed15668a8c5c266fa706937edebbd7b52d145657aae1e46a7b1d19dabaf403465bc5af50a94fa70205456bfc87a1458bac6e +EBUILD superslicer-2.5.59.10-r1.ebuild 2799 BLAKE2B 568bbab777f09dc266e9c6ecf9d40d908d1346c41520d58c5133e315bd1b282875645af2a73172a0cf9e376ae903e7d66597005a486b451a21a9e44a2adb254d SHA512 11e0a7f449fe51e3bae7108c3773e2acf31ae67827934e87126cf2355262ee5fec307d4ef842c640a381311c60449d83bba97b5ecad0752b2d9698d617d2b58b EBUILD superslicer-2.5.59.10.ebuild 2748 BLAKE2B b6865b9c9d61b0a5afd49b1632488cc9983c169af5b7ded19bcf3c146bd1870fbc940c699005e9777793d3c759ad517f7e103eded6f4b6350768929d298356ac SHA512 dd31e1a229973bc91fabf18a415a111859c230888477223a3d6df19c79fed1b06fbca9245e0eac549beffbcc6a27123f7e2b0e1831c1a23e737f0aedbc4d9f1e EBUILD superslicer-2.5.59.2-r2.ebuild 2490 BLAKE2B 5f1775a715b74a581daec55361e3c0b813d09e6e46fb47c27e680f0f739a822c9669fe7dc0e49b35365f78bde93ae5f112446580c058f56f17297d4e010f1f2b SHA512 febd71376f386a2c6b6cbd2f39b7f58e86f607475d33c9792bf099f195a1c6a0971b24b76dff8615e1bce2713c334ba702b78bff0e810dce5db85fbf5a464704 EBUILD superslicer-2.5.59.8.ebuild 2743 BLAKE2B 6a7842738221df57aa1ea8e0682c50252e044e74bf90d69dc894d3bc92586c7e9520bc429cac3d1e53907cef3a3f56311f0f454f41fed4c915463a412ad8878f SHA512 d5ef833bd7a87d177df2cf99ec6ad5b5eb31e61e4babc315020d602b8eac5aabfa0c5d70f22de86f186cf1c3efd935629166695533939c8d33861b9faf22463f diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-headers.patch b/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-headers.patch new file mode 100644 index 000000000000..b6689d9a298e --- /dev/null +++ b/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-headers.patch @@ -0,0 +1,45 @@ +https://bugs.gentoo.org/936146 +--- a/src/slic3r/GUI/GLTexture.cpp 2024-08-10 11:05:17.663411745 +0100 ++++ b/src/slic3r/GUI/GLTexture.cpp 2024-08-10 11:05:34.463543701 +0100 +@@ -10,6 +10,8 @@ + + #include + #include ++#include ++#include + + #include + #include +--- a/src/slic3r/GUI/RemovableDriveManager.cpp 2024-08-10 11:24:53.572234573 +0100 ++++ b/src/slic3r/GUI/RemovableDriveManager.cpp 2024-08-10 11:28:24.393792051 +0100 +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++//#include + #include + #endif + +--- a/src/slic3r/GUI/ScriptExecutor.cpp 2024-08-10 11:28:32.423851365 +0100 ++++ b/src/slic3r/GUI/ScriptExecutor.cpp 2024-08-10 11:28:41.893921315 +0100 +@@ -10,7 +10,7 @@ + #include + #include + #include +-#include ++//#include + + #include + #include +--- a/src/slic3r/GUI/BitmapCache.cpp.old 2024-08-10 12:00:52.538869133 +0100 ++++ b/src/slic3r/GUI/BitmapCache.cpp 2024-08-10 12:01:15.519040423 +0100 +@@ -6,6 +6,8 @@ + #include "GUI_Utils.hpp" + + #include ++#include ++#include + + #ifdef __WXGTK2__ + // Broken alpha workaround diff --git a/media-gfx/superslicer/superslicer-2.5.59.10-r1.ebuild b/media-gfx/superslicer/superslicer-2.5.59.10-r1.ebuild new file mode 100644 index 000000000000..a19e63212295 --- /dev/null +++ b/media-gfx/superslicer/superslicer-2.5.59.10-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" +MY_PN="SuperSlicer" +SLICER_PROFILES_COMMIT="ca25c7ec55dcc6073da61e39692c321cdb6497dc" + +inherit cmake wxwidgets xdg flag-o-matic + +DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" +HOMEPAGE="https://github.com/supermerill/SuperSlicer/" +SRC_URI=" + https://github.com/supermerill/SuperSlicer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/slic3r/slic3r-profiles/archive/${SLICER_PROFILES_COMMIT}.tar.gz -> ${P}-profiles.tar.gz +" + +LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="test" + +RESTRICT="test" + +# No dep on sci-libs/libigl, in-tree version cannot build +# static library currently. Using bundled one. +RDEPEND=" + dev-cpp/eigen:3 + dev-cpp/tbb:= + dev-libs/boost:=[nls] + dev-libs/cereal + dev-libs/expat + dev-libs/glib:2 + dev-libs/gmp:= + dev-libs/mpfr:= + dev-libs/imath:= + >=media-gfx/openvdb-8.2:= + net-misc/curl[adns] + media-libs/glew:0= + media-libs/libpng:0= + media-libs/qhull:= + sci-libs/nlopt + sci-libs/opencascade:= + >=sci-mathematics/cgal-5.0:= + sys-apps/dbus + sys-libs/zlib:= + virtual/glu + virtual/opengl + x11-libs/gtk+:3 + x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] +" +DEPEND="${RDEPEND} + media-libs/qhull[static-libs] +" + +PATCHES=( + "${FILESDIR}/${PN}-2.5.59.2-boost.patch" + "${FILESDIR}/${PN}-2.5.59.2-cereal.patch" + "${FILESDIR}/${PN}-2.5.59.2-dont-install-angelscript.patch" + "${FILESDIR}/${PN}-2.5.59.2-gcodeviewer-symlink-fix.patch" + "${FILESDIR}/${PN}-2.5.59.2-missing-includes-fix.patch" + "${FILESDIR}/${PN}-2.5.59.2-openexr3.patch" + "${FILESDIR}/${PN}-2.5.59.2-wxgtk3-wayland-fix.patch" + "${FILESDIR}/${PN}-2.5.59.2-relax-OpenCASCADE-dep.patch" + "${FILESDIR}/${PN}-2.5.59.2-link-occtwrapper-statically.patch" + "${FILESDIR}/${PN}-2.5.59.8-additional-imports-fixes.patch" + "${FILESDIR}/${PN}-2.5.59.8-fix-compilation-error-gnu17.patch" + "${FILESDIR}/${PN}-2.5.59.8-libnest2d-link-xcb.patch" + "${FILESDIR}/${PN}-2.5.59.8-boost-replace-load-string-file.patch" + "${FILESDIR}/${PN}-2.5.59.10-boost-1.85.patch" + "${FILESDIR}/${PN}-2.5.59.10-boost-headers.patch" +) + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_unpack() { + default + + mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die +} + +src_configure() { + CMAKE_BUILD_TYPE="Release" + + append-flags -fno-strict-aliasing + + setup-wxwidgets + + local mycmakeargs=( + -DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB" + + -DSLIC3R_BUILD_TESTS=$(usex test) + -DSLIC3R_FHS=ON + -DSLIC3R_GTK=3 + -DSLIC3R_GUI=ON + -DSLIC3R_PCH=OFF + -DSLIC3R_STATIC=OFF + -DSLIC3R_WX_STABLE=ON + -Wno-dev + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + rm "${ED}/usr/lib/udev/rules.d/90-3dconnexion.rules" || die +} -- cgit v1.2.3