From 9fce7c3870923a6fdf907e5665c75706fba3de97 Mon Sep 17 00:00:00 2001 From: Jan Kleinert Date: Sat, 23 Dec 2023 23:57:40 +0100 Subject: [PATCH] bump opencascade and pythonocc to 7.6.2 --- .github/workflows/build-conda-packages.yml | 7 +++++++ opencascade/fix-private-linking.patch | 14 +++++++------- opencascade/fix_brepblend.patch | 13 ------------- opencascade/meta.yaml | 12 ++++++------ opencascade/no-xmu.patch | 13 ------------- python-occ-7x/meta.yaml | 10 +++++----- 6 files changed, 25 insertions(+), 44 deletions(-) delete mode 100644 opencascade/fix_brepblend.patch delete mode 100644 opencascade/no-xmu.patch diff --git a/.github/workflows/build-conda-packages.yml b/.github/workflows/build-conda-packages.yml index 2f1ffbd..c3b791f 100644 --- a/.github/workflows/build-conda-packages.yml +++ b/.github/workflows/build-conda-packages.yml @@ -56,6 +56,12 @@ 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 apt-get remove -y swig + - name: Install requirements (ubuntu, macos) if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos') shell: bash -l {0} @@ -63,6 +69,7 @@ jobs: 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 index bae9e06..d9e59c2 100644 --- 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 deleted file mode 100644 index e16a357..0000000 --- a/opencascade/fix_brepblend.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: opencascade-7.4.0/src/BRepBlend/BRepBlend_AppSurface.cxx -=================================================================== ---- opencascade-7.4.0.orig/src/BRepBlend/BRepBlend_AppSurface.cxx -+++ opencascade-7.4.0/src/BRepBlend/BRepBlend_AppSurface.cxx -@@ -126,7 +126,7 @@ Standard_Real BRepBlend_AppSurface::TolC - return approx.TolCurveOnSurf(Index); - } - --inline void BRepBlend_AppSurface::TolReached (Standard_Real& Tol3d, -+void BRepBlend_AppSurface::TolReached (Standard_Real& Tol3d, - Standard_Real& Tol2d) const - { - Tol3d = approx.MaxErrorOnSurf(); diff --git a/opencascade/meta.yaml b/opencascade/meta.yaml index 1f19c57..07ccf07 100644 --- a/opencascade/meta.yaml +++ b/opencascade/meta.yaml @@ -1,6 +1,6 @@ {% 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 }} @@ -8,15 +8,13 @@ package: 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,6 +36,7 @@ requirements: - tbb-devel ==2019.5 - python - freetype + - rapidjson - fontconfig # [unix] run: @@ -45,6 +44,7 @@ requirements: - tbb ==2019.5 - freetype - six + - rapidjson test: requires: diff --git a/opencascade/no-xmu.patch b/opencascade/no-xmu.patch deleted file mode 100644 index df81194..0000000 --- a/opencascade/no-xmu.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: opencascade-7.4.0/adm/cmake/occt_csf.cmake -=================================================================== ---- opencascade-7.4.0.orig/adm/cmake/occt_csf.cmake -+++ opencascade-7.4.0/adm/cmake/occt_csf.cmake -@@ -115,7 +115,7 @@ else() - else() - set (CSF_OpenGlLibs "GL") - endif() -- set (CSF_XwLibs "X11 Xext Xmu Xi") -+ set (CSF_XwLibs "X11 Xext Xi") - set (CSF_dl "dl") - set (CSF_fontconfig "fontconfig") - endif() diff --git a/python-occ-7x/meta.yaml b/python-occ-7x/meta.yaml index fc18a39..5cccc9c 100644 --- 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: