Gentoo Archives: gentoo-commits

From: Michael Weber <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/xmw:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
Date: Thu, 29 Sep 2016 15:00:57
Message-Id: 1475161159.d794630ed625d2e096513e0db089709de6bb70fa.xmw@gentoo
1 commit: d794630ed625d2e096513e0db089709de6bb70fa
2 Author: Michael Weber <michael <AT> xmw <DOT> de>
3 AuthorDate: Thu Sep 29 14:59:19 2016 +0000
4 Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 29 14:59:19 2016 +0000
6 URL: https://gitweb.gentoo.org/dev/xmw.git/commit/?id=d794630e
7
8 sci-libs/opencascade: Version bump (testing, bug 595196).
9
10 Package-Manager: portage-2.2.28
11 Manifest-Sign-Key: 0x71D573A82F434065
12
13 sci-libs/opencascade/Manifest | 20 ++++
14 .../files/opencascade-7.0.0-MAT2d.patch | 24 +++++
15 .../files/opencascade-7.0.0-buildsystem.patch | 13 +++
16 sci-libs/opencascade/metadata.xml | 14 +++
17 sci-libs/opencascade/opencascade-7.0.0.ebuild | 105 +++++++++++++++++++++
18 5 files changed, 176 insertions(+)
19
20 diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
21 new file mode 100644
22 index 0000000..b2a4da2
23 --- /dev/null
24 +++ b/sci-libs/opencascade/Manifest
25 @@ -0,0 +1,20 @@
26 +-----BEGIN PGP SIGNED MESSAGE-----
27 +Hash: SHA256
28 +
29 +DIST opencascade-7.0.0.tgz 220147192 SHA256 073445b37b62d005a64744ba601f36ec118a25913dee4e6419f30dc9594a90dc SHA512 0c8e1a6c4a589a28e5baef10ccff1d94ad76c9e7ac827881fc7265e6f6d44d4332820034efc1f348d67663f7f508c2edc265c5e01da062c6ca4f94b1c47c2753 WHIRLPOOL bab3f49584b13e8e2a6310b13c0b987ba3cbb5d8f2d44caf8394b3852907449b9a72746ecc7f6606de4326f91ce00069daeabe322c0ec70961bbd584b1108988
30 +-----BEGIN PGP SIGNATURE-----
31 +
32 +iQIcBAEBCAAGBQJX7SxAAAoJEHHVc6gvQ0BlbC0QANgmMRTZyy36VpiXtZf02dc6
33 +kgZ1NCl/ljY9nb8J9lLlWNvu6Quj5x5CrjxgtknvuzcLGVS9oIfMwuXUxILRUoqg
34 +085zjp9M5nK/nbxCasL3xgbmyNb0ZNIPkOJJLOijUAioEdKF7yYGS3vdsXExjl1m
35 +b2TJ2/7Vw1Kb9WUV+nSzXzHB2rfBIhSaXn5j00KTsWuw7wrJgD70prArQ/EQFwFE
36 +0oOTYJkKvzMiuocVzRZ+GegfdktTHHDSyQeoELEk6nheCkNy7AdMeWwZEQNd9TRO
37 +2cCB8EZkjZ7E0WpSbESeZXvtOyN+CgFzPONeD6bW35x0RPj/xtOjP20hNDZYgQgh
38 +X733+vvE9CFNH8moRpS60NNo0AIsNyZejzxk64tB1Vu/SEQjrHkDOR2DOqwvOBJZ
39 +fXCDIs31RPiZLiimr+NKA3LB0OENd004bF9Dj+Y4d/nS3DrCovbrsGW0OwtkdfSl
40 +9be5qkIrTTI0nZDkbkaFTBj20uboH1+BRHFXE0nRs6ezP59nYS2GjdN9zhnhRn8m
41 +q3mB6+IUALxRYn5ci4KIOYpwtgJv0xI7B+34aDkngRNJhMB8HjSY5NijLrpLxX6Y
42 +o85Uc3T7ok+0SSLxGlUxsc/qQ/AVVjjJz5XaRYPBj+BGk67NQgV5yL7Cum69CWds
43 +ZWxneAw63rq7uiv0HE97
44 +=TpT3
45 +-----END PGP SIGNATURE-----
46
47 diff --git a/sci-libs/opencascade/files/opencascade-7.0.0-MAT2d.patch b/sci-libs/opencascade/files/opencascade-7.0.0-MAT2d.patch
48 new file mode 100644
49 index 0000000..239c888
50 --- /dev/null
51 +++ b/sci-libs/opencascade/files/opencascade-7.0.0-MAT2d.patch
52 @@ -0,0 +1,24 @@
53 +From: ski <ski@×××××××××××.com>
54 +Date: Tue, 26 Apr 2016 13:02:32 +0000 (+0300)
55 +Subject: 0027435: Compilation error on Linux platfrom in Debug mode with enabled OCCT_DEBUG...
56 +X-Git-Tag: V7_0_winwerth~75
57 +X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=4b5857d330d381ea52951f7b64336b455187a948
58 +
59 +0027435: Compilation error on Linux platfrom in Debug mode with enabled OCCT_DEBUG definition
60 +
61 +Error was fixed.
62 +---
63 +
64 +diff --git a/src/MAT2d/MAT2d_Tool2d.cxx b/src/MAT2d/MAT2d_Tool2d.cxx
65 +index 0175199..8b4324d 100644
66 +--- a/src/MAT2d/MAT2d_Tool2d.cxx
67 ++++ b/src/MAT2d/MAT2d_Tool2d.cxx
68 +@@ -1078,7 +1078,7 @@ void MAT2d_Tool2d::Dump(const Standard_Integer bisector,
69 + if(bisector == -1) return;
70 + if(bisector > theNumberOfBisectors) return;
71 +
72 +- Handle(Geom2d_Curve) thebisector = GeomBis(bisector).Value();
73 ++ Handle(Geom2d_Curve) thebisector = (Handle(Geom2d_Curve)) GeomBis(bisector).Value();
74 +
75 + MAT2d_DrawCurve(thebisector,3);
76 +
77
78 diff --git a/sci-libs/opencascade/files/opencascade-7.0.0-buildsystem.patch b/sci-libs/opencascade/files/opencascade-7.0.0-buildsystem.patch
79 new file mode 100644
80 index 0000000..f88c9f8
81 --- /dev/null
82 +++ b/sci-libs/opencascade/files/opencascade-7.0.0-buildsystem.patch
83 @@ -0,0 +1,13 @@
84 +--- opencascade-7.0.0/CMakeLists.txt
85 ++++ opencascade-7.0.0/CMakeLists.txt
86 +@@ -61,7 +61,10 @@
87 + # enable extended messages of many OCCT algorithms
88 + set (BUILD_WITH_DEBUG OFF CACHE BOOL "${BUILD_WITH_DEBUG_DESCR}")
89 + if (BUILD_WITH_DEBUG)
90 ++ message (STATUS "xmw: debug")
91 + add_definitions (-DOCCT_DEBUG)
92 ++else()
93 ++ message (STATUS "xmw: no debug")
94 + endif()
95 +
96 + # copy samples to install directory
97
98 diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
99 new file mode 100644
100 index 0000000..0dc2b1d
101 --- /dev/null
102 +++ b/sci-libs/opencascade/metadata.xml
103 @@ -0,0 +1,14 @@
104 +<?xml version="1.0" encoding="UTF-8"?>
105 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
106 +<pkgmetadata>
107 + <maintainer type="person">
108 + <email>xmw@g.o</email>
109 + <name>Michael Weber</name>
110 + </maintainer>
111 + <use>
112 + <flag name="freeimage">Enable support for image i/o via media-libs/freeimage</flag>
113 + <flag name="gl2ps">Use gl2ps PostScript printing library</flag>
114 + <flag name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
115 + <flag name="vtk">Enable Virtualisation Toolkit</flag>
116 + </use>
117 +</pkgmetadata>
118
119 diff --git a/sci-libs/opencascade/opencascade-7.0.0.ebuild b/sci-libs/opencascade/opencascade-7.0.0.ebuild
120 new file mode 100644
121 index 0000000..1eb8e33
122 --- /dev/null
123 +++ b/sci-libs/opencascade/opencascade-7.0.0.ebuild
124 @@ -0,0 +1,105 @@
125 +# Copyright 1999-2016 Gentoo Foundation
126 +# Distributed under the terms of the GNU General Public License v2
127 +# $Id$
128 +
129 +EAPI=5
130 +
131 +inherit cmake-utils eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
132 +
133 +DESCRIPTION="Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
134 +HOMEPAGE="http://www.opencascade.com/"
135 +SRC_URI="http://www.${PN}.com/sites/default/files/private/occt/OCC_${PV}_release/${P}.tgz"
136 +
137 +LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
138 +SLOT="${PV}"
139 +KEYWORDS="~amd64 ~x86"
140 +IUSE="debug doc examples freeimage gl2ps java tbb test vtk"
141 +
142 +MY_VTK="vtk-6.1"
143 +DEPEND="app-eselect/eselect-opencascade
144 + dev-lang/tcl:0=
145 + dev-lang/tk:0=
146 + dev-tcltk/itcl
147 + dev-tcltk/itk
148 + dev-tcltk/tix
149 + media-libs/freetype:2
150 + media-libs/ftgl
151 + virtual/glu
152 + virtual/opengl
153 + x11-libs/libXmu
154 + doc? ( app-doc/doxygen )
155 + freeimage? ( media-libs/freeimage )
156 + gl2ps? ( x11-libs/gl2ps )
157 + java? ( >=virtual/jdk-0:= )
158 + tbb? ( dev-cpp/tbb )
159 + vtk? ( =sci-libs/${MY_VTK}*[rendering] )"
160 +RDEPEND="${DEPEND}"
161 +
162 +# https://bugs.gentoo.org/show_bug.cgi?id=352435
163 +# https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
164 +RESTRICT="bindist fetch mirror"
165 +
166 +CHECKREQS_MEMORY="256M"
167 +CHECKREQS_DISK_BUILD="3584M"
168 +
169 +PATCHES=( "${FILESDIR}"/${P}-buildsystem.patch
170 + "${FILESDIR}"/${P}-MAT2d.patch )
171 +
172 +pkg_setup() {
173 + check-reqs_pkg_setup
174 + java-pkg-opt-2_pkg_setup
175 +}
176 +
177 +src_prepare() {
178 + cmake-utils_src_prepare
179 + java-pkg-opt-2_src_prepare
180 +}
181 +
182 +src_configure() {
183 + # from dox/dev_guides/building/cmake/cmake.md
184 + local mycmakeargs=(
185 + -DBUILD_WITH_DEBUG=$(usex debug)
186 + -DINSTALL_DIR="${EROOT}"usr
187 + -DINSTALL_DIR_WITH_VERSION=yes
188 + -DUSE_D3D=no
189 + -DUSE_FREEIMAGE=$(usex freeimage)
190 + -DUSE_GL2PS=$(usex gl2ps)
191 + -DUSE_TBB=$(usex tbb)
192 + -DUSE_VTK=$(usex vtk)
193 + -DBUILD_DOC_Overview=$(usex doc)
194 + -DINSTALL_DOC_Overview=$(usex doc)
195 + -DINSTALL_SAMPLES=$(usex examples)
196 + -DINSTALL_TEST_CASES=$(usex test)
197 + )
198 + cmake-utils_src_configure
199 +}
200 +
201 +src_install() {
202 + cmake-utils_src_install
203 +
204 + #insinto /etc/env.d/${PN}
205 + #newins 50${PN} ${PV}
206 +
207 + rm -v "${D}"usr/share/doc/${P}/README.txt* \
208 + "${D}"usr/share/doc/${P}/LICENSE_LGPL_21.txt* \
209 + "${D}"usr/share/doc/${P}/OCCT_LGPL_EXCEPTION.txt* || die
210 +
211 + if ! use examples; then
212 + rm -rf "${D}"usr/share/${P}/samples || die
213 + fi
214 +
215 + if use doc; then
216 + insinto /usr/share/doc/${PF}
217 + doins -r doc/{overview,pdf,refman}
218 + doins doc/release_notes_${PV}.pdf
219 + fi
220 +}
221 +
222 +pkg_postinst() {
223 + eselect ${PN} set ${PV}
224 + einfo
225 + elog "After upgrading OpenCASCADE you may have to rebuild packages depending on it."
226 + elog "You get a list by running \"equery depends sci-libs/opencascade\""
227 + elog "revdep-rebuild does NOT suffice."
228 + einfo
229 +}