diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-09-16 12:11:35 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-09-16 12:11:35 +0100 |
commit | b66ecfb4dc09ba76e37787df2f7df1a78c3c1cc9 (patch) | |
tree | 884bce771a1bba8b311dfffbde4acdad07bf2c54 /media-gfx/freecad | |
parent | 08e318096831eb3aae369910ba75e27f59367e2f (diff) |
gentoo auto-resync : 16:09:2024 - 12:11:35
Diffstat (limited to 'media-gfx/freecad')
-rw-r--r-- | media-gfx/freecad/Manifest | 6 | ||||
-rw-r--r-- | media-gfx/freecad/freecad-1.0_rc1-r1.ebuild (renamed from media-gfx/freecad/freecad-1.0_rc1.ebuild) | 22 | ||||
-rw-r--r-- | media-gfx/freecad/freecad-9999.ebuild | 25 | ||||
-rw-r--r-- | media-gfx/freecad/metadata.xml | 3 |
4 files changed, 35 insertions, 21 deletions
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.ebuild b/media-gfx/freecad/freecad-1.0_rc1-r1.ebuild index cfc5732f206f..0cd5f233f0bb 100644 --- a/media-gfx/freecad/freecad-1.0_rc1.ebuild +++ b/media-gfx/freecad/freecad-1.0_rc1-r1.ebuild @@ -27,12 +27,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}" @@ -52,6 +52,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 @@ -118,6 +119,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}] @@ -125,9 +130,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 ) @@ -201,7 +206,7 @@ src_configure() { 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 @@ -231,7 +236,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) @@ -337,14 +342,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/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 @@ <flag name="show"> Build the show module, a helper module for visibility automation </flag> + <flag name="smesh"> + Build the Salome SMESH module + </flag> <flag name="surface"> Build the surface module and workbench </flag> |