* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2020-04-26 11:00 David Seifert
0 siblings, 0 replies; 70+ messages in thread
From: David Seifert @ 2020-04-26 11:00 UTC (permalink / raw
To: gentoo-commits
commit: 4f22d9f19fab425d3f4746197b3b9a6d18da138b
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 10:59:12 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 10:59:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f22d9f1
sci-libs/opencascade: Replace virtual/ffmpeg
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../{opencascade-7.4.0.ebuild => opencascade-7.4.0-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/opencascade/opencascade-7.4.0.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r1.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-7.4.0.ebuild
rename to sci-libs/opencascade/opencascade-7.4.0-r1.ebuild
index 871c8a8e49c..ac229f1e071 100644
--- a/sci-libs/opencascade/opencascade-7.4.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
virtual/glu
virtual/opengl
x11-libs/libXmu
- ffmpeg? ( virtual/ffmpeg )
+ ffmpeg? ( media-video/ffmpeg )
freeimage? ( media-libs/freeimage )
java? ( virtual/jdk:1.8 )
qt5? (
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2024-08-25 15:44 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2024-08-25 15:44 UTC (permalink / raw
To: gentoo-commits
commit: 2540b94573649e1086d476b528973012ba64e91a
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Aug 12 16:38:50 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 15:42:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2540b945
sci-libs/opencascade: fix missing libGL
This is a due-diligence update of the dependency on media-libs/libglvnd.
There are no other known reports of this issue outside of automated testing.
Given that this ebuild already fails on systems where media-libs/libglvnd[X]
isn't already pulled by other packages it seems to be the better choice to avoid
the huge rebuild and refrain from rev-bumping.
Closes: https://bugs.gentoo.org/936901
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38121
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.7.2-r1.ebuild | 5 ++++-
sci-libs/opencascade/opencascade-7.8.1.ebuild | 5 ++++-
sci-libs/opencascade/opencascade-9999.ebuild | 5 ++++-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
index f3c88aa3ab89..ebb48f6acc7e 100644
--- a/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
@@ -52,9 +52,12 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype:2
)
- opengl? (
+ gles2-only? (
media-libs/libglvnd
)
+ opengl? (
+ media-libs/libglvnd[X]
+ )
X? (
x11-libs/libX11
)
diff --git a/sci-libs/opencascade/opencascade-7.8.1.ebuild b/sci-libs/opencascade/opencascade-7.8.1.ebuild
index 94a2d018ce23..30e00b7a18a0 100644
--- a/sci-libs/opencascade/opencascade-7.8.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.8.1.ebuild
@@ -51,9 +51,12 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype:2
)
- opengl? (
+ gles2-only? (
media-libs/libglvnd
)
+ opengl? (
+ media-libs/libglvnd[X]
+ )
X? (
x11-libs/libX11
)
diff --git a/sci-libs/opencascade/opencascade-9999.ebuild b/sci-libs/opencascade/opencascade-9999.ebuild
index 3e9783394b53..aa6493d1b426 100644
--- a/sci-libs/opencascade/opencascade-9999.ebuild
+++ b/sci-libs/opencascade/opencascade-9999.ebuild
@@ -51,9 +51,12 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype:2
)
- opengl? (
+ gles2-only? (
media-libs/libglvnd
)
+ opengl? (
+ media-libs/libglvnd[X]
+ )
X? (
x11-libs/libX11
)
^ permalink raw reply related [flat|nested] 70+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2024-08-25 15:44 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2024-08-25 15:44 UTC (permalink / raw
To: gentoo-commits
commit: 504354429be23ab68485214f4b79567f41e5ba45
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Aug 12 16:30:31 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 15:42:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50435442
sci-libs/opencascade: 9999 drop obsolete patches
Closes: https://bugs.gentoo.org/937763
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-9999.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-9999.ebuild b/sci-libs/opencascade/opencascade-9999.ebuild
index 94a2d018ce23..3e9783394b53 100644
--- a/sci-libs/opencascade/opencascade-9999.ebuild
+++ b/sci-libs/opencascade/opencascade-9999.ebuild
@@ -97,8 +97,6 @@ BDEPEND="
"
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-fix-installation-of-cmake-config-files.patch"
"${FILESDIR}/${PN}-7.7.0-avoid-pre-stripping-binaries.patch"
"${FILESDIR}/${PN}-7.7.0-build-against-vtk-9.2.patch"
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2024-04-14 14:28 Andrew Ammerlaan
0 siblings, 0 replies; 70+ messages in thread
From: Andrew Ammerlaan @ 2024-04-14 14:28 UTC (permalink / raw
To: gentoo-commits
commit: a5f11c2d5ee461993ad424b4d700b3f1fb09d835
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sun Apr 14 11:49:11 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 14:15:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f11c2d
sci-libs/opencascade: drop 7.7.1-r1
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36238
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.7.1-r1.ebuild | 360 -----------------------
1 file changed, 360 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.7.1-r1.ebuild b/sci-libs/opencascade/opencascade-7.7.1-r1.ebuild
deleted file mode 100644
index 2c547bf457dd..000000000000
--- a/sci-libs/opencascade/opencascade-7.7.1-r1.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic virtualx
-
-DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
-HOMEPAGE="https://www.opencascade.com"
-
-MY_PN="OCCT"
-
-MY_TEST_PV="7.7.0"
-MY_TEST_PV2="${MY_TEST_PV//./_}"
-
-SRC_URI="
- test? ( https://github.com/Open-Cascade-SAS/${MY_PN}/releases/download/V${MY_TEST_PV2}/${PN}-dataset-${MY_TEST_PV}.tgz
- -> ${PN}-dataset-${MY_TEST_PV}.tar.gz )
-"
-
-if [[ ${PV} = *9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/Open-Cascade-SAS/${MY_PN}.git"
-else
- MY_PV="${PV//./_}"
- SRC_URI+="
- https://github.com/Open-Cascade-SAS/${MY_PN}/archive/refs/tags/V${MY_PV}.tar.gz -> ${P}.tar.gz
- "
- S="${WORKDIR}/${MY_PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only gui json +opengl optimize tbb test testprograms tk vtk"
-
-REQUIRED_USE="
- ?? ( optimize tbb )
- ?? ( opengl gles2-only )
- examples? ( gui )
- test? ( freeimage json opengl )
-"
-
-# There's no easy way to test. Testing needs a rather big environment properly set up.
-RESTRICT="!test? ( test )"
-
-# ffmpeg: https://tracker.dev.opencascade.org/view.php?id=32871
-RDEPEND="
- dev-lang/tcl:=
- tk? ( dev-lang/tk:= )
- dev-libs/double-conversion
- freetype? (
- media-libs/fontconfig
- media-libs/freetype:2
- )
- opengl? (
- media-libs/libglvnd
- )
- X? (
- x11-libs/libX11
- )
- gui? (
- 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? (
- dev-lang/tk:=
- sci-libs/vtk:=[rendering]
- tbb? (
- sci-libs/vtk:=[tbb,-cuda]
- )
- )
-"
-DEPEND="
- ${RDEPEND}
- X? ( x11-base/xorg-proto )
- json? ( dev-libs/rapidjson )
-"
-BDEPEND="
- doc? ( app-text/doxygen[dot] )
- gui? (
- dev-qt/linguist-tools:5
- )
- test? ( dev-tcltk/thread )
-"
-
-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-fix-installation-of-cmake-config-files.patch"
- "${FILESDIR}/${PN}-7.7.0-avoid-pre-stripping-binaries.patch"
- "${FILESDIR}/${PN}-7.7.0-build-against-vtk-9.2.patch"
- "${FILESDIR}/${PN}-7.7.0-musl.patch"
- "${FILESDIR}/${PN}-7.7.0-tbb-detection.patch"
- "${FILESDIR}/${PN}-7.8.0-cmake-min-version.patch"
- "${FILESDIR}/${PN}-7.8.0-tests.patch"
-)
-
-src_unpack() {
- if [[ ${PV} = *9999* ]] ; then
- git-r3_src_unpack
- else
- unpack "${P}.tar.gz"
- fi
-
- if use test; then
- mkdir "${WORKDIR}/data"
- pushd "${WORKDIR}/data" > /dev/null || die
- # should be in paths indicated by CSF_TestDataPath environment variable,
- # or in subfolder data in the script directory
- unpack "${PN}-dataset-${MY_TEST_PV}.tar.gz"
- popd > /dev/null || die
- fi
-}
-
-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() {
- # -Werror=odr
- # https://bugs.gentoo.org/862912
- # https://tracker.dev.opencascade.org/view.php?id=33091
- filter-lto
-
- local mycmakeargs=(
- -D3RDPARTY_DIR="${ESYSROOT}/usr"
- -DBUILD_CPP_STANDARD="C++17"
- -DBUILD_SOVERSION_NUMBERS=2
-
- -DBUILD_DOC_Overview="$(usex doc)"
- -DBUILD_Inspector="$(usex gui)"
-
- -DBUILD_ENABLE_FPE_SIGNAL_HANDLER="$(usex debug)"
- -DBUILD_USE_PCH="no"
- # -DBUILD_OPT_PROFILE="Default" # Production
- # -DBUILD_RESOURCES="yes"
- # -DBUILD_YACCLEX="yes"
-
- -DBUILD_RELEASE_DISABLE_EXCEPTIONS="no" # bug #847916
- -DINSTALL_DIR="${EPREFIX}/usr"
- -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_TESTS="share/${PN}/tests"
- -DINSTALL_DIR_WITH_VERSION="no"
- -DINSTALL_SAMPLES="$(usex examples)"
-
- -DINSTALL_TEST_CASES="$(usex testprograms)"
-
- # no package yet in tree
- -DUSE_DRACO="no"
- -DUSE_FFMPEG="$(usex ffmpeg)"
- -DUSE_FREEIMAGE="$(usex freeimage)"
- -DUSE_FREETYPE="$(usex freetype)"
- # Indicates whether OpenGL ES 2.0 should be used in OCCT visualization module
- -DUSE_GLES2="$(usex gles2-only)"
- # Indicates whether OpenGL desktop should be used in OCCT visualization module
- -DUSE_OPENGL="$(usex opengl)"
- # no package in tree
- -DUSE_OPENVR="no"
- -DUSE_RAPIDJSON="$(usex json)"
- -DUSE_TBB="$(usex tbb)"
- -DUSE_TK="$(usex tk)"
- -DUSE_VTK="$(usex vtk)"
- -DUSE_XLIB="$(usex X)"
- )
-
- if use doc; then
- mycmakeargs+=(
- -DINSTALL_DOC_Overview="yes"
- -D3RDPARTY_SKIP_DOT_EXECUTABLE="no"
- )
- fi
-
- if use examples || use gui; then
- mycmakeargs+=(
- -D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
- -DBUILD_SAMPLES_QT="$(usex examples)"
- )
- else
- mycmakeargs+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5="yes"
- )
- fi
-
- if use tbb; then
- mycmakeargs+=(
- -D3RDPARTY_TBB_DIR="${ESYSROOT}/usr"
- )
- fi
-
- if use vtk; then
- local vtk_ver
- vtk_ver="$(best_version "sci-libs/vtk")"
- vtk_ver=$(ver_cut 1-2 "${vtk_ver#sci-libs/vtk-}")
- mycmakeargs+=(
- -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}/usr/include/vtk-${vtk_ver}"
- -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}/usr/$(get_libdir)"
- )
- 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_test() {
- echo "export CSF_OCCTDataPath=${WORKDIR}/data" >> "${BUILD_DIR}/custom.sh" || die
-
- if has_version media-fonts/dejavu; then
- cp "${ESYSROOT}/usr/share/fonts/dejavu/DejaVuSans.ttf" "${WORKDIR}/data/" # no die here as this isn't fatal
- fi
-
- local test_file=${T}/testscript.tcl
-
- local draw_opts=(
- i # see ${BUILD_DIR}/custom*.sh
- # -b # batch mode (no GUI, no viewers)
- -v # no GUI, use virtual (off-screen) windows for viewers
- )
-
- local test_names=(
- "demo draw bug30430" # prone to dying due to cpu limit
- )
- local test_opts=( # run single tests
- -overwrite
- )
- for test_name in "${test_names[@]}"; do
- cat >> "${test_file}" <<- _EOF_ || die
- test ${test_name} -outfile "${BUILD_DIR}/test_results/${test_name// /\/}.html" ${test_opts[@]}
- _EOF_
- done
-
- local testgrid_opts=()
-
- local SKIP_TESTS=()
-
- if [[ "${OCCT_OPTIONAL_TESTS}" != "true" ]]; then
- SKIP_TESTS+=(
- 'blend complex F4'
- 'bugs'
- 'geometry circ2d3Tan '{CircleCircleLin_11,CircleLinPoint_11}
- 'heal checkshape bug32448_1'
- 'hlr exact_hlr bug25813_2'
-
- 'hlr poly_hlr '{bug25813_2,bug25813_3,bug25813_4,Plate}
- 'lowalgos intss bug'{565,567_1,25950,27431,29807_i1003,29807_i2006,29807_i3003,29807_i5002,30703}
- 'lowalgos proximity '{A4,A5}
- 'opengl background bug27836'
- 'opengl drivers opengles'
- 'opengles3'
-
- 'offset wire_closed_inside_0_005 D1'
- 'offset wire_unclosed_outside_0_025 A1'
-
- 'demo draw bug30430'
- )
-
- local DEL_TESTS=(
- 'opengl/data/background/bug27836'
- 'perf/mesh/bug26965'
- 'v3d/trsf/bug26029'
- )
-
- for test in "${DEL_TESTS[@]}"; do
- rm "${CMAKE_USE_DIR}/tests/${test}" || die
- done
- fi
-
- if ! use vtk; then
- SKIP_TESTS+=(
- 'vtk'
- )
- echo "IGNORE /Could not open: libTKIVtkDraw/skip VTK" >> "${CMAKE_USE_DIR}/tests/opengl/parse.rules"
- fi
-
- if [[ -n "${SKIP_TESTS[*]}" ]]; then
- testgrid_opts+=( -exclude "$(IFS=',' ; echo "${SKIP_TESTS[*]}")" )
- fi
-
- testgrid_opts+=(
- # -refresh 5
- -overwrite
- )
- cat >> "${test_file}" <<- _EOF_ || die
- testgrid -outdir "${BUILD_DIR}/test_results" ${testgrid_opts[@]}
- _EOF_
-
- # # regenerate summary in case we have to
- # cat >> "${test_file}" <<- _EOF_ || die
- # testsummarize "${BUILD_DIR}/test_results"
- # _EOF_
-
- # Work around zink warnings
- export LIBGL_ALWAYS_SOFTWARE="true"
-
- export CASROOT="${BUILD_DIR}"
-
- virtx \
- "${BUILD_DIR}/draw.sh" \
- "${draw_opts[@]}" \
- -f "${test_file}"
-
- if [[ ! -f "${BUILD_DIR}/test_results/tests.log" ]]; then
- eerror "tests never ran!"
- die
- fi
- failed_tests="$(grep ": FAILED" "${BUILD_DIR}/test_results/tests.log")"
- if [[ -n ${failed_tests} ]]; then
- eerror "Failed tests:"
- eerror "${failed_tests}"
- die
- fi
-}
-
-src_install() {
- cmake_src_install
-
- doenvd "${T}/99${PN}"
-
- docompress -x "/usr/share/doc/${PF}/overview/html"
-}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2024-04-14 14:28 Andrew Ammerlaan
0 siblings, 0 replies; 70+ messages in thread
From: Andrew Ammerlaan @ 2024-04-14 14:28 UTC (permalink / raw
To: gentoo-commits
commit: 58cabfdf158ec5485bd3401f7e2ebad6d3046fdd
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Thu Apr 11 14:22:21 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 14:15:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58cabfdf
sci-libs/opencascade: add tk dep, don't set USE_QT
Closes: https://bugs.gentoo.org/928674
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../{opencascade-7.7.1.ebuild => opencascade-7.7.1-r1.ebuild} | 4 ++--
.../{opencascade-7.7.2.ebuild => opencascade-7.7.2-r1.ebuild} | 4 ++--
sci-libs/opencascade/opencascade-7.8.0.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.7.1.ebuild b/sci-libs/opencascade/opencascade-7.7.1-r1.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-7.7.1.ebuild
rename to sci-libs/opencascade/opencascade-7.7.1-r1.ebuild
index 58050d6c5717..2c547bf457dd 100644
--- a/sci-libs/opencascade/opencascade-7.7.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.1-r1.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
freeimage? ( media-libs/freeimage )
tbb? ( dev-cpp/tbb:= )
vtk? (
+ dev-lang/tk:=
sci-libs/vtk:=[rendering]
tbb? (
sci-libs/vtk:=[tbb,-cuda]
@@ -181,7 +182,6 @@ src_configure() {
# no package in tree
-DUSE_OPENVR="no"
-DUSE_RAPIDJSON="$(usex json)"
- -DUSE_QT="$(usex gui)"
-DUSE_TBB="$(usex tbb)"
-DUSE_TK="$(usex tk)"
-DUSE_VTK="$(usex vtk)"
@@ -195,7 +195,7 @@ src_configure() {
)
fi
- if use gui; then
+ if use examples || use gui; then
mycmakeargs+=(
-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
-DBUILD_SAMPLES_QT="$(usex examples)"
diff --git a/sci-libs/opencascade/opencascade-7.7.2.ebuild b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-7.7.2.ebuild
rename to sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
index a83c28ed566c..ce92fcc889e0 100644
--- a/sci-libs/opencascade/opencascade-7.7.2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
freeimage? ( media-libs/freeimage )
tbb? ( dev-cpp/tbb:= )
vtk? (
+ dev-lang/tk:=
sci-libs/vtk:=[rendering]
tbb? (
sci-libs/vtk:=[tbb,-cuda]
@@ -181,7 +182,6 @@ src_configure() {
# no package in tree
-DUSE_OPENVR="no"
-DUSE_RAPIDJSON="$(usex json)"
- -DUSE_QT="$(usex gui)"
-DUSE_TBB="$(usex tbb)"
-DUSE_TK="$(usex tk)"
-DUSE_VTK="$(usex vtk)"
@@ -195,7 +195,7 @@ src_configure() {
)
fi
- if use gui; then
+ if use examples || use gui; then
mycmakeargs+=(
-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
-DBUILD_SAMPLES_QT="$(usex examples)"
diff --git a/sci-libs/opencascade/opencascade-7.8.0.ebuild b/sci-libs/opencascade/opencascade-7.8.0.ebuild
index ffa9e2065e14..fb390401a82b 100644
--- a/sci-libs/opencascade/opencascade-7.8.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.8.0.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
jemalloc? ( dev-libs/jemalloc )
tbb? ( dev-cpp/tbb:= )
vtk? (
+ dev-lang/tk:=
sci-libs/vtk:=[rendering]
tbb? (
sci-libs/vtk:=[tbb,-cuda]
@@ -182,7 +183,6 @@ src_configure() {
# no package in tree
-DUSE_OPENVR="no"
-DUSE_RAPIDJSON="$(usex json)"
- -DUSE_QT="$(usex gui)"
-DUSE_TBB="$(usex tbb)"
-DUSE_TK="$(usex tk)"
-DUSE_VTK="$(usex vtk)"
@@ -210,7 +210,7 @@ src_configure() {
)
fi
- if use gui; then
+ if use examples || use gui; then
mycmakeargs+=(
-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
-DBUILD_SAMPLES_QT="$(usex examples)"
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2024-03-26 20:25 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2024-03-26 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 701bc30b5e597655e5cdf02a74c64836333b61e3
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Mar 26 19:02:35 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 20:23:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=701bc30b
sci-libs/opencascade: mark as LTO-unsafe
Closes: https://bugs.gentoo.org/862912
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.7.0-r2.ebuild | 7 ++++++-
sci-libs/opencascade/opencascade-7.7.1.ebuild | 7 ++++++-
sci-libs/opencascade/opencascade-7.7.2.ebuild | 7 ++++++-
sci-libs/opencascade/opencascade-7.8.0.ebuild | 7 ++++++-
sci-libs/opencascade/opencascade-9999.ebuild | 7 ++++++-
5 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
index 547ddb45705a..9db1978c27a0 100644
--- a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
@@ -5,7 +5,7 @@
EAPI=8
-inherit cmake
+inherit cmake flag-o-matic
MY_SLOT="$(ver_cut 1-2)"
MY_PV="$(ver_rs 3 '-')"
@@ -82,6 +82,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/862912
+ # https://tracker.dev.opencascade.org/view.php?id=33091
+ filter-lto
+
local mycmakeargs=(
-DBUILD_DOC_Overview=$(usex doc)
-DBUILD_Inspector=$(usex examples)
diff --git a/sci-libs/opencascade/opencascade-7.7.1.ebuild b/sci-libs/opencascade/opencascade-7.7.1.ebuild
index d9ef51dd1f11..58050d6c5717 100644
--- a/sci-libs/opencascade/opencascade-7.7.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake virtualx
+inherit cmake flag-o-matic virtualx
DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
HOMEPAGE="https://www.opencascade.com"
@@ -133,6 +133,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/862912
+ # https://tracker.dev.opencascade.org/view.php?id=33091
+ filter-lto
+
local mycmakeargs=(
-D3RDPARTY_DIR="${ESYSROOT}/usr"
-DBUILD_CPP_STANDARD="C++17"
diff --git a/sci-libs/opencascade/opencascade-7.7.2.ebuild b/sci-libs/opencascade/opencascade-7.7.2.ebuild
index 606592c2b231..a83c28ed566c 100644
--- a/sci-libs/opencascade/opencascade-7.7.2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake virtualx
+inherit cmake flag-o-matic virtualx
DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
HOMEPAGE="https://www.opencascade.com"
@@ -133,6 +133,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/862912
+ # https://tracker.dev.opencascade.org/view.php?id=33091
+ filter-lto
+
local mycmakeargs=(
-D3RDPARTY_DIR="${ESYSROOT}/usr"
-DBUILD_CPP_STANDARD="C++17"
diff --git a/sci-libs/opencascade/opencascade-7.8.0.ebuild b/sci-libs/opencascade/opencascade-7.8.0.ebuild
index 33ab0630c4c9..ffa9e2065e14 100644
--- a/sci-libs/opencascade/opencascade-7.8.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.8.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake virtualx
+inherit cmake flag-o-matic virtualx
DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
HOMEPAGE="https://www.opencascade.com"
@@ -134,6 +134,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/862912
+ # https://tracker.dev.opencascade.org/view.php?id=33091
+ filter-lto
+
local mycmakeargs=(
-D3RDPARTY_DIR="${ESYSROOT}/usr"
-DBUILD_CPP_STANDARD="C++17"
diff --git a/sci-libs/opencascade/opencascade-9999.ebuild b/sci-libs/opencascade/opencascade-9999.ebuild
index 2f819b1746e8..e3da366e699f 100644
--- a/sci-libs/opencascade/opencascade-9999.ebuild
+++ b/sci-libs/opencascade/opencascade-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake virtualx
+inherit cmake flag-o-matic virtualx
DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
HOMEPAGE="https://www.opencascade.com"
@@ -134,6 +134,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/862912
+ # https://tracker.dev.opencascade.org/view.php?id=33091
+ filter-lto
+
local mycmakeargs=(
-D3RDPARTY_DIR="${ESYSROOT}/usr"
-DBUILD_CPP_STANDARD="C++17"
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2024-03-23 8:34 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2024-03-23 8:34 UTC (permalink / raw
To: gentoo-commits
commit: ee4cd7a0bcc86892b808514a87b864d464925f1f
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Feb 16 15:01:07 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:33:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee4cd7a0
sci-libs/opencascade: drop obsolete block
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.6.3-r2.ebuild | 1 -
sci-libs/opencascade/opencascade-7.7.0-r2.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild b/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
index 25a8b78a8a7a..2e561ce32b79 100644
--- a/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
@@ -27,7 +27,6 @@ RESTRICT="test"
# ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
RDEPEND="
- !app-eselect/eselect-opencascade
dev-lang/tcl:=
dev-lang/tk:=
dev-tcltk/itcl
diff --git a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
index 31f9cb4cbfca..547ddb45705a 100644
--- a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
@@ -28,7 +28,6 @@ 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
^ permalink raw reply related [flat|nested] 70+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2023-07-31 8:43 Joonas Niilola
0 siblings, 0 replies; 70+ messages in thread
From: Joonas Niilola @ 2023-07-31 8:43 UTC (permalink / raw
To: gentoo-commits
commit: 15a45083c6adc9b268be5170dd25bc96933f5ecf
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 31 08:42:33 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jul 31 08:43:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15a45083
sci-libs/opencascade: add missing xorg-proto dep
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.7.0-r2.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
index 076a308ee9ba..87f8035f70d2 100644
--- a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
@@ -49,6 +49,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
+ x11-base/xorg-proto
json? ( dev-libs/rapidjson )
vtk? ( dev-libs/utfcpp )
"
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2023-02-06 19:49 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2023-02-06 19:49 UTC (permalink / raw
To: gentoo-commits
commit: 4dec3db3d56a4681432fc336183ad0306a9b3a0e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 6 19:49:25 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 6 19:49:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dec3db3
sci-libs/opencascade: Stabilize 7.7.0-r1 amd64, #893360
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.7.0-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
index 57907bad4816..c22348558869 100644
--- a/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 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}
@@ -17,7 +17,7 @@ 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"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
IUSE="doc examples ffmpeg freeimage gles2 json optimize tbb vtk"
REQUIRED_USE="?? ( optimize tbb )"
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2023-01-27 7:46 Joonas Niilola
0 siblings, 0 replies; 70+ messages in thread
From: Joonas Niilola @ 2023-01-27 7:46 UTC (permalink / raw
To: gentoo-commits
commit: a09299ba9747ac81ed4d8deab8d1e682f34879d1
Author: Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Fri Jan 27 07:06:41 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 07:42:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a09299ba
sci-libs/opencascade: drop 7.5.2-r6
Signed-off-by: Zoltan Puskas <zoltan <AT> sinustrom.info>
Closes: https://github.com/gentoo/gentoo/pull/29293
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/opencascade/Manifest | 1 -
sci-libs/opencascade/opencascade-7.5.2-r6.ebuild | 175 -----------------------
2 files changed, 176 deletions(-)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index ff6ab85b0da3..b0510b20df5f 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,4 +1,3 @@
-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/opencascade-7.5.2-r6.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
deleted file mode 100644
index f2acaba15e74..000000000000
--- a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-MY_PV="$(ver_rs 1- '_')"
-PV_MAJ="$(ver_cut 1-2)"
-
-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=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
-S="${WORKDIR}/occt-V${MY_PV}"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="0/${PV_MAJ}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug doc examples ffmpeg freeimage gles2-only 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://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
-RDEPEND="
- !app-eselect/eselect-opencascade
- dev-lang/tcl:=
- dev-lang/tk:=
- dev-tcltk/itcl
- dev-tcltk/itk
- dev-tcltk/tix
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/ftgl
- virtual/glu
- 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:= )
- freeimage? ( media-libs/freeimage )
- tbb? ( <dev-cpp/tbb-2021.4.0 )
- vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- dev-cpp/eigen
- dev-libs/rapidjson
- doc? ( app-doc/doxygen )
- examples? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.5.1-0001-allow-default-search-path-for-Qt5.patch
- "${FILESDIR}"/${PN}-7.5.1-0002-remove-unnecessary-Qt5-check.patch
- "${FILESDIR}"/${PN}-7.5.1-0003-add-Gentoo-configuration-type.patch
- "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
- "${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.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
- "${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- use debug && append-cppflags -DDEBUG
-
- 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
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FREEIMAGE=$(usex freeimage)
- -DUSE_FREETYPE=ON
- -DUSE_GLES2=$(usex gles2-only)
- -DUSE_RAPIDJSON=$(usex json)
- -DUSE_TBB=$(usex tbb)
- -DUSE_VTK=$(usex vtk)
- )
-
- use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
-
- if use examples; then
- mycmakeargs+=(
- -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
- -DBUILD_SAMPLES_QT=ON
- )
- 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
-
- # prepare /etc/env.d file
- 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}"
-
- # remove examples
- if use !examples; then
- rm -r "${ED}/usr/share/${PN}/samples" || die
- fi
-
- docompress -x /usr/share/doc/${PF}/overview/html
-}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2023-01-04 5:50 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2023-01-04 5:50 UTC (permalink / raw
To: gentoo-commits
commit: 463b1378781aac8534288fd51f0f432dc8fa6690
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Jan 2 07:50:55 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 05:48:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=463b1378
sci-libs/opencascade: simplify vtk logic (v7.7.0)
Avoid using conditional logic to determine the include directory for VTK.
Suggested-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.7.0-r1.ebuild | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
index efd245f9b465..57907bad4816 100644
--- a/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
@@ -133,17 +133,14 @@ src_configure() {
fi
if use vtk; then
+ local vtk_ver=$(best_version "sci-libs/vtk")
+ vtk_ver=${vtk_ver#sci-libs/vtk-}
+ vtk_ver=$(ver_cut 1-2 ${vtk_ver})
mycmakeargs+=(
-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+ -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-${vtk_ver}
-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
)
- if has_version ">=sci-libs/vtk-9.2.0"; then
- mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 )
- elif has_version ">=sci-libs/vtk-9.1.0"; then
- mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 )
- elif has_version ">=sci-libs/vtk-9.0.0"; then
- mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 )
- fi
fi
cmake_src_configure
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2023-01-04 5:50 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2023-01-04 5:50 UTC (permalink / raw
To: gentoo-commits
commit: 0d7bfedb0301cadcf0e96cec0eb182ab1f471553
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Jan 2 07:57:00 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 05:48:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d7bfedb
sci-libs/opencascade: simplify vtk logic (v7.6.3)
Backport patch from v7.7.0
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28932
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.6.3-r1.ebuild | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
index 2090e9b45195..82352ba3e3a2 100644
--- a/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
@@ -132,17 +132,14 @@ src_configure() {
fi
if use vtk; then
+ local vtk_ver=$(best_version "sci-libs/vtk")
+ vtk_ver=${vtk_ver#sci-libs/vtk-}
+ vtk_ver=$(ver_cut 1-2 ${vtk_ver})
mycmakeargs+=(
-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+ -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-${vtk_ver}
-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
)
- if has_version ">=sci-libs/vtk-9.2.0"; then
- mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 )
- elif has_version ">=sci-libs/vtk-9.1.0"; then
- mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 )
- elif has_version ">=sci-libs/vtk-9.0.0"; then
- mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 )
- fi
fi
cmake_src_configure
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-12-31 15:36 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2022-12-31 15:36 UTC (permalink / raw
To: gentoo-commits
commit: 3a10bb3a17cd9fa3929de46ca53d76adff94adbd
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun Dec 18 16:12:35 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 15:36:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a10bb3a
sci-libs/opencascade: build 7.6.3 against vtk-9.2
Backport patch from v7.7.0
Bug: https://bugs.gentoo.org/886343
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28704
Signed-off-by: Sam James <sam <AT> gentoo.org>
...de-7.6.3.ebuild => opencascade-7.6.3-r1.ebuild} | 25 +++++++++++-----------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.6.3.ebuild b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
similarity index 88%
rename from sci-libs/opencascade/opencascade-7.6.3.ebuild
rename to sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
index cd7888f8818b..2090e9b45195 100644
--- a/sci-libs/opencascade/opencascade-7.6.3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
media-libs/ftgl
virtual/glu
virtual/opengl
- x11-libs/libXmu
+ x11-libs/libX11
examples? (
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -49,7 +49,7 @@ RDEPEND="
ffmpeg? ( <media-video/ffmpeg-5:= )
freeimage? ( media-libs/freeimage )
tbb? ( dev-cpp/tbb:= )
- vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
+ vtk? ( <sci-libs/vtk-9.3.0:=[rendering] )
"
DEPEND="
${RDEPEND}
@@ -68,6 +68,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
"${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
+ "${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch
)
src_prepare() {
@@ -131,18 +132,16 @@ src_configure() {
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)
- )
+ mycmakeargs+=(
+ -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+ -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
+ )
+ if has_version ">=sci-libs/vtk-9.2.0"; then
+ mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 )
+ elif has_version ">=sci-libs/vtk-9.1.0"; then
+ mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 )
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)
- )
+ mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 )
fi
fi
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-12-19 14:49 Andreas Sturmlechner
0 siblings, 0 replies; 70+ messages in thread
From: Andreas Sturmlechner @ 2022-12-19 14:49 UTC (permalink / raw
To: gentoo-commits
commit: caac47cd51854fdbba440c37ecb62f27a2dcd669
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 14:48:13 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 14:49:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caac47cd
sci-libs/opencascade: Revert "drop 7.5.2-r6"
This reverts commit cce61ad9fb4d880a97dd9d1772972a4863ea5558.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/opencascade/Manifest | 1 +
sci-libs/opencascade/opencascade-7.5.2-r6.ebuild | 175 +++++++++++++++++++++++
2 files changed, 176 insertions(+)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index b0510b20df5f..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/opencascade-7.5.2-r6.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
new file mode 100644
index 000000000000..f2acaba15e74
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+MY_PV="$(ver_rs 1- '_')"
+PV_MAJ="$(ver_cut 1-2)"
+
+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=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
+S="${WORKDIR}/occt-V${MY_PV}"
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="0/${PV_MAJ}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug doc examples ffmpeg freeimage gles2-only 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://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
+RDEPEND="
+ !app-eselect/eselect-opencascade
+ dev-lang/tcl:=
+ dev-lang/tk:=
+ dev-tcltk/itcl
+ dev-tcltk/itk
+ dev-tcltk/tix
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/ftgl
+ virtual/glu
+ 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:= )
+ freeimage? ( media-libs/freeimage )
+ tbb? ( <dev-cpp/tbb-2021.4.0 )
+ vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ dev-cpp/eigen
+ dev-libs/rapidjson
+ doc? ( app-doc/doxygen )
+ examples? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.5.1-0001-allow-default-search-path-for-Qt5.patch
+ "${FILESDIR}"/${PN}-7.5.1-0002-remove-unnecessary-Qt5-check.patch
+ "${FILESDIR}"/${PN}-7.5.1-0003-add-Gentoo-configuration-type.patch
+ "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
+ "${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.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
+ "${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ use debug && append-cppflags -DDEBUG
+
+ 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
+ -DUSE_FFMPEG=$(usex ffmpeg)
+ -DUSE_FREEIMAGE=$(usex freeimage)
+ -DUSE_FREETYPE=ON
+ -DUSE_GLES2=$(usex gles2-only)
+ -DUSE_RAPIDJSON=$(usex json)
+ -DUSE_TBB=$(usex tbb)
+ -DUSE_VTK=$(usex vtk)
+ )
+
+ use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
+
+ if use examples; then
+ mycmakeargs+=(
+ -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
+ -DBUILD_SAMPLES_QT=ON
+ )
+ 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
+
+ # prepare /etc/env.d file
+ 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}"
+
+ # remove examples
+ if use !examples; then
+ rm -r "${ED}/usr/share/${PN}/samples" || die
+ fi
+
+ docompress -x /usr/share/doc/${PF}/overview/html
+}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-12-19 14:47 Andreas Sturmlechner
0 siblings, 0 replies; 70+ messages in thread
From: Andreas Sturmlechner @ 2022-12-19 14:47 UTC (permalink / raw
To: gentoo-commits
commit: cce61ad9fb4d880a97dd9d1772972a4863ea5558
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 11:35:33 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 14:45:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce61ad9
sci-libs/opencascade: drop 7.5.2-r6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/opencascade/Manifest | 1 -
sci-libs/opencascade/opencascade-7.5.2-r6.ebuild | 175 -----------------------
2 files changed, 176 deletions(-)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index ff6ab85b0da3..b0510b20df5f 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,4 +1,3 @@
-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/opencascade-7.5.2-r6.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
deleted file mode 100644
index f2acaba15e74..000000000000
--- a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-MY_PV="$(ver_rs 1- '_')"
-PV_MAJ="$(ver_cut 1-2)"
-
-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=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
-S="${WORKDIR}/occt-V${MY_PV}"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="0/${PV_MAJ}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug doc examples ffmpeg freeimage gles2-only 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://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
-RDEPEND="
- !app-eselect/eselect-opencascade
- dev-lang/tcl:=
- dev-lang/tk:=
- dev-tcltk/itcl
- dev-tcltk/itk
- dev-tcltk/tix
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/ftgl
- virtual/glu
- 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:= )
- freeimage? ( media-libs/freeimage )
- tbb? ( <dev-cpp/tbb-2021.4.0 )
- vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- dev-cpp/eigen
- dev-libs/rapidjson
- doc? ( app-doc/doxygen )
- examples? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.5.1-0001-allow-default-search-path-for-Qt5.patch
- "${FILESDIR}"/${PN}-7.5.1-0002-remove-unnecessary-Qt5-check.patch
- "${FILESDIR}"/${PN}-7.5.1-0003-add-Gentoo-configuration-type.patch
- "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
- "${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.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
- "${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- use debug && append-cppflags -DDEBUG
-
- 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
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FREEIMAGE=$(usex freeimage)
- -DUSE_FREETYPE=ON
- -DUSE_GLES2=$(usex gles2-only)
- -DUSE_RAPIDJSON=$(usex json)
- -DUSE_TBB=$(usex tbb)
- -DUSE_VTK=$(usex vtk)
- )
-
- use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
-
- if use examples; then
- mycmakeargs+=(
- -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
- -DBUILD_SAMPLES_QT=ON
- )
- 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
-
- # prepare /etc/env.d file
- 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}"
-
- # remove examples
- if use !examples; then
- rm -r "${ED}/usr/share/${PN}/samples" || die
- fi
-
- docompress -x /usr/share/doc/${PF}/overview/html
-}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-12-13 14:11 Andrew Ammerlaan
0 siblings, 0 replies; 70+ messages in thread
From: Andrew Ammerlaan @ 2022-12-13 14:11 UTC (permalink / raw
To: gentoo-commits
commit: b1c6afa07316c3b71e4a4c37637b69a351d49ac0
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 13 13:30:34 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Dec 13 13:36:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c6afa0
sci-libs/opencascade: ensure vtk include dirs are found
Closes: https://bugs.gentoo.org/885621
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.5.2-r6.ebuild | 2 +-
sci-libs/opencascade/opencascade-7.5.3-r8.ebuild | 2 +-
sci-libs/opencascade/opencascade-7.6.3.ebuild | 2 +-
sci-libs/opencascade/opencascade-7.7.0.ebuild | 10 ++++++++--
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
index d4500132ab1f..f2acaba15e74 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
ffmpeg? ( media-video/ffmpeg:= )
freeimage? ( media-libs/freeimage )
tbb? ( <dev-cpp/tbb-2021.4.0 )
- vtk? ( sci-libs/vtk:=[rendering] )
+ vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
"
DEPEND="${RDEPEND}"
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
index 87b782fa5e6a..bdd9b918a69a 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
ffmpeg? ( media-video/ffmpeg:= )
freeimage? ( media-libs/freeimage )
tbb? ( dev-cpp/tbb:= )
- vtk? ( sci-libs/vtk:=[rendering] )
+ vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
"
DEPEND="${RDEPEND}"
diff --git a/sci-libs/opencascade/opencascade-7.6.3.ebuild b/sci-libs/opencascade/opencascade-7.6.3.ebuild
index 398ea6df2e54..cd7888f8818b 100644
--- a/sci-libs/opencascade/opencascade-7.6.3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.3.ebuild
@@ -49,7 +49,7 @@ RDEPEND="
ffmpeg? ( <media-video/ffmpeg-5:= )
freeimage? ( media-libs/freeimage )
tbb? ( dev-cpp/tbb:= )
- vtk? ( sci-libs/vtk:=[rendering] )
+ vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
"
DEPEND="
${RDEPEND}
diff --git a/sci-libs/opencascade/opencascade-7.7.0.ebuild b/sci-libs/opencascade/opencascade-7.7.0.ebuild
index 072150e2df0a..c2f7e7dbf7a4 100644
--- a/sci-libs/opencascade/opencascade-7.7.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
ffmpeg? ( <media-video/ffmpeg-5:= )
freeimage? ( media-libs/freeimage )
tbb? ( dev-cpp/tbb:= )
- vtk? ( sci-libs/vtk:=[rendering] )
+ vtk? ( <sci-libs/vtk-9.3.0:=[rendering] )
"
DEPEND="
${RDEPEND}
@@ -132,7 +132,13 @@ src_configure() {
fi
if use vtk; then
- if has_version ">=sci-libs/vtk-9.1.0"; then
+ if has_version ">=sci-libs/vtk-9.2.0"; then
+ mycmakeargs+=(
+ -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+ -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2
+ -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
+ )
+ elif 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
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-09-27 13:57 Andrew Ammerlaan
0 siblings, 0 replies; 70+ messages in thread
From: Andrew Ammerlaan @ 2022-09-27 13:57 UTC (permalink / raw
To: gentoo-commits
commit: fd15b37705f0e3e4251ed993743dc8f587ed772c
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun Sep 25 08:02:26 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 13:56:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd15b377
sci-libs/opencascade: drop 7.6.2-r1
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27442
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/opencascade/Manifest | 1 -
sci-libs/opencascade/opencascade-7.6.2-r1.ebuild | 172 -----------------------
2 files changed, 173 deletions(-)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 2ce18530639e..c3e51ef720d8 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,4 +1,3 @@
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.2.tar.gz 48207505 BLAKE2B 62d0015fdd6321036c4be02214730da46339d7032eec84969164497d1138bc8125c025f1af55beb3587e456845dbfa04596375085d694c0d2b5bc787ee18abeb SHA512 fa3874f0a7783c03fec863f28b87430ad794d1397147aa2c51604599bdd1510b08c8d98de799fef724100db5de5696eeeb170149a38228774864c692861f8ccc
DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d SHA512 c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded
diff --git a/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild b/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
deleted file mode 100644
index 30553c491ea0..000000000000
--- a/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PV="$(ver_rs 1- '_')"
-MY_SLOT="$(ver_cut 1-2)"
-
-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=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
-S="${WORKDIR}/occt-V${MY_PV}"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-IUSE="doc eigen 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://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
-RDEPEND="
- !app-eselect/eselect-opencascade
- dev-lang/tcl:=
- dev-lang/tk:=
- dev-tcltk/itcl
- dev-tcltk/itk
- dev-tcltk/tix
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/ftgl
- virtual/glu
- 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}
- eigen? ( dev-cpp/eigen )
- json? ( dev-libs/rapidjson )
- vtk? ( dev-libs/utfcpp )
-"
-BDEPEND="
- doc? ( app-doc/doxygen[dot] )
- examples? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
- "${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}"/${P}-avoid-pre-stripping-binaries.patch
- "${FILESDIR}"/${PN}-7.5.3-tbb-2021.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
- -DUSE_EIGEN=$(usex eigen)
- -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
- )
-
- use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
-
- if use examples; then
- mycmakeargs+=(
- -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
- -DBUILD_SAMPLES_QT=ON
- )
- 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
-}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-09-25 7:20 Joonas Niilola
0 siblings, 0 replies; 70+ messages in thread
From: Joonas Niilola @ 2022-09-25 7:20 UTC (permalink / raw
To: gentoo-commits
commit: e75a91c6cff14f32413759cb041df7ad0049ad5c
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 25 07:20:15 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Sep 25 07:20:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e75a91c6
sci-libs/opencascade: Stabilize 7.6.3 amd64, #872644
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/opencascade/opencascade-7.6.3.ebuild b/sci-libs/opencascade/opencascade-7.6.3.ebuild
index 192d6d2408c3..398ea6df2e54 100644
--- a/sci-libs/opencascade/opencascade-7.6.3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/occt-${COMMIT_SHORT}"
LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
IUSE="doc eigen examples ffmpeg freeimage gles2 json optimize tbb vtk"
REQUIRED_USE="?? ( optimize tbb )"
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-08-14 16:06 Florian Schmaus
0 siblings, 0 replies; 70+ messages in thread
From: Florian Schmaus @ 2022-08-14 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 614e6abf6e848b9a983ef3f6cc7ed6eaf990d31d
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Aug 9 11:27:17 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Aug 14 16:03:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=614e6abf
sci-libs/opencascade: add 7.6.3
Closes: https://bugs.gentoo.org/861953
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26793
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
sci-libs/opencascade/Manifest | 1 +
sci-libs/opencascade/opencascade-7.6.3.ebuild | 175 ++++++++++++++++++++++++++
2 files changed, 176 insertions(+)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 7f2f7d3cadb3..2ce18530639e 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.2.tar.gz 48207505 BLAKE2B 62d0015fdd6321036c4be02214730da46339d7032eec84969164497d1138bc8125c025f1af55beb3587e456845dbfa04596375085d694c0d2b5bc787ee18abeb SHA512 fa3874f0a7783c03fec863f28b87430ad794d1397147aa2c51604599bdd1510b08c8d98de799fef724100db5de5696eeeb170149a38228774864c692861f8ccc
+DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d SHA512 c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded
diff --git a/sci-libs/opencascade/opencascade-7.6.3.ebuild b/sci-libs/opencascade/opencascade-7.6.3.ebuild
new file mode 100644
index 000000000000..192d6d2408c3
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.6.3.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_SLOT="$(ver_cut 1-2)"
+COMMIT="b079fb9877ef64d4a8158a60fa157f59b096debb"
+COMMIT_SHORT="${COMMIT:0:7}"
+
+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=${COMMIT};sf=tgz -> ${P}.tar.gz"
+S="${WORKDIR}/occt-${COMMIT_SHORT}"
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc eigen 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://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
+RDEPEND="
+ !app-eselect/eselect-opencascade
+ dev-lang/tcl:=
+ dev-lang/tk:=
+ dev-tcltk/itcl
+ dev-tcltk/itk
+ dev-tcltk/tix
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/ftgl
+ virtual/glu
+ 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}
+ eigen? ( dev-cpp/eigen )
+ json? ( dev-libs/rapidjson )
+ vtk? ( dev-libs/utfcpp )
+"
+BDEPEND="
+ doc? ( app-doc/doxygen[dot] )
+ examples? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
+ "${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.6.2-avoid-pre-stripping-binaries.patch
+ "${FILESDIR}"/${PN}-7.5.3-tbb-2021.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
+ -DUSE_EIGEN=$(usex eigen)
+ -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 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
+}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-07-27 19:03 Conrad Kostecki
0 siblings, 0 replies; 70+ messages in thread
From: Conrad Kostecki @ 2022-07-27 19:03 UTC (permalink / raw
To: gentoo-commits
commit: 71aac51f1d7b6446066da410b997badcfff4c522
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Jul 26 05:55:36 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 19:02:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71aac51f
sci-libs/opencascade: drop 7.6.1-r2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26599
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sci-libs/opencascade/Manifest | 1 -
sci-libs/opencascade/opencascade-7.6.1-r2.ebuild | 171 -----------------------
2 files changed, 172 deletions(-)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 01cf7e4ba735..7f2f7d3cadb3 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,4 +1,3 @@
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.1.tar.gz 48201174 BLAKE2B 7d13f0e17dfb9261ae77de9e66cf93053803313ac6848b3412a147f311e935c4ea9c930c7c9948bbce1f0172365ea9d326047f42b967ecdee435d68325093c61 SHA512 1466d95eea7539f5cf52a40ada712b2b0cfb9c1970271f5ea60d0408a1c3f1ae16b885dd36c3c0fcef3cedb05c420a7c637ee5168b5b081b0f55068cda412bb0
DIST opencascade-7.6.2.tar.gz 48207505 BLAKE2B 62d0015fdd6321036c4be02214730da46339d7032eec84969164497d1138bc8125c025f1af55beb3587e456845dbfa04596375085d694c0d2b5bc787ee18abeb SHA512 fa3874f0a7783c03fec863f28b87430ad794d1397147aa2c51604599bdd1510b08c8d98de799fef724100db5de5696eeeb170149a38228774864c692861f8ccc
diff --git a/sci-libs/opencascade/opencascade-7.6.1-r2.ebuild b/sci-libs/opencascade/opencascade-7.6.1-r2.ebuild
deleted file mode 100644
index e11b24187775..000000000000
--- a/sci-libs/opencascade/opencascade-7.6.1-r2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PV="$(ver_rs 1- '_')"
-MY_SLOT="$(ver_cut 1-2)"
-
-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=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
-S="${WORKDIR}/occt-V${MY_PV}"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="doc eigen 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://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
-RDEPEND="
- !app-eselect/eselect-opencascade
- dev-lang/tcl:=
- dev-lang/tk:=
- dev-tcltk/itcl
- dev-tcltk/itk
- dev-tcltk/tix
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/ftgl
- virtual/glu
- 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}
- eigen? ( dev-cpp/eigen )
- json? ( dev-libs/rapidjson )
-"
-BDEPEND="
- doc? ( app-doc/doxygen[dot] )
- examples? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
- "${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.6.2-avoid-pre-stripping-binaries.patch
- "${FILESDIR}"/${PN}-7.5.3-tbb-2021.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
- -DUSE_EIGEN=$(usex eigen)
- -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
- )
-
- use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
-
- if use examples; then
- mycmakeargs+=(
- -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
- -DBUILD_SAMPLES_QT=ON
- )
- 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
-}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-07-26 14:22 Joonas Niilola
0 siblings, 0 replies; 70+ messages in thread
From: Joonas Niilola @ 2022-07-26 14:22 UTC (permalink / raw
To: gentoo-commits
commit: aca8e7fa013fc4f9e0770a70a3918309cbd7ae00
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 14:16:16 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 14:22:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca8e7fa
sci-libs/opencascade: Stabilize 7.6.2-r1 amd64, #861119
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.6.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild b/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
index 7773a90fb9f2..30553c491ea0 100644
--- a/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/occt-V${MY_PV}"
LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
IUSE="doc eigen examples ffmpeg freeimage gles2 json optimize tbb vtk"
REQUIRED_USE="?? ( optimize tbb )"
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-06-21 10:14 Andrew Ammerlaan
0 siblings, 0 replies; 70+ messages in thread
From: Andrew Ammerlaan @ 2022-06-21 10:14 UTC (permalink / raw
To: gentoo-commits
commit: 2243b8cdfa6361a5831e69102a493419b40e1d71
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Jun 21 05:08:30 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 10:12:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2243b8cd
sci-libs/opencascade: drop 7.6.0-r4
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26015
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/opencascade/Manifest | 1 -
sci-libs/opencascade/opencascade-7.6.0-r4.ebuild | 170 -----------------------
2 files changed, 171 deletions(-)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index f769dfd54afc..01cf7e4ba735 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,5 +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.0.tar.gz 48193117 BLAKE2B c16cd096f20e90267a00b6be21b17b22b491cf5d9aa1a311d64d7707042dc88380c60ececceb6728dbcdd4ff56a67558144292950e11518b21cbc49ace4e88cd SHA512 6839eb6641b9e0752474fce11cf1756223067febe0f5bcd5db249e3eccef29517a6952c124aae818220b6360070a792dacd1b0b4ce970b8351ce38598f31b4be
DIST opencascade-7.6.1.tar.gz 48201174 BLAKE2B 7d13f0e17dfb9261ae77de9e66cf93053803313ac6848b3412a147f311e935c4ea9c930c7c9948bbce1f0172365ea9d326047f42b967ecdee435d68325093c61 SHA512 1466d95eea7539f5cf52a40ada712b2b0cfb9c1970271f5ea60d0408a1c3f1ae16b885dd36c3c0fcef3cedb05c420a7c637ee5168b5b081b0f55068cda412bb0
DIST opencascade-7.6.2.tar.gz 48207505 BLAKE2B 62d0015fdd6321036c4be02214730da46339d7032eec84969164497d1138bc8125c025f1af55beb3587e456845dbfa04596375085d694c0d2b5bc787ee18abeb SHA512 fa3874f0a7783c03fec863f28b87430ad794d1397147aa2c51604599bdd1510b08c8d98de799fef724100db5de5696eeeb170149a38228774864c692861f8ccc
diff --git a/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild b/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
deleted file mode 100644
index 41e15cf2bd76..000000000000
--- a/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PV="$(ver_rs 1- '_')"
-MY_SLOT="$(ver_cut 1-2)"
-
-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=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
-S="${WORKDIR}/occt-V${MY_PV}"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="doc eigen 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://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
-RDEPEND="
- !app-eselect/eselect-opencascade
- dev-lang/tcl:=
- dev-lang/tk:=
- dev-tcltk/itcl
- dev-tcltk/itk
- dev-tcltk/tix
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/ftgl
- virtual/glu
- 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-2021.4 )
- vtk? ( sci-libs/vtk:=[rendering] )
-"
-DEPEND="
- ${RDEPEND}
- eigen? ( dev-cpp/eigen )
- json? ( dev-libs/rapidjson )
-"
-BDEPEND="
- doc? ( app-doc/doxygen[dot] )
- examples? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
- "${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.6.2-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
- -DUSE_EIGEN=$(usex eigen)
- -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
- )
-
- use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
-
- if use examples; then
- mycmakeargs+=(
- -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
- -DBUILD_SAMPLES_QT=ON
- )
- 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
-}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-06-14 16:01 Joonas Niilola
0 siblings, 0 replies; 70+ messages in thread
From: Joonas Niilola @ 2022-06-14 16:01 UTC (permalink / raw
To: gentoo-commits
commit: b83c7f5ae1de392a1589aa8bee357bc850a004ab
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 16:00:59 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 16:01:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b83c7f5a
sci-libs/opencascade: add a missing dep dev-libs/utfcpp to 7.6.2
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.6.2.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/opencascade/opencascade-7.6.2.ebuild b/sci-libs/opencascade/opencascade-7.6.2.ebuild
index 1a0ee2adda8e..7914fe259a7e 100644
--- a/sci-libs/opencascade/opencascade-7.6.2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.2.ebuild
@@ -54,6 +54,7 @@ DEPEND="
${RDEPEND}
eigen? ( dev-cpp/eigen )
json? ( dev-libs/rapidjson )
+ vtk? ( dev-libs/utfcpp )
"
BDEPEND="
doc? ( app-doc/doxygen[dot] )
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-06-14 16:01 Joonas Niilola
0 siblings, 0 replies; 70+ messages in thread
From: Joonas Niilola @ 2022-06-14 16:01 UTC (permalink / raw
To: gentoo-commits
commit: 04a868c8a47bb0862ea27da0a4b91ee7c36ed41e
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun Jun 5 07:40:31 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 16:01:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04a868c8
sci-libs/opencascade: add 7.6.2
Closes: https://bugs.gentoo.org/848063
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/opencascade/Manifest | 1 +
sci-libs/opencascade/opencascade-7.6.2.ebuild | 169 ++++++++++++++++++++++++++
2 files changed, 170 insertions(+)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 3fb132e2eb98..f769dfd54afc 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -2,3 +2,4 @@ DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70
DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
DIST opencascade-7.6.0.tar.gz 48193117 BLAKE2B c16cd096f20e90267a00b6be21b17b22b491cf5d9aa1a311d64d7707042dc88380c60ececceb6728dbcdd4ff56a67558144292950e11518b21cbc49ace4e88cd SHA512 6839eb6641b9e0752474fce11cf1756223067febe0f5bcd5db249e3eccef29517a6952c124aae818220b6360070a792dacd1b0b4ce970b8351ce38598f31b4be
DIST opencascade-7.6.1.tar.gz 48201174 BLAKE2B 7d13f0e17dfb9261ae77de9e66cf93053803313ac6848b3412a147f311e935c4ea9c930c7c9948bbce1f0172365ea9d326047f42b967ecdee435d68325093c61 SHA512 1466d95eea7539f5cf52a40ada712b2b0cfb9c1970271f5ea60d0408a1c3f1ae16b885dd36c3c0fcef3cedb05c420a7c637ee5168b5b081b0f55068cda412bb0
+DIST opencascade-7.6.2.tar.gz 48207505 BLAKE2B 62d0015fdd6321036c4be02214730da46339d7032eec84969164497d1138bc8125c025f1af55beb3587e456845dbfa04596375085d694c0d2b5bc787ee18abeb SHA512 fa3874f0a7783c03fec863f28b87430ad794d1397147aa2c51604599bdd1510b08c8d98de799fef724100db5de5696eeeb170149a38228774864c692861f8ccc
diff --git a/sci-libs/opencascade/opencascade-7.6.2.ebuild b/sci-libs/opencascade/opencascade-7.6.2.ebuild
new file mode 100644
index 000000000000..cd8196d34d06
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.6.2.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PV="$(ver_rs 1- '_')"
+MY_SLOT="$(ver_cut 1-2)"
+
+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=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
+S="${WORKDIR}/occt-V${MY_PV}"
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc eigen 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://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
+RDEPEND="
+ !app-eselect/eselect-opencascade
+ dev-lang/tcl:=
+ dev-lang/tk:=
+ dev-tcltk/itcl
+ dev-tcltk/itk
+ dev-tcltk/tix
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/ftgl
+ virtual/glu
+ 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-2021.4 )
+ vtk? ( sci-libs/vtk:=[rendering] )
+"
+DEPEND="
+ ${RDEPEND}
+ eigen? ( dev-cpp/eigen )
+ json? ( dev-libs/rapidjson )
+"
+BDEPEND="
+ doc? ( app-doc/doxygen[dot] )
+ examples? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
+ "${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
+)
+
+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
+ -DUSE_EIGEN=$(usex eigen)
+ -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
+ )
+
+ use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
+
+ if use examples; then
+ mycmakeargs+=(
+ -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
+ -DBUILD_SAMPLES_QT=ON
+ )
+ 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
+}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-06-03 11:01 Joonas Niilola
0 siblings, 0 replies; 70+ messages in thread
From: Joonas Niilola @ 2022-06-03 11:01 UTC (permalink / raw
To: gentoo-commits
commit: 5ba6842a473c75f691487e770716356cefbd5cd3
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun May 29 11:03:31 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 11:01:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ba6842a
sci-libs/opencascade: allow some exceptions
Disabling some of the exceptions (BUILD_RELEASE_DISABLE_EXCEPTIONS=ON),
which is the default, can lead to crashes of consumer applications. This
patch disables this option, so those exceptions are enabled.
Bug: https://github.com/FreeCAD/FreeCAD/issues/6200
Closes: https://bugs.gentoo.org/847916
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/25673
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../{opencascade-7.5.2-r5.ebuild => opencascade-7.5.2-r6.ebuild} | 1 +
.../{opencascade-7.5.3-r6.ebuild => opencascade-7.5.3-r7.ebuild} | 1 +
.../{opencascade-7.6.0-r3.ebuild => opencascade-7.6.0-r4.ebuild} | 1 +
.../{opencascade-7.6.1.ebuild => opencascade-7.6.1-r1.ebuild} | 1 +
4 files changed, 4 insertions(+)
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
rename to sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
index 5b0cab240b53..4ba6a2ccee23 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
@@ -89,6 +89,7 @@ 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}"
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
rename to sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
index 192327a682a5..7dc58dcd6393 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
@@ -89,6 +89,7 @@ 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}"
diff --git a/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild b/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
rename to sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
index ab4bbc4c974b..cd8196d34d06 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
@@ -84,6 +84,7 @@ 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}"
diff --git a/sci-libs/opencascade/opencascade-7.6.1.ebuild b/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.6.1.ebuild
rename to sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
index ab4bbc4c974b..cd8196d34d06 100644
--- a/sci-libs/opencascade/opencascade-7.6.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
@@ -84,6 +84,7 @@ 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}"
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-05-19 12:12 Joonas Niilola
0 siblings, 0 replies; 70+ messages in thread
From: Joonas Niilola @ 2022-05-19 12:12 UTC (permalink / raw
To: gentoo-commits
commit: 42bd7306aca7869ffc9c67499ac85c124407dae3
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 12:10:52 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu May 19 12:10:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42bd7306
sci-libs/opencascade: Stabilize 7.5.3-r6 amd64, #829841
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.5.3-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
index 19b5d7637932..192327a682a5 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/occt-V${MY_PV}"
LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
SLOT="0/${PV_MAJ}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
IUSE="debug doc examples ffmpeg freeimage gles2-only json optimize tbb vtk"
REQUIRED_USE="?? ( optimize tbb )"
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-03-16 22:54 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2022-03-16 22:54 UTC (permalink / raw
To: gentoo-commits
commit: 5a35a120eb244b1de1dab4d40bcc81596cd90ff8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 22:53:44 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 22:53:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a35a120
sci-libs/opencascade: add link to ffmpeg bug
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.5.2-r5.ebuild | 1 +
sci-libs/opencascade/opencascade-7.5.3-r6.ebuild | 1 +
sci-libs/opencascade/opencascade-7.6.0-r3.ebuild | 1 +
sci-libs/opencascade/opencascade-7.6.1.ebuild | 1 +
4 files changed, 4 insertions(+)
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
index 8bf1c6acd11e..5b0cab240b53 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( optimize tbb )"
# properly set up.
RESTRICT="test"
+# ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
RDEPEND="
!app-eselect/eselect-opencascade
dev-lang/tcl:=
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
index 1bec9312ad8d..19b5d7637932 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( optimize tbb )"
# properly set up.
RESTRICT="test"
+# ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
RDEPEND="
!app-eselect/eselect-opencascade
dev-lang/tcl:=
diff --git a/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild b/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
index e98c9c7e07dd..ab4bbc4c974b 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( optimize tbb )"
# properly set up.
RESTRICT="test"
+# ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
RDEPEND="
!app-eselect/eselect-opencascade
dev-lang/tcl:=
diff --git a/sci-libs/opencascade/opencascade-7.6.1.ebuild b/sci-libs/opencascade/opencascade-7.6.1.ebuild
index e98c9c7e07dd..ab4bbc4c974b 100644
--- a/sci-libs/opencascade/opencascade-7.6.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.1.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( optimize tbb )"
# properly set up.
RESTRICT="test"
+# ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
RDEPEND="
!app-eselect/eselect-opencascade
dev-lang/tcl:=
^ permalink raw reply related [flat|nested] 70+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-03-16 22:51 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2022-03-16 22:51 UTC (permalink / raw
To: gentoo-commits
commit: 3228209e96de27714701026db5c01ae1f9994be9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 22:50:19 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 22:51:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3228209e
sci-libs/opencascade: drop glibc RDEPEND
Not needed, we're masking on musl profiles, and this isn't
a binary package. It could one day work on non-glibc and
an RDEPEND makes it trickier to test on musl.
Bug: https://bugs.gentoo.org/832742
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.6.0-r3.ebuild | 2 --
sci-libs/opencascade/opencascade-7.6.1.ebuild | 2 --
2 files changed, 4 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild b/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
index fe70db843047..e98c9c7e07dd 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
@@ -24,7 +24,6 @@ REQUIRED_USE="?? ( optimize tbb )"
# properly set up.
RESTRICT="test"
-# sys-libs/glibc see bug #832742
RDEPEND="
!app-eselect/eselect-opencascade
dev-lang/tcl:=
@@ -35,7 +34,6 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype:2
media-libs/ftgl
- sys-libs/glibc
virtual/glu
virtual/opengl
x11-libs/libXmu
diff --git a/sci-libs/opencascade/opencascade-7.6.1.ebuild b/sci-libs/opencascade/opencascade-7.6.1.ebuild
index fe70db843047..e98c9c7e07dd 100644
--- a/sci-libs/opencascade/opencascade-7.6.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.1.ebuild
@@ -24,7 +24,6 @@ REQUIRED_USE="?? ( optimize tbb )"
# properly set up.
RESTRICT="test"
-# sys-libs/glibc see bug #832742
RDEPEND="
!app-eselect/eselect-opencascade
dev-lang/tcl:=
@@ -35,7 +34,6 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype:2
media-libs/ftgl
- sys-libs/glibc
virtual/glu
virtual/opengl
x11-libs/libXmu
^ permalink raw reply related [flat|nested] 70+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-03-16 22:51 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2022-03-16 22:51 UTC (permalink / raw
To: gentoo-commits
commit: 088d1cd3dd668d0460b42632306fc612e13422e2
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun Mar 13 09:47:01 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 22:51:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=088d1cd3
sci-libs/opencascade: backport fixes from v7.6.1
Package is not yet compatible with ffmpeg-5, so we restrict to
<media-video/ffmpeg-5. Reported upstream.
Not compatible with musl libc implementation, so we explicitly
DEPEND on sys-libs/glibc.
Closes: https://bugs.gentoo.org/832742
Closes: https://bugs.gentoo.org/834422
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24525
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{opencascade-7.6.0-r2.ebuild => opencascade-7.6.0-r3.ebuild} | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sci-libs/opencascade/opencascade-7.6.0-r2.ebuild b/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.6.0-r2.ebuild
rename to sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
index bc1c5b551fbb..fe70db843047 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( optimize tbb )"
# properly set up.
RESTRICT="test"
+# sys-libs/glibc see bug #832742
RDEPEND="
!app-eselect/eselect-opencascade
dev-lang/tcl:=
@@ -34,6 +35,7 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype:2
media-libs/ftgl
+ sys-libs/glibc
virtual/glu
virtual/opengl
x11-libs/libXmu
@@ -44,7 +46,7 @@ RDEPEND="
dev-qt/qtwidgets:5
dev-qt/qtxml:5
)
- ffmpeg? ( media-video/ffmpeg:= )
+ ffmpeg? ( <media-video/ffmpeg-5:= )
freeimage? ( media-libs/freeimage )
tbb? ( <dev-cpp/tbb-2021.4 )
vtk? ( sci-libs/vtk:=[rendering] )
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-03-16 22:51 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2022-03-16 22:51 UTC (permalink / raw
To: gentoo-commits
commit: 5e6ca21c0846fea81d72cb8267b2ef2f66a5a755
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun Mar 13 09:42:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 22:50:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e6ca21c
sci-libs/opencascade: bump to 7.6.1
Package is not yet compatible with ffmpeg-5, so we restrict to
<media-video/ffmpeg-5. Reported upstream.
Not compatible with musl libc implementation, so we explicitly
DEPEND on sys-libs/glibc.
Closes: https://bugs.gentoo.org/835040
Bug: https://bugs.gentoo.org/832742
Bug: https://bugs.gentoo.org/834422
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/Manifest | 1 +
sci-libs/opencascade/opencascade-7.6.1.ebuild | 169 ++++++++++++++++++++++++++
2 files changed, 170 insertions(+)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index bd6eac9d5f78..3fb132e2eb98 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.0.tar.gz 48193117 BLAKE2B c16cd096f20e90267a00b6be21b17b22b491cf5d9aa1a311d64d7707042dc88380c60ececceb6728dbcdd4ff56a67558144292950e11518b21cbc49ace4e88cd SHA512 6839eb6641b9e0752474fce11cf1756223067febe0f5bcd5db249e3eccef29517a6952c124aae818220b6360070a792dacd1b0b4ce970b8351ce38598f31b4be
+DIST opencascade-7.6.1.tar.gz 48201174 BLAKE2B 7d13f0e17dfb9261ae77de9e66cf93053803313ac6848b3412a147f311e935c4ea9c930c7c9948bbce1f0172365ea9d326047f42b967ecdee435d68325093c61 SHA512 1466d95eea7539f5cf52a40ada712b2b0cfb9c1970271f5ea60d0408a1c3f1ae16b885dd36c3c0fcef3cedb05c420a7c637ee5168b5b081b0f55068cda412bb0
diff --git a/sci-libs/opencascade/opencascade-7.6.1.ebuild b/sci-libs/opencascade/opencascade-7.6.1.ebuild
new file mode 100644
index 000000000000..fe70db843047
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.6.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PV="$(ver_rs 1- '_')"
+MY_SLOT="$(ver_cut 1-2)"
+
+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=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
+S="${WORKDIR}/occt-V${MY_PV}"
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc eigen 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"
+
+# sys-libs/glibc see bug #832742
+RDEPEND="
+ !app-eselect/eselect-opencascade
+ dev-lang/tcl:=
+ dev-lang/tk:=
+ dev-tcltk/itcl
+ dev-tcltk/itk
+ dev-tcltk/tix
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/ftgl
+ sys-libs/glibc
+ virtual/glu
+ 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-2021.4 )
+ vtk? ( sci-libs/vtk:=[rendering] )
+"
+DEPEND="
+ ${RDEPEND}
+ eigen? ( dev-cpp/eigen )
+ json? ( dev-libs/rapidjson )
+"
+BDEPEND="
+ doc? ( app-doc/doxygen[dot] )
+ examples? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
+ "${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
+)
+
+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)
+
+ -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
+ -DUSE_EIGEN=$(usex eigen)
+ -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
+ )
+
+ use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
+
+ if use examples; then
+ mycmakeargs+=(
+ -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
+ -DBUILD_SAMPLES_QT=ON
+ )
+ 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
+}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-01-16 1:31 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2022-01-16 1:31 UTC (permalink / raw
To: gentoo-commits
commit: 4dd0f6791ebdc200a1e41ffd9b55435d8996b31f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 16 01:31:07 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 01:31:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dd0f679
sci-libs/opencascade: revbump for fixed USE_OPENGL option in 7.6.x
Closes: https://bugs.gentoo.org/831069
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{opencascade-7.6.0-r1.ebuild => opencascade-7.6.0-r2.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild b/sci-libs/opencascade/opencascade-7.6.0-r2.ebuild
similarity index 100%
rename from sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
rename to sci-libs/opencascade/opencascade-7.6.0-r2.ebuild
^ permalink raw reply [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-01-16 0:24 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2022-01-16 0:24 UTC (permalink / raw
To: gentoo-commits
commit: 78a3dae6d75a4f8846b1a157140cfaafa45eb370
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 16 00:24:32 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 00:24:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78a3dae6
sci-libs/opencascade: rename from gles2->gles2-only for <7.6.0
Bug: https://github.com/gentoo/gentoo/pull/23814
Closes: https://bugs.gentoo.org/831280
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.5.2-r5.ebuild | 2 +-
sci-libs/opencascade/opencascade-7.5.3-r6.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
index d8764d64ee6d..8bf1c6acd11e 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
@@ -106,7 +106,7 @@ src_configure() {
-DUSE_FFMPEG=$(usex ffmpeg)
-DUSE_FREEIMAGE=$(usex freeimage)
-DUSE_FREETYPE=ON
- -DUSE_GLES2=$(usex gles2)
+ -DUSE_GLES2=$(usex gles2-only)
-DUSE_RAPIDJSON=$(usex json)
-DUSE_TBB=$(usex tbb)
-DUSE_VTK=$(usex vtk)
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
index f52f6f7b6bd1..1bec9312ad8d 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
@@ -106,7 +106,7 @@ src_configure() {
-DUSE_FFMPEG=$(usex ffmpeg)
-DUSE_FREEIMAGE=$(usex freeimage)
-DUSE_FREETYPE=ON
- -DUSE_GLES2=$(usex gles2)
+ -DUSE_GLES2=$(usex gles2-only)
-DUSE_RAPIDJSON=$(usex json)
-DUSE_TBB=$(usex tbb)
-DUSE_VTK=$(usex vtk)
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-01-15 22:14 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2022-01-15 22:14 UTC (permalink / raw
To: gentoo-commits
commit: ec86df92464abd1cd60e9675e9f84f83a9e6e76b
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Jan 15 20:50:21 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 15 22:14:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec86df92
sci-libs/opencascade: don't pass USE_OPENGL option
The option defaults to on and was erroneously passed as with the
invert value of the gles2 USE flag, which lead to only libTKOpenGles
library being built, but no libTKOpenGL library, resulting in build
failures in revdeps.
Closes: https://bugs.gentoo.rog/831069
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.6.0-r1.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild b/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
index 2c03ea0ead25..595c605bc985 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
@@ -105,7 +105,6 @@ src_configure() {
-DUSE_FREEIMAGE=$(usex freeimage)
-DUSE_FREETYPE=ON
-DUSE_GLES2=$(usex gles2)
- -DUSE_OPENGL=$(usex !gles2)
# no package in tree
-DUSE_OPENVR=OFF
-DUSE_RAPIDJSON=$(usex json)
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-01-15 22:14 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2022-01-15 22:14 UTC (permalink / raw
To: gentoo-commits
commit: 0ea126f6c797701fe675896e6a8bca989d9b82bb
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Jan 15 14:52:19 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 15 22:14:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ea126f6
sci-libs/opencascade: fix installation paths for 7.5
Use the same path as for the 7.6 series /usr/$(get_libdir)/${PN}
instead of /usr/$(get_libdir)/${P}, so the changed environment
files works for all versions.
Bugs: https://bugs.gentoo.org/831054
Bugs: https://bugs.gentoo.org/831069
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...de-7.5.2-r4.ebuild => opencascade-7.5.2-r5.ebuild} | 19 ++++++++++++-------
...de-7.5.3-r5.ebuild => opencascade-7.5.3-r6.ebuild} | 19 ++++++++++++-------
2 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
similarity index 90%
rename from sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
rename to sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
index 98fad573f3a8..f4c5fd8ff1e3 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
@@ -88,15 +88,20 @@ src_configure() {
local mycmakeargs=(
-DBUILD_DOC_Overview=$(usex doc)
-DBUILD_Inspector=$(usex examples)
- -DBUILD_WITH_DEBUG=$(usex debug)
- -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin"
- -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}"
+
+ -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_LIB="$(get_libdir)/${P}"
- -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin"
- -DINSTALL_DIR_WITH_VERSION=ON
+ -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
-DUSE_FFMPEG=$(usex ffmpeg)
-DUSE_FREEIMAGE=$(usex freeimage)
@@ -160,7 +165,7 @@ src_install() {
# remove examples
if use !examples; then
- rm -r "${ED}/usr/share/${P}/samples" || die
+ rm -r "${ED}/usr/share/${PN}/samples" || die
fi
docompress -x /usr/share/doc/${PF}/overview/html
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
similarity index 90%
rename from sci-libs/opencascade/opencascade-7.5.3-r5.ebuild
rename to sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
index 55ca127b2053..57cdfcf646b6 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
@@ -88,15 +88,20 @@ src_configure() {
local mycmakeargs=(
-DBUILD_DOC_Overview=$(usex doc)
-DBUILD_Inspector=$(usex examples)
- -DBUILD_WITH_DEBUG=$(usex debug)
- -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin"
- -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}"
+
+ -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_LIB="$(get_libdir)/${P}"
- -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin"
- -DINSTALL_DIR_WITH_VERSION=ON
+ -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
-DUSE_FFMPEG=$(usex ffmpeg)
-DUSE_FREEIMAGE=$(usex freeimage)
@@ -160,7 +165,7 @@ src_install() {
# remove examples
if use !examples; then
- rm -r "${ED}/usr/share/${P}/samples" || die
+ rm -r "${ED}/usr/share/${PN}/samples" || die
fi
docompress -x /usr/share/doc/${PF}/overview/html
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-01-15 22:14 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2022-01-15 22:14 UTC (permalink / raw
To: gentoo-commits
commit: 2dcf0c603c3975d7f0c01435d64d2bdeddb6f8db
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Jan 15 20:52:47 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 15 22:14:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dcf0c60
sci-libs/opencascade: rename gles2 USE flag to gles2-only
Bugs: https://bugs.gentoo.org/831069
Bugs: https://bugs.gentoo.org/831126
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/23814
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.5.2-r5.ebuild | 2 +-
sci-libs/opencascade/opencascade-7.5.3-r6.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
index f4c5fd8ff1e3..d8764d64ee6d 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/occt-V${MY_PV}"
LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
SLOT="0/${PV_MAJ}"
KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug doc examples ffmpeg freeimage gles2 json optimize tbb vtk"
+IUSE="debug doc examples ffmpeg freeimage gles2-only json optimize tbb vtk"
REQUIRED_USE="?? ( optimize tbb )"
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
index 57cdfcf646b6..f52f6f7b6bd1 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/occt-V${MY_PV}"
LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
SLOT="0/${PV_MAJ}"
KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug doc examples ffmpeg freeimage gles2 json optimize tbb vtk"
+IUSE="debug doc examples ffmpeg freeimage gles2-only json optimize tbb vtk"
REQUIRED_USE="?? ( optimize tbb )"
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-01-13 1:25 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2022-01-13 1:25 UTC (permalink / raw
To: gentoo-commits
commit: 557e00d429f1249c6a15bc56181f369f087a8545
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 13 01:11:22 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 13 01:25:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=557e00d4
sci-libs/opencascade: block eselect-opencascade
We're no longer pursuing slotted OCC. Please emerge --depclean it
if you have it installed (eselect-opencascade).
Deslotting of OCC was already completed.
Bug: https://bugs.gentoo.org/831069
Bug: https://bugs.gentoo.org/831054
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.5.2-r4.ebuild | 1 +
sci-libs/opencascade/opencascade-7.5.3-r5.ebuild | 1 +
sci-libs/opencascade/opencascade-7.6.0-r1.ebuild | 1 +
3 files changed, 3 insertions(+)
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
index 7f662a01ff3a..98fad573f3a8 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
@@ -25,6 +25,7 @@ REQUIRED_USE="?? ( optimize tbb )"
RESTRICT="test"
RDEPEND="
+ !app-eselect/eselect-opencascade
dev-lang/tcl:=
dev-lang/tk:=
dev-tcltk/itcl
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild
index 6c9825a5afde..55ca127b2053 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild
@@ -25,6 +25,7 @@ REQUIRED_USE="?? ( optimize tbb )"
RESTRICT="test"
RDEPEND="
+ !app-eselect/eselect-opencascade
dev-lang/tcl:=
dev-lang/tk:=
dev-tcltk/itcl
diff --git a/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild b/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
index 4791baa0fb60..2c03ea0ead25 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
@@ -25,6 +25,7 @@ REQUIRED_USE="?? ( optimize tbb )"
RESTRICT="test"
RDEPEND="
+ !app-eselect/eselect-opencascade
dev-lang/tcl:=
dev-lang/tk:=
dev-tcltk/itcl
^ permalink raw reply related [flat|nested] 70+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2022-01-10 1:04 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2022-01-10 1:04 UTC (permalink / raw
To: gentoo-commits
commit: 62acc9193ee2728e613bb511a483ee16c8947ec1
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Dec 13 05:01:20 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 10 01:02:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62acc919
sci-libs/opencascade: use single slot/subslot for 7.5.2
Instead of using different slots for different versions, the package now
uses a single slot with subslots. This is to simplify dependency handling
in revdeps.
Allow to build against sci-libs/vtk-9.1.0
Package-Manager: Portage-3.0.29, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...7.5.2-r2.ebuild => opencascade-7.5.2-r3.ebuild} | 34 ++++++++++------------
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r2.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r3.ebuild
similarity index 87%
rename from sci-libs/opencascade/opencascade-7.5.2-r2.ebuild
rename to sci-libs/opencascade/opencascade-7.5.2-r3.ebuild
index cf90cc0c8aa1..080f7888f0bd 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/ta
S="${WORKDIR}/occt-V${MY_PV}"
LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV_MAJ}"
+SLOT="0/${PV_MAJ}"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="debug doc examples ffmpeg freeimage gles2 json optimize tbb vtk"
@@ -25,7 +25,6 @@ REQUIRED_USE="?? ( optimize tbb )"
RESTRICT="test"
RDEPEND="
- app-eselect/eselect-opencascade
dev-lang/tcl:=
dev-lang/tk:=
dev-tcltk/itcl
@@ -49,13 +48,11 @@ RDEPEND="
tbb? ( <dev-cpp/tbb-2021.4.0 )
vtk? ( sci-libs/vtk:=[rendering] )
"
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}"
+
+BDEPEND="
dev-cpp/eigen
dev-libs/rapidjson
-"
-BDEPEND="
- app-eselect/eselect-opencascade
doc? ( app-doc/doxygen )
examples? ( dev-qt/linguist-tools:5 )
"
@@ -119,7 +116,13 @@ src_configure() {
fi
if use vtk; then
- if has_version ">=sci-libs/vtk-9.0.0"; 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
@@ -134,11 +137,11 @@ src_configure() {
sed -e "s|lib/|$(get_libdir)/|" \
-e "s|VAR_PV|${PV}|" \
-e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
- < "${FILESDIR}"/${PN}-${PV_MAJ}.env.in > "${T}"/${PV_MAJ} || die
+ < "${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}"/${PV_MAJ} || die
+ 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
@@ -146,16 +149,14 @@ src_configure() {
if use optimize ; then
sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \
-e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \
- -i "${T}"/${PV_MAJ} || die
+ -i "${T}"/99${PN} || die
fi
}
src_install() {
cmake_src_install
- # respect slotting
- insinto "/etc/env.d/${PN}"
- doins "${T}/${PV_MAJ}"
+ doenvd "${T}/99${PN}"
# remove examples
if use !examples; then
@@ -164,8 +165,3 @@ src_install() {
docompress -x /usr/share/doc/${PF}/overview/html
}
-
-pkg_postinst() {
- eselect ${PN} set ${PV_MAJ} || die "failed to switch to updated implementation"
- einfo "You can switch between available ${PN} implementations using eselect ${PN}"
-}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2021-11-06 6:03 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2021-11-06 6:03 UTC (permalink / raw
To: gentoo-commits
commit: ae4b8cf469e002f7ec97970895dfaea33a084ee5
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Nov 5 16:32:37 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 6 06:03:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae4b8cf4
sci-libs/opencascade: drop 7.5.2-r1
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.5.2-r1.ebuild | 171 -----------------------
1 file changed, 171 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r1.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r1.ebuild
deleted file mode 100644
index b05376833bc..00000000000
--- a/sci-libs/opencascade/opencascade-7.5.2-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-MY_PV="$(ver_rs 1- '_')"
-PV_MAJ="$(ver_cut 1-2)"
-
-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=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
-S="${WORKDIR}/occt-V${MY_PV}"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV_MAJ}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug 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"
-
-RDEPEND="
- app-eselect/eselect-opencascade
- dev-lang/tcl:=
- dev-lang/tk:=
- dev-tcltk/itcl
- dev-tcltk/itk
- dev-tcltk/tix
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/ftgl
- virtual/glu
- 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:= )
- freeimage? ( media-libs/freeimage )
- tbb? ( dev-cpp/tbb:= )
- vtk? ( sci-libs/vtk:=[rendering] )
-"
-DEPEND="
- ${RDEPEND}
- dev-cpp/eigen
- dev-libs/rapidjson
-"
-BDEPEND="
- app-eselect/eselect-opencascade
- doc? ( app-doc/doxygen )
- examples? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.5.1-0001-allow-default-search-path-for-Qt5.patch
- "${FILESDIR}"/${PN}-7.5.1-0002-remove-unnecessary-Qt5-check.patch
- "${FILESDIR}"/${PN}-7.5.1-0003-add-Gentoo-configuration-type.patch
- "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
- "${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.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- use debug && append-cppflags -DDEBUG
-
- 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_WITH_DEBUG=$(usex debug)
- -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin"
- -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}"
- -DINSTALL_DIR_DOC="share/doc/${PF}"
- -DINSTALL_DIR_LIB="$(get_libdir)/${P}"
- -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin"
- -DINSTALL_DIR_WITH_VERSION=ON
- -DINSTALL_SAMPLES=$(usex examples)
- -DINSTALL_TEST_CASES=NO
- -DUSE_D3D=NO
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FREEIMAGE=$(usex freeimage)
- -DUSE_FREETYPE=ON
- -DUSE_GLES2=$(usex gles2)
- -DUSE_RAPIDJSON=$(usex json)
- -DUSE_TBB=$(usex tbb)
- -DUSE_VTK=$(usex vtk)
- )
-
- use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
-
- if use examples; then
- mycmakeargs+=(
- -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
- -DBUILD_SAMPLES_QT=ON
- )
- fi
-
- if use vtk; then
- if 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
-
- # prepare /etc/env.d file
- sed -e "s|lib/|$(get_libdir)/|" \
- -e "s|VAR_PV|${PV}|" \
- -e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
- < "${FILESDIR}"/${PN}-${PV_MAJ}.env.in > "${T}"/${PV_MAJ} || die
-
- # use TBB for memory allocation optimizations
- if use tbb; then
- sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/${PV_MAJ} || 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}"/${PV_MAJ} || die
- fi
-}
-
-src_install() {
- cmake_src_install
-
- # respect slotting
- insinto "/etc/env.d/${PN}"
- doins "${T}/${PV_MAJ}"
-
- # remove examples
- if use !examples; then
- rm -r "${ED}/usr/share/${P}/samples" || die
- fi
-
- docompress -x /usr/share/doc/${PF}/overview/html
-}
-
-pkg_postinst() {
- eselect ${PN} set ${PV_MAJ} || die "failed to switch to updated implementation"
- einfo "You can switch between available ${PN} implementations using eselect ${PN}"
-}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2021-11-06 6:03 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2021-11-06 6:03 UTC (permalink / raw
To: gentoo-commits
commit: 9f74703d8f9637f484ee9cdbe18d23efb5704a19
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Nov 5 16:31:23 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 6 06:03:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f74703d
sci-libs/opencascade: restrict dependency on dev-cpp/tbb
Version tbb-2021.4.0 has some header files removed, so we restrict to
earlier versions.
Bug: https://bugs.gentoo.org/821655
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.5.2-r2.ebuild | 171 +++++++++++++++++++++++
1 file changed, 171 insertions(+)
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r2.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r2.ebuild
new file mode 100644
index 00000000000..cf90cc0c8aa
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.5.2-r2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+MY_PV="$(ver_rs 1- '_')"
+PV_MAJ="$(ver_cut 1-2)"
+
+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=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
+S="${WORKDIR}/occt-V${MY_PV}"
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="${PV_MAJ}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug 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"
+
+RDEPEND="
+ app-eselect/eselect-opencascade
+ dev-lang/tcl:=
+ dev-lang/tk:=
+ dev-tcltk/itcl
+ dev-tcltk/itk
+ dev-tcltk/tix
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/ftgl
+ virtual/glu
+ 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:= )
+ freeimage? ( media-libs/freeimage )
+ tbb? ( <dev-cpp/tbb-2021.4.0 )
+ vtk? ( sci-libs/vtk:=[rendering] )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/eigen
+ dev-libs/rapidjson
+"
+BDEPEND="
+ app-eselect/eselect-opencascade
+ doc? ( app-doc/doxygen )
+ examples? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.5.1-0001-allow-default-search-path-for-Qt5.patch
+ "${FILESDIR}"/${PN}-7.5.1-0002-remove-unnecessary-Qt5-check.patch
+ "${FILESDIR}"/${PN}-7.5.1-0003-add-Gentoo-configuration-type.patch
+ "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
+ "${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.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ use debug && append-cppflags -DDEBUG
+
+ 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_WITH_DEBUG=$(usex debug)
+ -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin"
+ -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}"
+ -DINSTALL_DIR_DOC="share/doc/${PF}"
+ -DINSTALL_DIR_LIB="$(get_libdir)/${P}"
+ -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin"
+ -DINSTALL_DIR_WITH_VERSION=ON
+ -DINSTALL_SAMPLES=$(usex examples)
+ -DINSTALL_TEST_CASES=NO
+ -DUSE_D3D=NO
+ -DUSE_FFMPEG=$(usex ffmpeg)
+ -DUSE_FREEIMAGE=$(usex freeimage)
+ -DUSE_FREETYPE=ON
+ -DUSE_GLES2=$(usex gles2)
+ -DUSE_RAPIDJSON=$(usex json)
+ -DUSE_TBB=$(usex tbb)
+ -DUSE_VTK=$(usex vtk)
+ )
+
+ use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
+
+ if use examples; then
+ mycmakeargs+=(
+ -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
+ -DBUILD_SAMPLES_QT=ON
+ )
+ fi
+
+ if use vtk; then
+ if 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
+
+ # prepare /etc/env.d file
+ sed -e "s|lib/|$(get_libdir)/|" \
+ -e "s|VAR_PV|${PV}|" \
+ -e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
+ < "${FILESDIR}"/${PN}-${PV_MAJ}.env.in > "${T}"/${PV_MAJ} || die
+
+ # use TBB for memory allocation optimizations
+ if use tbb; then
+ sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/${PV_MAJ} || 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}"/${PV_MAJ} || die
+ fi
+}
+
+src_install() {
+ cmake_src_install
+
+ # respect slotting
+ insinto "/etc/env.d/${PN}"
+ doins "${T}/${PV_MAJ}"
+
+ # remove examples
+ if use !examples; then
+ rm -r "${ED}/usr/share/${P}/samples" || die
+ fi
+
+ docompress -x /usr/share/doc/${PF}/overview/html
+}
+
+pkg_postinst() {
+ eselect ${PN} set ${PV_MAJ} || die "failed to switch to updated implementation"
+ einfo "You can switch between available ${PN} implementations using eselect ${PN}"
+}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2021-11-06 6:03 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2021-11-06 6:03 UTC (permalink / raw
To: gentoo-commits
commit: 91fcc8e56f971057697496a5b1db114442862558
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Nov 5 16:38:52 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 6 06:03:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91fcc8e5
sci-libs/opencascade: drop 7.5.3-r2
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/22832
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.5.3-r2.ebuild | 171 -----------------------
1 file changed, 171 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r2.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r2.ebuild
deleted file mode 100644
index 14258f13db4..00000000000
--- a/sci-libs/opencascade/opencascade-7.5.3-r2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-MY_PV="$(ver_rs 1- '_')"
-PV_MAJ="$(ver_cut 1-2)"
-
-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=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
-S="${WORKDIR}/occt-V${MY_PV}"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV_MAJ}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug 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"
-
-RDEPEND="
- app-eselect/eselect-opencascade
- dev-lang/tcl:=
- dev-lang/tk:=
- dev-tcltk/itcl
- dev-tcltk/itk
- dev-tcltk/tix
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/ftgl
- virtual/glu
- 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:= )
- freeimage? ( media-libs/freeimage )
- tbb? ( dev-cpp/tbb:= )
- vtk? ( sci-libs/vtk:=[rendering] )
-"
-DEPEND="
- ${RDEPEND}
- dev-cpp/eigen
- dev-libs/rapidjson
-"
-BDEPEND="
- app-eselect/eselect-opencascade
- doc? ( app-doc/doxygen )
- examples? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.5.1-0001-allow-default-search-path-for-Qt5.patch
- "${FILESDIR}"/${PN}-7.5.1-0002-remove-unnecessary-Qt5-check.patch
- "${FILESDIR}"/${PN}-7.5.1-0003-add-Gentoo-configuration-type.patch
- "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
- "${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.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- use debug && append-cppflags -DDEBUG
-
- 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_WITH_DEBUG=$(usex debug)
- -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin"
- -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}"
- -DINSTALL_DIR_DOC="share/doc/${PF}"
- -DINSTALL_DIR_LIB="$(get_libdir)/${P}"
- -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin"
- -DINSTALL_DIR_WITH_VERSION=ON
- -DINSTALL_SAMPLES=$(usex examples)
- -DINSTALL_TEST_CASES=NO
- -DUSE_D3D=NO
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FREEIMAGE=$(usex freeimage)
- -DUSE_FREETYPE=ON
- -DUSE_GLES2=$(usex gles2)
- -DUSE_RAPIDJSON=$(usex json)
- -DUSE_TBB=$(usex tbb)
- -DUSE_VTK=$(usex vtk)
- )
-
- use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
-
- if use examples; then
- mycmakeargs+=(
- -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
- -DBUILD_SAMPLES_QT=ON
- )
- fi
-
- if use vtk; then
- if 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
-
- # prepare /etc/env.d file
- sed -e "s|lib/|$(get_libdir)/|" \
- -e "s|VAR_PV|${PV}|" \
- -e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
- < "${FILESDIR}"/${PN}-${PV_MAJ}.env.in > "${T}"/${PV_MAJ} || die
-
- # use TBB for memory allocation optimizations
- if use tbb; then
- sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/${PV_MAJ} || 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}"/${PV_MAJ} || die
- fi
-}
-
-src_install() {
- cmake_src_install
-
- # respect slotting
- insinto "/etc/env.d/${PN}"
- doins "${T}/${PV_MAJ}"
-
- # remove examples
- if use !examples; then
- rm -r "${ED}/usr/share/${P}/samples" || die
- fi
-
- docompress -x /usr/share/doc/${PF}/overview/html
-}
-
-pkg_postinst() {
- eselect ${PN} set ${PV_MAJ} || die "failed to switch to updated implementation"
- einfo "You can switch between available ${PN} implementations using eselect ${PN}"
-}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2021-11-06 6:03 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2021-11-06 6:03 UTC (permalink / raw
To: gentoo-commits
commit: 261afe53c2fb4e7d5fcdb1bb12395f04f1bf62dd
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Nov 5 16:37:58 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 6 06:03:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=261afe53
sci-libs/opencascade: restrict dependency on dev-cpp/tbb
Version tbb-2021.4.0 has some header files removed, so we need to
restrict to earlier versions.
Closes: https://bugs.gentoo.org/821655
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.5.3-r3.ebuild | 171 +++++++++++++++++++++++
1 file changed, 171 insertions(+)
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r3.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r3.ebuild
new file mode 100644
index 00000000000..0296150b6b0
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.5.3-r3.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_PV="$(ver_rs 1- '_')"
+PV_MAJ="$(ver_cut 1-2)"
+
+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=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
+S="${WORKDIR}/occt-V${MY_PV}"
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="${PV_MAJ}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug 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"
+
+RDEPEND="
+ app-eselect/eselect-opencascade
+ dev-lang/tcl:=
+ dev-lang/tk:=
+ dev-tcltk/itcl
+ dev-tcltk/itk
+ dev-tcltk/tix
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/ftgl
+ virtual/glu
+ 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:= )
+ freeimage? ( media-libs/freeimage )
+ tbb? ( <dev-cpp/tbb-2021.4.0 )
+ vtk? ( sci-libs/vtk:=[rendering] )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/eigen
+ dev-libs/rapidjson
+"
+BDEPEND="
+ app-eselect/eselect-opencascade
+ doc? ( app-doc/doxygen )
+ examples? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.5.1-0001-allow-default-search-path-for-Qt5.patch
+ "${FILESDIR}"/${PN}-7.5.1-0002-remove-unnecessary-Qt5-check.patch
+ "${FILESDIR}"/${PN}-7.5.1-0003-add-Gentoo-configuration-type.patch
+ "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
+ "${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.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ use debug && append-cppflags -DDEBUG
+
+ 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_WITH_DEBUG=$(usex debug)
+ -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin"
+ -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}"
+ -DINSTALL_DIR_DOC="share/doc/${PF}"
+ -DINSTALL_DIR_LIB="$(get_libdir)/${P}"
+ -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin"
+ -DINSTALL_DIR_WITH_VERSION=ON
+ -DINSTALL_SAMPLES=$(usex examples)
+ -DINSTALL_TEST_CASES=NO
+ -DUSE_D3D=NO
+ -DUSE_FFMPEG=$(usex ffmpeg)
+ -DUSE_FREEIMAGE=$(usex freeimage)
+ -DUSE_FREETYPE=ON
+ -DUSE_GLES2=$(usex gles2)
+ -DUSE_RAPIDJSON=$(usex json)
+ -DUSE_TBB=$(usex tbb)
+ -DUSE_VTK=$(usex vtk)
+ )
+
+ use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
+
+ if use examples; then
+ mycmakeargs+=(
+ -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
+ -DBUILD_SAMPLES_QT=ON
+ )
+ fi
+
+ if use vtk; then
+ if 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
+
+ # prepare /etc/env.d file
+ sed -e "s|lib/|$(get_libdir)/|" \
+ -e "s|VAR_PV|${PV}|" \
+ -e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
+ < "${FILESDIR}"/${PN}-${PV_MAJ}.env.in > "${T}"/${PV_MAJ} || die
+
+ # use TBB for memory allocation optimizations
+ if use tbb; then
+ sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/${PV_MAJ} || 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}"/${PV_MAJ} || die
+ fi
+}
+
+src_install() {
+ cmake_src_install
+
+ # respect slotting
+ insinto "/etc/env.d/${PN}"
+ doins "${T}/${PV_MAJ}"
+
+ # remove examples
+ if use !examples; then
+ rm -r "${ED}/usr/share/${P}/samples" || die
+ fi
+
+ docompress -x /usr/share/doc/${PF}/overview/html
+}
+
+pkg_postinst() {
+ eselect ${PN} set ${PV_MAJ} || die "failed to switch to updated implementation"
+ einfo "You can switch between available ${PN} implementations using eselect ${PN}"
+}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2021-11-04 7:35 Ionen Wolkens
0 siblings, 0 replies; 70+ messages in thread
From: Ionen Wolkens @ 2021-11-04 7:35 UTC (permalink / raw
To: gentoo-commits
commit: a828b50d2918f4bd7d572ef8f0c133a08eeb5ec7
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Aug 9 19:41:16 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Nov 4 07:25:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a828b50d
sci-libs/opencascade: drop 7.5.1
cleanup
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21937
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
sci-libs/opencascade/Manifest | 1 -
sci-libs/opencascade/opencascade-7.5.1-r2.ebuild | 175 -----------------------
2 files changed, 176 deletions(-)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index aa5f02d0bfc..eddc8789850 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,3 +1,2 @@
-DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a SHA512 ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a462cccc1c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f
DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
diff --git a/sci-libs/opencascade/opencascade-7.5.1-r2.ebuild b/sci-libs/opencascade/opencascade-7.5.1-r2.ebuild
deleted file mode 100644
index 375cc0a8d77..00000000000
--- a/sci-libs/opencascade/opencascade-7.5.1-r2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO:
-# check the src files referenced in 51opencascade, i.e. resources and the like
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-MY_PV="$(ver_rs 1- '_')"
-PV_MAJ="$(ver_cut 1-2)"
-
-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=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
-S="${WORKDIR}/occt-V${MY_PV}"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV_MAJ}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug 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"
-
-RDEPEND="
- app-eselect/eselect-opencascade
- dev-cpp/eigen
- dev-lang/tcl:0=
- dev-lang/tk:0=
- dev-libs/rapidjson
- dev-tcltk/itcl
- dev-tcltk/itk
- dev-tcltk/tix
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/ftgl
- virtual/glu
- 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 )
- freeimage? ( media-libs/freeimage )
- json? ( dev-libs/rapidjson )
- tbb? ( dev-cpp/tbb:= )
- vtk? ( >=sci-libs/vtk-8.1.0[rendering] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? ( app-doc/doxygen )
- examples? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-0001-allow-default-search-path-for-Qt5.patch
- "${FILESDIR}"/${P}-0002-remove-unnecessary-Qt5-check.patch
- "${FILESDIR}"/${P}-0003-add-Gentoo-configuration-type.patch
- "${FILESDIR}"/${P}-0004-fix-installation-of-cmake-config-files.patch
- "${FILESDIR}"/${P}-0005-fix-write-permissions-on-scripts.patch
- "${FILESDIR}"/${P}-0006-fix-creation-of-custom.sh-script.patch
- "${FILESDIR}"/${P}-fix-AllValues-name-collision-with-vtk-9.0.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- if use debug; then
- append-cppflags -DDEBUG
- append-flags -g
- fi
-
- 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_WITH_DEBUG=$(usex debug)
- -DCMAKE_INSTALL_PREFIX="/usr"
- -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin"
- -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}"
- -DINSTALL_DIR_DOC="share/doc/${PF}"
- -DINSTALL_DIR_LIB="$(get_libdir)/${P}"
- -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin"
- -DINSTALL_DIR_WITH_VERSION=ON
- -DINSTALL_SAMPLES=$(usex examples)
- -DINSTALL_TEST_CASES=NO
- -DUSE_D3D=NO
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FREEIMAGE=$(usex freeimage)
- -DUSE_FREETYPE=ON
- -DUSE_GLES2=$(usex gles2)
- -DUSE_RAPIDJSON=$(usex json)
- -DUSE_TBB=$(usex tbb)
- -DUSE_VTK=$(usex vtk)
- )
-
- use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
-
- if use examples; then
- mycmakeargs+=(
- -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
- -DBUILD_SAMPLES_QT=ON
- )
- fi
-
- if use vtk; then
- if 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
-
- prepare_env_file() {
- # prepare /etc/env.d file
- sed -e 's|VAR_CASROOT|'${ESYSROOT}'/usr|g' < "${FILESDIR}/${PN}-${PV_MAJ}.env.in" >> "${T}/${PV_MAJ}" || die
- sed -e 's|lib/|'$(get_libdir)'/|g' -i "${T}/${PV_MAJ}" || die
- sed -e 's|VAR_PV|'${PV}'|g' -i "${T}/${PV_MAJ}" || die
-
- # use TBB for memory allocation optimizations?
- use tbb && (sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}/${PV_MAJ}" || die)
-
- if use optimize ; then
- # use internal optimized memory manager?
- sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' -i "${T}/${PV_MAJ}" || die
- # don't clear memory ?
- sed -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' -i "${T}/${PV_MAJ}" || die
- fi
- }
-
- prepare_env_file
-}
-
-src_install() {
- use doc && docompress -x /usr/share/doc/${PF}/overview/html
- cmake_src_install
-
- # respect slotting
- insinto "/etc/env.d/${PN}"
- doins "${T}/${PV_MAJ}"
-
- # remove examples
- if use !examples; then
- rm -r "${ED}/usr/share/${P}/samples" || die
- fi
-}
-
-pkg_postinst() {
- eselect ${PN} set ${PV_MAJ} || die "failed to switch to updated implementation"
- einfo "You can switch between available ${PN} implementations using eselect ${PN}"
-}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2021-10-29 22:23 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2021-10-29 22:23 UTC (permalink / raw
To: gentoo-commits
commit: 4a2cadb3202d6edf64262944e60d3d7df74fe62a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 29 22:20:14 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 22:22:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a2cadb3
sci-libs/opencascade: add tbb subslot operator
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{opencascade-7.4.0-r4.ebuild => opencascade-7.4.0-r5.ebuild} | 2 +-
.../{opencascade-7.5.1-r1.ebuild => opencascade-7.5.1-r2.ebuild} | 2 +-
.../{opencascade-7.5.2.ebuild => opencascade-7.5.2-r1.ebuild} | 2 +-
.../{opencascade-7.5.3.ebuild => opencascade-7.5.3-r2.ebuild} | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r5.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
rename to sci-libs/opencascade/opencascade-7.4.0-r5.ebuild
index 7a53a10d350..b6dbf4121d0 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r5.ebuild
@@ -50,7 +50,7 @@ RDEPEND="
dev-qt/qtwidgets:5
dev-qt/qtxml:5
)
- tbb? ( dev-cpp/tbb )
+ tbb? ( dev-cpp/tbb:= )
vtk? (
>=sci-libs/vtk-8.1.0[rendering]
<sci-libs/vtk-9
diff --git a/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild b/sci-libs/opencascade/opencascade-7.5.1-r2.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
rename to sci-libs/opencascade/opencascade-7.5.1-r2.ebuild
index 666120a0cd9..375cc0a8d77 100644
--- a/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.1-r2.ebuild
@@ -52,7 +52,7 @@ RDEPEND="
ffmpeg? ( media-video/ffmpeg )
freeimage? ( media-libs/freeimage )
json? ( dev-libs/rapidjson )
- tbb? ( dev-cpp/tbb )
+ tbb? ( dev-cpp/tbb:= )
vtk? ( >=sci-libs/vtk-8.1.0[rendering] )
"
DEPEND="${RDEPEND}"
diff --git a/sci-libs/opencascade/opencascade-7.5.2.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r1.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-7.5.2.ebuild
rename to sci-libs/opencascade/opencascade-7.5.2-r1.ebuild
index 59a4a6c42c7..b05376833bc 100644
--- a/sci-libs/opencascade/opencascade-7.5.2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
)
ffmpeg? ( media-video/ffmpeg:= )
freeimage? ( media-libs/freeimage )
- tbb? ( dev-cpp/tbb )
+ tbb? ( dev-cpp/tbb:= )
vtk? ( sci-libs/vtk:=[rendering] )
"
DEPEND="
diff --git a/sci-libs/opencascade/opencascade-7.5.3.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r2.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-7.5.3.ebuild
rename to sci-libs/opencascade/opencascade-7.5.3-r2.ebuild
index 23b32a16122..14258f13db4 100644
--- a/sci-libs/opencascade/opencascade-7.5.3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r2.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
)
ffmpeg? ( media-video/ffmpeg:= )
freeimage? ( media-libs/freeimage )
- tbb? ( dev-cpp/tbb )
+ tbb? ( dev-cpp/tbb:= )
vtk? ( sci-libs/vtk:=[rendering] )
"
DEPEND="
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2021-10-24 4:06 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2021-10-24 4:06 UTC (permalink / raw
To: gentoo-commits
commit: 5480f8d93ea900ea085b9de0be2f6b14f668eacf
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Oct 22 08:53:12 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 24 04:06:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5480f8d9
sci-libs/opencascade: bump to 7.5.3
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/22669
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/Manifest | 1 +
sci-libs/opencascade/opencascade-7.5.3.ebuild | 171 ++++++++++++++++++++++++++
2 files changed, 172 insertions(+)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 29f10ccec88..a6e46ffdc98 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,3 +1,4 @@
DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a SHA512 ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a462cccc1c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f
DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
+DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
diff --git a/sci-libs/opencascade/opencascade-7.5.3.ebuild b/sci-libs/opencascade/opencascade-7.5.3.ebuild
new file mode 100644
index 00000000000..23b32a16122
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.5.3.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_PV="$(ver_rs 1- '_')"
+PV_MAJ="$(ver_cut 1-2)"
+
+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=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
+S="${WORKDIR}/occt-V${MY_PV}"
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="${PV_MAJ}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug 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"
+
+RDEPEND="
+ app-eselect/eselect-opencascade
+ dev-lang/tcl:=
+ dev-lang/tk:=
+ dev-tcltk/itcl
+ dev-tcltk/itk
+ dev-tcltk/tix
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/ftgl
+ virtual/glu
+ 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:= )
+ freeimage? ( media-libs/freeimage )
+ tbb? ( dev-cpp/tbb )
+ vtk? ( sci-libs/vtk:=[rendering] )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/eigen
+ dev-libs/rapidjson
+"
+BDEPEND="
+ app-eselect/eselect-opencascade
+ doc? ( app-doc/doxygen )
+ examples? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.5.1-0001-allow-default-search-path-for-Qt5.patch
+ "${FILESDIR}"/${PN}-7.5.1-0002-remove-unnecessary-Qt5-check.patch
+ "${FILESDIR}"/${PN}-7.5.1-0003-add-Gentoo-configuration-type.patch
+ "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
+ "${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.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ use debug && append-cppflags -DDEBUG
+
+ 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_WITH_DEBUG=$(usex debug)
+ -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin"
+ -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}"
+ -DINSTALL_DIR_DOC="share/doc/${PF}"
+ -DINSTALL_DIR_LIB="$(get_libdir)/${P}"
+ -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin"
+ -DINSTALL_DIR_WITH_VERSION=ON
+ -DINSTALL_SAMPLES=$(usex examples)
+ -DINSTALL_TEST_CASES=NO
+ -DUSE_D3D=NO
+ -DUSE_FFMPEG=$(usex ffmpeg)
+ -DUSE_FREEIMAGE=$(usex freeimage)
+ -DUSE_FREETYPE=ON
+ -DUSE_GLES2=$(usex gles2)
+ -DUSE_RAPIDJSON=$(usex json)
+ -DUSE_TBB=$(usex tbb)
+ -DUSE_VTK=$(usex vtk)
+ )
+
+ use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
+
+ if use examples; then
+ mycmakeargs+=(
+ -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
+ -DBUILD_SAMPLES_QT=ON
+ )
+ fi
+
+ if use vtk; then
+ if 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
+
+ # prepare /etc/env.d file
+ sed -e "s|lib/|$(get_libdir)/|" \
+ -e "s|VAR_PV|${PV}|" \
+ -e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
+ < "${FILESDIR}"/${PN}-${PV_MAJ}.env.in > "${T}"/${PV_MAJ} || die
+
+ # use TBB for memory allocation optimizations
+ if use tbb; then
+ sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/${PV_MAJ} || 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}"/${PV_MAJ} || die
+ fi
+}
+
+src_install() {
+ cmake_src_install
+
+ # respect slotting
+ insinto "/etc/env.d/${PN}"
+ doins "${T}/${PV_MAJ}"
+
+ # remove examples
+ if use !examples; then
+ rm -r "${ED}/usr/share/${P}/samples" || die
+ fi
+
+ docompress -x /usr/share/doc/${PF}/overview/html
+}
+
+pkg_postinst() {
+ eselect ${PN} set ${PV_MAJ} || die "failed to switch to updated implementation"
+ einfo "You can switch between available ${PN} implementations using eselect ${PN}"
+}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2021-06-04 7:38 Joonas Niilola
0 siblings, 0 replies; 70+ messages in thread
From: Joonas Niilola @ 2021-06-04 7:38 UTC (permalink / raw
To: gentoo-commits
commit: 947d701c21889771f1f6839f2b46d96789fcee59
Author: Wolfgang E. Sanyer <ezzieyguywuf <AT> gmail <DOT> com>
AuthorDate: Mon May 17 19:36:44 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jun 4 07:38:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=947d701c
sci-libs/opencascade: patch cmake config so that find_package works
Signed-off-by: Wolfgang E. Sanyer <ezzieyguywuf <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20856
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../{opencascade-7.5.1.ebuild => opencascade-7.5.1-r1.ebuild} | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/sci-libs/opencascade/opencascade-7.5.1.ebuild b/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
similarity index 92%
rename from sci-libs/opencascade/opencascade-7.5.1.ebuild
rename to sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
index 474b381f556..88f0fd45888 100644
--- a/sci-libs/opencascade/opencascade-7.5.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
@@ -80,6 +80,13 @@ 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"
}
src_configure() {
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2021-06-04 7:38 Joonas Niilola
0 siblings, 0 replies; 70+ messages in thread
From: Joonas Niilola @ 2021-06-04 7:38 UTC (permalink / raw
To: gentoo-commits
commit: 4ad62687497908e2f353cf68756253d0a860e68b
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 4 07:38:04 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jun 4 07:38:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad62687
sci-libs/opencascade: add missing die to 7.5.1-r1
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.5.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild b/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
index 88f0fd45888..ffa4d80678e 100644
--- a/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
@@ -86,7 +86,7 @@ src_prepare() {
# 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"
+ -i "adm/cmake/occt_toolkit.cmake" || die
}
src_configure() {
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2021-05-04 22:02 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2021-05-04 22:02 UTC (permalink / raw
To: gentoo-commits
commit: da53808432edde9896401246635ea5e3c153c4fb
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Apr 19 05:52:08 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 4 22:01:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da538084
sci-libs/opencascade: fix Qt dependency
Changes a dependency on dev-qt/linguist-tool
Closes: https://bugs.gentoo.org/783810
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20449
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.4.0-r4.ebuild | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
index 2c5adfb7524..7a53a10d350 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
@@ -9,19 +9,21 @@ EAPI=7
inherit check-reqs cmake flag-o-matic java-pkg-opt-2
+MY_PV="$(ver_rs 1- '_')"
+
DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
HOMEPAGE="https://www.opencascade.com"
-MY_PV="$(ver_rs 1- '_')"
SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
+S="${WORKDIR}/occt-V${MY_PV}"
LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
SLOT="${PV}"
KEYWORDS="~amd64 ~arm64 ~x86"
-# gl2ps
-IUSE="debug doc examples ffmpeg freeimage gles2 inspector java optimize qt5 tbb +vtk"
+IUSE="debug doc +examples ffmpeg freeimage gles2 inspector java optimize qt5 tbb +vtk"
REQUIRED_USE="
inspector? ( qt5 )
+ qt5? ( examples )
?? ( optimize tbb )
"
@@ -56,10 +58,8 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
- doc? (
- app-doc/doxygen
- qt5? ( dev-qt/linguist-tools:5 )
- )
+ doc? ( app-doc/doxygen )
+ qt5? ( dev-qt/linguist-tools:5 )
"
# There's no easy way to test. Testing needs a rather big environment
@@ -71,8 +71,6 @@ CHECKREQS_DISK_BUILD="3584M"
CMAKE_BUILD_TYPE=Release
-S="${WORKDIR}/occt-V${MY_PV}"
-
PATCHES=(
"${FILESDIR}/${P}-find-qt.patch"
"${FILESDIR}/${P}-fix-install.patch"
@@ -116,7 +114,7 @@ src_configure() {
cmake_src_configure
# prepare /etc/env.d file
- sed -e 's|VAR_CASROOT|'${EROOT%}'/usr/'$(get_libdir)'/'${P}'/ros|g' < "${FILESDIR}/${P}.env.in" >> "${T}/${PV}" || die
+ sed -e 's|VAR_CASROOT|'${ESYSROOT}'/usr/'$(get_libdir)'/'${P}'/ros|g' < "${FILESDIR}/${P}.env.in" >> "${T}/${PV}" || die
sed -i -e 's|ros/lib|ros/'$(get_libdir)'|' "${T}/${PV}" || die
# use TBB for memory allocation optimizations?
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2021-03-01 8:26 Joonas Niilola
0 siblings, 0 replies; 70+ messages in thread
From: Joonas Niilola @ 2021-03-01 8:26 UTC (permalink / raw
To: gentoo-commits
commit: b287fc1826ac151436a72ee0e385c386ea069b00
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Wed Feb 24 21:10:40 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 1 08:25:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b287fc18
sci-libs/opencascade: restrict vtk version
Restrict vtk to versions prio v9. This version of
opencascade does not build against >=vtk-9.
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19637
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.4.0-r4.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
index 4b7371a287c..2c5adfb7524 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
@@ -49,7 +49,10 @@ RDEPEND="
dev-qt/qtxml:5
)
tbb? ( dev-cpp/tbb )
- vtk? ( >=sci-libs/vtk-8.1.0[rendering] )
+ vtk? (
+ >=sci-libs/vtk-8.1.0[rendering]
+ <sci-libs/vtk-9
+ )
"
DEPEND="${RDEPEND}"
BDEPEND="
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2021-02-22 18:57 Sam James
0 siblings, 0 replies; 70+ messages in thread
From: Sam James @ 2021-02-22 18:57 UTC (permalink / raw
To: gentoo-commits
commit: f71ec0e5159508aaf91e6ac72841e1e4d9f8f5c6
Author: Roy Bamford <neddyseagoon <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 19:44:38 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 18:57:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f71ec0e5
sci-libs/opencascade: added ~arm64
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Roy Bamford <neddyseagoon <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.4.0-r4.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
index 669ac8caecb..d46a66fe600 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
@@ -16,7 +16,8 @@ SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/ta
LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
+# gl2ps
IUSE="debug doc examples ffmpeg freeimage gles2 inspector java optimize qt5 tbb +vtk"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2021-02-18 9:36 Joonas Niilola
0 siblings, 0 replies; 70+ messages in thread
From: Joonas Niilola @ 2021-02-18 9:36 UTC (permalink / raw
To: gentoo-commits
commit: 3641a1664c3b19eda94f05a04fe4652dd544abd2
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Feb 9 22:42:34 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 09:36:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3641a166
sci-libs/opencascade: drop old 7.4.0-r3
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19394
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.4.0-r3.ebuild | 147 -----------------------
1 file changed, 147 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.4.0-r3.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r3.ebuild
deleted file mode 100644
index a6957289df1..00000000000
--- a/sci-libs/opencascade/opencascade-7.4.0-r3.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO:
-# check the src files referenced in 51opencascade, i.e. resources and the like
-# check where cmake gets it's '-s' linker flag to avoid pre-stripping (QA)
-
-EAPI=7
-
-inherit check-reqs cmake flag-o-matic java-pkg-opt-2
-
-DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
-HOMEPAGE="https://www.opencascade.com"
-MY_PV="$(ver_rs 1- '_')"
-SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-# gl2ps
-IUSE="debug doc examples ffmpeg freeimage gles2 inspector java optimize qt5 tbb +vtk"
-
-REQUIRED_USE="
- inspector? ( qt5 )
- ?? ( optimize tbb )
-"
-
-# gl2ps? ( x11-libs/gl2ps )
-RDEPEND="
- app-eselect/eselect-opencascade
- dev-cpp/eigen
- dev-lang/tcl:0=
- dev-lang/tk:0=
- dev-tcltk/itcl
- dev-tcltk/itk
- dev-tcltk/tix
- media-libs/freetype:2
- media-libs/ftgl
- virtual/glu
- virtual/opengl
- x11-libs/libXmu
- ffmpeg? ( media-video/ffmpeg )
- freeimage? ( media-libs/freeimage )
- java? ( virtual/jdk:1.8 )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtquickcontrols2:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
- tbb? ( dev-cpp/tbb )
- vtk? ( >=sci-libs/vtk-8.1.0[rendering] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? (
- app-doc/doxygen
- qt5? ( dev-qt/linguist-tools:5 )
- )
-"
-
-# There's no easy way to test. Testing needs a rather big environment
-# properly set up.
-RESTRICT="test"
-
-CHECKREQS_MEMORY="256M"
-CHECKREQS_DISK_BUILD="3584M"
-
-CMAKE_BUILD_TYPE=Release
-
-S="${WORKDIR}/occt-V${MY_PV}"
-
-PATCHES=(
- "${FILESDIR}/${P}-find-qt.patch"
- "${FILESDIR}/${P}-fix-install.patch"
-)
-
-pkg_setup() {
- check-reqs_pkg_setup
- use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- use java && java-pkg-opt-2_src_prepare
- sed -e 's/\/lib\$/\/'$(get_libdir)'\$/' \
- -i adm/templates/OpenCASCADEConfig.cmake.in || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_DOC_Overview=$(usex doc)
- -DBUILD_Inspector=$(usex inspector)
- -DBUILD_WITH_DEBUG=$(usex debug)
- -DCMAKE_CONFIGURATION_TYPES="Gentoo"
- -DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${P}/ros"
- -DINSTALL_DIR_DOC="/usr/share/doc/${PF}"
- -DINSTALL_DIR_CMAKE="/usr/$(get_libdir)/cmake"
-# -DINSTALL_DOC_Overview=$(usex doc)
- -DINSTALL_SAMPLES=$(usex examples)
- -DINSTALL_TEST_CASES=NO
- -DUSE_D3D=no
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FREEIMAGE=$(usex freeimage)
-# -DUSE_GL2PS=$(usex gl2ps)
- -DUSE_GLES2=$(usex gles2)
- -DUSE_TBB=$(usex tbb)
- -DUSE_VTK=$(usex vtk)
- )
-
- use examples && mycmakeargs+=( -DBUILD_SAMPLES_QT=$(usex qt5) )
-
- cmake_src_configure
-
- # prepare /etc/env.d file
- sed -e 's|VAR_CASROOT|'${EROOT%}'/usr/'$(get_libdir)'/'${P}'/ros|g' < "${FILESDIR}/${P}.env.in" >> "${T}/${PV}" || die
- sed -i -e 's|ros/lib|ros/'$(get_libdir)'|' "${T}/${PV}" || die
-
- # use TBB for memory allocation optimizations?
- use tbb && (sed -i -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' "${T}/${PV}" || die)
-
- if use optimize ; then
- # use internal optimized memory manager?
- sed -i -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' "${T}/${PV}" || die
- # don't clear memory ?
- sed -i -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' "${T}/${PV}" || die
- fi
-}
-
-src_install() {
- cmake_src_install
-
- # respect slotting
- insinto "/etc/env.d/${PN}"
- doins "${T}/${PV}"
-
- # remove examples
- use examples || (rm -rf "${ED}/usr/$(get_libdir)/${P}/ros/share/${PN}/samples" || die)
- use java || (rm -rf "${ED}/usr/$(get_libdir)/${P}/ros/share/${PN}/samples/java" || die)
- use qt5 || (rm -rf "${ED}/usr/$(get_libdir)/${P}/ros/share/${PN}/samples/qt" || die)
-}
-
-pkg_postinst() {
- eselect ${PN} set ${PV} || die "failed to switch to updated implementation"
- einfo "You can switch between available ${PN} implementations using eselect ${PN}"
-}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2021-02-07 17:07 Conrad Kostecki
0 siblings, 0 replies; 70+ messages in thread
From: Conrad Kostecki @ 2021-02-07 17:07 UTC (permalink / raw
To: gentoo-commits
commit: 066585e37ce67fe47f8045e0d2c2534736235956
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun Feb 7 16:20:07 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Feb 7 17:07:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=066585e3
sci-libs/opencascade: fix metadata email
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sci-libs/opencascade/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index 471a91a9796..2402194e836 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>waebbl@gmail.com</email>
+ <email>waebbl-gentoo@posteo.net</email>
<name>Bernd Waibel</name>
</maintainer>
<maintainer type="project">
^ permalink raw reply related [flat|nested] 70+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2020-10-26 10:15 Joonas Niilola
0 siblings, 0 replies; 70+ messages in thread
From: Joonas Niilola @ 2020-10-26 10:15 UTC (permalink / raw
To: gentoo-commits
commit: ba489315ed494b0038ea44fbf2ccff8c420a1a58
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sat Oct 17 14:50:51 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 10:14:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba489315
sci-libs/opencascade: fix check in cmake config
Fix a check for library path in the OpenCASCADEConfig.cmake
file.
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17956
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../{opencascade-7.4.0-r2.ebuild => opencascade-7.4.0-r3.ebuild} | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sci-libs/opencascade/opencascade-7.4.0-r2.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r3.ebuild
similarity index 97%
rename from sci-libs/opencascade/opencascade-7.4.0-r2.ebuild
rename to sci-libs/opencascade/opencascade-7.4.0-r3.ebuild
index 5abfadcc3ce..a6957289df1 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r3.ebuild
@@ -84,6 +84,8 @@ pkg_setup() {
src_prepare() {
cmake_src_prepare
use java && java-pkg-opt-2_src_prepare
+ sed -e 's/\/lib\$/\/'$(get_libdir)'\$/' \
+ -i adm/templates/OpenCASCADEConfig.cmake.in || die
}
src_configure() {
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2020-04-27 14:42 Matthias Maier
0 siblings, 0 replies; 70+ messages in thread
From: Matthias Maier @ 2020-04-27 14:42 UTC (permalink / raw
To: gentoo-commits
commit: 0c80e6025a81328f5d4efaf95bcc1b805c9dad51
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 27 14:40:01 2020 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Apr 27 14:42:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c80e602
sci-libs/opencascade: Use $P instead of $PF for install directory
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
.../{opencascade-7.4.0-r1.ebuild => opencascade-7.4.0-r2.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/opencascade/opencascade-7.4.0-r1.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r2.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.4.0-r1.ebuild
rename to sci-libs/opencascade/opencascade-7.4.0-r2.ebuild
index ac229f1e071..5abfadcc3ce 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r2.ebuild
@@ -92,7 +92,7 @@ src_configure() {
-DBUILD_Inspector=$(usex inspector)
-DBUILD_WITH_DEBUG=$(usex debug)
-DCMAKE_CONFIGURATION_TYPES="Gentoo"
- -DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${PF}/ros"
+ -DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${P}/ros"
-DINSTALL_DIR_DOC="/usr/share/doc/${PF}"
-DINSTALL_DIR_CMAKE="/usr/$(get_libdir)/cmake"
# -DINSTALL_DOC_Overview=$(usex doc)
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2020-04-01 14:38 Joonas Niilola
0 siblings, 0 replies; 70+ messages in thread
From: Joonas Niilola @ 2020-04-01 14:38 UTC (permalink / raw
To: gentoo-commits
commit: 15ab981cf372fab8ced5299f7ee1d06a23c4f027
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Fri Mar 27 16:18:59 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Apr 1 14:37:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15ab981c
sci-libs/opencascade: fix unused cmake variable
Closes: https://bugs.gentoo.org/710694
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.4.0.ebuild | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.4.0.ebuild b/sci-libs/opencascade/opencascade-7.4.0.ebuild
index 372cacad7c8..871c8a8e49c 100644
--- a/sci-libs/opencascade/opencascade-7.4.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0.ebuild
@@ -53,7 +53,12 @@ RDEPEND="
vtk? ( >=sci-libs/vtk-8.1.0[rendering] )
"
DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="
+ doc? (
+ app-doc/doxygen
+ qt5? ( dev-qt/linguist-tools:5 )
+ )
+"
# There's no easy way to test. Testing needs a rather big environment
# properly set up.
@@ -90,7 +95,7 @@ src_configure() {
-DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${PF}/ros"
-DINSTALL_DIR_DOC="/usr/share/doc/${PF}"
-DINSTALL_DIR_CMAKE="/usr/$(get_libdir)/cmake"
- -DINSTALL_DOC_Overview=$(usex doc)
+# -DINSTALL_DOC_Overview=$(usex doc)
-DINSTALL_SAMPLES=$(usex examples)
-DINSTALL_TEST_CASES=NO
-DUSE_D3D=no
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2020-01-03 19:08 Andreas Sturmlechner
0 siblings, 0 replies; 70+ messages in thread
From: Andreas Sturmlechner @ 2020-01-03 19:08 UTC (permalink / raw
To: gentoo-commits
commit: 4bfb6fed9ab59bbdeb4451dfabaf8a066d0c4dca
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 3 19:00:07 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 3 19:00:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bfb6fed
sci-libs/opencascade: Switch to cmake.eclass
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.4.0.ebuild | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.4.0.ebuild b/sci-libs/opencascade/opencascade-7.4.0.ebuild
index 5c0a6496857..372cacad7c8 100644
--- a/sci-libs/opencascade/opencascade-7.4.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# TODO:
@@ -7,7 +7,7 @@
EAPI=7
-inherit check-reqs cmake-utils flag-o-matic java-pkg-opt-2 multilib
+inherit check-reqs cmake flag-o-matic java-pkg-opt-2
DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
HOMEPAGE="https://www.opencascade.com"
@@ -77,7 +77,7 @@ pkg_setup() {
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
use java && java-pkg-opt-2_src_prepare
}
@@ -104,7 +104,7 @@ src_configure() {
use examples && mycmakeargs+=( -DBUILD_SAMPLES_QT=$(usex qt5) )
- cmake-utils_src_configure
+ cmake_src_configure
# prepare /etc/env.d file
sed -e 's|VAR_CASROOT|'${EROOT%}'/usr/'$(get_libdir)'/'${P}'/ros|g' < "${FILESDIR}/${P}.env.in" >> "${T}/${PV}" || die
@@ -122,7 +122,7 @@ src_configure() {
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
# respect slotting
insinto "/etc/env.d/${PN}"
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2019-04-21 18:24 Andreas Sturmlechner
0 siblings, 0 replies; 70+ messages in thread
From: Andreas Sturmlechner @ 2019-04-21 18:24 UTC (permalink / raw
To: gentoo-commits
commit: 5a0a541e5695ded2639283d2fde7ba1ece03014b
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sun Apr 21 10:25:47 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 18:21:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a0a541e
sci-libs/opencascade: fix flag description
USE flag description for vtk has been wrong in metadata.xml.
Thanks to Dirk Gouders for pointing it out.
Reported-by: Dirk Gouders <dirk <AT> gouders.net>
Closes: https://bugs.gentoo.org/683138
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11763
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/opencascade/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index 38f461d22b3..cfb5bac89f9 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -14,6 +14,6 @@
<flag name="gl2ps">Use gl2ps PostScript printing library</flag>
<flag name="gles2">Use OpenGL ES 2.0</flag>
<flag name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
- <flag name="vtk">Enable Virtualisation Toolkit</flag>
+ <flag name="vtk">Enable Visualization Toolkit</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 70+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2019-02-06 22:38 Patrice Clement
0 siblings, 0 replies; 70+ messages in thread
From: Patrice Clement @ 2019-02-06 22:38 UTC (permalink / raw
To: gentoo-commits
commit: 0f730b1ce4c3fac673499bc42c47bbe3f523a394
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Feb 3 11:48:56 2019 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Feb 6 22:37:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f730b1c
sci-libs/opencascade: use HTTPS.
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10969
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
sci-libs/opencascade/opencascade-7.3.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-7.3.0.ebuild b/sci-libs/opencascade/opencascade-7.3.0.ebuild
index 6d40cf35bba..15dce82b6a9 100644
--- a/sci-libs/opencascade/opencascade-7.3.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ inherit check-reqs cmake-utils eapi7-ver java-pkg-opt-2
MY_PV="$(ver_rs 1- '_')"
DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
-HOMEPAGE="http://www.opencascade.com/"
+HOMEPAGE="https://www.opencascade.com/"
SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2019-01-15 23:13 Patrice Clement
0 siblings, 0 replies; 70+ messages in thread
From: Patrice Clement @ 2019-01-15 23:13 UTC (permalink / raw
To: gentoo-commits
commit: a82de88707e5e4e3d8a8a3bc1521d4f34c31e18c
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sun Dec 23 21:48:59 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Jan 15 23:12:14 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a82de887
sci-libs/opencascade: add maintainer.
Add myself as maintainer (see
https://archives.gentoo.org/gentoo-dev/message/3d497dc197a35250614437572ef80e4b)
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10688
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
sci-libs/opencascade/metadata.xml | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index ac137460a1e..38f461d22b3 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -1,12 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <use>
- <flag name="freeimage">Enable support for image i/o via media-libs/freeimage</flag>
- <flag name="gl2ps">Use gl2ps PostScript printing library</flag>
- <flag name="gles2">Use OpenGL ES 2.0</flag>
- <flag name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
- <flag name="vtk">Enable Virtualisation Toolkit</flag>
- </use>
+<maintainer type="person">
+ <email>waebbl@gmail.com</email>
+ <name>Bernd Waibel</name>
+</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
+<use>
+ <flag name="freeimage">Enable support for image i/o via media-libs/freeimage</flag>
+ <flag name="gl2ps">Use gl2ps PostScript printing library</flag>
+ <flag name="gles2">Use OpenGL ES 2.0</flag>
+ <flag name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
+ <flag name="vtk">Enable Virtualisation Toolkit</flag>
+</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 70+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2018-04-05 12:31 Andreas Sturmlechner
0 siblings, 0 replies; 70+ messages in thread
From: Andreas Sturmlechner @ 2018-04-05 12:31 UTC (permalink / raw
To: gentoo-commits
commit: 7f4ed1058c3e345c926bc2b67810bca7cd65b050
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 5 12:01:27 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 5 12:24:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f4ed105
sci-libs/opencascade: epatch -> eapply
Package-Manager: Portage-2.3.28, Repoman-2.3.9
sci-libs/opencascade/opencascade-6.9.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
index bf868ce0ef5..b8abc59a41a 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
MY_VTK_PV=${MY_VTK_P/sci-libs\/vtk-}
MY_VTK_SUB=vtk-$(get_version_component_range 1-2 ${MY_VTK_PV})
if has_version ">=sci-libs/vtk-6.3" ; then #bug 605304
- epatch "${FILESDIR}"/${PN}-6.9.1-vtk-6.3.patch
+ eapply "${FILESDIR}"/${PN}-6.9.1-vtk-6.3.patch
fi
java-pkg-opt-2_src_prepare
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2017-12-22 11:44 Michael Weber
0 siblings, 0 replies; 70+ messages in thread
From: Michael Weber @ 2017-12-22 11:44 UTC (permalink / raw
To: gentoo-commits
commit: 79c7b34b303dcc7dca8cfc2df66925604627370d
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 11:44:19 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 11:44:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79c7b34b
sci-libs/opencascade: Quote has_version argument.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sci-libs/opencascade/opencascade-6.9.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
index 4a855150295..8eff7a5ab1a 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
@@ -118,7 +118,7 @@ TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*
-i configure.ac || die
# no longer needed https://tracker.dev.opencascade.org/view.php?id=28971
- if has_version >=sys-libs/glibc-2.26 ; then
+ if has_version ">=sys-libs/glibc-2.26" ; then
sed -e '/#include <xlocale.h>/d' \
-i inc/Standard_CLocaleSentry.hxx || die
fi
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2017-12-22 11:37 Michael Weber
0 siblings, 0 replies; 70+ messages in thread
From: Michael Weber @ 2017-12-22 11:37 UTC (permalink / raw
To: gentoo-commits
commit: 422d70a744d3b4a1947f0f6b07c3fd4f1b2b0fe8
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 11:35:22 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 11:37:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=422d70a7
sci-libs/opencascade: Drop xlocale.h include.
Bug: https://bugs.gentoo.org/610362
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sci-libs/opencascade/opencascade-6.9.1-r2.ebuild | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
index 5b581add74b..4a855150295 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
@@ -117,6 +117,12 @@ TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*
-e "/\$qt directory is not exists/s/AC_MSG_ERROR/AC_MSG_NOTICE/" \
-i configure.ac || die
+ # no longer needed https://tracker.dev.opencascade.org/view.php?id=28971
+ if has_version >=sys-libs/glibc-2.26 ; then
+ sed -e '/#include <xlocale.h>/d' \
+ -i inc/Standard_CLocaleSentry.hxx || die
+ fi
+
eautoreconf
}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2017-11-06 1:58 Andreas Sturmlechner
0 siblings, 0 replies; 70+ messages in thread
From: Andreas Sturmlechner @ 2017-11-06 1:58 UTC (permalink / raw
To: gentoo-commits
commit: 0d2a598ccf73735880a42e5f67212dadec0fde0c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 5 19:55:52 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 6 01:57:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d2a598c
sci-libs/opencascade: Drop USE=qt4
Thanks-to: Fabio Rossi <rossi.f <AT> inwind.it>
Closes: https://bugs.gentoo.org/624194
Package-Manager: Portage-2.3.13, Repoman-2.3.4
sci-libs/opencascade/opencascade-6.9.1-r2.ebuild | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
index 3f0de66418d..5b581add74b 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
@@ -12,9 +12,10 @@ SRC_URI="http://www.opencascade.com/sites/default/files/private/occt/OCC_${PV}_r
LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
SLOT="${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples freeimage gl2ps java qt4 +tbb +vtk"
+IUSE="debug doc examples freeimage gl2ps java +tbb +vtk"
-DEPEND="app-eselect/eselect-opencascade
+DEPEND="
+ app-eselect/eselect-opencascade
dev-lang/tcl:0=
dev-lang/tk:0=
dev-tcltk/itcl
@@ -28,14 +29,16 @@ DEPEND="app-eselect/eselect-opencascade
gl2ps? ( x11-libs/gl2ps )
java? ( >=virtual/jdk-0:= )
tbb? ( dev-cpp/tbb )
- vtk? ( || ( sci-libs/vtk[imaging] sci-libs/vtk[qt4] sci-libs/vtk[rendering] sci-libs/vtk[views] sci-libs/vtk[all-modules] ) )"
+ vtk? ( || ( sci-libs/vtk[imaging] sci-libs/vtk[rendering] sci-libs/vtk[views] sci-libs/vtk[all-modules] ) )"
RDEPEND="${DEPEND}"
CHECKREQS_MEMORY="256M"
CHECKREQS_DISK_BUILD="3584M"
-PATCHES=( "${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch
- "${FILESDIR}"/${PN}-6.9.1-vtk-configure.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch
+ "${FILESDIR}"/${PN}-6.9.1-vtk-configure.patch
+)
pkg_setup() {
check-reqs_pkg_setup
@@ -111,9 +114,9 @@ TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*
sed -e "/^AM_C_PROTOTYPES$/d" \
-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
- -e "s:\$qt/include:\$qt/include/qt4:g"\
- -e "s:\$qt/lib:\$qt/$(get_libdir)/qt4:g"\
+ -e "/\$qt directory is not exists/s/AC_MSG_ERROR/AC_MSG_NOTICE/" \
-i configure.ac || die
+
eautoreconf
}
@@ -123,9 +126,9 @@ src_configure() {
--with-tcl="${EROOT}usr/$(get_libdir)" --with-tk="${EROOT}usr/$(get_libdir)" \
--with-freetype="${EROOT}usr" \
--with-ftgl="${EROOT}usr" \
+ --without-qt \
$(usex freeimage "--with-freeimage=${EROOT}usr" "") \
$(usex gl2ps "--with-gl2ps=${EROOT}usr" "") \
- $(usex qt4 "--with-qt=${EROOT}usr" "") \
$(usex tbb "--with-tbb-include=${EROOT}usr" "") \
$(usex tbb "--with-tbb-library=${EROOT}usr" "") \
$(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \
@@ -162,9 +165,7 @@ src_install() {
pkg_postinst() {
eselect ${PN} set ${PV}
- einfo
elog "After upgrading OpenCASCADE you may have to rebuild packages depending on it."
elog "You get a list by running \"equery depends sci-libs/opencascade\""
elog "revdep-rebuild does NOT suffice."
- einfo
}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2017-06-04 22:52 Michael Weber
0 siblings, 0 replies; 70+ messages in thread
From: Michael Weber @ 2017-06-04 22:52 UTC (permalink / raw
To: gentoo-commits
commit: 5c5a29323b20138103ace226b0048059d792b779
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 4 22:51:52 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Jun 4 22:52:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5a2932
sci-libs/opencascade: Remove RESTRICT=fetch (bug 619300, bug 600514).
Package-Manager: Portage-2.3.6, Repoman-2.3.2
sci-libs/opencascade/opencascade-6.7.1-r1.ebuild | 3 ---
sci-libs/opencascade/opencascade-6.8.0-r1.ebuild | 3 ---
sci-libs/opencascade/opencascade-6.9.0-r1.ebuild | 3 ---
sci-libs/opencascade/opencascade-6.9.1-r1.ebuild | 3 ---
4 files changed, 12 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild b/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
index 1883666c47d..de1201862ab 100644
--- a/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
@@ -30,9 +30,6 @@ DEPEND="app-eselect/eselect-opencascade
tbb? ( dev-cpp/tbb )"
RDEPEND="${DEPEND}"
-# https://bugs.gentoo.org/show_bug.cgi?id=600514
-RESTRICT="fetch"
-
CHECKREQS_MEMORY="256M"
CHECKREQS_DISK_BUILD="3584M"
diff --git a/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild b/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
index d646e876d67..1164f28ccc4 100644
--- a/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
@@ -30,9 +30,6 @@ DEPEND="app-eselect/eselect-opencascade
tbb? ( dev-cpp/tbb )"
RDEPEND="${DEPEND}"
-# https://bugs.gentoo.org/show_bug.cgi?id=600514
-RESTRICT="fetch"
-
CHECKREQS_MEMORY="256M"
CHECKREQS_DISK_BUILD="3584M"
diff --git a/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild b/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
index 18a7db0b2d8..df80ca41482 100644
--- a/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
@@ -32,9 +32,6 @@ DEPEND="app-eselect/eselect-opencascade
vtk? ( || ( =sci-libs/${MY_VTK}*[imaging] =sci-libs/${MY_VTK}*[qt4] =sci-libs/${MY_VTK}*[rendering] =sci-libs/${MY_VTK}*[views] =sci-libs/${MY_VTK}*[all-modules] ) )"
RDEPEND="${DEPEND}"
-# https://bugs.gentoo.org/show_bug.cgi?id=600514
-RESTRICT="fetch"
-
CHECKREQS_MEMORY="256M"
CHECKREQS_DISK_BUILD="3584M"
diff --git a/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
index 45c52394ebb..02db66a9487 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
@@ -32,9 +32,6 @@ DEPEND="app-eselect/eselect-opencascade
vtk? ( || ( =sci-libs/${MY_VTK}*[imaging] =sci-libs/${MY_VTK}*[qt4] =sci-libs/${MY_VTK}*[rendering] =sci-libs/${MY_VTK}*[views] =sci-libs/${MY_VTK}*[all-modules] ) )"
RDEPEND="${DEPEND}"
-# https://bugs.gentoo.org/show_bug.cgi?id=600514
-RESTRICT="fetch"
-
CHECKREQS_MEMORY="256M"
CHECKREQS_DISK_BUILD="3584M"
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2017-01-31 8:37 Robin H. Johnson
0 siblings, 0 replies; 70+ messages in thread
From: Robin H. Johnson @ 2017-01-31 8:37 UTC (permalink / raw
To: gentoo-commits
commit: aa861d9b221519dedf0a332a5b0a5dacdd955993
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 31 08:34:32 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 08:37:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa861d9b
sci-libs/opencascade: update RESTRICT
As per bug 600514, upstream licensing has changed since the older bug
352435 that caused the RESTRICT. It is now LGPL, and most the
restrictions can be removed. RESTRICT=fetch is still in place as
upstream would like you to register before downloading.
Package-Manager: portage-2.3.2
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=600514
See-Also: https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
See-Also: https://bugs.gentoo.org/show_bug.cgi?id=352435
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
sci-libs/opencascade/opencascade-6.7.1-r1.ebuild | 7 +++----
sci-libs/opencascade/opencascade-6.8.0-r1.ebuild | 7 +++----
sci-libs/opencascade/opencascade-6.9.0-r1.ebuild | 7 +++----
sci-libs/opencascade/opencascade-6.9.1-r1.ebuild | 7 +++----
4 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild b/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
index 3570e2d..276acdc 100644
--- a/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -31,9 +31,8 @@ DEPEND="app-eselect/eselect-opencascade
tbb? ( dev-cpp/tbb )"
RDEPEND="${DEPEND}"
-# https://bugs.gentoo.org/show_bug.cgi?id=352435
-# https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-RESTRICT="bindist mirror"
+# https://bugs.gentoo.org/show_bug.cgi?id=600514
+RESTRICT="fetch"
CHECKREQS_MEMORY="256M"
CHECKREQS_DISK_BUILD="3584M"
diff --git a/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild b/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
index 6ce45c8..15b0bbb 100644
--- a/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -31,9 +31,8 @@ DEPEND="app-eselect/eselect-opencascade
tbb? ( dev-cpp/tbb )"
RDEPEND="${DEPEND}"
-# https://bugs.gentoo.org/show_bug.cgi?id=352435
-# https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-RESTRICT="bindist mirror"
+# https://bugs.gentoo.org/show_bug.cgi?id=600514
+RESTRICT="fetch"
CHECKREQS_MEMORY="256M"
CHECKREQS_DISK_BUILD="3584M"
diff --git a/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild b/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
index c155ba1..48cb0a9 100644
--- a/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -33,9 +33,8 @@ DEPEND="app-eselect/eselect-opencascade
vtk? ( || ( =sci-libs/${MY_VTK}*[imaging] =sci-libs/${MY_VTK}*[qt4] =sci-libs/${MY_VTK}*[rendering] =sci-libs/${MY_VTK}*[views] =sci-libs/${MY_VTK}*[all-modules] ) )"
RDEPEND="${DEPEND}"
-# https://bugs.gentoo.org/show_bug.cgi?id=352435
-# https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-RESTRICT="bindist mirror"
+# https://bugs.gentoo.org/show_bug.cgi?id=600514
+RESTRICT="fetch"
CHECKREQS_MEMORY="256M"
CHECKREQS_DISK_BUILD="3584M"
diff --git a/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
index ce5a35c..01d43e6 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -33,9 +33,8 @@ DEPEND="app-eselect/eselect-opencascade
vtk? ( || ( =sci-libs/${MY_VTK}*[imaging] =sci-libs/${MY_VTK}*[qt4] =sci-libs/${MY_VTK}*[rendering] =sci-libs/${MY_VTK}*[views] =sci-libs/${MY_VTK}*[all-modules] ) )"
RDEPEND="${DEPEND}"
-# https://bugs.gentoo.org/show_bug.cgi?id=352435
-# https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-RESTRICT="bindist fetch mirror"
+# https://bugs.gentoo.org/show_bug.cgi?id=600514
+RESTRICT="fetch"
CHECKREQS_MEMORY="256M"
CHECKREQS_DISK_BUILD="3584M"
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2016-11-19 17:56 David Seifert
0 siblings, 0 replies; 70+ messages in thread
From: David Seifert @ 2016-11-19 17:56 UTC (permalink / raw
To: gentoo-commits
commit: 3664bcddc74344ead74fe8b27488662bbd6228c7
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 17:54:53 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 17:55:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3664bcdd
sci-libs/opencascade: Restore installing modules into /etc/env.d/${PN}
Gentoo-bug: 599920
Package-Manager: portage-2.3.2
.../{opencascade-6.7.1.ebuild => opencascade-6.7.1-r1.ebuild} | 3 ++-
.../{opencascade-6.8.0.ebuild => opencascade-6.8.0-r1.ebuild} | 3 ++-
.../{opencascade-6.9.0.ebuild => opencascade-6.9.0-r1.ebuild} | 3 ++-
.../{opencascade-6.9.1.ebuild => opencascade-6.9.1-r1.ebuild} | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-6.7.1.ebuild b/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-6.7.1.ebuild
rename to sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
index b768338..3570e2d 100644
--- a/sci-libs/opencascade/opencascade-6.7.1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
@@ -141,7 +141,8 @@ src_install() {
dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
fi
- newenvd 50${PN} ${PV}
+ insinto /etc/env.d/${PN}
+ newins 50${PN} ${PV}
#cd "${S}"
if use examples ; then
diff --git a/sci-libs/opencascade/opencascade-6.8.0.ebuild b/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-6.8.0.ebuild
rename to sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
index dbe6658..6ce45c8 100644
--- a/sci-libs/opencascade/opencascade-6.8.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
@@ -139,7 +139,8 @@ src_install() {
dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
fi
- newenvd 50${PN} ${PV}
+ insinto /etc/env.d/${PN}
+ newins 50${PN} ${PV}
if use examples ; then
insinto /usr/share/doc/${PF}/examples
diff --git a/sci-libs/opencascade/opencascade-6.9.0.ebuild b/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-6.9.0.ebuild
rename to sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
index 6058f7f..c155ba1 100644
--- a/sci-libs/opencascade/opencascade-6.9.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
@@ -144,7 +144,8 @@ src_install() {
dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
fi
- newenvd 50${PN} ${PV}
+ insinto /etc/env.d/${PN}
+ newins 50${PN} ${PV}
if use examples ; then
insinto /usr/share/doc/${PF}/examples
diff --git a/sci-libs/opencascade/opencascade-6.9.1.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-6.9.1.ebuild
rename to sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
index a9b5077..ce5a35c 100644
--- a/sci-libs/opencascade/opencascade-6.9.1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
@@ -144,7 +144,8 @@ src_install() {
dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
fi
- newenvd 50${PN} ${PV}
+ insinto /etc/env.d/${PN}
+ newins 50${PN} ${PV}
if use examples ; then
insinto /usr/share/doc/${PF}/examples
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2016-11-06 10:29 David Seifert
0 siblings, 0 replies; 70+ messages in thread
From: David Seifert @ 2016-11-06 10:29 UTC (permalink / raw
To: gentoo-commits
commit: 8ba76897c9404c75c2abcba000dfdd830c4ee1b5
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 3 21:17:55 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 6 10:29:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba76897
sci-libs/opencascade: [QA] Fix multiple violations
* Overlong DESCRIPTION
* insinto/newins /etc/env.d/
Package-Manager: portage-2.3.2
sci-libs/opencascade/opencascade-6.7.1.ebuild | 7 +++----
sci-libs/opencascade/opencascade-6.8.0.ebuild | 7 +++----
sci-libs/opencascade/opencascade-6.9.0.ebuild | 5 ++---
sci-libs/opencascade/opencascade-6.9.1.ebuild | 5 ++---
4 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-6.7.1.ebuild b/sci-libs/opencascade/opencascade-6.7.1.ebuild
index 831e170..b768338 100644
--- a/sci-libs/opencascade/opencascade-6.7.1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,7 +6,7 @@ EAPI=5
inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
-DESCRIPTION="Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
HOMEPAGE="http://www.opencascade.org/"
SRC_URI="http://files.opencascade.com/OCCT/OCC_${PV}_release/opencascade-${PV}.tgz"
@@ -141,8 +141,7 @@ src_install() {
dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
fi
- insinto /etc/env.d/${PN}
- newins 50${PN} ${PV}
+ newenvd 50${PN} ${PV}
#cd "${S}"
if use examples ; then
diff --git a/sci-libs/opencascade/opencascade-6.8.0.ebuild b/sci-libs/opencascade/opencascade-6.8.0.ebuild
index af9f50e..dbe6658 100644
--- a/sci-libs/opencascade/opencascade-6.8.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,7 +6,7 @@ EAPI=5
inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
-DESCRIPTION="Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
HOMEPAGE="http://www.opencascade.org/"
SRC_URI="http://files.opencascade.com/OCCT/OCC_${PV}_release/opencascade-${PV}.tgz"
@@ -139,8 +139,7 @@ src_install() {
dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
fi
- insinto /etc/env.d/${PN}
- newins 50${PN} ${PV}
+ newenvd 50${PN} ${PV}
if use examples ; then
insinto /usr/share/doc/${PF}/examples
diff --git a/sci-libs/opencascade/opencascade-6.9.0.ebuild b/sci-libs/opencascade/opencascade-6.9.0.ebuild
index dd95900..6058f7f 100644
--- a/sci-libs/opencascade/opencascade-6.9.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
-DESCRIPTION="Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
HOMEPAGE="http://www.opencascade.org/"
SRC_URI="http://files.opencascade.com/OCCT/OCC_${PV}_release/opencascade-${PV}.tgz"
@@ -144,8 +144,7 @@ src_install() {
dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
fi
- insinto /etc/env.d/${PN}
- newins 50${PN} ${PV}
+ newenvd 50${PN} ${PV}
if use examples ; then
insinto /usr/share/doc/${PF}/examples
diff --git a/sci-libs/opencascade/opencascade-6.9.1.ebuild b/sci-libs/opencascade/opencascade-6.9.1.ebuild
index 894b2e6..a9b5077 100644
--- a/sci-libs/opencascade/opencascade-6.9.1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
-DESCRIPTION="Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
HOMEPAGE="http://www.opencascade.org/"
SRC_URI="http://www.opencascade.com/sites/default/files/private/occt/OCC_${PV}_release/opencascade-${PV}.tgz"
@@ -144,8 +144,7 @@ src_install() {
dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
fi
- insinto /etc/env.d/${PN}
- newins 50${PN} ${PV}
+ newenvd 50${PN} ${PV}
if use examples ; then
insinto /usr/share/doc/${PF}/examples
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2016-09-26 12:04 Michael Weber
0 siblings, 0 replies; 70+ messages in thread
From: Michael Weber @ 2016-09-26 12:04 UTC (permalink / raw
To: gentoo-commits
commit: f50af8ad1cd34db7f2e841d36222d8d507e011fd
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 12:03:56 2016 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 12:03:56 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f50af8ad
sci-libs/opencascade: USE=vtk needs vtkInteractionStyle, bug 557602.
Package-Manager: portage-2.2.28
sci-libs/opencascade/opencascade-6.9.0.ebuild | 4 ++--
sci-libs/opencascade/opencascade-6.9.1.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-6.9.0.ebuild b/sci-libs/opencascade/opencascade-6.9.0.ebuild
index 7762a18..dd95900 100644
--- a/sci-libs/opencascade/opencascade-6.9.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -30,7 +30,7 @@ DEPEND="app-eselect/eselect-opencascade
gl2ps? ( x11-libs/gl2ps )
java? ( >=virtual/jdk-0:= )
tbb? ( dev-cpp/tbb )
- vtk? ( =sci-libs/${MY_VTK}* )"
+ vtk? ( || ( =sci-libs/${MY_VTK}*[imaging] =sci-libs/${MY_VTK}*[qt4] =sci-libs/${MY_VTK}*[rendering] =sci-libs/${MY_VTK}*[views] =sci-libs/${MY_VTK}*[all-modules] ) )"
RDEPEND="${DEPEND}"
# https://bugs.gentoo.org/show_bug.cgi?id=352435
diff --git a/sci-libs/opencascade/opencascade-6.9.1.ebuild b/sci-libs/opencascade/opencascade-6.9.1.ebuild
index 0b66059..894b2e6 100644
--- a/sci-libs/opencascade/opencascade-6.9.1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -30,7 +30,7 @@ DEPEND="app-eselect/eselect-opencascade
gl2ps? ( x11-libs/gl2ps )
java? ( >=virtual/jdk-0:= )
tbb? ( dev-cpp/tbb )
- vtk? ( =sci-libs/${MY_VTK}* )"
+ vtk? ( || ( =sci-libs/${MY_VTK}*[imaging] =sci-libs/${MY_VTK}*[qt4] =sci-libs/${MY_VTK}*[rendering] =sci-libs/${MY_VTK}*[views] =sci-libs/${MY_VTK}*[all-modules] ) )"
RDEPEND="${DEPEND}"
# https://bugs.gentoo.org/show_bug.cgi?id=352435
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2016-06-17 15:14 Michael Weber
0 siblings, 0 replies; 70+ messages in thread
From: Michael Weber @ 2016-06-17 15:14 UTC (permalink / raw
To: gentoo-commits
commit: 6f8ade7322a104908646aef4366c271b4e6bfc70
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 17 15:10:41 2016 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 15:14:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f8ade73
sci-libs/opencascade: Version bump.
Package-Manager: portage-2.2.28
sci-libs/opencascade/Manifest | 1 +
sci-libs/opencascade/opencascade-6.9.1.ebuild | 168 ++++++++++++++++++++++++++
2 files changed, 169 insertions(+)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 9314c97..2bc71fb 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,3 +1,4 @@
DIST opencascade-6.7.1.tgz 194568487 SHA256 c918cb554c0c22d322dc1d2f3a31069e1d5dcbae869db741339e1d4903e864b1 SHA512 31df4bd172d51b1ebee7e67075fa9cdbeb73eccb326f428b1911f15c9ac0feedc5977e2490f54a130b409f292dd6bfb7d40143263a47aa0330c28337639fe828 WHIRLPOOL d6fc042a4aca381ce74eaf1ca2adead5b0f88b599176c13ecd7a967f9dd92e4589c73ebde53ee3b374a78f696bacf674eb18a356ffcf38bbc8d7e60b30043fa6
DIST opencascade-6.8.0.tgz 198319238 SHA256 50b145655fd3a4448e291388650cd0dcab8f9d99201aba32e8d26aeff03e8e1c SHA512 4fa95bc244001fd27ad1248acf44d6fd6633fa21fa2479bbea42977bdc9688b638eaca5df8442120d3e075113a031a7f894d0525a6b54e537cb3363c0a698c8b WHIRLPOOL 5b57de759208668e970ef0f3cf55589ea13d2295bac8d12ee597d7a40be402427c3c67e232d68df5a0f91ed87c9f7157faa717490f774e8431910d8223c49bf1
DIST opencascade-6.9.0.tgz 203915299 SHA256 e9da098b304f6b65c3958947c3c687f00128ce020b67d97554a3e3be9cf3d090 SHA512 79c7f715087ca627447a1cfd0b19a216150d71865f53f791978842ca9663181c5b608d93a7dc81945ad0dba287ea003cfa3ff47ebae07602a8fd38e6e1344aee WHIRLPOOL ab3bf2d1e369f87501bc5f3f63c092b6586a76b56443179e542fc2c1b10e9d504429c60096b7bd555c578ba54212693d4b495f34bb9045c3e1fb519b1d480538
+DIST opencascade-6.9.1.tgz 209589289 SHA256 f92659ae3fb09c28233fb9178bc24fd2aab6776f6d9ea2479c3bdfe6296b873f SHA512 92f0fffb110344feebaba9dd4a3427419ea9e6db7b09556b7dcdb1248f2a868e3337587abf9921392435031431f3876cea4d4709fd9926604dcebbd6d26f8963 WHIRLPOOL 02fe93b6e6dc7de45a3bf55ce9c5d826cb83ffda565273d008961c5824475d8f4dda04b782071b821c017409aeb0f6be05ea29a5d89ca57db85ea757aec27e4a
diff --git a/sci-libs/opencascade/opencascade-6.9.1.ebuild b/sci-libs/opencascade/opencascade-6.9.1.ebuild
new file mode 100644
index 0000000..0b66059
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-6.9.1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
+
+DESCRIPTION="Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+HOMEPAGE="http://www.opencascade.org/"
+SRC_URI="http://www.opencascade.com/sites/default/files/private/occt/OCC_${PV}_release/opencascade-${PV}.tgz"
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples freeimage gl2ps java qt4 +tbb +vtk"
+
+MY_VTK="vtk-6.1"
+DEPEND="app-eselect/eselect-opencascade
+ dev-lang/tcl:0=
+ dev-lang/tk:0=
+ dev-tcltk/itcl
+ dev-tcltk/itk
+ dev-tcltk/tix
+ media-libs/ftgl
+ virtual/glu
+ virtual/opengl
+ x11-libs/libXmu
+ freeimage? ( media-libs/freeimage )
+ gl2ps? ( x11-libs/gl2ps )
+ java? ( >=virtual/jdk-0:= )
+ tbb? ( dev-cpp/tbb )
+ vtk? ( =sci-libs/${MY_VTK}* )"
+RDEPEND="${DEPEND}"
+
+# https://bugs.gentoo.org/show_bug.cgi?id=352435
+# https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
+RESTRICT="bindist fetch mirror"
+
+CHECKREQS_MEMORY="256M"
+CHECKREQS_DISK_BUILD="3584M"
+
+pkg_setup() {
+ check-reqs_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ java-pkg-opt-2_src_prepare
+
+ epatch \
+ "${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch
+
+ # Feed environment variables used by Opencascade compilation
+ my_install_dir=${EROOT}usr/$(get_libdir)/${P}/ros
+ local my_env_install="#!/bin/sh -f
+if [ -z \"\$PATH\" ]; then
+ export PATH=VAR_CASROOT/Linux/bin
+else
+ export PATH=VAR_CASROOT/Linux/bin:\$PATH
+fi
+if [ -z \"\$LD_LIBRARY_PATH\" ]; then
+ export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib
+else
+ export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib:\$LD_LIBRARY_PATH
+fi"
+ local my_sys_lib=${EROOT}usr/$(get_libdir)
+ local my_env="CASROOT=VAR_CASROOT
+CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT
+CSF_LANGUAGE=us
+MMGT_CLEAR=1
+CSF_EXCEPTION_PROMPT=1
+CSF_SHMessage=VAR_CASROOT/src/SHMessage
+CSF_MDTVTexturesDirectory=VAR_CASROOT/src/Textures
+CSF_XSMessage=VAR_CASROOT/src/XSMessage
+CSF_StandardDefaults=VAR_CASROOT/src/StdResource
+CSF_PluginDefaults=VAR_CASROOT/src/StdResource
+CSF_XCAFDefaults=VAR_CASROOT/src/StdResource
+CSF_StandardLiteDefaults=VAR_CASROOT/src/StdResource
+CSF_GraphicShr=VAR_CASROOT/Linux/lib/libTKOpenGl.so
+CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat
+CSF_UnitsDefinition=VAR_CASROOT/src/UnitsAPI/Units.dat
+CSF_IGESDefaults=VAR_CASROOT/src/XSTEPResource
+CSF_STEPDefaults=VAR_CASROOT/src/XSTEPResource
+CSF_XmlOcafResource=VAR_CASROOT/src/XmlOcafResource
+CSF_MIGRATION_TYPES=VAR_CASROOT/src/StdResource/MigrationSheet.txt
+TCLHOME=${EROOT}usr/bin
+TCLLIBPATH=${my_sys_lib}
+ITK_LIBRARY=${my_sys_lib}/itk$(grep ITK_VER /usr/include/itk.h | sed 's/^.*"\(.*\)".*/\1/')
+ITCL_LIBRARY=${my_sys_lib}/itcl$(grep ITCL_VER /usr/include/itcl.h | sed 's/^.*"\(.*\)".*/\1/')
+TIX_LIBRARY=${my_sys_lib}/tix$(grep TIX_VER /usr/include/tix.h | sed 's/^.*"\(.*\)".*/\1/')
+TK_LIBRARY=${my_sys_lib}/tk$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
+TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')"
+
+ ( echo "${my_env_install}"
+ echo "${my_env}" | sed -e "s:^:export :" ) \
+ | sed -e "s:VAR_CASROOT:${S}:g" > env.sh || die
+ source env.sh
+
+ ( echo "PATH=${my_install_dir}/lin/bin"
+ echo "LDPATH=${my_install_dir}/lin/$(get_libdir)"
+ echo "${my_env}" | sed \
+ -e "s:VAR_CASROOT:${my_install_dir}/lin:g" \
+ -e "s:/Linux/lib/:/$(get_libdir)/:g" || die
+ ) > 50${PN}
+
+ append-cxxflags "-fpermissive"
+
+ sed -e "/^AM_C_PROTOTYPES$/d" \
+ -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
+ -e "s:\$qt/include:\$qt/include/qt4:g"\
+ -e "s:\$qt/lib:\$qt/$(get_libdir)/qt4:g"\
+ -e "/CSF_VTK_LIB=/s:-${MY_VTK/vtk-}::g" \
+ -i configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --prefix=${my_install_dir}/lin --exec-prefix=${my_install_dir}/lin \
+ --with-tcl="${EROOT}usr/$(get_libdir)" --with-tk="${EROOT}usr/$(get_libdir)" \
+ --with-freetype="${EROOT}usr" \
+ --with-ftgl="${EROOT}usr" \
+ $(usex freeimage "--with-freeimage=${EROOT}usr" "") \
+ $(usex gl2ps "--with-gl2ps=${EROOT}usr" "") \
+ $(usex qt4 "--with-qt=${EROOT}usr" "") \
+ $(usex tbb "--with-tbb-include=${EROOT}usr" "") \
+ $(usex tbb "--with-tbb-library=${EROOT}usr" "") \
+ $(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \
+ $(usex vtk "--with-vtk-include=${EROOT}usr/include/${MY_VTK}" "") \
+ $(usex vtk "--with-vtk-library=${EROOT}usr/$(get_libdir)" "") \
+ $(use_enable debug) \
+ $(use_enable !debug production)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ prune_libtool_files
+
+ # Symlinks for keeping original OpenCascade folder structure and
+ # add a link lib to $(get_libdir) if we are e.g. on amd64 multilib
+ if [ "$(get_libdir)" != "lib" ]; then
+ dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
+ fi
+
+ insinto /etc/env.d/${PN}
+ newins 50${PN} ${PV}
+
+ if use examples ; then
+ insinto /usr/share/doc/${PF}/examples
+ doins -r data
+ doins -r samples
+ fi
+ if use doc; then
+ insinto /usr/share/doc/${PF}
+ doins -r doc/{overview,pdf,refman}
+ fi
+}
+
+pkg_postinst() {
+ eselect ${PN} set ${PV}
+ einfo
+ elog "After upgrading OpenCASCADE you may have to rebuild packages depending on it."
+ elog "You get a list by running \"equery depends sci-libs/opencascade\""
+ elog "revdep-rebuild does NOT suffice."
+ einfo
+}
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2015-08-23 11:15 Michael Weber
0 siblings, 0 replies; 70+ messages in thread
From: Michael Weber @ 2015-08-23 11:15 UTC (permalink / raw
To: gentoo-commits
commit: 410d3a68e98a87f63e117175a506fd292134f865
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 11:15:09 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 11:15:09 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410d3a68
sci-libs/opencascade: Fix USE=java dep to >=virtual/jdk-0:= (thanks to all contributors on bug 541644).
Package-Manager: portage-2.2.20.1
sci-libs/opencascade/opencascade-6.7.1.ebuild | 2 +-
sci-libs/opencascade/opencascade-6.8.0.ebuild | 2 +-
sci-libs/opencascade/opencascade-6.9.0.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-libs/opencascade/opencascade-6.7.1.ebuild b/sci-libs/opencascade/opencascade-6.7.1.ebuild
index e18a372..f64ba6a 100644
--- a/sci-libs/opencascade/opencascade-6.7.1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.7.1.ebuild
@@ -27,7 +27,7 @@ DEPEND="app-eselect/eselect-opencascade
x11-libs/libXmu
freeimage? ( media-libs/freeimage )
gl2ps? ( x11-libs/gl2ps )
- java? ( virtual/jdk:= )
+ java? ( >=virtual/jdk-0:= )
tbb? ( dev-cpp/tbb )"
RDEPEND="${DEPEND}"
diff --git a/sci-libs/opencascade/opencascade-6.8.0.ebuild b/sci-libs/opencascade/opencascade-6.8.0.ebuild
index 0c09d22..a2eb96f 100644
--- a/sci-libs/opencascade/opencascade-6.8.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.8.0.ebuild
@@ -27,7 +27,7 @@ DEPEND="app-eselect/eselect-opencascade
x11-libs/libXmu
freeimage? ( media-libs/freeimage )
gl2ps? ( x11-libs/gl2ps )
- java? ( virtual/jdk:= )
+ java? ( >=virtual/jdk-0:= )
tbb? ( dev-cpp/tbb )"
RDEPEND="${DEPEND}"
diff --git a/sci-libs/opencascade/opencascade-6.9.0.ebuild b/sci-libs/opencascade/opencascade-6.9.0.ebuild
index 1f59e16..690dde6 100644
--- a/sci-libs/opencascade/opencascade-6.9.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.0.ebuild
@@ -28,7 +28,7 @@ DEPEND="app-eselect/eselect-opencascade
x11-libs/libXmu
freeimage? ( media-libs/freeimage )
gl2ps? ( x11-libs/gl2ps )
- java? ( virtual/jdk:= )
+ java? ( >=virtual/jdk-0:= )
tbb? ( dev-cpp/tbb )
vtk? ( =sci-libs/${MY_VTK}* )"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 70+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
@ 2015-08-09 13:58 Michael Weber
0 siblings, 0 replies; 70+ messages in thread
From: Michael Weber @ 2015-08-09 13:58 UTC (permalink / raw
To: gentoo-commits
commit: 40b3fd64ec9c5d6d94f0f0897740bc77622c24a1
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 9 13:58:26 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 13:58:26 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40b3fd64
sci-libs/opencascade: add USE=vtk (bug 557022, thanks Helmut Jarausch).
Package-Manager: portage-2.2.20
sci-libs/opencascade/metadata.xml | 3 ++-
sci-libs/opencascade/opencascade-6.9.0.ebuild | 9 +++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index ccbd7c2..7d64287 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -8,6 +8,7 @@
<use>
<flag name="freeimage">Enable support for image i/o via media-libs/freeimage</flag>
<flag name="gl2ps">Use gl2ps PostScript printing library</flag>
- <flag name="tbb">tEnable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
+ <flag name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
+ <flag name="vtk">Enable Virtualisation Toolkit</flag>
</use>
</pkgmetadata>
diff --git a/sci-libs/opencascade/opencascade-6.9.0.ebuild b/sci-libs/opencascade/opencascade-6.9.0.ebuild
index da82dfc..1f59e16 100644
--- a/sci-libs/opencascade/opencascade-6.9.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.0.ebuild
@@ -13,8 +13,9 @@ SRC_URI="http://files.opencascade.com/OCCT/OCC_${PV}_release/opencascade-${PV}.t
LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
SLOT="${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples freeimage gl2ps java qt4 +tbb"
+IUSE="debug doc examples freeimage gl2ps java qt4 +tbb +vtk"
+MY_VTK="vtk-6.1"
DEPEND="app-eselect/eselect-opencascade
dev-lang/tcl:0=
dev-lang/tk:0=
@@ -28,7 +29,8 @@ DEPEND="app-eselect/eselect-opencascade
freeimage? ( media-libs/freeimage )
gl2ps? ( x11-libs/gl2ps )
java? ( virtual/jdk:= )
- tbb? ( dev-cpp/tbb )"
+ tbb? ( dev-cpp/tbb )
+ vtk? ( =sci-libs/${MY_VTK}* )"
RDEPEND="${DEPEND}"
# http://bugs.gentoo.org/show_bug.cgi?id=352435
@@ -108,6 +110,7 @@ TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*
-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
-e "s:\$qt/include:\$qt/include/qt4:g"\
-e "s:\$qt/lib:\$qt/$(get_libdir)/qt4:g"\
+ -e "/CSF_VTK_LIB=/s:-${MY_VTK/vtk-}::g" \
-i configure.ac || die
eautoreconf
}
@@ -124,6 +127,8 @@ src_configure() {
$(usex tbb "--with-tbb-include=${EROOT}usr" "") \
$(usex tbb "--with-tbb-library=${EROOT}usr" "") \
$(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \
+ $(usex vtk "--with-vtk-include=${EROOT}usr/include/${MY_VTK}" "") \
+ $(usex vtk "--with-vtk-library=${EROOT}usr/$(get_libdir)" "") \
$(use_enable debug) \
$(use_enable !debug production)
}
^ permalink raw reply related [flat|nested] 70+ messages in thread
end of thread, other threads:[~2024-08-25 15:44 UTC | newest]
Thread overview: 70+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-26 11:00 [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2024-08-25 15:44 Sam James
2024-08-25 15:44 Sam James
2024-04-14 14:28 Andrew Ammerlaan
2024-04-14 14:28 Andrew Ammerlaan
2024-03-26 20:25 Sam James
2024-03-23 8:34 Sam James
2023-07-31 8:43 Joonas Niilola
2023-02-06 19:49 Sam James
2023-01-27 7:46 Joonas Niilola
2023-01-04 5:50 Sam James
2023-01-04 5:50 Sam James
2022-12-31 15:36 Sam James
2022-12-19 14:49 Andreas Sturmlechner
2022-12-19 14:47 Andreas Sturmlechner
2022-12-13 14:11 Andrew Ammerlaan
2022-09-27 13:57 Andrew Ammerlaan
2022-09-25 7:20 Joonas Niilola
2022-08-14 16:06 Florian Schmaus
2022-07-27 19:03 Conrad Kostecki
2022-07-26 14:22 Joonas Niilola
2022-06-21 10:14 Andrew Ammerlaan
2022-06-14 16:01 Joonas Niilola
2022-06-14 16:01 Joonas Niilola
2022-06-03 11:01 Joonas Niilola
2022-05-19 12:12 Joonas Niilola
2022-03-16 22:54 Sam James
2022-03-16 22:51 Sam James
2022-03-16 22:51 Sam James
2022-03-16 22:51 Sam James
2022-01-16 1:31 Sam James
2022-01-16 0:24 Sam James
2022-01-15 22:14 Sam James
2022-01-15 22:14 Sam James
2022-01-15 22:14 Sam James
2022-01-13 1:25 Sam James
2022-01-10 1:04 Sam James
2021-11-06 6:03 Sam James
2021-11-06 6:03 Sam James
2021-11-06 6:03 Sam James
2021-11-06 6:03 Sam James
2021-11-04 7:35 Ionen Wolkens
2021-10-29 22:23 Sam James
2021-10-24 4:06 Sam James
2021-06-04 7:38 Joonas Niilola
2021-06-04 7:38 Joonas Niilola
2021-05-04 22:02 Sam James
2021-03-01 8:26 Joonas Niilola
2021-02-22 18:57 Sam James
2021-02-18 9:36 Joonas Niilola
2021-02-07 17:07 Conrad Kostecki
2020-10-26 10:15 Joonas Niilola
2020-04-27 14:42 Matthias Maier
2020-04-01 14:38 Joonas Niilola
2020-01-03 19:08 Andreas Sturmlechner
2019-04-21 18:24 Andreas Sturmlechner
2019-02-06 22:38 Patrice Clement
2019-01-15 23:13 Patrice Clement
2018-04-05 12:31 Andreas Sturmlechner
2017-12-22 11:44 Michael Weber
2017-12-22 11:37 Michael Weber
2017-11-06 1:58 Andreas Sturmlechner
2017-06-04 22:52 Michael Weber
2017-01-31 8:37 Robin H. Johnson
2016-11-19 17:56 David Seifert
2016-11-06 10:29 David Seifert
2016-09-26 12:04 Michael Weber
2016-06-17 15:14 Michael Weber
2015-08-23 11:15 Michael Weber
2015-08-09 13:58 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox