[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/
commit: 8cdc93710f895d042f33b8eece7b6534fc097804
Author: Paul Zander gmail com>
AuthorDate: Sun Apr 14 15:26:42 2024 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Sun Apr 14 15:36:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cdc9371
sci-libs/opencascasde: fix vtk_components.patch
Closes: https://bugs.gentoo.org/930016
Signed-off-by: Paul Zander gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36253
Signed-off-by: Andrew Ammerlaan gentoo.org>
sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch
b/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch
index 224becfdec1f..03a6277c6fa8 100644
--- a/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch
+++ b/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch
@@ -6,7 +6,7 @@ index 7d25a37..79257d1 100644
set (ENV{VTK_DIR} "${3RDPARTY_VTK_DIR}")
endif()
--find_package(VTK)
+-find_package(VTK QUIET)
+find_package(VTK
+ COMPONENTS
+CommonCore
[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/, profiles/base/
commit: e3179b6eab5b0d068a54ff39f17cddd9457adcc3
Author: Paul Zander gmail com>
AuthorDate: Mon Mar 25 16:16:46 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 25 18:54:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3179b6e
sci-libs/opencascade: fix 927629, 927592, 925441
Closes: https://bugs.gentoo.org/927629
Closes: https://bugs.gentoo.org/927592
Closes: https://bugs.gentoo.org/925441
Signed-off-by: Paul Zander gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35912
Signed-off-by: Sam James gentoo.org>
profiles/base/package.use.mask | 2 +-
.../files/opencascade-7.7.0-tbb-detection.patch| 53 ++
sci-libs/opencascade/opencascade-7.7.1.ebuild | 41 ++---
sci-libs/opencascade/opencascade-7.7.2.ebuild | 41 ++---
sci-libs/opencascade/opencascade-7.8.0.ebuild | 30 ++--
5 files changed, 96 insertions(+), 71 deletions(-)
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 76b39e86f880..1b39b7a886a6 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -270,7 +270,7 @@ x11-wm/stumpwm doc
# Bernd Waibel (2022-11-25)
# USE=tbb is broken in 7.7.0
# https://tracker.dev.opencascade.org/view.php?id=33152
->=sci-libs/opencascade-7.7.0 tbb
+ (2022-11-22)
# app-text/pandoc is not keyworded on most architectures
diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-tbb-detection.patch
b/sci-libs/opencascade/files/opencascade-7.7.0-tbb-detection.patch
new file mode 100644
index ..c93b009a9da6
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.7.0-tbb-detection.patch
@@ -0,0 +1,53 @@
+From: Fabio Rossi
+See-Also: https://tracker.dev.opencascade.org/view.php?id=33612
+Fix tbb detection
+
+--- ./adm/cmake/tbb.cmake 2022-11-11 23:19:44.0 +0100
./adm/cmake/tbb.cmake.new 2024-02-24 18:59:32.267165878 +0100
+@@ -56,13 +56,17 @@
+ list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
+ endif()
+
++# Get installed configuration of tbb
++get_target_property (TARGET_TBB_IMPORT_CONFS TBB::tbb
IMPORTED_CONFIGURATIONS)
++list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
++
+ separate_arguments (CSF_TBB)
+ foreach (LIB IN LISTS CSF_TBB)
+ string(TOLOWER "${LIB}" LIB_LOWER)
+ string(TOUPPER "${LIB}" LIB_UPPER)
+
+ # Achive *.lib files and directory containing it.
+- get_target_property (TBB_LIB_FILE "TBB::${LIB_LOWER}"
IMPORTED_IMPLIB_RELEASE)
++ get_target_property (TBB_LIB_FILE "TBB::${LIB_LOWER}"
IMPORTED_IMPLIB_${CHOSEN_IMPORT_CONF})
+ # Reserve cache variable for *.lib.
+ if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
+ set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER}
library (*.lib)")
+@@ -89,7 +93,7 @@
+ endif()
+
+ # Achive *.dll files and directory containing it.
+- get_target_property (TBB_DLL_FILE "TBB::${LIB_LOWER}"
IMPORTED_LOCATION_RELEASE)
++ get_target_property (TBB_DLL_FILE "TBB::${LIB_LOWER}"
IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
+ # Reserve cache variable for *.dll.
+ if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_DLL)
+ set (3RDPARTY_${LIB_UPPER}_DLL "" CACHE FILEPATH "${LIB_UPPER}
library (*.dll)")
+@@ -185,13 +189,17 @@
+ list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
+ endif()
+
++ # Get installed configuration of tbb
++ get_target_property (TARGET_TBB_IMPORT_CONFS TBB::tbb
IMPORTED_CONFIGURATIONS)
++ list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
++
+ separate_arguments (CSF_TBB)
+ foreach (LIB IN LISTS CSF_TBB)
+ string(TOLOWER "${LIB}" LIB_LOWER)
+ string(TOUPPER "${LIB}" LIB_UPPER)
+
+ # Achive *.so files and directory containing it.
+-get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}"
IMPORTED_LOCATION_RELEASE)
++get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}"
IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
+ # Reserve cache variable for *.so.
+ if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
+ set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER}
library (*.so)")
diff --git a/sci-libs/opencascade/opencascade-7.7.1.ebuild
b/sci-libs/opencascade/opencascade-7.7.1.ebuild
index 384a99eaaf44..d9ef51dd1f11 100644
--- a/sci-libs/opencascade/opencascade-7.7.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.1.ebuild
@@ -32,11 +32,12 @@ 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 jemalloc
json +opengl optimize tbb test testprograms tk vtk"
+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? (
[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/
commit: 6c55a8ea86f9ccf27bd0def2756262a2d7eafba2
Author: Paul Zander gmail com>
AuthorDate: Fri Feb 16 15:02:28 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Mar 23 08:33:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c55a8ea
sci-libs/opencascade: add 7.7.1, 7.7.2, 7.8.0,
Closes: https://bugs.gentoo.org/923350
Closes: https://bugs.gentoo.org/911578
Closes: https://bugs.gentoo.org/908889
Signed-off-by: Paul Zander gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35374
Signed-off-by: Sam James gentoo.org>
sci-libs/opencascade/Manifest | 5 +
.../opencascade-7.7.0-jemalloc-lib-type.patch | 27 ++
.../opencascade-7.8.0-cmake-min-version.patch | 14 +
.../files/opencascade-7.8.0-tests.patch| 19 ++
sci-libs/opencascade/metadata.xml | 33 +-
sci-libs/opencascade/opencascade-7.7.1.ebuild | 366 +
sci-libs/opencascade/opencascade-7.7.2.ebuild | 366 +
sci-libs/opencascade/opencascade-7.8.0.ebuild | 365
sci-libs/opencascade/opencascade-.ebuild | 365
9 files changed, 1539 insertions(+), 21 deletions(-)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index af71bb8b4462..ac0e7aa5db19 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,2 +1,7 @@
DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B
ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d
SHA512
c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded
DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B
b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a
SHA512
6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c
+DIST opencascade-7.7.1.tar.gz 48408076 BLAKE2B
46e14a47a0ce555ac17a3fca520c1f21d7ca05c67b54259e3d2d8560618db096313d5be3d5e4a24acad1912534c17293ad203f48dd7464690aec86e287d9f230
SHA512
f095848d212afbe7e71614d46f57222e347246aec7c92aafae59e6f07798f5371c7a125042c149393ee7d361f28eb89b5196de17a7cc37233f1586ba919c0839
+DIST opencascade-7.7.2.tar.gz 48404428 BLAKE2B
28d637e75eca570e38401a0a59127ffdbcb06838a91cc3899fe905834bb47e0e9a92d16cde52027d94e78b0fbddc2043340a35dcb0f4a472c4f2bdac2713216c
SHA512
d9e882d44bb65616f8cfce68ebdcd5765669b84e3d82cfb2d1bc22b71b0e878442c079bacc37e9d54f28ce98a7c23bf81f2a3e3e7bbeeec38927ca739f423dee
+DIST opencascade-7.8.0.tar.gz 48428565 BLAKE2B
91253101072af27c94b82b82beed5c1f1d7460f4154600fba805c5b2d27976a4841b9a9dfab9e67706d02463b2c630c5b63d1f056e84c69c9c8eeaca7e7caebf
SHA512
af176cbd105c49949282c16bb6e30f69167bc6c00a50e0ae69aea555815d47ac3c4540c233e596c5add7cb846c2b33d7be267d8e02472286e758b662b4a652ab
+DIST opencascade-dataset-7.7.0.tar.gz 128392200 BLAKE2B
ebfbe6f24520144ca4a82e4ddd0486890552c2de1b62bf5c0d4990d777d4a1458dea54f8a6f08d8a0999582fb4325eda0002fc8a0137b9e66d024a47145d1279
SHA512
71d7e807b1d629fe7371b9d1d503024d00b7c1ae1775e62803eeffd127bd1c768e5240fdd1f949a237737089d528b5d4e43d26db025bbe14a4e0e4616ebdc5d8
+DIST opencascade-dataset-7.8.0.tar.xz 97049756 BLAKE2B
aae5f076d9fc8a0d8a05028b0d9ffb527978e7acfdf5ecbc7e71c5ee3d6060cd7db9e56dba5b94a445bf5cf208126711cda70306607bdc5cd5e8b68df8fc150c
SHA512
9b4c91d7b4743c47f2cf8d9a3b6ded73409a13133013424150ee9bdb61fd771c0b8799c7f31b459a7d2ba140399b9c0c972e2d0476188006361b4fb04042d990
diff --git
a/sci-libs/opencascade/files/opencascade-7.7.0-jemalloc-lib-type.patch
b/sci-libs/opencascade/files/opencascade-7.7.0-jemalloc-lib-type.patch
new file mode 100644
index ..c80d9946b7c6
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.7.0-jemalloc-lib-type.patch
@@ -0,0 +1,27 @@
+From: Paul Zander
+
+Only try to find the jemalloc libs we are going to use
+
+diff --git a/adm/cmake/jemalloc.cmake b/adm/cmake/jemalloc.cmake
+index b37d5d276..deef66d6c 100644
+--- a/adm/cmake/jemalloc.cmake
b/adm/cmake/jemalloc.cmake
+@@ -128,6 +128,7 @@ endmacro()
+ # Reset CSF variable
+ set (CSF_MMGR "")
+
++if(BUILD_LIBRARY_TYPE EQUAL "Static")
+ # find static jemalloc lib
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a")
+ if (WIN32)
+@@ -137,7 +138,10 @@ elseif(NOT WIN32)
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES "" "so")
+ JEMALLOC_LIB_SEARCH ("jemalloc.so.2" "SHARED")
+ endif()
++endif()
+
++if(BUILD_LIBRARY_TYPE EQUAL "Shared")
+ # find shared jemalloc lib
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".so")
+ JEMALLOC_LIB_SEARCH ("jemalloc" "SHARED")
++endif()
diff --git
a/sci-libs/opencascade/files/opencascade-7.8.0-cmake-min-version.patch
b/sci-libs/opencascade/files/opencascade-7.8.0-cmake-min-version.patch
new file mode 100644
index
[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/
commit: 6f48536ddd49190e89e394361f01864a29ce8e96
Author: Bernd Waibel posteo net>
AuthorDate: Sat Oct 8 12:20:14 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Nov 25 11:18:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f48536d
sci-libs/opencascade: add 7.7.0
Bug: https://tracker.dev.opencascade.org/view.php?id=32650
Bug: https://tracker.dev.opencascade.org/view.php?id=33216
Closes: https://bugs.gentoo.org/880233
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27696
Signed-off-by: Joonas Niilola gentoo.org>
sci-libs/opencascade/Manifest | 1 +
...ncascade-7.7.0-add-missing-include-limits.patch | 19 +++
...ascade-7.7.0-avoid-pre-stripping-binaries.patch | 34
0-fix-installation-of-cmake-config-files.patch | 33
sci-libs/opencascade/opencascade-7.7.0.ebuild | 176 +
5 files changed, 263 insertions(+)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index c3e51ef720d8..ff6ab85b0da3 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,3 +1,4 @@
DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B
86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288
SHA512
f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B
be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1
SHA512
2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B
ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d
SHA512
c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded
+DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B
b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a
SHA512
6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c
diff --git
a/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch
b/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch
new file mode 100644
index ..2bc59319864a
--- /dev/null
+++
b/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch
@@ -0,0 +1,19 @@
+From 44a30819131496bf41f2e1dcfd362b23173db6fb Mon Sep 17 00:00:00 2001
+From: Bernd Waibel
+Date: Wed, 5 Oct 2022 21:55:06 +0200
+Subject: [PATCH] add missing #include
+
+Signed-off-by: Bernd Waibel
+--- a/src/ViewerTest/ViewerTest_CmdParser.cxx
b/src/ViewerTest/ViewerTest_CmdParser.cxx
+@@ -21,6 +21,7 @@
+
+ #include
+ #include
++#include
+
+ namespace
+ {
+--
+2.38.0
+
diff --git
a/sci-libs/opencascade/files/opencascade-7.7.0-avoid-pre-stripping-binaries.patch
b/sci-libs/opencascade/files/opencascade-7.7.0-avoid-pre-stripping-binaries.patch
new file mode 100644
index ..5c351cb32996
--- /dev/null
+++
b/sci-libs/opencascade/files/opencascade-7.7.0-avoid-pre-stripping-binaries.patch
@@ -0,0 +1,34 @@
+From e145fb627d199e888267e19eab951c69c2f8151c Mon Sep 17 00:00:00 2001
+From: Bernd Waibel
+Date: Sat, 8 Oct 2022 13:16:47 +0200
+Subject: [PATCH] avoid pre-stripping binaries
+
+Signed-off-by: Bernd Waibel
+--- a/adm/cmake/occt_defs_flags.cmake
b/adm/cmake/occt_defs_flags.cmake
+@@ -135,22 +135,12 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
+ # CLang can be used with both libstdc++ and libc++, however on OS X
libstdc++ is outdated.
+ set (CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}")
+ endif()
+- # Optimize size of binaries
+- set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}")
+ elseif(MINGW)
+ add_definitions(-D_WIN32_WINNT=0x0601)
+ # _WIN32_WINNT=0x0601 (use Windows 7 SDK)
+ #set (CMAKE_SYSTEM_VERSION "6.1")
+ # workaround bugs in mingw with vtable export
+ set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--export-all-symbols")
+-
+- # Optimize size of binaries
+- set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+- set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+-elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
+- # Optimize size of binaries
+- set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+- set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+ endif()
+
+ if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
+--
+2.38.0
+
diff --git
a/sci-libs/opencascade/files/opencascade-7.7.0-fix-installation-of-cmake-config-files.patch
[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/
commit: 3adf9db9fe478c3b272c0284a81c10f00ca87df7
Author: Bernd Waibel posteo net>
AuthorDate: Mon Dec 13 07:36:51 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Jan 10 01:02:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3adf9db9
sci-libs/opencascade: use single slot/subslot for 7.5.3
Instead of using different slots for different versions, the package now
uses a single slot with subslots. This is to simplyfy dependency handling
in revdeps.
Allow build against sci-libs/vtk-9.1.0
Package-Manager: Portage-3.0.29, Repoman-3.0.3
Signed-off-by: Bernd Waibel posteo.net>
Signed-off-by: Sam James gentoo.org>
sci-libs/opencascade/files/opencascade-7.5.env.in | 102 -
...7.5.3-r3.ebuild => opencascade-7.5.3-r4.ebuild} | 34 +++
2 files changed, 15 insertions(+), 121 deletions(-)
diff --git a/sci-libs/opencascade/files/opencascade-7.5.env.in
b/sci-libs/opencascade/files/opencascade-7.5.env.in
deleted file mode 100644
index d7148c241f11..
--- a/sci-libs/opencascade/files/opencascade-7.5.env.in
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# This file sets needed and optional environment variables for
-# Open CASCADE Technology
-#
-# See:
https://dev.opencascade.org/doc/overview/html/index.html#OCCT_OVW_SECTION_4_2
-# for further documentation.
-#
-# Some of the values are set at compile time depending on what USE flags
-# were enabled. Those values are marked as such.
-
-# define the root directory of Open CASCADE Technology (needed)
-CASROOT="VAR_CASROOT"
-PATH="VAR_CASROOT/lib/opencascade-VAR_PV/bin"
-LDPATH="VAR_CASROOT/lib/opencascade-VAR_PV"
-
-#
-# The MMGT_* variables are used to determine how memory management will work
-# in OCCT. All of those are optional. If they are not set here, their default
-# values will be used.
-#
-# Uncomment or change the ones you need to adapt from its default.
-#
-# MMGT_OPT = {0,1,2} (default: 0) set at compile time
-# if set to 0 (the default), every memory block is allocated in C
-# memory heap directly (via malloc() and free()). Will be set, if
-# neither the the 'optimize' nor the 'tbb' USE flags are set.
-# if set to 1, the memory manager performs it's own internal optimization.
-# Will be set, if the 'optimize' USE flag is set.
-# if set to 2, Intel(R) TBB optimized memory manager is used. Will be set,
-# if the 'tbb' USE flag is set.
-#MMGT_OPT=0
-
-# MMGT_CLEAR = {0,1} (default: 1)
-# if set to 0, memory block is returned as it is. Will be set, if the
-# 'optimize' USE flag is set
-# if set to 1, every allocated memory block is cleared by zeros
-#MMGT_CLEAR=1
-
-# MMGT_CELLSIZE (default: 200)
-# defines the maximal size of blocks allocated in large pools of memory.
-#MMGT_CELLSIZE=200
-
-# MMGT_NBPAGES (default: 1)
-# defines the size of memory chunks allocated for small blocks in pages
-# (OS dependant)
-#MMGT_NBPAGES=1
-
-# MMGT_THRESHOLD (default: 4)
-# defines the maximal size of blocks that are recycled internally instead
-# of being returned to the heap.
-#MMGT_THRESHOLD=4
-
-# MMGT_MMAP = {0,1} (default: 1)
-# if set to 0, large memory blocks will be allocated in the C heap by
-# malloc()
-# if set to 1, large memory blocks are allocated using memory mapping
-# functions of the operating system.
-#MMGT_MMAP=1
-
-# CSF_LANGUAGE (default: us) optional
-# defines the default language of messages indicated by a two-letter
-# country code. Currently it's not verified if this work with other
-# than the default languages, so we keep it commented.
-#CSF_LANGUAGE=us
-
-# CSF_DEBUG_BOP (default: undefined) optional
-# if defined then it should specify the directory where diagnostic data
-# on problems occured in Boolean operations will be saved. Not defined by
-# default.
-#
-# NOTE: Only enable for debugging purposes. If set, this variable has a
-# large impact on the performance of boolean operations.
-#CSF_DEBUG_BOP="/var/tmp"
-
-# CSF_EXCEPTION_PROMPT (default: 1) optional
-# not documented upstream (maybe a flag indicating whether the user shall
-# be prompted in the case of exceptions)
-#CSF_EXCEPTION_PROMPT=1
-
-# The following CSF_* variables define various directories and files where
-# OCCT is looking for resources.
-CSF_GraphicShr="VAR_CASROOT/lib/opencascade-VAR_PV/libTKOpenGl.so"
-CSF_MIGRATION_TYPES="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource/MigrationSheet.txt"
-CSF_MDTVTexturesDirectory="VAR_CASROOT/share/opencascade-VAR_PV/resources/Textures"
-CSF_PluginDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_StandardDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_StandardLiteDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/
commit: 5ff97289ab2e63afcb5dfa0591312e0716ccada9
Author: Bernd Waibel posteo net>
AuthorDate: Fri Nov 5 18:31:59 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Jan 10 01:02:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff97289
sci-libs/opencascade: bump to 7.6.0
- move to using single slot/subslot mechanism to simplify the use
of the library in revdeps
Bug: https://tracker.dev.opencascade.org/view.php?id=32650
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel posteo.net>
Signed-off-by: Sam James gentoo.org>
sci-libs/opencascade/Manifest | 1 +
sci-libs/opencascade/files/opencascade.env.in | 102
sci-libs/opencascade/metadata.xml | 4 +
sci-libs/opencascade/opencascade-7.6.0.ebuild | 168 ++
4 files changed, 275 insertions(+)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index eddc8789850f..bd6eac9d5f78 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,2 +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.0.tar.gz 48193117 BLAKE2B
c16cd096f20e90267a00b6be21b17b22b491cf5d9aa1a311d64d7707042dc88380c60ececceb6728dbcdd4ff56a67558144292950e11518b21cbc49ace4e88cd
SHA512
6839eb6641b9e0752474fce11cf1756223067febe0f5bcd5db249e3eccef29517a6952c124aae818220b6360070a792dacd1b0b4ce970b8351ce38598f31b4be
diff --git a/sci-libs/opencascade/files/opencascade.env.in
b/sci-libs/opencascade/files/opencascade.env.in
new file mode 100644
index ..d7148c241f11
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade.env.in
@@ -0,0 +1,102 @@
+#
+# This file sets needed and optional environment variables for
+# Open CASCADE Technology
+#
+# See:
https://dev.opencascade.org/doc/overview/html/index.html#OCCT_OVW_SECTION_4_2
+# for further documentation.
+#
+# Some of the values are set at compile time depending on what USE flags
+# were enabled. Those values are marked as such.
+
+# define the root directory of Open CASCADE Technology (needed)
+CASROOT="VAR_CASROOT"
+PATH="VAR_CASROOT/lib/opencascade-VAR_PV/bin"
+LDPATH="VAR_CASROOT/lib/opencascade-VAR_PV"
+
+#
+# The MMGT_* variables are used to determine how memory management will work
+# in OCCT. All of those are optional. If they are not set here, their default
+# values will be used.
+#
+# Uncomment or change the ones you need to adapt from its default.
+#
+# MMGT_OPT = {0,1,2} (default: 0) set at compile time
+# if set to 0 (the default), every memory block is allocated in C
+# memory heap directly (via malloc() and free()). Will be set, if
+# neither the the 'optimize' nor the 'tbb' USE flags are set.
+# if set to 1, the memory manager performs it's own internal optimization.
+# Will be set, if the 'optimize' USE flag is set.
+# if set to 2, Intel(R) TBB optimized memory manager is used. Will be set,
+# if the 'tbb' USE flag is set.
+#MMGT_OPT=0
+
+# MMGT_CLEAR = {0,1} (default: 1)
+# if set to 0, memory block is returned as it is. Will be set, if the
+# 'optimize' USE flag is set
+# if set to 1, every allocated memory block is cleared by zeros
+#MMGT_CLEAR=1
+
+# MMGT_CELLSIZE (default: 200)
+# defines the maximal size of blocks allocated in large pools of memory.
+#MMGT_CELLSIZE=200
+
+# MMGT_NBPAGES (default: 1)
+# defines the size of memory chunks allocated for small blocks in pages
+# (OS dependant)
+#MMGT_NBPAGES=1
+
+# MMGT_THRESHOLD (default: 4)
+# defines the maximal size of blocks that are recycled internally instead
+# of being returned to the heap.
+#MMGT_THRESHOLD=4
+
+# MMGT_MMAP = {0,1} (default: 1)
+# if set to 0, large memory blocks will be allocated in the C heap by
+# malloc()
+# if set to 1, large memory blocks are allocated using memory mapping
+# functions of the operating system.
+#MMGT_MMAP=1
+
+# CSF_LANGUAGE (default: us) optional
+# defines the default language of messages indicated by a two-letter
+# country code. Currently it's not verified if this work with other
+# than the default languages, so we keep it commented.
+#CSF_LANGUAGE=us
+
+# CSF_DEBUG_BOP
[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/
commit: 17c99e0bcaa5ed97c1e737d0c1bae60c1d35a69c Author: Bernd Waibel posteo net> AuthorDate: Sun Jun 6 19:01:10 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Wed Jul 7 20:04:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17c99e0b sci-libs/opencascade: bump to 7.5.2 Quote paths in template env file Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Bernd Waibel posteo.net> Closes: https://github.com/gentoo/gentoo/pull/21149 Signed-off-by: Ionen Wolkens gentoo.org> sci-libs/opencascade/Manifest | 1 + sci-libs/opencascade/files/opencascade-7.5.env.in | 40 ++--- sci-libs/opencascade/opencascade-7.5.2.ebuild | 171 ++ 3 files changed, 192 insertions(+), 20 deletions(-) diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest index 77c4e42f391..29f10ccec88 100644 --- a/sci-libs/opencascade/Manifest +++ b/sci-libs/opencascade/Manifest @@ -1,2 +1,3 @@ DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a SHA512 ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a4621c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f +DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676 diff --git a/sci-libs/opencascade/files/opencascade-7.5.env.in b/sci-libs/opencascade/files/opencascade-7.5.env.in index 50766cbb6bb..d7148c241f1 100644 --- a/sci-libs/opencascade/files/opencascade-7.5.env.in +++ b/sci-libs/opencascade/files/opencascade-7.5.env.in @@ -9,9 +9,9 @@ # were enabled. Those values are marked as such. # define the root directory of Open CASCADE Technology (needed) -CASROOT=VAR_CASROOT -PATH=VAR_CASROOT/lib/opencascade-VAR_PV/bin -LDPATH=VAR_CASROOT/lib/opencascade-VAR_PV +CASROOT="VAR_CASROOT" +PATH="VAR_CASROOT/lib/opencascade-VAR_PV/bin" +LDPATH="VAR_CASROOT/lib/opencascade-VAR_PV" # # The MMGT_* variables are used to determine how memory management will work @@ -70,7 +70,7 @@ LDPATH=VAR_CASROOT/lib/opencascade-VAR_PV # # NOTE: Only enable for debugging purposes. If set, this variable has a # large impact on the performance of boolean operations. -#CSF_DEBUG_BOP=/var/tmp +#CSF_DEBUG_BOP="/var/tmp" # CSF_EXCEPTION_PROMPT (default: 1) optional # not documented upstream (maybe a flag indicating whether the user shall @@ -79,24 +79,24 @@ LDPATH=VAR_CASROOT/lib/opencascade-VAR_PV # The following CSF_* variables define various directories and files where # OCCT is looking for resources. -CSF_GraphicShr=VAR_CASROOT/lib/opencascade-VAR_PV/libTKOpenGl.so -CSF_MIGRATION_TYPES=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource/MigrationSheet.txt -CSF_MDTVTexturesDirectory=VAR_CASROOT/share/opencascade-VAR_PV/resources/Textures -CSF_PluginDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource -CSF_StandardDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource -CSF_StandardLiteDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource -CSF_XCAFDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource -CSF_XmlOcafResource=VAR_CASROOT/share/opencascade-VAR_PV/resources/XmlOcafResource +CSF_GraphicShr="VAR_CASROOT/lib/opencascade-VAR_PV/libTKOpenGl.so" +CSF_MIGRATION_TYPES="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource/MigrationSheet.txt" +CSF_MDTVTexturesDirectory="VAR_CASROOT/share/opencascade-VAR_PV/resources/Textures" +CSF_PluginDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource" +CSF_StandardDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource" +CSF_StandardLiteDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource" +CSF_XCAFDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource" +CSF_XmlOcafResource="VAR_CASROOT/share/opencascade-VAR_PV/resources/XmlOcafResource" # The below values might be optional. -CSF_IGESDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource -CSF_ShadersDirectory=VAR_CASROOT/share/opencascade-VAR_PV/resources/Shaders -CSF_SHMessage=VAR_CASROOT/share/opencascade-VAR_PV/resources/SHMessage -CSF_STEPDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource
[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/
commit: 0f7a957b96c79b35bd8cbb7c712bb7358188853e
Author: Roman Beranek prusa3d com>
AuthorDate: Thu Jun 3 14:09:09 2021 +
Commit: Alexey Shvetsov gentoo org>
CommitDate: Thu Jun 24 10:06:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f7a957b
sci-libs/opencascade[vtk]: prevent name collision
VTK-9.0 declares in their headers 'struct AllValues' which collides with
a macro defined by GLX.
This has been only partially fixed in the upstream:
https://git.dev.opencascade.org/gitweb/?p=occt.git;a=commit;h=2c276f91da0
It was necessary to put `#undef`s in a few other places.
Closes: https://bugs.gentoo.org/794031
Signed-off-by: Roman Beranek prusa3d.com>
Closes: https://github.com/gentoo/gentoo/pull/21105
Signed-off-by: Alexey Shvetsov gentoo.org>
...fix-AllValues-name-collision-with-vtk-9.0.patch | 172 +
sci-libs/opencascade/opencascade-7.5.1-r1.ebuild | 1 +
2 files changed, 173 insertions(+)
diff --git
a/sci-libs/opencascade/files/opencascade-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
b/sci-libs/opencascade/files/opencascade-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
new file mode 100644
index 000..e2725ebb2c6
--- /dev/null
+++
b/sci-libs/opencascade/files/opencascade-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
@@ -0,0 +1,172 @@
+From f624c55d7b75ccbe3fdfef0db141fdbe1f6b383a Mon Sep 17 00:00:00 2001
+From: anv
+Date: Tue, 27 Apr 2021 21:33:54 +0300
+Subject: [PATCH 1/2] 0032331: Visualization - Exception when trying to display
+ some surfaces using iVtk with VTK 9
+
+Updated memory allocation for vtkPolyData to use more suited method for VTK
versions after 9.0
+---
+ src/IVtkDraw/IVtkDraw_Interactor.cxx | 7 +++
+ src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx | 50 ++-
+ 2 files changed, 56 insertions(+), 1 deletion(-)
+
+diff --git a/src/IVtkDraw/IVtkDraw_Interactor.cxx
b/src/IVtkDraw/IVtkDraw_Interactor.cxx
+index f9f68c37b6..1b68c959f5 100644
+--- a/src/IVtkDraw/IVtkDraw_Interactor.cxx
b/src/IVtkDraw/IVtkDraw_Interactor.cxx
+@@ -20,6 +20,13 @@
+ #include
+ #else
+ #include
++
++// Preventing naming collisions between
++// GLX and VTK versions 9.0 and above
++#ifdef AllValues
++#undef AllValues
++#endif
++
+ #include
+ #include
+ #endif
+diff --git a/src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx
b/src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx
+index 26ded68af5..bd289d2b51 100644
+--- a/src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx
b/src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx
+@@ -87,6 +87,11 @@ int IVtkTools_SubPolyDataFilter::RequestData
(vtkInformation *vtkNotUsed(theRequ
+
+ // Prepare the list of ids from the set of ids.
+ // Iterate on input cells.
++#if (VTK_MAJOR_VERSION >= 9)
++// Count number of different cells.
++int aNbVerts = 0, aNbLines = 0, aNbPolys = 0, aNbStrips = 0;
++int aNbVertPts = 0, aNbLinePts = 0, aNbPolyPts = 0, aNbStripPts = 0;
++#endif
+ if (!myIdsSet.IsEmpty())
+ {
+ for (vtkIdType anI = 0; anI < aSize; anI++)
+@@ -95,13 +100,56 @@ int IVtkTools_SubPolyDataFilter::RequestData
(vtkInformation *vtkNotUsed(theRequ
+ {
+ // Add a cell id to output if it's value is in the set.
+ anIdList->InsertNextId (anI);
++#if (VTK_MAJOR_VERSION >= 9)
++ switch (anInput->GetCellType(anI))
++ {
++case VTK_VERTEX:
++ aNbVerts++;
++ aNbVertPts++;
++ break;
++case VTK_POLY_VERTEX:
++ aNbVerts++;
++ aNbVertPts += anInput->GetCell(anI)->GetNumberOfPoints();
++ break;
++case VTK_LINE:
++ aNbLines++;
++ aNbLinePts += 2;
++ break;
++case VTK_POLY_LINE:
++ aNbLines++;
++ aNbLinePts += anInput->GetCell(anI)->GetNumberOfPoints();
++ break;
++case VTK_TRIANGLE:
++ aNbPolys++;
++ aNbPolyPts += 3;
++ break;
++case VTK_QUAD:
++ aNbPolys++;
++ aNbPolyPts += 4;
++ break;
++case VTK_POLYGON:
++ aNbPolys++;
++ aNbPolyPts += anInput->GetCell(anI)->GetNumberOfPoints();
++ break;
++case VTK_TRIANGLE_STRIP:
++ aNbStrips++;
++ aNbStripPts += anInput->GetCell(anI)->GetNumberOfPoints();
++ break;
++ }
++#endif
+ }
+ }
+ }
+
+ // Copy cells with their points according to the prepared list of cell
ids.
+
anOutput->GetCellData()->AllocateArrays(anInput->GetCellData()->GetNumberOfArrays());
+-anOutput->Allocate(anInput, anIdList->GetNumberOfIds()); // Allocate
output cells
++// Allocate output cells
++#if (VTK_MAJOR_VERSION >= 9)
++anOutput->AllocateExact (aNbVerts, aNbVertPts, aNbLines, aNbLinePts,
aNbPolys, aNbPolyPts,
[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/
commit: 1c351b875bed560e5954ddf4db1ae25c3141f13b
Author: Bernd Waibel posteo net>
AuthorDate: Tue Feb 9 22:40:18 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Feb 18 09:36:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c351b87
sci-libs/opencascade: fix pre-stripping files
Closes: https://bugs.gentoo.org/769410
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel posteo.net>
Signed-off-by: Joonas Niilola gentoo.org>
...Gentoo-specific-avoid-pre-stripping-files.patch | 30 ++
sci-libs/opencascade/opencascade-7.4.0-r4.ebuild | 8 ++
2 files changed, 32 insertions(+), 6 deletions(-)
diff --git
a/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch
b/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch
new file mode 100644
index 000..0d4015cabd7
--- /dev/null
+++
b/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch
@@ -0,0 +1,30 @@
+From 2ddba09ea491ae5d18b074a2d1126d44c0a2b1f6 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel
+Date: Tue, 9 Feb 2021 22:26:14 +0100
+Subject: [PATCH] [Gentoo-specific] avoid pre-stripping files
+
+Signed-off-by: Bernd Waibel
+---
+ adm/cmake/occt_defs_flags.cmake | 6 --
+ 1 file changed, 6 deletions(-)
+
+diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake
+index 5484c675..4e513ab5 100644
+--- a/adm/cmake/occt_defs_flags.cmake
b/adm/cmake/occt_defs_flags.cmake
+@@ -137,12 +137,6 @@ elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
+ set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
+ endif()
+
+-# Optimize size of binaries
+-if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR MINGW)
+- set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+- set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+-endif()
+-
+ if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
+ set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
+ set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
+--
+2.30.0
+
diff --git a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
index a6b119a193b..669ac8caecb 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
@@ -17,7 +17,6 @@
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"
-# gl2ps
IUSE="debug doc examples ffmpeg freeimage gles2 inspector java optimize qt5
tbb +vtk"
REQUIRED_USE="
@@ -25,7 +24,6 @@ REQUIRED_USE="
?? ( optimize tbb )
"
-# gl2ps? ( x11-libs/gl2ps )
RDEPEND="
app-eselect/eselect-opencascade
dev-cpp/eigen
@@ -75,6 +73,7 @@ PATCHES=(
"${FILESDIR}/${P}-find-qt.patch"
"${FILESDIR}/${P}-fix-install.patch"
"${FILESDIR}/${P}-fix-issue-with-cmake-path-variables.patch"
+ "${FILESDIR}/${P}-Gentoo-specific-avoid-pre-stripping-files.patch"
)
pkg_setup() {
@@ -85,8 +84,6 @@ 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() {
@@ -98,18 +95,17 @@ src_configure() {
-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 doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
use examples && mycmakeargs+=( -DBUILD_SAMPLES_QT=$(usex qt5) )
cmake_src_configure
[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/
commit: 3a529685c95f6c74ed4b46d4c7501373b0a55769
Author: Bernd Waibel posteo net>
AuthorDate: Tue Feb 9 21:20:39 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Feb 18 09:36:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a529685
sci-libs/opencascade: fix paths in cmake config
Thanks to Fabio Rossi for reporting the issue.
See also upstream bug at
https://tracker.dev.opencascade.org/view.php?id=32035
Closes: https://bugs.gentoo.org/763162
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel posteo.net>
Signed-off-by: Joonas Niilola gentoo.org>
...7.4.0-fix-issue-with-cmake-path-variables.patch | 41 ++
sci-libs/opencascade/opencascade-7.4.0-r4.ebuild | 148 +
2 files changed, 189 insertions(+)
diff --git
a/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch
b/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch
new file mode 100644
index 000..aacb642019f
--- /dev/null
+++
b/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch
@@ -0,0 +1,41 @@
+From cefaa5bddedcb90a06d6ef8f0837a11619e5d87e Mon Sep 17 00:00:00 2001
+From: Bernd Waibel
+Date: Tue, 9 Feb 2021 20:58:43 +0100
+Subject: [PATCH] fix issue with cmake path variables
+
+Thanks to Fabio Rossi for reporting the issue.
+Upstream bug: https://tracker.dev.opencascade.org/view.php?id=32035
+
+Signed-off-by: Bernd Waibel
+---
+ adm/templates/OpenCASCADEConfig.cmake.in | 14 +-
+ 1 file changed, 1 insertion(+), 13 deletions(-)
+
+diff --git a/adm/templates/OpenCASCADEConfig.cmake.in
b/adm/templates/OpenCASCADEConfig.cmake.in
+index 4937103b..db99a8d1 100644
+--- a/adm/templates/OpenCASCADEConfig.cmake.in
b/adm/templates/OpenCASCADEConfig.cmake.in
+@@ -16,19 +16,7 @@ set (OpenCASCADE_MINOR_VERSION "@OCC_VERSION_MINOR@")
+ set (OpenCASCADE_MAINTENANCE_VERSION "@OCC_VERSION_MAINTENANCE@")
+ set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@")
+
+-# Compute the installation prefix from this OpenCASCADEConfig.cmake file
+-# location, by going up one level + one level if "cmake" + one level if "lib".
+-# This is made to support different locations of CMake files:
+-# - in UNIX style: $INSTALL_DIR/lib/cmake/opencascade-
+-# - in Windows style: $INSTALL_DIR/cmake
+-get_filename_component (OpenCASCADE_INSTALL_PREFIX
"${CMAKE_CURRENT_LIST_FILE}" PATH)
+-get_filename_component (OpenCASCADE_INSTALL_PREFIX
"${OpenCASCADE_INSTALL_PREFIX}" PATH)
+-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
+- get_filename_component (OpenCASCADE_INSTALL_PREFIX
"${OpenCASCADE_INSTALL_PREFIX}" PATH)
+-endif()
+-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$")
+- get_filename_component (OpenCASCADE_INSTALL_PREFIX
"${OpenCASCADE_INSTALL_PREFIX}" PATH)
+-endif()
++set (OpenCASCADE_INSTALL_PREFIX "$ENV{CASROOT}")
+
+ # Set OpenCASCADE paths to headers, binaries, libraries, resources, tests,
samples, data
+ set (OpenCASCADE_BINARY_DIR
"${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_BIN@")
+--
+2.30.0
+
diff --git a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
new file mode 100644
index 000..a6b119a193b
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
@@ -0,0 +1,148 @@
+# 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
+# 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 )
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/
commit: 0b00b035e79aed9609ac7e8e921267d75de2ee94
Author: Michael Perlov gmail com>
AuthorDate: Sat Sep 15 14:23:51 2018 +
Commit: Amy Liffey gentoo org>
CommitDate: Sat Oct 27 10:35:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b00b035
sci-libs/opencascade: Version bump to 7.3.0
Closes: https://github.com/gentoo/gentoo/pull/9871
Closes: https://bugs.gentoo.org/610362
Signed-off-by: Michael Perlov gmail.com>
Signed-off-by: Amy Liffey gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
sci-libs/opencascade/Manifest | 1 +
.../files/opencascade-7.3.0-fixed-DESTDIR.patch| 31 +
.../files/opencascade-7.3.0-vtk-compat.patch | 13 ++
sci-libs/opencascade/metadata.xml | 1 +
sci-libs/opencascade/opencascade-7.3.0.ebuild | 140 +
5 files changed, 186 insertions(+)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 29c34b19d5a..922670cf0cf 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1 +1,2 @@
DIST opencascade-6.9.1.tgz 209589289 BLAKE2B
266d68042dbbb8c9bc5f167b9aefaf84b3f1568c25530acb36271443429e67972aae913ebcea09c9ea27164e2e3f007eb287350d7ad69486755cdcb713fdb1af
SHA512
92f0fffb110344feebaba9dd4a3427419ea9e6db7b09556b7dcdb1248f2a868e3337587abf9921392435031431f3876cea4d4709fd9926604dcebbd6d26f8963
+DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B
bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6
SHA512
17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da
diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch
b/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch
new file mode 100644
index 000..c0a6363e19f
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch
@@ -0,0 +1,31 @@
+--- a/CMakeLists.txt 2016-11-25 11:50:18.0 +0100
b/CMakeLists.txt 2017-03-18 08:44:10.406668714 +0100
+@@ -885,7 +885,7 @@ if (EXISTS
"${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
+
+ set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
+
+- file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}"
"${CUSTOM_CONTENT}")
++ file (WRITE
\"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}\"
"${CUSTOM_CONTENT}")
+ else()
+ OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main"
"custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
+ endif()
+@@ -906,7 +906,7 @@
+ endforeach()
+ # install OpenCASCADE config file with compile definitions and C/C++ flags
ONLY for current configuration
+ install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\"
CMAKE_INSTALL_CONFIG_NAME_LOWER)")
+-install (CODE
"configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\"
\"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\"
COPYONLY)")
++install (CODE
"configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\"
\"\$ENV{DESTDIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\"
COPYONLY)")
+
+ foreach (OCCT_MODULE ${OCCT_MODULES})
+ if (BUILD_MODULE_${OCCT_MODULE})
+--- a/adm/cmake/occt_macros.cmake 2016-11-25 11:50:18.0 +0100
b/adm/cmake/occt_macros.cmake 2017-03-18 08:44:10.406668714 +0100
+@@ -558,7 +558,7 @@
+ "cmake_policy(PUSH)
+ cmake_policy(SET CMP0007 NEW)
+ string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\"
CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
+- file (GLOB ALL_OCCT_TARGET_FILES
\"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
++ file (GLOB ALL_OCCT_TARGET_FILES
\"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
+ foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
+ file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
+ file (REMOVE \"\${TARGET_FILENAME}\")
diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch
b/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch
new file mode 100644
index 000..71700a57f1d
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch
@@ -0,0 +1,13 @@
+--- a/src/IVtkVTK/IVtkVTK_ShapeData.cxx 2018-09-15 01:57:25.086783255 +0300
b/src/IVtkVTK/IVtkVTK_ShapeData.cxx 2018-09-15 01:58:20.89839 +0300
+@@ -29,6 +29,10 @@
+ #pragma warning(pop)
+ #endif
+
++#ifdef vtkGenericDataArray_h
++#define InsertNextTupleValue InsertNextTypedTuple
++#endif
++
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/
commit: 5e7c5d97488b5b46e20db03862f2502f91335286 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 5 19:30:20 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 6 01:57:16 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e7c5d97 sci-libs/opencascade: Drop old Bug: https://bugs.gentoo.org/624194 Package-Manager: Portage-2.3.13, Repoman-2.3.4 sci-libs/opencascade/Manifest | 3 - .../opencascade-6.5.4-fixed-tbb-VERSION.patch | 10 -- .../files/opencascade-6.7.0-fixed-DESTDIR.patch| 51 --- .../opencascade-6.7.1-deprecated-glx-api.patch | 89 --- sci-libs/opencascade/opencascade-6.7.1-r1.ebuild | 161 sci-libs/opencascade/opencascade-6.8.0-r1.ebuild | 158 sci-libs/opencascade/opencascade-6.9.0-r1.ebuild | 163 sci-libs/opencascade/opencascade-6.9.1-r1.ebuild | 164 - 8 files changed, 799 deletions(-) diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest index 2bc71fba802..635f58a5844 100644 --- a/sci-libs/opencascade/Manifest +++ b/sci-libs/opencascade/Manifest @@ -1,4 +1 @@ -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/files/opencascade-6.5.4-fixed-tbb-VERSION.patch b/sci-libs/opencascade/files/opencascade-6.5.4-fixed-tbb-VERSION.patch deleted file mode 100644 index 88b13acd21c..000 --- a/sci-libs/opencascade/files/opencascade-6.5.4-fixed-tbb-VERSION.patch +++ /dev/null @@ -1,10 +0,0 @@ src/Standard/Standard_MMgrTBBalloc.cxx -+++ src/Standard/Standard_MMgrTBBalloc.cxx -@@ -12,6 +12,7 @@ - - // paralleling with Intel TBB - #ifdef HAVE_TBB -+#undef VERSION - #include - using namespace tbb; - #else diff --git a/sci-libs/opencascade/files/opencascade-6.7.0-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-6.7.0-fixed-DESTDIR.patch deleted file mode 100644 index 3a3f9809344..000 --- a/sci-libs/opencascade/files/opencascade-6.7.0-fixed-DESTDIR.patch +++ /dev/null @@ -1,51 +0,0 @@ Makefile.am.old2014-01-13 09:43:18.530500362 +0100 -+++ Makefile.am2014-01-13 09:45:40.430496833 +0100 -@@ -82,29 +82,29 @@ - cd $(top_builddir)/adm/lin/amk && $(MAKE) $(AM_MAKEFLAGS) Draw - - install-exec-local: -- $(INSTALL) -d $(prefix)/$(platform) -- if [ -e $(prefix)/bin -a ! -e $(prefix)/$(platform)/bin ]; then \ -- cd $(prefix)/$(platform) && ln -s ../bin bin; \ -+ $(INSTALL) -d $(DESTDIR)$(prefix)/$(platform) -+ if [ -e $(DESTDIR)$(prefix)/bin -a ! -e $(DESTDIR)$(prefix)/$(platform)/bin ]; then \ -+ cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../bin bin; \ - fi -- if [ -e $(prefix)/lib -a ! -e $(prefix)/$(platform)/lib ]; then \ -- cd $(prefix)/$(platform) && ln -s ../lib lib; \ -+ if [ -e $(DESTDIR)$(prefix)/lib -a ! -e $(DESTDIR)$(prefix)/$(platform)/lib ]; then \ -+ cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../lib lib; \ - fi -- buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(prefix); installd=`pwd`; cd $$buildd; \ -+ buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(DESTDIR)$(prefix); installd=`pwd`; cd $$buildd; \ - if [ "$$installd" != "$$sourced" ]; then \ -- $(INSTALL) -d $(prefix)/inc; \ -- cp -frL $(top_srcdir)/inc $(prefix); \ -- cp -frL
[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/
commit: 82adaded86fa4c9b710da76851edf52749edfb87 Author: Michael Weber gentoo org> AuthorDate: Thu Jun 22 08:15:16 2017 + Commit: Michael Weber gentoo org> CommitDate: Thu Jun 22 08:15:35 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82adaded sci-libs/opencascade: Fix path spec in vtk-6.3 patch (bug 621160). Package-Manager: Portage-2.3.6, Repoman-2.3.2 sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch index e6b011b1e03..8e1d3361dde 100644 --- a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch +++ b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch @@ -1,5 +1,5 @@ work/opencascade-6.9.1/configure.ac -+++ work/opencascade-6.9.1/configure.ac +--- opencascade-6.9.1/configure.ac opencascade-6.9.1/configure.ac @@ -1044,7 +1044,7 @@ fi if test "x$vtk_lib" != "x"; then
[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/
commit: 24245dad85ece9d1f34a3874a258271f2d73328f Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Wed Feb 1 18:36:54 2017 + Commit: David Seifert gentoo org> CommitDate: Wed Feb 1 22:39:42 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24245dad sci-libs/opencascade: remove unused file Closes: https://github.com/gentoo/gentoo/pull/3763 sci-libs/opencascade/files/env.sh.template | 40 -- 1 file changed, 40 deletions(-) diff --git a/sci-libs/opencascade/files/env.sh.template b/sci-libs/opencascade/files/env.sh.template deleted file mode 100644 index 146c86b.. --- a/sci-libs/opencascade/files/env.sh.template +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -f - -export CASROOT=VAR_CASROOT - -if [ -z "PATH" ]; -then PATH=VAR_CASROOT/Linux/bin; -else PATH=VAR_CASROOT/Linux/bin:$PATH; -fi -export PATH -if [ -z "LD_LIBRARY_PATH" ]; -then LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib; -else LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib:$LD_LIBRARY_PATH; -fi -export LD_LIBRARY_PATH -export CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT -export CSF_LANGUAGE=us -export MMGT_CLEAR=1 -export CSF_EXCEPTION_PROMPT=1 -export CSF_SHMessage=VAR_CASROOT/src/SHMessage -export CSF_MDTVTexturesDirectory=VAR_CASROOT/src/Textures -export CSF_XSMessage=VAR_CASROOT/src/XSMessage -export CSF_StandardDefaults=VAR_CASROOT/src/StdResource -export CSF_PluginDefaults=VAR_CASROOT/src/StdResource -export CSF_XCAFDefaults=VAR_CASROOT/src/StdResource -export CSF_StandardLiteDefaults=VAR_CASROOT/src/StdResource -export CSF_GraphicShr=VAR_CASROOT/Linux/lib/libTKOpenGl.so -export CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat -export CSF_UnitsDefinition=VAR_CASROOT/src/UnitsAPI/Units.dat -export CSF_IGESDefaults=VAR_CASROOT/src/XSTEPResource -export CSF_STEPDefaults=VAR_CASROOT/src/XSTEPResource -export CSF_XmlOcafResource=VAR_CASROOT/src/XmlOcafResource -export CSF_MIGRATION_TYPES=VAR_CASROOT/src/StdResource/MigrationSheet.txt - -export TCLHOME=VAR_SYS_BIN -export TCLLIBPATH=VAR_SYS_LIB -export ITK_LIBRARY=VAR_SYS_LIB/VAR_ITK -export ITCL_LIBRARY=VAR_SYS_LIB/VAR_ITCL -export TIX_LIBRARY=VAR_SYS_LIB/VAR_TIX -export TK_LIBRARY=VAR_SYS_LIB/VAR_TK -export TCL_LIBRARY=VAR_SYS_LIB/VAR_TCL
[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/
commit: 06e649ca4f4dab96b9663ee1af659755bdabd10b Author: Michael Weber xmw AT gentoo DOT org AuthorDate: Tue Aug 11 09:16:52 2015 + Commit: Michael Weber xmw AT gentoo DOT org CommitDate: Tue Aug 11 09:16:52 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06e649ca sci-libs/opencascade/opencascade: drop old versions Package-Manager: portage-2.2.20 sci-libs/opencascade/Manifest | 3 - .../files/opencascade-6.5-fixed-DESTDIR.patch | 174 --- .../opencascade/files/opencascade-6.5-ftgl.patch | 77 - .../opencascade/files/opencascade-6.5-tcl8.6.patch | 46 - .../files/opencascade-6.5.4-fixed-DESTDIR.patch| 46 - .../files/opencascade-6.5.4-tcl8.6.patch | 38 - .../opencascade-6.5.5-deprecated-glx-api.patch | 30 .../opencascade-6.6.0-deprecated-glx-api.patch | 50 -- .../files/opencascade-6.6.0-fixed-DESTDIR.patch| 45 - sci-libs/opencascade/opencascade-6.5.5.ebuild | 171 --- sci-libs/opencascade/opencascade-6.5.ebuild| 187 - sci-libs/opencascade/opencascade-6.6.0.ebuild | 169 --- 12 files changed, 1036 deletions(-) diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest index fc426c2..9314c97 100644 --- a/sci-libs/opencascade/Manifest +++ b/sci-libs/opencascade/Manifest @@ -1,6 +1,3 @@ -DIST OpenCASCADE650.tar.gz 214819922 SHA256 fb95d8a542bbfc26af6186495f752a683b40137b34d6afd8f9bb02730c2436c6 SHA512 ea2c3703e3338584d84fb8e06664e79f5f113a117e94a4eefcf39bac3bcc28d81ace2340c83399ecbe5774c348faa3713e90623f8329562e10700ad7e2048be7 WHIRLPOOL 78e092b9ea892d7686578696bcba67f649b65b8d520f358cf2aac9a2c49baf75ff3717899865d7f752a5577b123f8d0eadce06173e5b1bad3dcf0c31052b09d6 -DIST OpenCASCADE655.tgz 146901035 SHA256 f5c6ab58aeb5c514428ae1b802e2820ca9267d19eecd64776f06baa60098d1b6 SHA512 848057a8a9fd41f1d13c4634c5e3366d37f3b4c81b7b194be9d4e48f5608f0bdfbc8cedd2a466e1724649a04ee87bfd0d1a445be47d832cc12fba5647689ceb2 WHIRLPOOL 18413460491c8a2fd10e97c22dd4b9b4772d97f19d27f59f33faa6618a1aac348877abc3ab9526878b38aba22328986a5c656ac91930cad460d33e93653bb463 -DIST OpenCASCADE660.tgz 119153607 SHA256 e39fa4b2255b9bd9bf97aa122043f4608d97b6b79d922375da53275e42b25d60 SHA512 8ee232f96ad650e55ac1f5fb1fe684b9d8198279dee4d7fd80a569c35562fffa643dd362fed7c5aff79541dbc463acc38b1364d8396c2c92c2d73f4955893866 WHIRLPOOL 29f0eaee2c64e4fb3fbb958e7cd043a2738a9d62414f332b81c65a009a100f39f56c38b20ffad4e76754522bfcbdc915470c84f9c218109650f9fd23d7bb3813 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 diff --git a/sci-libs/opencascade/files/opencascade-6.5-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-6.5-fixed-DESTDIR.patch deleted file mode 100644 index ea0f9b6..000 --- a/sci-libs/opencascade/files/opencascade-6.5-fixed-DESTDIR.patch +++ /dev/null @@ -1,174 +0,0 @@ -diff -urN opencascade.orig/ros/Makefile.am opencascade/ros/Makefile.am opencascade.orig/ros/Makefile.am 2011-03-06 16:08:59.0 +0100 -+++ opencascade/ros/Makefile.am2011-03-06 16:13:35.0 +0100 -@@ -86,106 +86,106 @@ - dir_SunOS=sun - - install-exec-local: -- $(INSTALL) -d $(prefix)/$(platform) -- if [ -e $(prefix)/bin -a ! -e $(prefix)/$(platform)/bin ]; then \ -- cd $(prefix)/$(platform) ln -s ../bin bin; \ -+ $(INSTALL) -d $(DESTDIR)$(prefix)/$(platform) -+ if [ -e $(DESTDIR)$(prefix)/bin -a ! -e $(DESTDIR)$(prefix)/$(platform)/bin ]; then \ -+ cd $(DESTDIR)$(prefix)/$(platform) ln -s ../bin bin; \ - fi -- if [ -e $(prefix)/lib -a ! -e $(prefix)/$(platform)/lib ]; then \ -- cd $(prefix)/$(platform) ln -s ../lib lib; \ -+ if [ -e $(DESTDIR)$(prefix)/lib -a ! -e $(DESTDIR)$(prefix)/$(platform)/lib ];
