commit 8be4675f11dcc58addb03cfcd90dbbd52dbd7698
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Mon Apr 29 18:56:37 2024 +0200
- adjusted patch for OpenCASCADE 7.8.0 libraries; release 3
OpenSceneGraph-OpenCASCADE.patch | 73 ++++++++++++++++++++++++++++++++++++++++
OpenSceneGraph.spec | 4 +--
2 files changed, 75 insertions(+), 2 deletions(-)
---
diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec
index 4834725..0536c85 100644
--- a/OpenSceneGraph.spec
+++ b/OpenSceneGraph.spec
@@ -8,7 +8,7 @@ Summary: Open Scene Graph - real-time visualization
library
Summary(pl.UTF-8): Open Scene Graph - biblioteka do wizualizacji
Name: OpenSceneGraph
Version: 3.6.5
-Release: 2
+Release: 3
License: OpenSceneGraph Public Licence (based on LGPL with exceptions)
Group: X11/Libraries
#Source0Download: https://github.com/openscenegraph/OpenSceneGraph/releases
@@ -23,7 +23,7 @@ Patch3: %{name}-openexr3.patch
URL:
https://www.openscenegraph.org/index.php/33-openscenegraph/4-front-page
BuildRequires: Coin-devel
BuildRequires: EGL-devel
-BuildRequires: OpenCASCADE-devel
+BuildRequires: OpenCASCADE-devel >= 7.8.0
BuildRequires: OpenEXR-devel
BuildRequires: OpenGL-devel >= 2
BuildRequires: Qt5Core-devel >= 5
diff --git a/OpenSceneGraph-OpenCASCADE.patch b/OpenSceneGraph-OpenCASCADE.patch
index df22925..268ff90 100644
--- a/OpenSceneGraph-OpenCASCADE.patch
+++ b/OpenSceneGraph-OpenCASCADE.patch
@@ -9,3 +9,76 @@
vertexList->push_back(osg::Vec3(pt.X(), pt.Y(), pt.Z()));
// populate color list
+---
OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeModules/FindOpenCascade.cmake.orig
2020-01-31 12:03:07.000000000 +0100
++++ OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeModules/FindOpenCascade.cmake
2024-04-29 06:17:25.777631751 +0200
+@@ -71,7 +71,6 @@ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKG
+ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKGeomAlgo TKGeomAlgo)
+ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKGeomBase TKGeomBase)
+ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKHLR TKHLR)
+-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKIGES TKIGES)
+ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKLCAF TKLCAF)
+ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKMath TKMath)
+ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKMesh TKMesh)
+@@ -81,17 +80,13 @@ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKO
+ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKPrim TKPrim)
+ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKService TKService)
+ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKShHealing TKShHealing)
+-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEP209 TKSTEP209)
+-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEPAttr TKSTEPAttr)
+-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEPBase TKSTEPBase)
+-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEP TKSTEP)
+-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTL TKSTL)
++FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKDESTL TKDESTL)
+ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKTObj TKTObj)
+ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKTopAlgo TKTopAlgo)
+ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKV3d TKV3d)
+-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKVRML TKVRML)
+-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXDEIGES TKXDEIGES)
+-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXDESTEP TKXDESTEP)
++FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKDEVRML TKDEVRML)
++FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKDEIGES TKDEIGES)
++FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKDESTEP TKDESTEP)
+ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXMesh TKXMesh)
+ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXmlL TKXmlL)
+ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXml TKXml)
+@@ -118,13 +113,8 @@ SET(OPENCASCADE_LIBRARY ${OPENCASCADE_LI
+ ${OPENCASCADE_TKMath}
+ ${OPENCASCADE_TKXCAF}
+ ${OPENCASCADE_TKXSBase}
+- ${OPENCASCADE_TKSTEPAttr}
+- ${OPENCASCADE_TKSTEPBase}
+- ${OPENCASCADE_TKSTEP209}
+- ${OPENCASCADE_TKSTEP}
+- ${OPENCASCADE_TKXDESTEP}
+- ${OPENCASCADE_TKIGES}
+- ${OPENCASCADE_TKXDEIGES}
++ ${OPENCASCADE_TKDESTEP}
++ ${OPENCASCADE_TKDEIGES}
+ ${OPENCASCADE_TKLCAF}
+ ${OPENCASCADE_TKBRep}
+ ${OPENCASCADE_TKMesh}
+@@ -144,22 +134,17 @@ SET(OPENCASCADE_LIBRARY ${OPENCASCADE_LI
+ ${OPENCASCADE_TKGeomAlgo}
+ ${OPENCASCADE_TKGeomBase}
+ ${OPENCASCADE_TKHLR}
+- ${OPENCASCADE_TKIGES}
+ ${OPENCASCADE_TKLCAF}
+ ${OPENCASCADE_TKMath}
+ ${OPENCASCADE_TKMesh}
+ ${OPENCASCADE_TKPrim}
+ ${OPENCASCADE_TKService}
+ ${OPENCASCADE_TKShHealing}
+- ${OPENCASCADE_TKSTEP}
+- ${OPENCASCADE_TKSTEP209}
+- ${OPENCASCADE_TKSTEPAttr}
+- ${OPENCASCADE_TKSTEPBase}
+ ${OPENCASCADE_TKTopAlgo}
+ ${OPENCASCADE_TKV3d}
+ ${OPENCASCADE_TKXCAF}
+- ${OPENCASCADE_TKXDEIGES}
+- ${OPENCASCADE_TKXDESTEP}
++ ${OPENCASCADE_TKDEIGES}
++ ${OPENCASCADE_TKDESTEP}
+ ${OPENCASCADE_TKXSBase}
+ )
+ endif ("${OPENCASCADE_LIBRARY_TYPE}" STREQUAL "Shared")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/OpenSceneGraph.git/commitdiff/8be4675f11dcc58addb03cfcd90dbbd52dbd7698
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
