diff options
author | Bernd Waibel <waebbl-gentoo@posteo.net> | 2022-10-08 14:20:14 +0200 |
---|---|---|
committer | Joonas Niilola <juippis@gentoo.org> | 2022-11-25 13:18:30 +0200 |
commit | 6f48536ddd49190e89e394361f01864a29ce8e96 (patch) | |
tree | 4dbeba41a0ceeeb031d5bd043915d49e561f9d80 /sci-libs/opencascade | |
parent | profiles/base: mask tbb use flag on sci-libs/opencascade (diff) | |
download | gentoo-6f48536ddd49190e89e394361f01864a29ce8e96.tar.gz gentoo-6f48536ddd49190e89e394361f01864a29ce8e96.tar.bz2 gentoo-6f48536ddd49190e89e394361f01864a29ce8e96.zip |
sci-libs/opencascade: add 7.7.0
Bug: https://tracker.dev.opencascade.org/view.php?id=32650
Bug: https://tracker.dev.opencascade.org/view.php?id=33216
Closes: https://bugs.gentoo.org/880233
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27696
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'sci-libs/opencascade')
5 files changed, 263 insertions, 0 deletions
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest index c3e51ef720d8..ff6ab85b0da3 100644 --- a/sci-libs/opencascade/Manifest +++ b/sci-libs/opencascade/Manifest @@ -1,3 +1,4 @@ DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47 DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d SHA512 c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded +DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a SHA512 6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch b/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch new file mode 100644 index 000000000000..2bc59319864a --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch @@ -0,0 +1,19 @@ +From 44a30819131496bf41f2e1dcfd362b23173db6fb Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Wed, 5 Oct 2022 21:55:06 +0200 +Subject: [PATCH] add missing #include <limits> + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/src/ViewerTest/ViewerTest_CmdParser.cxx ++++ b/src/ViewerTest/ViewerTest_CmdParser.cxx +@@ -21,6 +21,7 @@ + + #include <algorithm> + #include <iostream> ++#include <limits> + + namespace + { +-- +2.38.0 + diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-avoid-pre-stripping-binaries.patch b/sci-libs/opencascade/files/opencascade-7.7.0-avoid-pre-stripping-binaries.patch new file mode 100644 index 000000000000..5c351cb32996 --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.7.0-avoid-pre-stripping-binaries.patch @@ -0,0 +1,34 @@ +From e145fb627d199e888267e19eab951c69c2f8151c Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Sat, 8 Oct 2022 13:16:47 +0200 +Subject: [PATCH] avoid pre-stripping binaries + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/adm/cmake/occt_defs_flags.cmake ++++ b/adm/cmake/occt_defs_flags.cmake +@@ -135,22 +135,12 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]") + # CLang can be used with both libstdc++ and libc++, however on OS X libstdc++ is outdated. + set (CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}") + endif() +- # Optimize size of binaries +- set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}") + elseif(MINGW) + add_definitions(-D_WIN32_WINNT=0x0601) + # _WIN32_WINNT=0x0601 (use Windows 7 SDK) + #set (CMAKE_SYSTEM_VERSION "6.1") + # workaround bugs in mingw with vtable export + set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--export-all-symbols") +- +- # Optimize size of binaries +- set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") +- set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s") +-elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX) +- # Optimize size of binaries +- set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") +- set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s") + endif() + + if (BUILD_RELEASE_DISABLE_EXCEPTIONS) +-- +2.38.0 + diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-fix-installation-of-cmake-config-files.patch b/sci-libs/opencascade/files/opencascade-7.7.0-fix-installation-of-cmake-config-files.patch new file mode 100644 index 000000000000..924f002b727d --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.7.0-fix-installation-of-cmake-config-files.patch @@ -0,0 +1,33 @@ +From 4eb2236370134117729bc4d55191fce736bf4df6 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Thu, 6 Oct 2022 18:53:41 +0200 +Subject: [PATCH] fix installation of cmake config files + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1265,7 +1265,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES}) + endforeach() + # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration + install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)") +-install (CODE "file(INSTALL FILES \"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" DESTINATION \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/\" TYPE FILE)") ++install (FILES "${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake" DESTINATION "${INSTALL_DIR_CMAKE}") + + foreach (OCCT_MODULE ${OCCT_MODULES}) + if (BUILD_MODULE_${OCCT_MODULE}) +diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake +index 4a060665..8ab5e39c 100755 +--- a/adm/cmake/occt_macros.cmake ++++ b/adm/cmake/occt_macros.cmake +@@ -590,7 +590,7 @@ macro (OCCT_UPDATE_TARGET_FILE) + + install (CODE + "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE) +- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\") ++ file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\") + foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES}) + file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT) + file (REMOVE \"\${TARGET_FILENAME}\") +-- +2.38.0 + diff --git a/sci-libs/opencascade/opencascade-7.7.0.ebuild b/sci-libs/opencascade/opencascade-7.7.0.ebuild new file mode 100644 index 000000000000..072150e2df0a --- /dev/null +++ b/sci-libs/opencascade/opencascade-7.7.0.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# USE_{DRACO,FFMPEG,FREEIMAGE,FREETYPE,GLES2,OPENGL,OPENVR,RAPIDJSON,TBB,TK,VTK,XLIB} + +EAPI=8 + +inherit cmake + +MY_SLOT="$(ver_cut 1-2)" +MY_PV="$(ver_rs 3 '-')" + +DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange" +HOMEPAGE="https://www.opencascade.com" +SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=185d29b92f6764ffa9fc195b7dbe7bba3c4ac855;sf=tgz -> ${P}.tar.gz" +S="${WORKDIR}/occt-185d29b" + +LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )" +SLOT="0/${MY_SLOT}" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="doc examples ffmpeg freeimage gles2 json optimize tbb vtk" + +REQUIRED_USE="?? ( optimize tbb )" + +# There's no easy way to test. Testing needs a rather big environment +# properly set up. +RESTRICT="test" + +# ffmpeg: https://tracker.dev.opencascade.org/view.php?id=32871 +RDEPEND=" + !app-eselect/eselect-opencascade + dev-lang/tcl:= + dev-lang/tk:= + media-libs/fontconfig + media-libs/freetype:2 + virtual/opengl + x11-libs/libXmu + examples? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtquickcontrols2:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + ) + ffmpeg? ( <media-video/ffmpeg-5:= ) + freeimage? ( media-libs/freeimage ) + tbb? ( dev-cpp/tbb:= ) + vtk? ( sci-libs/vtk:=[rendering] ) +" +DEPEND=" + ${RDEPEND} + json? ( dev-libs/rapidjson ) + vtk? ( dev-libs/utfcpp ) +" +BDEPEND=" + doc? ( app-doc/doxygen ) + examples? ( dev-qt/linguist-tools:5 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch + "${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch + "${FILESDIR}"/${PN}-7.7.0-add-missing-include-limits.patch + "${FILESDIR}"/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch + "${FILESDIR}"/${PN}-7.7.0-avoid-pre-stripping-binaries.patch +) + +src_prepare() { + cmake_src_prepare + + sed -e 's|/lib\$|/'$(get_libdir)'\$|' \ + -i adm/templates/OpenCASCADEConfig.cmake.in || die + + # There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some + # assumptions it makes about installation paths. Rather than fixing it, just + # get rid of the mechanism altogether - its purpose is to allow a + # side-by-side installation of release and debug libraries. + sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \ + -i adm/cmake/occt_toolkit.cmake || die +} + +src_configure() { + local mycmakeargs=( + -DBUILD_DOC_Overview=$(usex doc) + -DBUILD_Inspector=$(usex examples) + -DBUILD_RELEASE_DISABLE_EXCEPTIONS=OFF # bug #847916 + + -DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin" + -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" + -DINSTALL_DIR_DATA="share/${PN}/data" + -DINSTALL_DIR_DOC="share/doc/${PF}" + -DINSTALL_DIR_INCLUDE="include/${PN}" + -DINSTALL_DIR_LIB="$(get_libdir)/${PN}" + -DINSTALL_DIR_RESOURCE="share/${PN}/resources" + -DINSTALL_DIR_SAMPLES="share/${PN}/samples" + -DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin" + -DINSTALL_DIR_WITH_VERSION=OFF + -DINSTALL_SAMPLES=$(usex examples) + -DINSTALL_TEST_CASES=NO + + -DUSE_D3D=NO + # no package yet in tree + -DUSE_DRACO=OFF + # has no function in 7.7.0_beta + # see https://dev.opencascade.org/content/occt-770-beta-version-available#comment-23733 + -DUSE_EIGEN=OFF + -DUSE_FFMPEG=$(usex ffmpeg) + -DUSE_FREEIMAGE=$(usex freeimage) + -DUSE_FREETYPE=ON + -DUSE_GLES2=$(usex gles2) + # no package in tree + -DUSE_OPENVR=OFF + -DUSE_RAPIDJSON=$(usex json) + -DUSE_TBB=$(usex tbb) + -DUSE_VTK=$(usex vtk) + -DUSE_XLIB=ON + # suppress CMake dev warnings + -Wno-dev + ) + + use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON ) + + if use examples; then + mycmakeargs+=( + -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr + -DBUILD_SAMPLES_QT=ON + ) + fi + + if use tbb; then + mycmakeargs+=( -D3RDPARTY_TBB_DIR="${ESYSROOT}"/usr ) + fi + + if use vtk; then + if has_version ">=sci-libs/vtk-9.1.0"; then + mycmakeargs+=( + -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr + -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 + -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) + ) + elif has_version ">=sci-libs/vtk-9.0.0"; then + mycmakeargs+=( + -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr + -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 + -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) + ) + fi + fi + + cmake_src_configure + + sed -e "s|lib/|$(get_libdir)/|" \ + -e "s|VAR_CASROOT|${EPREFIX}/usr|" \ + < "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die + + # use TBB for memory allocation optimizations + if use tbb; then + sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/99${PN} || die + fi + + # use internal optimized memory manager and don't clear memory with this + # memory manager. + if use optimize ; then + sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \ + -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \ + -i "${T}"/99${PN} || die + fi +} + +src_install() { + cmake_src_install + + doenvd "${T}/99${PN}" + + docompress -x /usr/share/doc/${PF}/overview/html +} |