mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
opencascade: update to version 7.8.0 (#9924)
* opencascade: update to version 7.8.0
This commit is contained in:
Joachim Mairböck
GitHub
@@ -7,9 +7,9 @@ COPYRIGHT="1993-1999 Matra Datavision
|
||||
1999-2020 OPEN CASCADE SAS"
|
||||
LICENSE="GNU LGPL v2.1
|
||||
Open CASCADE exception v1.0"
|
||||
REVISION="4"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${portVersion//./_};sf=tgz"
|
||||
CHECKSUM_SHA256="2fb23c8d67a7b72061b4f7a6875861e17d412d524527b2a96151ead1d9cfa2c1"
|
||||
CHECKSUM_SHA256="b9c8f0a9d523ac1a606697f95fc39d8acf1140d3728561b8010a604431b4e9cf"
|
||||
SOURCE_DIR="occt-V${portVersion//./_}"
|
||||
PATCHES="opencascade-$portVersion.patchset"
|
||||
|
||||
@@ -48,6 +48,15 @@ PROVIDES="
|
||||
lib:libTKBRep$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKCAF$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKCDF$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKDE$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKDECascade$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKDEGLTF$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKDEIGES$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKDEOBJ$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKDEPLY$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKDESTEP$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKDESTL$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKDEVRML$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKernel$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKFeat$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKFillet$secondaryArchSuffix = $libVersionCompat
|
||||
@@ -56,7 +65,6 @@ PROVIDES="
|
||||
lib:libTKGeomAlgo$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKGeomBase$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKHLR$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKIGES$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKLCAF$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKMath$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKMesh$secondaryArchSuffix = $libVersionCompat
|
||||
@@ -69,21 +77,11 @@ PROVIDES="
|
||||
lib:libTKShHealing$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKStd$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKStdL$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKSTEP$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKSTEP209$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKSTEPAttr$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKSTEPBase$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKSTL$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKTObj$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKTopAlgo$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKV3d$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKVCAF$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKVRML$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXCAF$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXDE$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXDECascade$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXDEIGES$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXDESTEP$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXMesh$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXml$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXmlL$secondaryArchSuffix = $libVersionCompat
|
||||
@@ -120,6 +118,15 @@ PROVIDES_devel="
|
||||
devel:libTKCAF$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKCDF$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKDCAF$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKDE$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKDECascade$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKDEGLTF$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKDEIGES$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKDEOBJ$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKDEPLY$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKDESTEP$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKDESTL$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKDEVRML$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKDFBrowser$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKDraw$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKernel$secondaryArchSuffix = $libVersionCompat
|
||||
@@ -131,7 +138,6 @@ PROVIDES_devel="
|
||||
devel:libTKGeomAlgo$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKGeomBase$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKHLR$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKIGES$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKLCAF$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKMath$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKMesh$secondaryArchSuffix = $libVersionCompat
|
||||
@@ -149,11 +155,6 @@ PROVIDES_devel="
|
||||
devel:libTKShHealing$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKStd$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKStdL$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKSTEP$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKSTEP209$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKSTEPAttr$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKSTEPBase$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKSTL$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKTInspector$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKTInspectorAPI$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKTObj$secondaryArchSuffix = $libVersionCompat
|
||||
@@ -165,15 +166,10 @@ PROVIDES_devel="
|
||||
devel:libTKV3d$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKVCAF$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKVInspector$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKVRML$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKView$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKViewerTest$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXCAF$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXDE$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXDECascade$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXDEDRAW$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXDEIGES$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXDESTEP$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXMesh$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXml$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXmlL$secondaryArchSuffix = $libVersionCompat
|
||||
@@ -181,6 +177,14 @@ PROVIDES_devel="
|
||||
devel:libTKXmlXCAF$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXSBase$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXSDRAW$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXSDRAWDE$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXSDRAWGLTF$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXSDRAWIGES$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXSDRAWOBJ$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXSDRAWPLY$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXSDRAWSTEP$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXSDRAWSTL$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libTKXSDRAWVRML$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
opencascade$secondaryArchSuffix == $portVersion base
|
||||
@@ -265,6 +269,14 @@ PROVIDES_tools="
|
||||
lib:libTKViewerTest$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXDEDRAW$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXSDRAW$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXSDRAWDE$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXSDRAWGLTF$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXSDRAWIGES$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXSDRAWOBJ$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXSDRAWPLY$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXSDRAWSTEP$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXSDRAWSTL$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libTKXSDRAWVRML$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_tools="
|
||||
opencascade$secondaryArchSuffix == $portVersion base
|
||||
@@ -335,6 +347,7 @@ BUILD()
|
||||
-D3RDPARTY_QT_DIR=$portPackageLinksDir/devel~libqt5 \
|
||||
-D3RDPARTY_SKIP_DOT_EXECUTABLE=OFF \
|
||||
-DBUILD_Inspector=ON \
|
||||
-DBUILD_OPT_PROFILE=Production \
|
||||
-DBUILD_SAMPLES_QT=ON \
|
||||
-DINSTALL_DIR=$prefix \
|
||||
-DINSTALL_DIR_BIN=$relativeCommandBinDir \
|
||||
@@ -371,16 +384,17 @@ INSTALL()
|
||||
make -C build install
|
||||
|
||||
prepareInstalledDevelLibs libTKBin libTKBinL libTKBinTObj libTKBinXCAF libTKBO libTKBool \
|
||||
libTKBRep libTKCAF libTKCDF libTKDCAF libTKDFBrowser libTKDraw libTKernel libTKExpress \
|
||||
libTKFeat libTKFillet libTKG2d libTKG3d libTKGeomAlgo libTKGeomBase libTKHLR libTKIGES \
|
||||
libTKLCAF libTKMath libTKMesh libTKMeshVS libTKMessageModel libTKMessageView libTKOffset \
|
||||
libTKPrim libTKQADraw libTKRWMesh libTKService libTKShapeView \
|
||||
libTKShHealing libTKStd libTKStdL libTKSTEP libTKSTEP209 libTKSTEPAttr libTKSTEPBase \
|
||||
libTKSTL libTKTInspector libTKTInspectorAPI libTKTObj libTKTObjDRAW libTKToolsDraw \
|
||||
libTKTopAlgo libTKTopTest libTKTreeModel libTKV3d libTKVCAF libTKView libTKViewerTest \
|
||||
libTKVInspector libTKVRML libTKXCAF libTKXDE libTKXDECascade libTKXDEDRAW libTKXDEIGES \
|
||||
libTKXDESTEP libTKXMesh libTKXml libTKXmlL libTKXmlTObj libTKXmlXCAF libTKXSBase \
|
||||
libTKXSDRAW
|
||||
libTKBRep libTKCAF libTKCDF libTKDCAF libTKDE libTKDECascade libTKDEGLTF libTKDEIGES \
|
||||
libTKDEOBJ libTKDEPLY libTKDESTEP libTKDESTL libTKDEVRML libTKDFBrowser libTKDraw \
|
||||
libTKernel libTKExpress libTKFeat libTKFillet libTKG2d libTKG3d libTKGeomAlgo \
|
||||
libTKGeomBase libTKHLR libTKLCAF libTKMath libTKMesh libTKMeshVS libTKMessageModel \
|
||||
libTKMessageView libTKOffset libTKPrim libTKQADraw libTKRWMesh libTKService \
|
||||
libTKShapeView libTKShHealing libTKStd libTKStdL libTKTInspector libTKTInspectorAPI \
|
||||
libTKTObj libTKTObjDRAW libTKToolsDraw libTKTopAlgo libTKTopTest libTKTreeModel libTKV3d \
|
||||
libTKVCAF libTKView libTKViewerTest libTKVInspector libTKXCAF libTKXDEDRAW libTKXMesh \
|
||||
libTKXml libTKXmlL libTKXmlTObj libTKXmlXCAF libTKXSBase libTKXSDRAW libTKXSDRAWDE \
|
||||
libTKXSDRAWGLTF libTKXSDRAWIGES libTKXSDRAWOBJ libTKXSDRAWPLY libTKXSDRAWSTEP \
|
||||
libTKXSDRAWSTL libTKXSDRAWVRML
|
||||
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
@@ -405,9 +419,11 @@ INSTALL()
|
||||
$dataDir/opencascade/resources/DrawResources
|
||||
|
||||
# for dynamic loading, version-less symlinks are needed for some libraries
|
||||
toolsLibs="libTKDraw libTKTopTest libTKViewerTest libTKXSDRAW libTKDCAF \
|
||||
libTKXDEDRAW libTKTObjDRAW libTKQADraw libTKShapeView libTKMessageModel libTKMessageView \
|
||||
libTKView libTKVInspector libTKTreeModel libTKDFBrowser libTKToolsDraw"
|
||||
toolsLibs="libTKDraw libTKTopTest libTKViewerTest libTKXSDRAW libTKXSDRAWDE libTKXSDRAWGLTF \
|
||||
libTKXSDRAWIGES libTKXSDRAWOBJ libTKXSDRAWPLY libTKXSDRAWSTEP libTKXSDRAWSTL \
|
||||
libTKXSDRAWVRML libTKDCAF libTKXDEDRAW libTKTObjDRAW libTKQADraw libTKShapeView \
|
||||
libTKMessageModel libTKMessageView libTKView libTKVInspector libTKTreeModel \
|
||||
libTKDFBrowser libTKToolsDraw"
|
||||
for lib in $toolsLibs; do
|
||||
ln -s $lib.so.$portVersion $libDir/$lib.so
|
||||
packageEntries tools \
|
||||
@@ -1,4 +1,4 @@
|
||||
From f986751f670e135a476903a6829976677d049eb2 Mon Sep 17 00:00:00 2001
|
||||
From db11071df1934abe7242cf436e4712fc79c8e8c9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
|
||||
Date: Sun, 18 Dec 2022 20:25:23 +0100
|
||||
Subject: Haiku support
|
||||
@@ -56,7 +56,7 @@ index e391ddf..6dc2e77 100644
|
||||
get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
|
||||
get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
|
||||
diff --git a/adm/templates/env.build.sh.in b/adm/templates/env.build.sh.in
|
||||
index 7e11c62..d95ff2d 100644
|
||||
index 3026d4c..888440c 100644
|
||||
--- a/adm/templates/env.build.sh.in
|
||||
+++ b/adm/templates/env.build.sh.in
|
||||
@@ -31,6 +31,8 @@ aSystem=`uname -s`
|
||||
@@ -68,7 +68,7 @@ index 7e11c62..d95ff2d 100644
|
||||
else
|
||||
export WOKSTATION="lin";
|
||||
fi
|
||||
@@ -108,6 +110,14 @@ if [ "$WOKSTATION" == "mac" ]; then
|
||||
@@ -112,6 +114,14 @@ if [ "$WOKSTATION" == "mac" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -84,7 +84,7 @@ index 7e11c62..d95ff2d 100644
|
||||
export CSF_LANGUAGE=us
|
||||
export MMGT_CLEAR=1
|
||||
diff --git a/adm/templates/env.install.sh.in b/adm/templates/env.install.sh.in
|
||||
index bdb2dec..b2ce8c7 100644
|
||||
index 36254ff..bc087e6 100644
|
||||
--- a/adm/templates/env.install.sh.in
|
||||
+++ b/adm/templates/env.install.sh.in
|
||||
@@ -33,6 +33,8 @@ aSystem=`uname -s`
|
||||
@@ -96,7 +96,7 @@ index bdb2dec..b2ce8c7 100644
|
||||
else
|
||||
export WOKSTATION="lin";
|
||||
fi
|
||||
@@ -110,6 +112,14 @@ if [ "$WOKSTATION" == "mac" ]; then
|
||||
@@ -114,6 +116,14 @@ if [ "$WOKSTATION" == "mac" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -241,10 +241,10 @@ index 7da3f19..72a1464 100644
|
||||
#endif
|
||||
|
||||
diff --git a/src/Standard/Standard_CString.cxx b/src/Standard/Standard_CString.cxx
|
||||
index f73d6b6..a40a2f7 100755
|
||||
index c62acd7..719f567 100755
|
||||
--- a/src/Standard/Standard_CString.cxx
|
||||
+++ b/src/Standard/Standard_CString.cxx
|
||||
@@ -79,7 +79,7 @@ Standard_Integer HashCodes (const Standard_CString theString, const Standard_Int
|
||||
@@ -49,7 +49,7 @@
|
||||
// glibc version for android platform use locale-independent implementation of
|
||||
// strtod, strtol, strtoll functions. For other system with locale-depended
|
||||
// implementations problems may appear if "C" locale is not set explicitly.
|
||||
@@ -254,7 +254,7 @@ index f73d6b6..a40a2f7 100755
|
||||
#endif
|
||||
#define strtod_l(thePtr, theNextPtr, theLocale) strtod(thePtr, theNextPtr)
|
||||
diff --git a/tests/perf/fclasses/bug24947 b/tests/perf/fclasses/bug24947
|
||||
index 39bb04b..0707f0d 100644
|
||||
index 493de12..ed5f356 100644
|
||||
--- a/tests/perf/fclasses/bug24947
|
||||
+++ b/tests/perf/fclasses/bug24947
|
||||
@@ -6,6 +6,7 @@ switch -nocase [checkplatform] {
|
||||
@@ -266,10 +266,10 @@ index 39bb04b..0707f0d 100644
|
||||
|
||||
for {set i 0} {$i < 1000} {incr i} {
|
||||
--
|
||||
2.37.3
|
||||
2.42.1
|
||||
|
||||
|
||||
From 5e0fca2d4c328191bda56db541a2e09ea765491f Mon Sep 17 00:00:00 2001
|
||||
From dd1e5248c2491f13aa80d0c350e7ed4b3ab29c4c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
|
||||
Date: Sun, 18 Dec 2022 20:26:18 +0100
|
||||
Subject: allow building the OpenGl module on Haiku
|
||||
@@ -309,10 +309,10 @@ index a1b5b2b..26c2d27 100644
|
||||
|
||||
#if !defined(HAVE_EGL)
|
||||
--
|
||||
2.37.3
|
||||
2.42.1
|
||||
|
||||
|
||||
From b36417c4388fb9af881ee5be23d0fe7964ea4338 Mon Sep 17 00:00:00 2001
|
||||
From e56aab06074fb2977028161ff44903f4eab397ca Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
|
||||
Date: Sun, 4 Dec 2022 21:33:38 +0100
|
||||
Subject: add a stub to allow building on Haiku when not using Xlib
|
||||
@@ -334,10 +334,10 @@ index a9b7406..87c8069 100644
|
||||
//
|
||||
#endif
|
||||
--
|
||||
2.37.3
|
||||
2.42.1
|
||||
|
||||
|
||||
From 83c7ca84fa3315a6bf4f2370828f8766d82cc00c Mon Sep 17 00:00:00 2001
|
||||
From b351369d7b73d208f56292d0e69bbaf130e0b68a Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Waibel <waebbl@gmail.com>
|
||||
Date: Wed, 3 Feb 2021 23:31:23 +0100
|
||||
Subject: allow default search path for Qt5
|
||||
@@ -358,10 +358,10 @@ index 535e6a2..ca8fa9a 100644
|
||||
# Now we can apply standard CMake finder for Qt. We do this mostly
|
||||
# to have qt4_wrap_cpp() function available
|
||||
--
|
||||
2.37.3
|
||||
2.42.1
|
||||
|
||||
|
||||
From bdb2616cdb97d4b0fb20aa623c2d80c511d66422 Mon Sep 17 00:00:00 2001
|
||||
From 475152c06b15bb0f75dec222374680c2728321f1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
|
||||
Date: Sun, 18 Dec 2022 20:16:41 +0100
|
||||
Subject: allow building without OpenGL (stubbed)
|
||||
@@ -369,10 +369,10 @@ Subject: allow building without OpenGL (stubbed)
|
||||
Tools which use a 3d viewer will now crash if built without OpenGL because there is no driver.
|
||||
|
||||
diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake
|
||||
index 132890b..0cdb426 100644
|
||||
index c939915..5e2df27 100644
|
||||
--- a/adm/cmake/occt_toolkit.cmake
|
||||
+++ b/adm/cmake/occt_toolkit.cmake
|
||||
@@ -434,6 +434,10 @@ if (USE_DRACO)
|
||||
@@ -440,6 +440,10 @@ if (USE_DRACO)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -534,7 +534,7 @@ index d92b6d5..3f361aa 100644
|
||||
Handle(V3d_Viewer) aViewer = new V3d_Viewer(aGraphicDriver);
|
||||
aViewer->SetDefaultViewSize(theViewSize);
|
||||
diff --git a/tools/View/View_Viewer.cxx b/tools/View/View_Viewer.cxx
|
||||
index f2d8dac..60a778a 100644
|
||||
index 5ba225a..becc510 100644
|
||||
--- a/tools/View/View_Viewer.cxx
|
||||
+++ b/tools/View/View_Viewer.cxx
|
||||
@@ -15,7 +15,11 @@
|
||||
@@ -546,10 +546,10 @@ index f2d8dac..60a778a 100644
|
||||
+#ifdef HAVE_OPENGL_EXT
|
||||
#include <OpenGl_GraphicDriver.hxx>
|
||||
+#endif
|
||||
#include <Standard_ExtString.hxx>
|
||||
|
||||
// =======================================================================
|
||||
@@ -56,7 +60,11 @@ void View_Viewer::InitViewer (const Handle(AIS_InteractiveContext)& theContext)
|
||||
// function : CreateView
|
||||
@@ -55,7 +59,11 @@ void View_Viewer::InitViewer (const Handle(AIS_InteractiveContext)& theContext)
|
||||
Handle(AIS_InteractiveContext) View_Viewer::CreateStandardViewer()
|
||||
{
|
||||
Handle(Aspect_DisplayConnection) aDisplayConnection = new Aspect_DisplayConnection();
|
||||
@@ -562,5 +562,5 @@ index f2d8dac..60a778a 100644
|
||||
Handle(V3d_Viewer) aViewer = new V3d_Viewer (aGraphicDriver);
|
||||
aViewer->SetDefaultLights();
|
||||
--
|
||||
2.37.3
|
||||
2.42.1
|
||||
|
||||
Reference in New Issue
Block a user