Merge pull request #32 from DLR-SC/occt-7.6.2

Update OCCT and pythonocc to 7.6.2
DLR-SC · Jan 2, 2024 · 3f2655d · 3f2655d
2 parents 2277029 + 8204b03
commit 3f2655d
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 44 deletions.
diff --git a/.github/workflows/build-conda-packages.yml b/.github/workflows/build-conda-packages.yml
@@ -56,13 +56,20 @@ jobs:
         sudo mv MacOSX10.9.sdk /opt/
         ls /opt
 
+    # removing swig 4.0.1 which shadows conda's swig 4.0.2 for some reason in ubuntu 20.04. Can be removed for ubuntu22.04
+    - name: Swig workaround for ubuntu-20.04
+      if: contains(matrix.os, 'ubuntu-20.04')
+      shell: bash -l {0}
+      run: sudo rm /usr/bin/swig4.0
+
     - name: Install requirements (ubuntu, macos)
       if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos')
       shell: bash -l {0}
       run: |
         conda install -y conda-build gitpython anaconda-client mesa-dri-drivers-cos6-x86_64
         conda info -a
         conda list
+        echo $PATH
 
     - name: Install requirements (windows)
       if: contains(matrix.os, 'windows')

diff --git a/opencascade/fix-private-linking.patch b/opencascade/fix-private-linking.patch
@@ -1,11 +1,11 @@
-Index: opencascade-7.4.0/adm/cmake/occt_toolkit.cmake
+Index: opencascade-7.6.2/adm/cmake/occt_toolkit.cmake
 ===================================================================
---- opencascade-7.4.0.orig/adm/cmake/occt_toolkit.cmake
-+++ opencascade-7.4.0/adm/cmake/occt_toolkit.cmake
-@@ -354,7 +354,7 @@ else()
- endif()
-
- if (BUILD_SHARED_LIBS)
+--- opencascade-7.6.2.orig/adm/cmake/occt_toolkit.cmake
++++ opencascade-7.6.2/adm/cmake/occt_toolkit.cmake
+@@ -400,7 +400,7 @@
+   if(IS_VTK_9XX)
+     string (REGEX REPLACE "vtk" "VTK::" USED_TOOLKITS_BY_CURRENT_PROJECT "${USED_TOOLKITS_BY_CURRENT_PROJECT}")
+   endif()
 -  target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
 +  target_link_libraries (${PROJECT_NAME} PUBLIC ${USED_TOOLKITS_BY_CURRENT_PROJECT} PRIVATE ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
  endif()

diff --git a/opencascade/fix_brepblend.patch b/opencascade/fix_brepblend.patch
diff --git a/opencascade/meta.yaml b/opencascade/meta.yaml
@@ -1,22 +1,20 @@
 {% set name = "opencascade" %}
-{% set version = "7.4.0" %}
-{% set commit = "V7_4_0" %}
+{% set version = "7.6.2" %}
+{% set commit = "V7_6_2" %}
 package:
   name: {{ name }}
   version: {{ version }}
 
 source:
   fn: {{ name }}-{{ version }}.tar.gz
   url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h={{ commit }};sf=tgz
-  sha256: 9614c2075cef53e30b25317fc8fcfb71d60a69181d562e1c56469ed8e54ad758
+  sha256: 9f7285acdfe63754955dfba1114010d5f273ac2be189c9717c4228bb28fd675f
   patches:
-    - no-xmu.patch     # [linux]
     - fix-private-linking.patch
-    - fix_brepblend.patch
     - dlr-feature-coons_c2.patch
 
 build:
-  number: 10
+  number: 0
   detect_binary_files_with_prefix: True
 
 requirements:
@@ -38,13 +36,15 @@ requirements:
     - tbb-devel ==2019.5
     - python
     - freetype
+    - rapidjson
     - fontconfig # [unix]
 
   run:
     - freeimageplus
     - tbb ==2019.5
     - freetype
     - six
+    - rapidjson
 
 test:
   requires:

diff --git a/opencascade/no-xmu.patch b/opencascade/no-xmu.patch
diff --git a/python-occ-7x/meta.yaml b/python-occ-7x/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "7.4.1" %}
+{% set version = "7.6.2" %}
 
 package:
   name: pythonocc-core
@@ -11,7 +11,7 @@ source:
     - 0001-DLR-patch-to-support-c2-continous-coons-patches.patch
 
 build:
-  number: 9
+  number: 0
   binary_relocation: false [osx]
 
 requirements:
@@ -22,14 +22,14 @@ requirements:
     - {{ cdt('mesa-libgl-devel') }}     # [linux]
     - ninja
     - cmake
-    - swig >=3.0.11
+    - swig >=4.0.2
 
   host:
     - python {{ python }}
-    - opencascade ==7.4.0
+    - opencascade ==7.6.2
 
   run:
-    - opencascade ==7.4.0
+    - opencascade ==7.6.2
     - python
 
 test: